<html><head><meta name="color-scheme" content="light dark"></head><body><pre style="word-wrap: break-word; white-space: pre-wrap;">From 01488a0ccd9abe15565bed50a45afcddbb0fe199 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= &lt;rafal@milecki.pl&gt;
Date: Fri, 12 Mar 2021 11:41:07 +0100
Subject: [PATCH] net: dsa: bcm_sf2: store PHY interface/mode in port structure
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It's needed later for proper switch / crossbar setup.

Signed-off-by: RafaÅ‚ MiÅ‚ecki &lt;rafal@milecki.pl&gt;
Acked-by: Florian Fainelli &lt;f.fainelli@gmail.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
---
 drivers/net/dsa/bcm_sf2.c | 16 ++++++++++++----
 drivers/net/dsa/bcm_sf2.h |  1 +
 2 files changed, 13 insertions(+), 4 deletions(-)

--- a/drivers/net/dsa/bcm_sf2.c
+++ b/drivers/net/dsa/bcm_sf2.c
@@ -400,8 +400,9 @@ static void bcm_sf2_intr_disable(struct
 static void bcm_sf2_identify_ports(struct bcm_sf2_priv *priv,
 				   struct device_node *dn)
 {
+	struct device *dev = priv-&gt;dev-&gt;ds-&gt;dev;
+	struct bcm_sf2_port_status *port_st;
 	struct device_node *port;
-	int mode;
 	unsigned int port_num;
 
 	priv-&gt;moca_port = -1;
@@ -410,19 +411,26 @@ static void bcm_sf2_identify_ports(struc
 		if (of_property_read_u32(port, "reg", &amp;port_num))
 			continue;
 
+		if (port_num &gt;= DSA_MAX_PORTS) {
+			dev_err(dev, "Invalid port number %d\n", port_num);
+			continue;
+		}
+
+		port_st = &amp;priv-&gt;port_sts[port_num];
+
 		/* Internal PHYs get assigned a specific 'phy-mode' property
 		 * value: "internal" to help flag them before MDIO probing
 		 * has completed, since they might be turned off at that
 		 * time
 		 */
-		mode = of_get_phy_mode(port);
-		if (mode &lt; 0)
+		port_st-&gt;mode = of_get_phy_mode(port);
+		if (port_st-&gt;mode &lt; 0)
 			continue;
 
-		if (mode == PHY_INTERFACE_MODE_INTERNAL)
+		if (port_st-&gt;mode == PHY_INTERFACE_MODE_INTERNAL)
 			priv-&gt;int_phy_mask |= 1 &lt;&lt; port_num;
 
-		if (mode == PHY_INTERFACE_MODE_MOCA)
+		if (port_st-&gt;mode == PHY_INTERFACE_MODE_MOCA)
 			priv-&gt;moca_port = port_num;
 
 		if (of_property_read_bool(port, "brcm,use-bcm-hdr"))
--- a/drivers/net/dsa/bcm_sf2.h
+++ b/drivers/net/dsa/bcm_sf2.h
@@ -44,6 +44,7 @@ struct bcm_sf2_hw_params {
 #define BCM_SF2_REGS_NUM	6
 
 struct bcm_sf2_port_status {
+	int mode;
 	unsigned int link;
 };
 
</pre></body></html>