From patchwork Fri Jul 21 13:54:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksij Rempel X-Patchwork-Id: 123874 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp223091vqg; Fri, 21 Jul 2023 06:59:07 -0700 (PDT) X-Google-Smtp-Source: APBJJlEVYmJqJxjzEcDvQghOiifdqii3cAB3B6D/gaqcWyjShfmlR06Kzwo7G55j5XOXOVLrYcAx X-Received: by 2002:a05:6a20:7d87:b0:10f:f672:6e88 with SMTP id v7-20020a056a207d8700b0010ff6726e88mr2282676pzj.4.1689947947493; Fri, 21 Jul 2023 06:59:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689947947; cv=none; d=google.com; s=arc-20160816; b=FyGHFC4ivDXHhJbum/JWJ+pTYEIqCFBh5RNeejaHlnc3rNIM7+XAg3JGyADAONQrC2 E09DTAmko1Rw0QeWayRdOxWcNXdfFi9yjsRpuAsb3ylbB0VNqspErxVVLowNVVu4YO84 8KMX8tTrMqOWIddV5eB7zOp5T0wRBqLj3GtH2I1R+nacouDWF4wctXnK37ODV0t9xDaM 1Vt/JtNfzpsYL9nLw7Sb+KaVJs7+SL5FIzMcfaPrUaKu/4nwNNrKvhrsTukr13xrWgtA ozjPCXQob/9aqjzcKwhz8CixMvElpzjyLDFjjEYsTMbx71zonSk09wzAKQYjm3n4RWwt iX2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=vkLWy8dyGjDGji5Pw5E0MiV7CRqIjjFYWuh5RdiEnqs=; fh=d9XFsL0QiW7mB0yy/Dn7n/CVmKRQqLnFoPiaUGJewck=; b=ZwbZwIYkHscPID/rz5NEt9t4oBlAg/y914IQmRb02Bi/Fppf7LT9czPfiOdF/UIPmH CxK34aidr3TzBRiFOcOgI1Y5NTzp0JBTEfwYr8xqG0kKcf+hDeRdT4Wa3wHWTvmMflpE HDs4sRymbnzu3xL6xi6MhdO1hkoJycIFZLGViPmXNBB2Q1gJMBiSGwKKbX72y8IcUe8C dW9SUMjNmdO6l5OzLXyWueKzoHSdKuZT9oy4L7QO5nrNlybqTZ31/KlCF9pvbJqbpsgk 6nrT06sYoINyQ3NGHRPQ1AFKtJaGVVKnnIKggVlzL34wS1ws63q7wYu5pOgY1Bpe9usB A6/g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q13-20020a62e10d000000b00672ad8f038csi2903534pfh.184.2023.07.21.06.58.54; Fri, 21 Jul 2023 06:59:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231639AbjGUNz6 (ORCPT + 99 others); Fri, 21 Jul 2023 09:55:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51256 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231573AbjGUNzu (ORCPT ); Fri, 21 Jul 2023 09:55:50 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ACBA630D4 for ; Fri, 21 Jul 2023 06:55:31 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qMqb3-0005Rr-W2; Fri, 21 Jul 2023 15:55:06 +0200 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1qMqb1-00150Y-AA; Fri, 21 Jul 2023 15:55:03 +0200 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1qMqb0-0068zO-21; Fri, 21 Jul 2023 15:55:02 +0200 From: Oleksij Rempel To: "David S. Miller" , Andrew Lunn , Eric Dumazet , Florian Fainelli , Jakub Kicinski , Paolo Abeni , Vladimir Oltean , Woojung Huh , Arun Ramadoss , Conor Dooley , Krzysztof Kozlowski , Rob Herring Cc: Oleksij Rempel , kernel@pengutronix.de, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, UNGLinuxDriver@microchip.com, "Russell King (Oracle)" , devicetree@vger.kernel.org Subject: [PATCH net-next v2 4/6] net: dsa: microchip: ksz9477: add Wake on PHY event support Date: Fri, 21 Jul 2023 15:54:59 +0200 Message-Id: <20230721135501.1464455-5-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230721135501.1464455-1-o.rempel@pengutronix.de> References: <20230721135501.1464455-1-o.rempel@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ore@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772038858530428381 X-GMAIL-MSGID: 1772038858530428381 KSZ9477 family of switches supports multiple PHY events: - wake on Link Up - wake on Energy Detect. Since current UAPI can't differentiate between this PHY events, map all of them to WAKE_PHY. Signed-off-by: Oleksij Rempel Reviewed-by: Florian Fainelli --- drivers/net/dsa/microchip/ksz9477.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchip/ksz9477.c index d14fcc98ec1e0..e3143b95a8ec9 100644 --- a/drivers/net/dsa/microchip/ksz9477.c +++ b/drivers/net/dsa/microchip/ksz9477.c @@ -88,7 +88,7 @@ void ksz9477_get_wol(struct ksz_device *dev, int port, if (!(pme_conf & PME_ENABLE)) return; - wol->supported = WAKE_MAGIC; + wol->supported = WAKE_PHY | WAKE_MAGIC; ret = ksz_pread8(dev, port, REG_PORT_PME_CTRL, &pme_ctrl); if (ret) @@ -96,6 +96,8 @@ void ksz9477_get_wol(struct ksz_device *dev, int port, if (pme_ctrl & PME_WOL_MAGICPKT) wol->wolopts |= WAKE_MAGIC; + if (pme_ctrl & (PME_WOL_LINKUP | PME_WOL_ENERGY)) + wol->wolopts |= WAKE_PHY; } int ksz9477_set_wol(struct ksz_device *dev, int port, @@ -104,7 +106,7 @@ int ksz9477_set_wol(struct ksz_device *dev, int port, u8 pme_conf, pme_ctrl = 0; int ret; - if (wol->wolopts & ~WAKE_MAGIC) + if (wol->wolopts & ~(WAKE_PHY | WAKE_MAGIC)) return -EINVAL; ret = ksz_read8(dev, REG_SW_PME_CTRL, &pme_conf); @@ -120,6 +122,8 @@ int ksz9477_set_wol(struct ksz_device *dev, int port, if (wol->wolopts & WAKE_MAGIC) pme_ctrl |= PME_WOL_MAGICPKT; + if (wol->wolopts & WAKE_PHY) + pme_ctrl |= PME_WOL_LINKUP | PME_WOL_ENERGY; return ksz_pwrite8(dev, port, REG_PORT_PME_CTRL, pme_ctrl); }