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 2/7] net: dsa: microchip: Set unique MAC at startup for WoL support
Date: Fri, 13 Oct 2023 14:24:00 +0200 [thread overview]
Message-ID: <20231013122405.3745475-3-o.rempel@pengutronix.de> (raw)
In-Reply-To: <20231013122405.3745475-1-o.rempel@pengutronix.de>
Set a unique global MAC address for each switch on the network at system
startup by syncing the switch's global MAC address with the Ethernet
address of the DSA master interface. This is crucial for supporting
Wake-on-LAN (WoL) functionality, as it requires a unique address for
each switch.
Although the operation is performed only at system start and won't sync
if the master Ethernet address changes dynamically, it lays the
groundwork for WoL support by ensuring a unique MAC address for each
switch.
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
---
drivers/net/dsa/microchip/ksz_common.c | 69 +++++++++++++++++++++++---
1 file changed, 62 insertions(+), 7 deletions(-)
diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c
index 02fab1adb27f..db0ef4ad181e 100644
--- a/drivers/net/dsa/microchip/ksz_common.c
+++ b/drivers/net/dsa/microchip/ksz_common.c
@@ -2173,6 +2173,57 @@ static int ksz_pirq_setup(struct ksz_device *dev, u8 p)
return ksz_irq_common_setup(dev, pirq);
}
+/**
+ * ksz_cmn_write_global_mac_addr - Write global MAC address to switch.
+ * @dev: The device structure.
+ * @addr: Pointer to MAC address.
+ *
+ * This function programs the switch's MAC address register with the given
+ * MAC address. The global MAC address is used as the source address in MAC
+ * pause control frames, for HSR self-address filtering, Wake-on-LAN (WoL),
+ * and for self-address filtering purposes.
+ *
+ * Return: 0 on success, or an error code on failure.
+ */
+static int ksz_cmn_write_global_mac_addr(struct ksz_device *dev,
+ const unsigned char *addr)
+{
+ const u16 *regs = dev->info->regs;
+ int i, ret;
+
+ for (i = 0; i < ETH_ALEN; i++) {
+ ret = ksz_write8(dev, regs[REG_SW_MAC_ADDR] + i, addr[i]);
+ if (ret)
+ return ret;
+ }
+
+ return 0;
+}
+
+/**
+ * ksz_cmn_set_default_switch_mac_addr - Set the switch's global MAC address
+ * from master port.
+ * @dev: The device structure.
+ *
+ * This function retrieves the MAC address from the master network device
+ * associated with the CPU port and writes it to the switch's global MAC
+ * address register.
+ *
+ * Return: 0 on success, or an error code on failure.
+ */
+static int ksz_cmn_set_default_switch_mac_addr(struct ksz_device *dev)
+{
+ struct dsa_switch *ds = dev->ds;
+ struct net_device *master;
+
+ /* use CPU port to get master net device because it is guaranteed
+ * to be a valid port
+ */
+ master = dsa_port_to_master(dsa_to_port(ds, dev->cpu_port));
+
+ return ksz_cmn_write_global_mac_addr(dev, master->dev_addr);
+}
+
static int ksz_setup(struct dsa_switch *ds)
{
struct ksz_device *dev = ds->priv;
@@ -2194,6 +2245,16 @@ static int ksz_setup(struct dsa_switch *ds)
return ret;
}
+ /* Set switch MAC address from master port.
+ * In the current implementation, this operation is only
+ * performed during system start and will not sync if the master
+ * Ethernet address changes dynamically thereafter. The global MAC
+ * address still can be overwritten for HSR use cases.
+ */
+ ret = ksz_cmn_set_default_switch_mac_addr(dev);
+ if (ret)
+ return ret;
+
/* set broadcast storm protection 10% rate */
regmap_update_bits(ksz_regmap_16(dev), regs[S_BROADCAST_CTRL],
BROADCAST_STORM_RATE,
@@ -3572,8 +3633,6 @@ static int ksz_switch_macaddr_get(struct dsa_switch *ds, int port,
const unsigned char *addr = slave->dev_addr;
struct ksz_switch_macaddr *switch_macaddr;
struct ksz_device *dev = ds->priv;
- const u16 *regs = dev->info->regs;
- int i;
/* Make sure concurrent MAC address changes are blocked */
ASSERT_RTNL();
@@ -3599,11 +3658,7 @@ static int ksz_switch_macaddr_get(struct dsa_switch *ds, int port,
refcount_set(&switch_macaddr->refcount, 1);
dev->switch_macaddr = switch_macaddr;
- /* Program the switch MAC address to hardware */
- for (i = 0; i < ETH_ALEN; i++)
- ksz_write8(dev, regs[REG_SW_MAC_ADDR] + i, addr[i]);
-
- return 0;
+ return ksz_cmn_write_global_mac_addr(dev, addr);
}
static void ksz_switch_macaddr_put(struct dsa_switch *ds)
--
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 ` Oleksij Rempel [this message]
2023-10-13 12:32 ` [PATCH net-next v3 2/7] net: dsa: microchip: Set unique MAC at startup for WoL support 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 ` [PATCH net-next v3 7/7] net: dsa: microchip: do not shut down the switch if WoL is active Oleksij Rempel
2023-10-16 10:22 ` 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-3-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).