From: Oleksij Rempel <o.rempel@pengutronix.de>
To: "David S. Miller" <davem@davemloft.net>,
Andrew Lunn <andrew@lunn.ch>, Eric Dumazet <edumazet@google.com>,
Florian Fainelli <f.fainelli@gmail.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Vladimir Oltean <olteanv@gmail.com>,
Woojung Huh <woojung.huh@microchip.com>,
Arun Ramadoss <arun.ramadoss@microchip.com>,
Conor Dooley <conor+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Rob Herring <robh+dt@kernel.org>
Cc: Oleksij Rempel <o.rempel@pengutronix.de>,
kernel@pengutronix.de, linux-kernel@vger.kernel.org,
netdev@vger.kernel.org, UNGLinuxDriver@microchip.com,
"Russell King (Oracle)" <linux@armlinux.org.uk>,
devicetree@vger.kernel.org
Subject: [PATCH net-next v3 7/7] net: dsa: microchip: do not shut down the switch if WoL is active
Date: Fri, 13 Oct 2023 14:24:05 +0200 [thread overview]
Message-ID: <20231013122405.3745475-8-o.rempel@pengutronix.de> (raw)
In-Reply-To: <20231013122405.3745475-1-o.rempel@pengutronix.de>
For Wake on Lan we should not reconfigure, reset or power down the
switch on shut down sequence.
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
---
drivers/net/dsa/microchip/ksz9477_i2c.c | 3 +++
drivers/net/dsa/microchip/ksz_common.c | 18 ++++++++++++++++++
drivers/net/dsa/microchip/ksz_common.h | 2 ++
drivers/net/dsa/microchip/ksz_spi.c | 3 +++
4 files changed, 26 insertions(+)
diff --git a/drivers/net/dsa/microchip/ksz9477_i2c.c b/drivers/net/dsa/microchip/ksz9477_i2c.c
index 2710afad4f3a..fe818742051c 100644
--- a/drivers/net/dsa/microchip/ksz9477_i2c.c
+++ b/drivers/net/dsa/microchip/ksz9477_i2c.c
@@ -66,6 +66,9 @@ static void ksz9477_i2c_shutdown(struct i2c_client *i2c)
if (!dev)
return;
+ if (ksz_wol_is_active(dev))
+ return;
+
if (dev->dev_ops->reset)
dev->dev_ops->reset(dev);
diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c
index 820edda82cea..c3669b9cc6ce 100644
--- a/drivers/net/dsa/microchip/ksz_common.c
+++ b/drivers/net/dsa/microchip/ksz_common.c
@@ -2959,6 +2959,24 @@ static int ksz_set_wol(struct dsa_switch *ds, int port,
return -EOPNOTSUPP;
}
+bool ksz_wol_is_active(struct ksz_device *dev)
+{
+ struct dsa_port *dp;
+
+ if (!dev->wakeup_source)
+ return false;
+
+ dsa_switch_for_each_user_port(dp, dev->ds) {
+ struct ethtool_wolinfo wol;
+
+ ksz_get_wol(dev->ds, dp->index, &wol);
+ if (wol.wolopts)
+ return true;
+ }
+
+ return false;
+}
+
static void ksz_set_xmii(struct ksz_device *dev, int port,
phy_interface_t interface)
{
diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/microchip/ksz_common.h
index 80679f38ee12..84b1eed8cd2a 100644
--- a/drivers/net/dsa/microchip/ksz_common.h
+++ b/drivers/net/dsa/microchip/ksz_common.h
@@ -397,6 +397,8 @@ bool ksz_get_gbit(struct ksz_device *dev, int port);
phy_interface_t ksz_get_xmii(struct ksz_device *dev, int port, bool gbit);
extern const struct ksz_chip_data ksz_switch_chips[];
+bool ksz_wol_is_active(struct ksz_device *dev);
+
/* Common register access functions */
static inline struct regmap *ksz_regmap_8(struct ksz_device *dev)
{
diff --git a/drivers/net/dsa/microchip/ksz_spi.c b/drivers/net/dsa/microchip/ksz_spi.c
index 279338451621..c5d9c3d86ddb 100644
--- a/drivers/net/dsa/microchip/ksz_spi.c
+++ b/drivers/net/dsa/microchip/ksz_spi.c
@@ -114,6 +114,9 @@ static void ksz_spi_shutdown(struct spi_device *spi)
if (!dev)
return;
+ if (ksz_wol_is_active(dev))
+ return;
+
if (dev->dev_ops->reset)
dev->dev_ops->reset(dev);
--
2.39.2
next prev parent reply other threads:[~2023-10-13 12:24 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-13 12:23 [PATCH net-next v3 0/7] net: dsa: microchip: provide Wake on LAN support Oleksij Rempel
2023-10-13 12:23 ` [PATCH net-next v3 1/7] net: dsa: microchip: Add missing MAC address register offset for ksz8863 Oleksij Rempel
2023-10-14 16:55 ` Andrew Lunn
2023-10-15 21:14 ` Florian Fainelli
2023-10-13 12:24 ` [PATCH net-next v3 2/7] net: dsa: microchip: Set unique MAC at startup for WoL support Oleksij Rempel
2023-10-13 12:32 ` Vladimir Oltean
2023-10-15 21:18 ` Florian Fainelli
2023-10-16 10:15 ` Vladimir Oltean
2023-10-14 17:01 ` Andrew Lunn
2023-10-13 12:24 ` [PATCH net-next v3 3/7] net: dsa: microchip: ksz9477: add Wake on LAN support Oleksij Rempel
2023-10-14 17:14 ` Andrew Lunn
2023-10-16 10:17 ` Vladimir Oltean
2023-10-13 12:24 ` [PATCH net-next v3 4/7] net: dsa: microchip: ksz9477: add Wake on PHY event support Oleksij Rempel
2023-10-14 17:20 ` Andrew Lunn
2023-10-13 12:24 ` [PATCH net-next v3 5/7] dt-bindings: net: dsa: microchip: add wakeup-source property Oleksij Rempel
2023-10-13 12:24 ` [PATCH net-next v3 6/7] net: dsa: microchip: use wakeup-source DT property to enable PME output Oleksij Rempel
2023-10-14 17:25 ` Andrew Lunn
2023-10-13 12:24 ` Oleksij Rempel [this message]
2023-10-16 10:22 ` [PATCH net-next v3 7/7] net: dsa: microchip: do not shut down the switch if WoL is active Vladimir Oltean
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231013122405.3745475-8-o.rempel@pengutronix.de \
--to=o.rempel@pengutronix.de \
--cc=UNGLinuxDriver@microchip.com \
--cc=andrew@lunn.ch \
--cc=arun.ramadoss@microchip.com \
--cc=conor+dt@kernel.org \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=edumazet@google.com \
--cc=f.fainelli@gmail.com \
--cc=kernel@pengutronix.de \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=netdev@vger.kernel.org \
--cc=olteanv@gmail.com \
--cc=pabeni@redhat.com \
--cc=robh+dt@kernel.org \
--cc=woojung.huh@microchip.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).