mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Álvaro Fernández Rojas" <noltari@gmail.com>
To: jonas.gorski@gmail.com, florian.fainelli@broadcom.com,
	andrew@lunn.ch, olteanv@gmail.com, davem@davemloft.net,
	edumazet@google.com, kuba@kernel.org, pabeni@redhat.com,
	horms@kernel.org, vivien.didelot@gmail.com,
	netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
	dgcbueu@gmail.com
Cc: "Álvaro Fernández Rojas" <noltari@gmail.com>
Subject: [PATCH net-next v3 04/14] net: dsa: b53: detect BCM5325 variants
Date: Thu, 12 Jun 2025 10:37:37 +0200	[thread overview]
Message-ID: <20250612083747.26531-5-noltari@gmail.com> (raw)
In-Reply-To: <20250612083747.26531-1-noltari@gmail.com>

Older BCM5325M switches lack some registers that newer BCM5325E have, so
we need to be able to differentiate them in order to check whether the
registers are available or not.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
 drivers/net/dsa/b53/b53_common.c | 34 ++++++++++++++++++++++++++------
 drivers/net/dsa/b53/b53_priv.h   | 16 +++++++++++++--
 2 files changed, 42 insertions(+), 8 deletions(-)

 v3: detect BCM5325 variants as requested by Florian.

diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c
index 222107223d109..2975dab6ee0bb 100644
--- a/drivers/net/dsa/b53/b53_common.c
+++ b/drivers/net/dsa/b53/b53_common.c
@@ -2490,8 +2490,18 @@ struct b53_chip_data {
 
 static const struct b53_chip_data b53_switch_chips[] = {
 	{
-		.chip_id = BCM5325_DEVICE_ID,
-		.dev_name = "BCM5325",
+		.chip_id = BCM5325M_DEVICE_ID,
+		.dev_name = "BCM5325M",
+		.vlans = 16,
+		.enabled_ports = 0x3f,
+		.arl_bins = 2,
+		.arl_buckets = 1024,
+		.imp_port = 5,
+		.duplex_reg = B53_DUPLEX_STAT_FE,
+	},
+	{
+		.chip_id = BCM5325E_DEVICE_ID,
+		.dev_name = "BCM5325E",
 		.vlans = 16,
 		.enabled_ports = 0x3f,
 		.arl_bins = 2,
@@ -2938,10 +2948,22 @@ int b53_switch_detect(struct b53_device *dev)
 		b53_write16(dev, B53_VLAN_PAGE, B53_VLAN_TABLE_ACCESS_25, 0xf);
 		b53_read16(dev, B53_VLAN_PAGE, B53_VLAN_TABLE_ACCESS_25, &tmp);
 
-		if (tmp == 0xf)
-			dev->chip_id = BCM5325_DEVICE_ID;
-		else
+		if (tmp == 0xf) {
+			u32 phy_id;
+			int val;
+
+			val = b53_phy_read16(dev->ds, 0, MII_PHYSID1);
+			phy_id = (val & 0xffff) << 16;
+			val = b53_phy_read16(dev->ds, 0, MII_PHYSID2);
+			phy_id |= (val & 0xffff);
+
+			if (phy_id == 0x0143bc30)
+				dev->chip_id = BCM5325E_DEVICE_ID;
+			else
+				dev->chip_id = BCM5325M_DEVICE_ID;
+		} else {
 			dev->chip_id = BCM5365_DEVICE_ID;
+		}
 		break;
 	case BCM5389_DEVICE_ID:
 	case BCM5395_DEVICE_ID:
@@ -2975,7 +2997,7 @@ int b53_switch_detect(struct b53_device *dev)
 		}
 	}
 
-	if (dev->chip_id == BCM5325_DEVICE_ID)
+	if (is5325(dev))
 		return b53_read8(dev, B53_STAT_PAGE, B53_REV_ID_25,
 				 &dev->core_rev);
 	else
diff --git a/drivers/net/dsa/b53/b53_priv.h b/drivers/net/dsa/b53/b53_priv.h
index a5ef7071ba07b..deea4d83f0e93 100644
--- a/drivers/net/dsa/b53/b53_priv.h
+++ b/drivers/net/dsa/b53/b53_priv.h
@@ -60,7 +60,8 @@ struct b53_io_ops {
 
 enum {
 	BCM4908_DEVICE_ID = 0x4908,
-	BCM5325_DEVICE_ID = 0x25,
+	BCM5325M_DEVICE_ID = 0x25,
+	BCM5325E_DEVICE_ID = 0x25e,
 	BCM5365_DEVICE_ID = 0x65,
 	BCM5389_DEVICE_ID = 0x89,
 	BCM5395_DEVICE_ID = 0x95,
@@ -162,7 +163,18 @@ struct b53_device {
 
 static inline int is5325(struct b53_device *dev)
 {
-	return dev->chip_id == BCM5325_DEVICE_ID;
+	return dev->chip_id == BCM5325E_DEVICE_ID ||
+		dev->chip_id == BCM5325M_DEVICE_ID;
+}
+
+static inline int is5325e(struct b53_device *dev)
+{
+	return dev->chip_id == BCM5325E_DEVICE_ID;
+}
+
+static inline int is5325m(struct b53_device *dev)
+{
+	return dev->chip_id == BCM5325M_DEVICE_ID;
 }
 
 static inline int is5365(struct b53_device *dev)
-- 
2.39.5


  parent reply	other threads:[~2025-06-12  8:37 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-06-12  8:37 [PATCH net-next v3 00/14] net: dsa: b53: fix BCM5325 support Álvaro Fernández Rojas
2025-06-12  8:37 ` [PATCH net-next v3 01/14] net: dsa: tag_brcm: legacy: reorganize functions Álvaro Fernández Rojas
2025-06-12  8:37 ` [PATCH net-next v3 02/14] net: dsa: tag_brcm: add support for legacy FCS tags Álvaro Fernández Rojas
2025-06-12  8:37 ` [PATCH net-next v3 03/14] net: dsa: b53: support " Álvaro Fernández Rojas
2025-06-12  8:37 ` Álvaro Fernández Rojas [this message]
2025-06-12  9:17   ` [PATCH net-next v3 04/14] net: dsa: b53: detect BCM5325 variants Jonas Gorski
2025-06-12  9:47     ` Álvaro Fernández Rojas
2025-06-12  8:37 ` [PATCH net-next v3 05/14] net: dsa: b53: add support for FDB operations on 5325/5365 Álvaro Fernández Rojas
2025-06-12  8:37 ` [PATCH net-next v3 06/14] net: dsa: b53: prevent FAST_AGE access on BCM5325 Álvaro Fernández Rojas
2025-06-12  8:37 ` [PATCH net-next v3 07/14] net: dsa: b53: prevent SWITCH_CTRL " Álvaro Fernández Rojas
2025-06-12  8:37 ` [PATCH net-next v3 08/14] net: dsa: b53: fix IP_MULTICAST_CTRL " Álvaro Fernández Rojas
2025-06-12 20:29   ` Florian Fainelli
2025-06-12  8:37 ` [PATCH net-next v3 09/14] net: dsa: b53: prevent DIS_LEARNING access " Álvaro Fernández Rojas
2025-06-12 20:30   ` Florian Fainelli
2025-06-12  8:37 ` [PATCH net-next v3 10/14] net: dsa: b53: prevent BRCM_HDR access on older devices Álvaro Fernández Rojas
2025-06-12  8:37 ` [PATCH net-next v3 11/14] net: dsa: b53: prevent GMII_PORT_OVERRIDE_CTRL access on BCM5325 Álvaro Fernández Rojas
2025-06-12  8:37 ` [PATCH net-next v3 12/14] net: dsa: b53: fix unicast/multicast flooding " Álvaro Fernández Rojas
2025-06-12  8:37 ` [PATCH net-next v3 13/14] net: dsa: b53: fix b53_imp_vlan_setup for BCM5325 Álvaro Fernández Rojas
2025-06-12 20:30   ` Florian Fainelli
2025-06-12  8:37 ` [PATCH net-next v3 14/14] net: dsa: b53: ensure BCM5325 PHYs are enabled Álvaro Fernández Rojas
2025-06-12  9:19   ` Jonas Gorski
2025-06-12  9:41     ` Álvaro Fernández Rojas

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=20250612083747.26531-5-noltari@gmail.com \
    --to=noltari@gmail.com \
    --cc=andrew@lunn.ch \
    --cc=davem@davemloft.net \
    --cc=dgcbueu@gmail.com \
    --cc=edumazet@google.com \
    --cc=florian.fainelli@broadcom.com \
    --cc=horms@kernel.org \
    --cc=jonas.gorski@gmail.com \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=olteanv@gmail.com \
    --cc=pabeni@redhat.com \
    --cc=vivien.didelot@gmail.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

all inboxes | Powered by JetHome®