From:   Colin Foster <colin.foster@in-advantage.com>
To:     netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
        devicetree@vger.kernel.org
Cc:     Russell King <linux@armlinux.org.uk>,
        Richard Cochran <richardcochran@gmail.com>,
        Florian Fainelli <f.fainelli@gmail.com>,
        Andrew Lunn <andrew@lunn.ch>, UNGLinuxDriver@microchip.com,
        Alexandre Belloni <alexandre.belloni@bootlin.com>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        Vladimir Oltean <vladimir.oltean@nxp.com>,
        Paolo Abeni <pabeni@redhat.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Eric Dumazet <edumazet@google.com>,
        "David S. Miller" <davem@davemloft.net>,
        Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
        Rob Herring <robh+dt@kernel.org>, Lee Jones <lee@kernel.org>
Subject: [PATCH v5 net-next 08/13] net: dsa: felix: add functionality when not all ports are supported
Date:   Fri, 27 Jan 2023 11:35:54 -0800
Message-Id: <20230127193559.1001051-9-colin.foster@in-advantage.com>
In-Reply-To: <20230127193559.1001051-1-colin.foster@in-advantage.com>
References: <20230127193559.1001051-1-colin.foster@in-advantage.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?2p22+13hOr36gq2WCUY/4OGgn6fLG8+vPQwXO6KUiFSjxy0In8cU93pMozHB?=
 =?us-ascii?Q?vJBN1xtMD0kih+vXlHX657Vzw2VgAuCx9WzXEnp6TZ0/5HUGOBw/HNV0asq/?=
 =?us-ascii?Q?uEX8JeMaXEJZ68QqGFu36h2DwueabHbUYjI9Qy1ZXeOxLhW9A0SEuv1W5Rwf?=
 =?us-ascii?Q?wcD2z9HQhUtLG1ZvOzmdmKeYKLQvNN11aRekzYzsvoVNarZ8YdWu7hPy34vv?=
 =?us-ascii?Q?gk3pbBXChrZxxlUDBDRLeqdgUAp5AY1J4vwk0khGiU4RzLqaYyFkeBKLRv1y?=
 =?us-ascii?Q?QVWKxsSf0qW/gh8jJI8cNTJWRX8izykjFoYTrw/EOdgKcPoSp0y1A92maNFC?=
 =?us-ascii?Q?vzbvnfQf/kTrqhRXaNcBTANq4hTBJowCE0tMExs6IK6in6D9oe6RZVUMjD14?=
 =?us-ascii?Q?jhTy9wSEcsM6qzcETmPkTHnwwMIKIrz/ztf1h6XVq5QSk9riBTjcJTtoF657?=
 =?us-ascii?Q?pm0Gp81uVJW1RebAIDi2Dtz12EoEG7UggnBJ9QLhmBZpV0REWqj8dp+pPGnA?=
 =?us-ascii?Q?EzcT/4yJPseHWJhXQRuCuuaCuK7EcIO8ctu5K6QSIFwIpIfWgzyk5y/AGPo0?=
 =?us-ascii?Q?iXvaqR4Uh41CduSQZ6Q4E0p+7jK0EPLUs3CJ6iz8k+c3QTk+jprwYYn5TKyq?=
 =?us-ascii?Q?B/qKvUpzow3T5MYmiOjY0u+JadytGGuGh55jkCEuovyZ9JqHYYCaD4huDzFw?=
 =?us-ascii?Q?1P3FL/uMe/ePqrXf1B5C0Vfn56Hc6jk5C6nOIQLXakD2hTllGEmc8cTHB+bZ?=
 =?us-ascii?Q?VLYQxc/rGukSUPsQN8qkNrl2o6csLrWIdvazNhjX3IAnN2KaqftQiv0Kt22m?=
 =?us-ascii?Q?A+/E6b229l+o/ywuvdAfAJSPFssO2N89Jn1K2gCtqJJIGHXrdNhz7itgQF8h?=
 =?us-ascii?Q?URt2lu0LBDKV/IYYX1eIIcMwKROikehi+YjNiGBMXnYkYBw/3Jv1kThpePV0?=
 =?us-ascii?Q?znroLs6ycrF+oQxLLIgmVQZvFRRNzCymCY1BvyxJuMFoSW6VZB2yf28vPZFQ?=
 =?us-ascii?Q?4Rw0T1wwQQZqnImdfZHGEBgEwNsKXgyP1az0KMm2tuiBSeUJDSRm5g0JocAF?=
 =?us-ascii?Q?/LWRmKdCIP3eILZ3pr25B7KFPOZk8cRiEB/YhsGcpr7dkaoiOAKsClsJOWU1?=
 =?us-ascii?Q?vmgk9VZrXCwuN0B/nnadEgUJoOO1fWDR3pCJvRZgFgnLwu4Edkhgwg1LxsbP?=
 =?us-ascii?Q?WQo2ITGzxkJK8+QnhlqOUpjJDUtmly2CsaZ9dl2RAiKx/IAyiHfl5AichAuu?=
 =?us-ascii?Q?8WZ2POAuVB1iFtanPtciV/OfOwIAraq6wWy2s9YZ7pVio3RaTMO//CD48tUN?=
 =?us-ascii?Q?yIoxB2wE+0S/OVqVXObDAwzx80mjHHY1sl3lBJUzWj8si8xWDI+T1G5HQzco?=
 =?us-ascii?Q?yhuYs3jwHodO0Egs1Reh8xrViSXOtgqYvGlJu5PF0WkKQXcPf1s4toTPDL5S?=
 =?us-ascii?Q?tE438G8XhhrCL1SbjS79QNWEhmQnvPHrNXuecHkyOxclS5ftqHt5+q4RiVje?=
 =?us-ascii?Q?CXP7tWa0UwlLA+9kKIkPlY5/ZLZJ5UyWudghql0mcPwZ5bOdOl6WqA9J43F9?=
 =?us-ascii?Q?BpJ5KJHZQKCK5AJE/hvG/49yvpRbbAxIJFVcjFUKGhcQYGbyPMewsh8DtV0E?=
 =?us-ascii?Q?FPGud3NLJWtOahjpdIwfTFo=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: febab0e5-7542-45e4-a178-08db009dc6cd
X-MS-Exchange-CrossTenant-AuthSource: DM5PR1001MB2345.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2023 19:36:25.0474
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 48e842ca-fbd8-4633-a79d-0c955a7d3aae
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: lR2ve3vr+tiCpephI7z80is+NijwhaxEcB3TUELbAuH0x7MJAG9LjLwD9+CSPTXtx7Gwl360eLubOnqMUNmWx2C3ox89AptNUCRoKv5r/bs=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR10MB4636
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

When the Felix driver would probe the ports and verify functionality, it
would fail if it hit single port mode that wasn't supported by the driver.

The initial case for the VSC7512 driver will have physical ports that
exist, but aren't supported by the driver implementation. Add the
OCELOT_PORT_MODE_NONE macro to handle this scenario, and allow the Felix
driver to continue with all the ports that are currently functional.

Signed-off-by: Colin Foster <colin.foster@in-advantage.com>
---

v5
    * No changes

v4
    * New patch

---
 drivers/net/dsa/ocelot/felix.c | 11 ++++++++---
 drivers/net/dsa/ocelot/felix.h |  1 +
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/drivers/net/dsa/ocelot/felix.c b/drivers/net/dsa/ocelot/felix.c
index d3ff6e8a82e9..d4cc9e60f369 100644
--- a/drivers/net/dsa/ocelot/felix.c
+++ b/drivers/net/dsa/ocelot/felix.c
@@ -1273,10 +1273,15 @@ static int felix_parse_ports_node(struct felix *felix,
 
 		err = felix_validate_phy_mode(felix, port, phy_mode);
 		if (err < 0) {
-			dev_err(dev, "Unsupported PHY mode %s on port %d\n",
-				phy_modes(phy_mode), port);
+			dev_info(dev, "Unsupported PHY mode %s on port %d\n",
+				 phy_modes(phy_mode), port);
 			of_node_put(child);
-			return err;
+
+			/* Leave port_phy_modes[port] = 0, which is also
+			 * PHY_INTERFACE_MODE_NA. This will perform a
+			 * best-effort to bring up as many ports as possible.
+			 */
+			continue;
 		}
 
 		port_phy_modes[port] = phy_mode;
diff --git a/drivers/net/dsa/ocelot/felix.h b/drivers/net/dsa/ocelot/felix.h
index 9e1ae1dde0d9..d5d0b30c0b75 100644
--- a/drivers/net/dsa/ocelot/felix.h
+++ b/drivers/net/dsa/ocelot/felix.h
@@ -7,6 +7,7 @@
 #define ocelot_to_felix(o)		container_of((o), struct felix, ocelot)
 #define FELIX_MAC_QUIRKS		OCELOT_QUIRK_PCS_PERFORMS_RATE_ADAPTATION
 
+#define OCELOT_PORT_MODE_NONE		0
 #define OCELOT_PORT_MODE_INTERNAL	BIT(0)
 #define OCELOT_PORT_MODE_SGMII		BIT(1)
 #define OCELOT_PORT_MODE_QSGMII		BIT(2)
-- 
2.25.1