From nobody Thu Sep 24 18:40:16 2026 Received: from relay.smtp-ext.broadcom.com (lpdvsmtp12.broadcom.com [192.19.144.207]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DDFE7518127; Mon, 21 Sep 2026 22:00:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.19.144.207 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790028038; cv=none; b=kiOJRZNkGe9QRFoR+2n2gH0m/lmroOt/MxwF5klDAwduHmCIwcvJnMqLXZdyPTIdNPrr+m25T94JNUS8kmnCX81MhCBoFskKS/TzEphvQ+z5MUEkpgweue3ciMK+Z/3XYxbO/nYxyqSaq9sU3T4zlu17bBabF+rR101SZZSONOc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790028038; c=relaxed/simple; bh=9BtkW7ld/l9NGI6zvPuCmYiPqVvG8BxSnRpqfgT/ZJc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=YLx2bszGBDadaOvh5bULVKviDTbg1AtU+pKoeuzFxcK69bCDx2qenTE9ACpTe86ByjQxHyFMJJOljyurut4cHJ1tOwVNi/SgzlVn9VU/My5k7ofRUCMXOWUDQKwPvzuBeP/CrJeRPujuNcaycZiS4UYn18xun+s7Hm3g4t6AwSw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=LCcFkusY; arc=none smtp.client-ip=192.19.144.207 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="LCcFkusY" Received: from mail-lvn-it-01.broadcom.com (mail-lvn-it-01.lvn.broadcom.net [10.36.132.253]) by relay.smtp-ext.broadcom.com (Postfix) with ESMTP id 214DBC0000D8; Mon, 21 Sep 2026 15:00:29 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 relay.smtp-ext.broadcom.com 214DBC0000D8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1790028029; bh=9BtkW7ld/l9NGI6zvPuCmYiPqVvG8BxSnRpqfgT/ZJc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LCcFkusY/PxFuLhwvGELb7LqdlmgCNV3Qc+nEo9mJu6NndV+v58Br1QykbKSlIucf BDEAgNnw2lJLcbF6YIO3WTgaT3CoUxIXw5AqKCPQ66HDpw2+X7tAFVqtYdF+IzLBq5 bqv1soS6+1RKybOpm7AbtZqT6GtU5PovWi5DKjrU= Received: from stbirv-lnx-1.igp.broadcom.net (stbirv-lnx-1.igp.broadcom.net [10.67.48.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail-lvn-it-01.broadcom.com (Postfix) with ESMTPSA id B92BDAE0; Mon, 21 Sep 2026 15:00:28 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , Nicolai Buchwitz , Doug Berger , Broadcom internal kernel review list , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Zak Kemble , Simon Horman , Ryo Takakura , linux-kernel@vger.kernel.org (open list) Subject: [PATCH net v2 1/5] net: bcmgenet: fix 64-bit RTNL stats reading in ethtool on 32-bit systems Date: Mon, 21 Sep 2026 15:00:17 -0700 Message-Id: <20260921220021.281418-2-florian.fainelli@broadcom.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260921220021.281418-1-florian.fainelli@broadcom.com> References: <20260921220021.281418-1-florian.fainelli@broadcom.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When bcmgenet was converted to 64-bit statistics, STAT_RTNL members were switched to point into struct rtnl_link_stats64, whose fields are 64-bit (__u64) regardless of architecture. However, bcmgenet_get_ethtool_stats() retained a legacy check: if (sizeof(unsigned long) !=3D sizeof(u32) && s->stat_sizeof =3D=3D sizeof(unsigned long)) On 32-bit systems, sizeof(unsigned long) =3D=3D sizeof(u32), causing this condition to evaluate to false. As a result, 64-bit RTNL stats fields were read via *(u32 *)p. On 32-bit Big-Endian systems (such as MIPS BE), this reads the high 32 bits and returns 0 until the counter exceeds 4GB; on 32-bit Little-Endian systems (such as 32-bit ARM), the value is truncated to 32 bits. Fix this by checking if s->stat_sizeof =3D=3D sizeof(u64) so 64-bit fields = are always read as 64-bit values. Fixes: 59aa6e3072aa ("net: bcmgenet: switch to use 64bit statistics") Assisted-by: LLM Reviewed-by: Nicolai Buchwitz Signed-off-by: Florian Fainelli --- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/e= thernet/broadcom/genet/bcmgenet.c index b916080f4ff1..7b089de9484e 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -1346,9 +1346,8 @@ static void bcmgenet_get_ethtool_stats(struct net_dev= ice *dev, p =3D (char *)&stats64; =20 p +=3D s->stat_offset; - if (sizeof(unsigned long) !=3D sizeof(u32) && - s->stat_sizeof =3D=3D sizeof(unsigned long)) - data[i] =3D *(unsigned long *)p; + if (s->stat_sizeof =3D=3D sizeof(u64)) + data[i] =3D *(u64 *)p; else data[i] =3D *(u32 *)p; } --=20 2.34.1 From nobody Thu Sep 24 18:40:16 2026 Received: from relay.smtp-ext.broadcom.com (relay.smtp-ext.broadcom.com [192.19.166.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 800104D17A0; Mon, 21 Sep 2026 22:00:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.19.166.228 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790028036; cv=none; b=ZQkHOVfAhKA6R+j7H53dh6J75YCLktoqNLLZB+psHGGhqmY/s+Hwre7ozTYPlvabSHKG7KKBRTGsMhofEBTdbAu52DNqQdH3UWMSsfzGVbfTjYdu6uI8l/VMdZAGKs2eXm/FGWma5QGz6IXKoJpKW8pkMrzjdJv0vsCBuYJ0M9Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790028036; c=relaxed/simple; bh=r48EioDs19eebRcriYekwzaNA1SAs1pTGEiMHxnRjHo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=jdH3VxDv3XZzhgh54IhmULgOy5RF0CgVtQpltY69r2wjjjGOdwr3WJnLUGhfTEyrjgDfG6GviD0PTgngLphQ69jvRrTHH0rXZfBgPa8pQ/ZjBoDva+rUYNmEHq0wkXe+Bx8TxjkIQ1y4cl5cOP/ShA+FcpoBkeVIXccX763yo8M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=s+P+vgeu; arc=none smtp.client-ip=192.19.166.228 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="s+P+vgeu" Received: from mail-lvn-it-01.broadcom.com (mail-lvn-it-01.lvn.broadcom.net [10.36.132.253]) by relay.smtp-ext.broadcom.com (Postfix) with ESMTP id 17DC2C0087BA; Mon, 21 Sep 2026 15:00:29 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 relay.smtp-ext.broadcom.com 17DC2C0087BA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1790028029; bh=r48EioDs19eebRcriYekwzaNA1SAs1pTGEiMHxnRjHo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s+P+vgeu1BhDy5vkcjin3Osd/3Rswf+sjqbTqpkM+0Sq/DcJnM9hZDwNh5ufzUlSv slP/6uzsEx9sxNP2G15Uafom2m0ijYPCDHFhJVUr8BTnNZGimtlhFYbZ/OBAjSuPhY W+yjobBFHbNuQJ9MvU8IL0NfpDgkKKrbMhD1/pO8= Received: from stbirv-lnx-1.igp.broadcom.net (stbirv-lnx-1.igp.broadcom.net [10.67.48.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail-lvn-it-01.broadcom.com (Postfix) with ESMTPSA id E49F0AE4; Mon, 21 Sep 2026 15:00:28 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , Nicolai Buchwitz , Doug Berger , Broadcom internal kernel review list , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Zak Kemble , Simon Horman , Ryo Takakura , linux-kernel@vger.kernel.org (open list) Subject: [PATCH net v2 2/5] net: bcmgenet: initialize u64 stats seq counter for all queues Date: Mon, 21 Sep 2026 15:00:18 -0700 Message-Id: <20260921220021.281418-3-florian.fainelli@broadcom.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260921220021.281418-1-florian.fainelli@broadcom.com> References: <20260921220021.281418-1-florian.fainelli@broadcom.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" bcmgenet_gstrings_stats statically defines ethtool statistics for queues 0 through GENET_MAX_MQ_CNT (4). However, bcmgenet_probe() only initialized the u64_stats_sync seq counter up to priv->hw_params->rx_queues and priv->hw_params->tx_queues. Since priv->hw_params->rx_queues is 0 across all hardware versions (and priv->hw_params->tx_queues is 0 on GENET V1), rings 1..4 have uninitialized u64_stats_sync structures. When ethtool -S is run on 32-bit kernels, bcmgenet_get_ethtool_stats() reads stats from rx_rings[1..4], causing lockdep warnings due to the uninitialized sequence counters. Initialize the sequence counters for all GENET_MAX_MQ_CNT + 1 queues. Fixes: ffc2c8c4a714 ("net: bcmgenet: Initialize u64 stats seq counter") Assisted-by: LLM Reviewed-by: Nicolai Buchwitz Signed-off-by: Florian Fainelli --- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/e= thernet/broadcom/genet/bcmgenet.c index 7b089de9484e..055e1362173b 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -4134,10 +4134,10 @@ static int bcmgenet_probe(struct platform_device *p= dev) priv->rx_rings[i].rx_max_coalesced_frames =3D 1; =20 /* Initialize u64 stats seq counter for 32bit machines */ - for (i =3D 0; i <=3D priv->hw_params->rx_queues; i++) + for (i =3D 0; i <=3D GENET_MAX_MQ_CNT; i++) { u64_stats_init(&priv->rx_rings[i].stats64.syncp); - for (i =3D 0; i <=3D priv->hw_params->tx_queues; i++) u64_stats_init(&priv->tx_rings[i].stats64.syncp); + } =20 /* libphy will determine the link state */ netif_carrier_off(dev); --=20 2.34.1 From nobody Thu Sep 24 18:40:16 2026 Received: from relay.smtp-ext.broadcom.com (lpdvsmtp12.broadcom.com [192.19.144.207]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DDE00517BCE; Mon, 21 Sep 2026 22:00:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.19.144.207 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790028037; cv=none; b=XD5zS0DjwyVCuNPEez9HGLfNRdqYUULd7UtEpVq1KlQoSRMrTWbD1aAzAp+2kkdfn/Mk26gbs6WEoPXq6Wbi5RXgROtQjlr1gDBxFWk1bfzXZWW69WAh3OGNRE/UtWA3ZCu+zjJyA7pI7MDLuDUuHtWvAYLNiwAakNoaJVBKgjI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790028037; c=relaxed/simple; bh=N22nJtg7LQ4qb6hJ5vQdtKyzGOu9WI70Mu0cPM/nb+E=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ZyV3+ITYT89duAYD6BEBQbGNAZ69O31OBvBE8eO0m969+3eIuTRolHGiEHg2GqGyRrXKHae5vzjqX+w0OeO1ydV/Qg9g6isn6ukWEgMZaa0wIoFKYRioeA8xPSI3BC3bj6rNZELPYoW8DZjhb0mw5znUTQYfGF+qNvX5sRdrjKA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=aShnvq8m; arc=none smtp.client-ip=192.19.144.207 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="aShnvq8m" Received: from mail-lvn-it-01.broadcom.com (mail-lvn-it-01.lvn.broadcom.net [10.36.132.253]) by relay.smtp-ext.broadcom.com (Postfix) with ESMTP id 7A4B6C0000E4; Mon, 21 Sep 2026 15:00:29 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 relay.smtp-ext.broadcom.com 7A4B6C0000E4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1790028029; bh=N22nJtg7LQ4qb6hJ5vQdtKyzGOu9WI70Mu0cPM/nb+E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aShnvq8mTflePsywKyU4JgIy1ApdEwkdYl8HOvDy8hE9Fr3iaNzDS2C7I2usHvOF8 zkzZ/W+2c+lMXXXirjCLENrt4Oa7xK+JXIMF9Bz0K6A7job2mAyD8vBjxcSABEEbIE 7nq9C8UYnHBC9qT7HlLuhVcGhx2NbriCHkLCerB4= Received: from stbirv-lnx-1.igp.broadcom.net (stbirv-lnx-1.igp.broadcom.net [10.67.48.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail-lvn-it-01.broadcom.com (Postfix) with ESMTPSA id 1C219AD9; Mon, 21 Sep 2026 15:00:29 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , Nicolai Buchwitz , Doug Berger , Broadcom internal kernel review list , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Zak Kemble , Simon Horman , Ryo Takakura , linux-kernel@vger.kernel.org (open list) Subject: [PATCH net v2 3/5] net: bcmgenet: do not skip WoL power up on GENET V1 Date: Mon, 21 Sep 2026 15:00:19 -0700 Message-Id: <20260921220021.281418-4-florian.fainelli@broadcom.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260921220021.281418-1-florian.fainelli@broadcom.com> References: <20260921220021.281418-1-florian.fainelli@broadcom.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" bcmgenet_power_up() had an early check for bcmgenet_has_ext(priv) before dispatching by power mode. GENET V1 does not have the EXT block (unlike GENET V2+), which causes bcmgenet_power_up() to immediately return 0. As a consequence, when waking up from GENET_POWER_WOL_MAGIC on GENET V1, bcmgenet_wol_power_up_cfg() is never invoked to disable the WoL clock, clear wake event masks, and restore normal PHY and MAC operations. Move the bcmgenet_has_ext() checks to the GENET_POWER_PASSIVE and GENET_POWER_CABLE_SENSE cases where the EXT registers are actually accessed, allowing GENET_POWER_WOL_MAGIC cleanup to execute on all hardware versions. Fixes: c3ae64ae0c08 ("net: bcmgenet: handle GENET_POWER_WOL_MAGIC") Assisted-by: LLM Reviewed-by: Nicolai Buchwitz Siged-off-by: Florian Fainelli --- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/e= thernet/broadcom/genet/bcmgenet.c index 055e1362173b..bfb74dca55d6 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -1762,13 +1762,12 @@ static int bcmgenet_power_up(struct bcmgenet_priv *= priv, int ret =3D 0; u32 reg; =20 - if (!bcmgenet_has_ext(priv)) - return ret; - - reg =3D bcmgenet_ext_readl(priv, EXT_EXT_PWR_MGMT); - switch (mode) { case GENET_POWER_PASSIVE: + if (!bcmgenet_has_ext(priv)) + break; + + reg =3D bcmgenet_ext_readl(priv, EXT_EXT_PWR_MGMT); reg &=3D ~(EXT_PWR_DOWN_DLL | EXT_PWR_DOWN_BIAS | EXT_ENERGY_DET_MASK); if (GENET_IS_V5(priv) && !bcmgenet_has_ephy_16nm(priv)) { @@ -1792,8 +1791,12 @@ static int bcmgenet_power_up(struct bcmgenet_priv *p= riv, break; =20 case GENET_POWER_CABLE_SENSE: + if (!bcmgenet_has_ext(priv)) + break; + /* enable APD */ if (!GENET_IS_V5(priv)) { + reg =3D bcmgenet_ext_readl(priv, EXT_EXT_PWR_MGMT); reg |=3D EXT_PWR_DN_EN_LD; bcmgenet_ext_writel(priv, reg, EXT_EXT_PWR_MGMT); } --=20 2.34.1 From nobody Thu Sep 24 18:40:16 2026 Received: from relay.smtp-ext.broadcom.com (lpdvsmtp12.broadcom.com [192.19.144.207]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DDF44518120; Mon, 21 Sep 2026 22:00:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.19.144.207 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790028037; cv=none; b=ShAojwydXq+yQIE6sX10kXDYX4M0YQ7F8YaQm4Q/yv8Ox4hAu827HldbpU2otMw8j5rVgVKC9zc0JIxErCuI+FFKlClXC5QuCMH3oNNt6LFCJq9vYc143GgP9JluSmtQOlMTYsVFUCf58IZ6EgAJUVKR4AG+vvu60dNJRLQFLtw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790028037; c=relaxed/simple; bh=qz4/YYWXJpr06I59bi5sUWCWfU/oGF8IV7/SYFOgw3c=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=rQl40lDLE6v+OPD5GOE1BGojP2agqLt736OyZfWywbSUuQ0cu4SO4YQbmbdxqOmCYS/eEmNfI6xTpX05YY8Xnz4ua6pBFTqx+eMncj33JlNg06Eb43Yv5o1Aa2mNYyXUmBhFf8w00NV4dMUW7HcyBA7jAg7fSg4zWi1B5jmMML4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=uIxyPS4P; arc=none smtp.client-ip=192.19.144.207 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="uIxyPS4P" Received: from mail-lvn-it-01.broadcom.com (mail-lvn-it-01.lvn.broadcom.net [10.36.132.253]) by relay.smtp-ext.broadcom.com (Postfix) with ESMTP id 9DBECC0000F3; Mon, 21 Sep 2026 15:00:29 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 relay.smtp-ext.broadcom.com 9DBECC0000F3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1790028029; bh=qz4/YYWXJpr06I59bi5sUWCWfU/oGF8IV7/SYFOgw3c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uIxyPS4P4DR5F1mbnyWhL/jqUD6Q508fj+DRLA3Am0e6XiY5xpQF6hVCsFRLLjJt7 Lu7/+d8k8jX/4ISd1kVsGZL08A30x3YIRP3gr7JU0LgBARy0S2AOmHWzvzrBu3wb3g ytM0mJqfQ4j4IFP1PIWDT0iMoxkJbsa7JWy7mAf8= Received: from stbirv-lnx-1.igp.broadcom.net (stbirv-lnx-1.igp.broadcom.net [10.67.48.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail-lvn-it-01.broadcom.com (Postfix) with ESMTPSA id 47D27AE0; Mon, 21 Sep 2026 15:00:29 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , Nicolai Buchwitz , Doug Berger , Broadcom internal kernel review list , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Zak Kemble , Simon Horman , Ryo Takakura , linux-kernel@vger.kernel.org (open list) Subject: [PATCH net v2 4/5] net: bcmgenet: validate Ethernet address in bcmgenet_set_mac_addr Date: Mon, 21 Sep 2026 15:00:20 -0700 Message-Id: <20260921220021.281418-5-florian.fainelli@broadcom.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260921220021.281418-1-florian.fainelli@broadcom.com> References: <20260921220021.281418-1-florian.fainelli@broadcom.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" bcmgenet_set_mac_addr() did not check whether the provided MAC address is a valid Ethernet address before applying it. Userspace could configure an invalid address (such as all zeroes or a multicast address) while the interface is down. Add a call to is_valid_ether_addr() and return -EADDRNOTAVAIL if the MAC address is not valid. Fixes: 1c1008c793fa ("net: bcmgenet: add main driver file") Assisted-by: LLM Reviewed-by: Nicolai Buchwitz Signed-off-by: Florian Fainelli --- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/e= thernet/broadcom/genet/bcmgenet.c index bfb74dca55d6..e9d9d3d7b636 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -3634,6 +3634,9 @@ static int bcmgenet_set_mac_addr(struct net_device *d= ev, void *p) if (netif_running(dev)) return -EBUSY; =20 + if (!is_valid_ether_addr(addr->sa_data)) + return -EADDRNOTAVAIL; + eth_hw_addr_set(dev, addr->sa_data); =20 return 0; --=20 2.34.1 From nobody Thu Sep 24 18:40:16 2026 Received: from relay.smtp-ext.broadcom.com (relay.smtp-ext.broadcom.com [192.19.166.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AE5EE517BC5; Mon, 21 Sep 2026 22:00:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.19.166.228 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790028037; cv=none; b=gB33gTYQiF9/psKeQvRLIYTyn2pqo+1UxH+fOe3yRa+TyVftdPJ+2SI0exhLq/JdbWc8V8TYeQCjqw+A7uMee7R6juH/vJowN6G6qG4z0u2+oFv8sv3aiszcnpgEzgRixetnt8ydNe8R9l0dI3raPpaGKsq2w+0q4zOL1eZsTps= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790028037; c=relaxed/simple; bh=XweC/BmVghZObXd0oGdfwJcXunlAoagyj0XiejVWlmw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=MyvqTev98UwlQ49kfOf5ycgMFntATLZWDHzPPvaGrEHIMHwJtiy6N0lTnoCyYUOsfnpKoxP+4i3Uaho/tck7symUkw4+ezlb9mZe9PtW4y0IzeGrRqbPrYzM/1UQ1I8EalBOQTrVX7FFTtkc8hMm0bLHM3ZlTKtx+8Af7auL3Lo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=uEPc1U+R; arc=none smtp.client-ip=192.19.166.228 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="uEPc1U+R" Received: from mail-lvn-it-01.broadcom.com (mail-lvn-it-01.lvn.broadcom.net [10.36.132.253]) by relay.smtp-ext.broadcom.com (Postfix) with ESMTP id 979E5C0087BC; Mon, 21 Sep 2026 15:00:29 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 relay.smtp-ext.broadcom.com 979E5C0087BC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1790028029; bh=XweC/BmVghZObXd0oGdfwJcXunlAoagyj0XiejVWlmw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uEPc1U+RRTkYJJCSepamm3PPceilbzVQY/IiOLwFA6kF9o46Om5WCFNEVOXy3SF60 OQT4ogxDj8gw8M/y7Df1x+uOlnAAraN17TrWkZp8FVzdJEeZ/gYuD+dKcNYfY5dbCv wnwYwa2bGFctG+Eq8+/y4owh1MykkEGDht9+QjFs= Received: from stbirv-lnx-1.igp.broadcom.net (stbirv-lnx-1.igp.broadcom.net [10.67.48.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail-lvn-it-01.broadcom.com (Postfix) with ESMTPSA id 734F9AE4; Mon, 21 Sep 2026 15:00:29 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , Nicolai Buchwitz , Doug Berger , Broadcom internal kernel review list , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Zak Kemble , Simon Horman , Ryo Takakura , linux-kernel@vger.kernel.org (open list) Subject: [PATCH net v2 5/5] net: bcmgenet: mask DMA_TIMEOUT_MASK when reading DMA_RING0_TIMEOUT Date: Mon, 21 Sep 2026 15:00:21 -0700 Message-Id: <20260921220021.281418-6-florian.fainelli@broadcom.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260921220021.281418-1-florian.fainelli@broadcom.com> References: <20260921220021.281418-1-florian.fainelli@broadcom.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" bcmgenet_get_coalesce() reads DMA_RING0_TIMEOUT to calculate rx_coalesce_usecs without masking out bits outside DMA_TIMEOUT_MASK (16 bits). If upper bits are non-zero or contain status/flags, the computed value of rx_coalesce_usecs returned to userspace via ethtool becomes corrupted. Mask the register read with DMA_TIMEOUT_MASK before computing the timeout in microseconds. Fixes: 4a29645bfe6c ("net: bcmgenet: Implement RX coalescing control knobs") Assisted-by: LLM Reviewed-by: Nicolai Buchwitz Signed-off-by: Florian Fainelli --- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/e= thernet/broadcom/genet/bcmgenet.c index e9d9d3d7b636..ef3b750630d3 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -852,7 +852,8 @@ static int bcmgenet_get_coalesce(struct net_device *dev, ec->rx_max_coalesced_frames =3D bcmgenet_rdma_ring_readl(priv, 0, DMA_MBUF_DONE_THRESH); ec->rx_coalesce_usecs =3D - bcmgenet_rdma_readl(priv, DMA_RING0_TIMEOUT) * 8192 / 1000; + (bcmgenet_rdma_readl(priv, DMA_RING0_TIMEOUT) & + DMA_TIMEOUT_MASK) * 8192 / 1000; =20 for (i =3D 0; i <=3D priv->hw_params->rx_queues; i++) { ring =3D &priv->rx_rings[i]; --=20 2.34.1