Received: by 2002:a05:7412:d8a:b0:e2:908c:2ebd with SMTP id b10csp920424rdg; Fri, 13 Oct 2023 05:25:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE59Ik2v/DHeGFRd5AetkwZz+3zS9Me8Osyhq9dNxHgtgne8axHDISajH7AjZ906ziqkJzc X-Received: by 2002:a05:6871:58e:b0:1e9:b495:bd0 with SMTP id u14-20020a056871058e00b001e9b4950bd0mr5398049oan.8.1697199908456; Fri, 13 Oct 2023 05:25:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697199908; cv=none; d=google.com; s=arc-20160816; b=R6GKX0iTmclZW3yIkO7w3eHWeCnyyDr3bVNhnLpOdmbU9ed452isN5XXV1eFr5xQXn 1nrlLwCPu+gDnTHS8IUNSIp9c6EN2MLvUEQPJ8sI6HZtj1ojnm5agKUVOqsJ58Ab/tsA u0rwoAMghZat/It3k2s0YtiNxO32/irRh+LV207xMGS52ofNBhz9Qb8VEV0mayQTiGBW fi1Q0RKDyegfk6j//GOlo2HZ93sRFtB4oYJKixnvyiRHOKRBBg0wqAmuDvI7Jw099wcA syR5GGrLw2cSMZiI+WctI4LRqrPB8Ny6aKS/mMM0HeuHOu1FPQ2qb+UTUGN5obrpirHU WREg== 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=4G5JyKivvVhG9s6Nlz83YJo8oMSpmiQZutk0Mfi3+3c=; fh=J4gjwt0mePoRaYCjaHLm28JnUFi5LyPM6ZZbSRFLAL0=; b=B0kYSSB12+rXp6wC69QvWQYnhD1Ix9aR2XumzGQeGvtrjCYMr79SnVRu7OdUr+tZQ/ KFDXyaS3VToXz0mpAXROxAT1iel6JYhco39zu8JLCUHja29drdjwU3zyZata0Zdp4LKn CUrXhUP9m61GvsZNXjIZYbrjIhDQbcKHfDQY/RgA/7zsk7xTclY1dOLBz0xh/qRQPBOw 0O9uVqGM50Ff1B8q6RrDsn6X9XTFd9ObMh2SXro7lg7mzfbV63bC2Cz2fQGl4p6rb3oO PNuUmAqxRFPsxyNeMFmMPic07RH8lmsMs1vVmcijwZ7m1OlQXg4qbXLVPvOeiPyXJAYQ gtsQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id w1-20020a63c101000000b00565e0624182si4461449pgf.404.2023.10.13.05.25.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 05:25:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 5469380A73FB; Fri, 13 Oct 2023 05:25:06 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231808AbjJMMYr (ORCPT + 99 others); Fri, 13 Oct 2023 08:24:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39810 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231725AbjJMMYb (ORCPT ); Fri, 13 Oct 2023 08:24:31 -0400 Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [IPv6:2a0a:edc0:2:b01:1d::104]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F03F4BD for ; Fri, 13 Oct 2023 05:24:28 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qrHD6-00016D-4T; Fri, 13 Oct 2023 14:24:08 +0200 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qrHD4-001OKi-W2; Fri, 13 Oct 2023 14:24:07 +0200 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1qrHD4-00FiNm-2y; Fri, 13 Oct 2023 14:24:06 +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 v3 2/7] net: dsa: microchip: Set unique MAC at startup for WoL support Date: Fri, 13 Oct 2023 14:24:00 +0200 Message-Id: <20231013122405.3745475-3-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231013122405.3745475-1-o.rempel@pengutronix.de> References: <20231013122405.3745475-1-o.rempel@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Fri, 13 Oct 2023 05:25:06 -0700 (PDT) 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 --- 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