1 From 853e80369cfceb2331bf34f251ba11c6602cc67f Mon Sep 17 00:00:00 2001
2 From: Heiner Kallweit <hkallweit1@gmail.com>
3 Date: Thu, 13 Feb 2025 20:15:42 +0100
4 Subject: [PATCH] r8169: add PHY c45 ops for MDIO_MMD_VENDOR2 registers
6 The integrated PHYs on chip versions from RTL8168g allow to address
7 MDIO_MMD_VEND2 registers. All c22 standard registers are mapped to
8 MDIO_MMD_VEND2 registers. So far the paging mechanism is used to
9 address PHY registers. Add support for c45 ops to address MDIO_MMD_VEND2
10 registers directly, w/o the paging.
12 Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
13 Reviewed-by: Andrew Lunn <andrew@lunn.ch>
14 Link: https://patch.msgid.link/d6f97eaa-0f13-468f-89cb-75a41087bc4a@gmail.com
15 Signed-off-by: Jakub Kicinski <kuba@kernel.org>
17 drivers/net/ethernet/realtek/r8169_main.c | 32 +++++++++++++++++++++++
18 1 file changed, 32 insertions(+)
20 --- a/drivers/net/ethernet/realtek/r8169_main.c
21 +++ b/drivers/net/ethernet/realtek/r8169_main.c
22 @@ -5207,6 +5207,33 @@ static int r8169_mdio_write_reg(struct m
26 +static int r8169_mdio_read_reg_c45(struct mii_bus *mii_bus, int addr,
27 + int devnum, int regnum)
29 + struct rtl8169_private *tp = mii_bus->priv;
34 + if (devnum == MDIO_MMD_VEND2 && regnum > MDIO_STAT2)
35 + return r8168_phy_ocp_read(tp, regnum);
40 +static int r8169_mdio_write_reg_c45(struct mii_bus *mii_bus, int addr,
41 + int devnum, int regnum, u16 val)
43 + struct rtl8169_private *tp = mii_bus->priv;
45 + if (addr > 0 || devnum != MDIO_MMD_VEND2 || regnum <= MDIO_STAT2)
48 + r8168_phy_ocp_write(tp, regnum, val);
53 static int r8169_mdio_register(struct rtl8169_private *tp)
55 struct pci_dev *pdev = tp->pci_dev;
56 @@ -5237,6 +5264,11 @@ static int r8169_mdio_register(struct rt
57 new_bus->read = r8169_mdio_read_reg;
58 new_bus->write = r8169_mdio_write_reg;
60 + if (tp->mac_version >= RTL_GIGA_MAC_VER_40) {
61 + new_bus->read_c45 = r8169_mdio_read_reg_c45;
62 + new_bus->write_c45 = r8169_mdio_write_reg_c45;
65 ret = devm_mdiobus_register(&pdev->dev, new_bus);