Skip to content

Commit 853e803

Browse files
hkallweitkuba-moo
authored andcommitted
r8169: add PHY c45 ops for MDIO_MMD_VENDOR2 registers
The integrated PHYs on chip versions from RTL8168g allow to address MDIO_MMD_VEND2 registers. All c22 standard registers are mapped to MDIO_MMD_VEND2 registers. So far the paging mechanism is used to address PHY registers. Add support for c45 ops to address MDIO_MMD_VEND2 registers directly, w/o the paging. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Link: https://patch.msgid.link/d6f97eaa-0f13-468f-89cb-75a41087bc4a@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 412723d commit 853e803

File tree

1 file changed

+32
-0
lines changed

1 file changed

+32
-0
lines changed

drivers/net/ethernet/realtek/r8169_main.c

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5200,6 +5200,33 @@ static int r8169_mdio_write_reg(struct mii_bus *mii_bus, int phyaddr,
52005200
return 0;
52015201
}
52025202

5203+
static int r8169_mdio_read_reg_c45(struct mii_bus *mii_bus, int addr,
5204+
int devnum, int regnum)
5205+
{
5206+
struct rtl8169_private *tp = mii_bus->priv;
5207+
5208+
if (addr > 0)
5209+
return -ENODEV;
5210+
5211+
if (devnum == MDIO_MMD_VEND2 && regnum > MDIO_STAT2)
5212+
return r8168_phy_ocp_read(tp, regnum);
5213+
5214+
return 0;
5215+
}
5216+
5217+
static int r8169_mdio_write_reg_c45(struct mii_bus *mii_bus, int addr,
5218+
int devnum, int regnum, u16 val)
5219+
{
5220+
struct rtl8169_private *tp = mii_bus->priv;
5221+
5222+
if (addr > 0 || devnum != MDIO_MMD_VEND2 || regnum <= MDIO_STAT2)
5223+
return -ENODEV;
5224+
5225+
r8168_phy_ocp_write(tp, regnum, val);
5226+
5227+
return 0;
5228+
}
5229+
52035230
static int r8169_mdio_register(struct rtl8169_private *tp)
52045231
{
52055232
struct pci_dev *pdev = tp->pci_dev;
@@ -5230,6 +5257,11 @@ static int r8169_mdio_register(struct rtl8169_private *tp)
52305257
new_bus->read = r8169_mdio_read_reg;
52315258
new_bus->write = r8169_mdio_write_reg;
52325259

5260+
if (tp->mac_version >= RTL_GIGA_MAC_VER_40) {
5261+
new_bus->read_c45 = r8169_mdio_read_reg_c45;
5262+
new_bus->write_c45 = r8169_mdio_write_reg_c45;
5263+
}
5264+
52335265
ret = devm_mdiobus_register(&pdev->dev, new_bus);
52345266
if (ret)
52355267
return ret;

0 commit comments

Comments
 (0)