mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-16 04:21:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

net: dsa: microchip: Don't embed struct phy_device to maintain the port state

Browse Source 
The KSZ9477 maintains the SGMII port's state for speed, duplex and link
status to be able to fixup the accesses to its internal older version of
the Designware XPCS. However, it does so by embedding a full instance of
struct phy_device, only to use the 'speed', 'link' and 'duplex' fields.

This is also only used for the SGMII port, it's otherwise unused for all
other regular ports.

Replace that with simple int/bool values.

Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20260319181705.1576679-1-maxime.chevallier@bootlin.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Maxime Chevallier
2026-03-19 19:17:04 +01:00
committed by Jakub Kicinski
parent fa782d4df0
commit 2e69e55897
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/net/dsa/microchip/ksz9477.c
View File

@@ -224,14 +224,13 @@ static int ksz9477_pcs_read(struct mii_bus *bus, int phy, int mmd, int reg)
else
duplex = DUPLEX_HALF;
if (!p->phydev.link ||
p->phydev.speed != speed ||
p->phydev.duplex != duplex) {
if (!p->link || p->speed != speed ||
p->duplex != duplex) {
u16 ctrl;
p->phydev.link = 1;
p->phydev.speed = speed;
p->phydev.duplex = duplex;
p->link = true;
p->speed = speed;
p->duplex = duplex;
port_sgmii_r(dev, port, mmd, MII_BMCR,
&ctrl);
ctrl &= BMCR_ANENABLE;
@@ -241,10 +240,10 @@ static int ksz9477_pcs_read(struct mii_bus *bus, int phy, int mmd, int reg)
ctrl);
}
} else {
p->phydev.link = 0;
p->link = false;
}
} else if (reg == MII_BMSR) {
p->phydev.link = !!(val & BMSR_LSTATUS);
p->link = !!(val & BMSR_LSTATUS);
}
}
@@ -557,7 +556,7 @@ int ksz9477_r_phy(struct ksz_device *dev, u16 addr, u16 reg, u16 *data)
val = 0x0700;
break;
case MII_STAT1000:
if (p->phydev.speed == SPEED_1000)
if (p->speed == SPEED_1000)
val = 0x3800;
else
val = 0;

2
drivers/net/dsa/microchip/ksz_common.c
View File

@@ -3983,7 +3983,7 @@ static void ksz9477_phylink_mac_link_up(struct phylink_config *config,
if (dev->info->internal_phy[port])
return;
p->phydev.speed = speed;
p->speed = speed;
ksz_port_set_xmii_speed(dev, port, speed);

4
drivers/net/dsa/microchip/ksz_common.h
View File

@@ -129,7 +129,9 @@ struct ksz_port {
bool learning;
bool isolated;
int stp_state;
struct phy_device phydev;
int speed;
int duplex;
bool link;
u32 fiber:1; /* port is fiber */
u32 force:1;