[RFC net-next] net: dsa: pass PHY flags when connecting shared ports

[RFC net-next] net: dsa: pass PHY flags when connecting shared ports

[Yongzhao Chen]

DSA calls get_phy_flags() when attaching user-port PHYs, but passes zero
when connecting shared (CPU and DSA) ports. Shared ports backed by PHYs
can also need switch-specific initialization data. The motivating case is
qca8k PHY-to-PHY CPU-port support carried by OpenWrt, where the internal
PHY driver needs the switch revision. That support is absent from this
net-next baseline.

Call the existing callback before connecting shared-port PHYs and document
its expanded scope. Drivers without the callback continue to pass zero.
Preserve the existing PHY connection error handling.

Make bcm_sf2 and ksz88xx return zero for non-user ports. This avoids newly
passing their PHY power-management and erratum flags to shared ports,
while retaining their existing user-port values.

Link: https://github.com/openwrt/openwrt/pull/25225
Assisted-by: LLM
Signed-off-by: Yongzhao Chen <yongzhao.derek@gmail.com>
---
This RFC proposes using get_phy_flags() for PHY-backed shared DSA ports,
with bcm_sf2 and ksz88xx guards to preserve their existing behavior.
The callback already carries switch-specific initialization data to PHYs;
the shared-port path should provide it before PHY initialization too.

The use case comes from qca8k PHY-to-PHY CPU-port support carried by
OpenWrt. That support is absent from this net-next baseline. The downstream
PHY driver needs the switch revision and a flag for a QCA8337 CPU-link
SmartSpeed quirk. This patch covers the generic flag propagation and
compatibility guards; the PHY-to-PHY support and quirk are outside its
scope. The complete RA74 fix would need those changes as well.

Reusing the callback keeps one interface for switch-to-PHY information.
The guards make bcm_sf2 and ksz88xx return zero for non-user ports,
preserving their previous contribution on those paths. They do not clear
flags already held by the PHY. qca8k continues to supply its revision for
internal PHYs. The pinned tree has no other callback implementations.

The patch is based on net-next
26ee8cd69d46a14b37ba5e512084fe80d730127a. Validation:

- Four fresh x86_64 builds compare baseline and candidate allyesconfig
  and allmodconfig with GCC 13.3.0, W=1 and KCFLAGS=-Wno-error. All builds
  produce vmlinux, bzImage and every expected module: 66 for allyesconfig
  and 11,173 for allmodconfig. Paired configurations are byte-identical;
  source, configuration and toolchain checks remain stable throughout.
  Complete warning/note comparisons, including repetition counts and
  compiler targets, show no new code diagnostics. Allmodconfig matches
  exactly. Allyesconfig differs only by four baseline make clock-skew
  diagnostics. Their two empty module lists were checked, and full-target
  replays reached stable dependencies with no new diagnostics. Raw logs
  and the review are retained. The default CONFIG_WERROR=y builds had
  stopped on warnings reproduced in the unpatched baseline: all 48 and
  12 initial error diagnostics, respectively. The common -Wno-error
  setting enables the complete comparison; these are not warning-free
  builds. Earlier affected-object COMPILE_TEST/W=1 builds also passed.
- A standalone C harness compiles actual DSA and driver function bodies
  with stubbed PHY/phylink operations under ASan/UBSan. All 52 cases pass,
  covering BCM/KSZ compatibility, qca8k revision propagation, all flag
  bits, callback arguments and call count, missing callbacks, and
  attachment errors. Removing either guard or disabling propagation
  makes the corresponding assertion fail. Earlier compiled-function
  checks also cover the OpenWrt 6.12 and 6.18 adaptations.
- Runtime testing used an OpenWrt 6.18 image on Redmi AX5400 (RA74), with
  the PHY-to-PHY support and QCA quirk. It passed sysupgrade and warm
  reboots, a physical 20-second power cycle, WAN/LAN DHCP, wired traffic
  and LAN VLAN isolation. These results cover the combined downstream
  changes. This net-next patch has not been runtime-tested on hardware;
  BCM SF2 and KSZ hardware have not been tested.

Codex assisted with the implementation, test harnesses and draft text.
The work addressed OpenWrt PR 25225 review, preserving other drivers'
behavior and preparing the generic change for upstream discussion.
Gemini 3.8 Flash, through agy, reviewed the design and an earlier draft.
The paired whole-tree build experiment was completed after those reviews.

 Documentation/networking/dsa/dsa.rst | 2 ++
 drivers/net/dsa/bcm_sf2.c            | 4 ++++
 drivers/net/dsa/microchip/ksz8.c     | 4 ++++
 net/dsa/port.c                       | 6 +++++-
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/Documentation/networking/dsa/dsa.rst b/Documentation/networking/dsa/dsa.rst
index 42a99f5df..9bb7a8f75 100644
--- a/Documentation/networking/dsa/dsa.rst
+++ b/Documentation/networking/dsa/dsa.rst
@@ -668,6 +668,8 @@ PHY devices and link management
   on its own (e.g.: coming from switch memory mapped registers), this function
   should return a 32-bit bitmask of "flags" that is private between the switch
   driver and the Ethernet PHY driver in ``drivers/net/phy/\*``.
+  It is called when connecting PHYs for user, CPU and DSA ports. Drivers
+  should return zero for ports that do not need switch-specific PHY flags.
 
 - ``phy_read``: Function invoked by the DSA user MDIO bus when attempting to read
   the switch port MDIO registers. If unavailable, return 0xffff for each read.
diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c
index 9e5713015..f516fc396 100644
--- a/drivers/net/dsa/bcm_sf2.c
+++ b/drivers/net/dsa/bcm_sf2.c
@@ -709,6 +709,10 @@ static u32 bcm_sf2_sw_get_phy_flags(struct dsa_switch *ds, int port)
 {
 	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);
 
+	/* Shared ports previously received no PHY flags. */
+	if (!dsa_is_user_port(ds, port))
+		return 0;
+
 	/* The BCM7xxx PHY driver expects to find the integrated PHY revision
 	 * in bits 15:8 and the patch level in bits 7:0 which is exactly what
 	 * the REG_PHY_REVISION register layout is.
diff --git a/drivers/net/dsa/microchip/ksz8.c b/drivers/net/dsa/microchip/ksz8.c
index 941ae9f66..d284c199f 100644
--- a/drivers/net/dsa/microchip/ksz8.c
+++ b/drivers/net/dsa/microchip/ksz8.c
@@ -2953,6 +2953,10 @@ static u32 ksz88xx_get_phy_flags(struct dsa_switch *ds, int port)
 {
 	struct ksz_device *dev = ds->priv;
 
+	/* Shared ports previously received no PHY flags. */
+	if (!dsa_is_user_port(ds, port))
+		return 0;
+
 	switch (dev->chip_id) {
 	case KSZ88X3_CHIP_ID:
 		/* Silicon Errata Sheet (DS80000830A):
diff --git a/net/dsa/port.c b/net/dsa/port.c
index 1f5536c0d..4db7e6f9c 100644
--- a/net/dsa/port.c
+++ b/net/dsa/port.c
@@ -1666,6 +1666,7 @@ static int dsa_shared_port_phylink_register(struct dsa_port *dp)
 {
 	struct dsa_switch *ds = dp->ds;
 	struct device_node *port_dn = dp->dn;
+	u32 phy_flags = 0;
 	int err;
 
 	dp->pl_config.dev = ds->dev;
@@ -1675,7 +1676,10 @@ static int dsa_shared_port_phylink_register(struct dsa_port *dp)
 	if (err)
 		return err;
 
-	err = phylink_of_phy_connect(dp->pl, port_dn, 0);
+	if (ds->ops->get_phy_flags)
+		phy_flags = ds->ops->get_phy_flags(ds, dp->index);
+
+	err = phylink_of_phy_connect(dp->pl, port_dn, phy_flags);
 	if (err && err != -ENODEV) {
 		pr_err("could not attach to PHY: %d\n", err);
 		goto err_phy_connect;

base-commit: 26ee8cd69d46a14b37ba5e512084fe80d730127a
-- 
2.43.0

Re: [RFC net-next] net: dsa: pass PHY flags when connecting shared ports

[Andrew Lunn]

> The use case comes from qca8k PHY-to-PHY CPU-port support carried by
> OpenWrt. That support is absent from this net-next baseline. The downstream
> PHY driver needs the switch revision and a flag for a QCA8337 CPU-link
> SmartSpeed quirk.

If the PHY driver is not in mainline, there is no need for this patch.

You need to post both this patch and the PHY driver in the same
series, so the new feature has a user.

    Andrew

---
pw-bot: cr