|
| 1 | +--- a/drivers/net/phy/realtek/realtek_main.c |
| 2 | ++++ b/drivers/net/phy/realtek/realtek_main.c |
| 3 | +@@ -171,6 +171,41 @@ |
| 4 | + |
| 5 | + #define RTL8224_SRAM_RTCT_LEN(pair) (0x8028 + (pair) * 4) |
| 6 | + |
| 7 | ++#define RTL8224_VND1_SERDES_CMD 0x3f8 |
| 8 | ++#define RTL8224_VND1_SERDES_READ 0x3fc |
| 9 | ++#define RTL8224_VND1_SERDES_WRITE 0x400 |
| 10 | ++#define RTL8224_SDS_CMD_READ BIT(15) |
| 11 | ++#define RTL8224_SDS_CMD_WRITE (BIT(15) | BIT(14)) |
| 12 | ++ |
| 13 | ++#define RTL8224_VND1_SERDES_MODE 0x7b20 |
| 14 | ++#define RTL8224_VND1_SERDES_MODE_MASK GENMASK(4, 0) |
| 15 | ++#define RTL8224_VND1_SERDES_MODE_OFF 0x1f |
| 16 | ++#define RTL8224_VND1_SERDES_MODE_USXGMII 0x0d |
| 17 | ++#define RTL8224_VND1_SERDES_SUBMODE_MASK GENMASK(14, 10) |
| 18 | ++#define RTL8224_VND1_SERDES_SUBMODE_10G_QXGMII (0x2 << 10) |
| 19 | ++ |
| 20 | ++#define RTL8224_SDS_AM_PAGE 0x6 |
| 21 | ++#define RTL8224_SDS_AM_PERIOD_REG 0x12 |
| 22 | ++ |
| 23 | ++#define RTL8224_SDS_AM_CFG0_REG 0x13 |
| 24 | ++#define RTL8224_SDS_AM_CFG1_REG 0x14 |
| 25 | ++#define RTL8224_SDS_AM_CFG2_REG 0x15 |
| 26 | ++#define RTL8224_SDS_AM_CFG3_REG 0x16 |
| 27 | ++#define RTL8224_SDS_AM_CFG4_REG 0x17 |
| 28 | ++#define RTL8224_SDS_AM_CFG5_REG 0x18 |
| 29 | ++ |
| 30 | ++#define RTL8224_SDS_NWAY_PAGE 0x7 |
| 31 | ++#define RTL8224_SDS_NWAY_OPCODE_REG 0x10 |
| 32 | ++#define RTL8224_SDS_NWAY_OPCODE_MASK GENMASK(7, 0) |
| 33 | ++#define RTL8224_SDS_NWAY_AN_REG 0x11 |
| 34 | ++#define RTL8224_SDS_NWAY_AN_EN_MASK GENMASK(3, 0) |
| 35 | ++ |
| 36 | ++#define RTL8224_SDS_REG0_TX_PAGE 0x2e |
| 37 | ++#define RTL8224_SDS_REG0_TX_POST1_REG 0x6 |
| 38 | ++#define RTL8224_SDS_REG0_TX_REG 0x7 |
| 39 | ++#define RTL8224_SDS_REG0_TX_Z0_REG 0xb |
| 40 | ++ |
| 41 | ++ |
| 42 | + #define RTL8221B_PHYCR1 0xa430 |
| 43 | + #define RTL8221B_PHYCR1_ALDPS_EN BIT(2) |
| 44 | + #define RTL8221B_PHYCR1_ALDPS_XTAL_OFF_EN BIT(12) |
| 45 | +@@ -2034,6 +2069,147 @@ exit: |
| 46 | + return ret; |
| 47 | + } |
| 48 | + |
| 49 | ++static int rtl8224_sds_read(struct phy_device *phydev, int page, u32 reg) |
| 50 | ++{ |
| 51 | ++ int ret; |
| 52 | ++ u32 val; |
| 53 | ++ u32 cmd = RTL8224_SDS_CMD_READ | (reg << 7) | (page << 1); |
| 54 | ++ |
| 55 | ++ ret = phy_write_mmd(phydev, MDIO_MMD_VEND1, RTL8224_VND1_SERDES_CMD, cmd); |
| 56 | ++ if (ret < 0) |
| 57 | ++ return ret; |
| 58 | ++ |
| 59 | ++ ret = phy_read_mmd_poll_timeout(phydev, MDIO_MMD_VEND1, |
| 60 | ++ RTL8224_VND1_SERDES_CMD, val, |
| 61 | ++ !(val & BIT(15)), 500, 500000000, |
| 62 | ++ false); |
| 63 | ++ if (ret < 0) |
| 64 | ++ return ret; |
| 65 | ++ |
| 66 | ++ return phy_read_mmd(phydev, MDIO_MMD_VEND1, RTL8224_VND1_SERDES_READ); |
| 67 | ++} |
| 68 | ++ |
| 69 | ++static int rtl8224_sds_write(struct phy_device *phydev, int page, int reg, u32 data) |
| 70 | ++{ |
| 71 | ++ int ret; |
| 72 | ++ u32 tmp; |
| 73 | ++ u32 cmd = RTL8224_SDS_CMD_WRITE | (reg << 7) | (page << 1); |
| 74 | ++ |
| 75 | ++ ret = phy_write_mmd(phydev, MDIO_MMD_VEND1, RTL8224_VND1_SERDES_WRITE, |
| 76 | ++ data); |
| 77 | ++ if (ret < 0) |
| 78 | ++ return ret; |
| 79 | ++ |
| 80 | ++ ret = phy_write_mmd(phydev, MDIO_MMD_VEND1, RTL8224_VND1_SERDES_CMD, cmd); |
| 81 | ++ if (ret < 0) |
| 82 | ++ return ret; |
| 83 | ++ |
| 84 | ++ return phy_read_mmd_poll_timeout(phydev, MDIO_MMD_VEND1, |
| 85 | ++ RTL8224_VND1_SERDES_CMD, tmp, |
| 86 | ++ !(tmp & BIT(15)), 500, 500000000, |
| 87 | ++ false); |
| 88 | ++} |
| 89 | ++ |
| 90 | ++static int rtl8224_sds_modify(struct phy_device *phydev, int page, int reg, u32 mask, u32 data) |
| 91 | ++{ |
| 92 | ++ int ret; |
| 93 | ++ u32 val; |
| 94 | ++ |
| 95 | ++ ret = rtl8224_sds_read(phydev, page, reg); |
| 96 | ++ if (ret < 0) |
| 97 | ++ return ret; |
| 98 | ++ |
| 99 | ++ val = (u32)ret; |
| 100 | ++ val = (val & ~mask) | (data & mask); |
| 101 | ++ |
| 102 | ++ ret = rtl8224_sds_write(phydev, page, reg, val); |
| 103 | ++ if (ret) |
| 104 | ++ return ret; |
| 105 | ++ |
| 106 | ++ return 0; |
| 107 | ++} |
| 108 | ++ |
| 109 | ++static int rtl8224_serdes_config(struct phy_device *phydev) |
| 110 | ++{ |
| 111 | ++ if ((phydev->mdio.addr & 3) != 0) |
| 112 | ++ return 0; |
| 113 | ++ |
| 114 | ++ /* Turn SerDes OFF */ |
| 115 | ++ phy_modify_mmd(phydev, MDIO_MMD_VEND1, RTL8224_VND1_SERDES_MODE, |
| 116 | ++ RTL8224_VND1_SERDES_MODE_MASK, |
| 117 | ++ RTL8224_VND1_SERDES_MODE_OFF); |
| 118 | ++ |
| 119 | ++ /* Use generic/standard-compliant AN mode */ |
| 120 | ++ rtl8224_sds_modify(phydev, RTL8224_SDS_NWAY_PAGE, |
| 121 | ++ RTL8224_SDS_NWAY_OPCODE_REG, |
| 122 | ++ RTL8224_SDS_NWAY_OPCODE_MASK, 0x0003); |
| 123 | ++ |
| 124 | ++ rtl8224_sds_write(phydev, RTL8224_SDS_AM_PAGE, |
| 125 | ++ RTL8224_SDS_AM_PERIOD_REG, 0x00a4); |
| 126 | ++ |
| 127 | ++ /* Set all AM markers to 0 */ |
| 128 | ++ rtl8224_sds_write(phydev, RTL8224_SDS_AM_PAGE, |
| 129 | ++ RTL8224_SDS_AM_CFG0_REG, 0); |
| 130 | ++ rtl8224_sds_write(phydev, RTL8224_SDS_AM_PAGE, |
| 131 | ++ RTL8224_SDS_AM_CFG1_REG, 0); |
| 132 | ++ rtl8224_sds_write(phydev, RTL8224_SDS_AM_PAGE, |
| 133 | ++ RTL8224_SDS_AM_CFG2_REG, 0); |
| 134 | ++ rtl8224_sds_write(phydev, RTL8224_SDS_AM_PAGE, |
| 135 | ++ RTL8224_SDS_AM_CFG3_REG, 0); |
| 136 | ++ rtl8224_sds_write(phydev, RTL8224_SDS_AM_PAGE, |
| 137 | ++ RTL8224_SDS_AM_CFG4_REG, 0); |
| 138 | ++ rtl8224_sds_write(phydev, RTL8224_SDS_AM_PAGE, |
| 139 | ++ RTL8224_SDS_AM_CFG5_REG, 0); |
| 140 | ++ |
| 141 | ++ /* Enable USXGMII autoneg on all 4 channels */ |
| 142 | ++ rtl8224_sds_modify(phydev, RTL8224_SDS_NWAY_PAGE, |
| 143 | ++ RTL8224_SDS_NWAY_AN_REG, |
| 144 | ++ RTL8224_SDS_NWAY_AN_EN_MASK, 0xf); |
| 145 | ++ |
| 146 | ++ rtl8224_sds_modify(phydev, 0x06, 0x03, BIT(15), BIT(15)); |
| 147 | ++ rtl8224_sds_modify(phydev, 0x06, 0x1d, BIT(9), BIT(9)); |
| 148 | ++ rtl8224_sds_modify(phydev, 0x06, 0x1f, BIT(13), BIT(13)); |
| 149 | ++ rtl8224_sds_write(phydev, 0x21, 0x10, 0x4480); |
| 150 | ++ rtl8224_sds_write(phydev, 0x21, 0x13, 0x0400); |
| 151 | ++ rtl8224_sds_write(phydev, 0x21, 0x18, 0x6d02); |
| 152 | ++ rtl8224_sds_write(phydev, 0x21, 0x1b, 0x424e); |
| 153 | ++ rtl8224_sds_write(phydev, 0x21, 0x1d, 0x0002); |
| 154 | ++ rtl8224_sds_write(phydev, 0x36, 0x1c, 0x1390); |
| 155 | ++ rtl8224_sds_write(phydev, 0x2e, 0x04, 0x0080); |
| 156 | ++ |
| 157 | ++ rtl8224_sds_write(phydev, RTL8224_SDS_REG0_TX_PAGE, |
| 158 | ++ RTL8224_SDS_REG0_TX_POST1_REG, 0x0408); |
| 159 | ++ |
| 160 | ++ rtl8224_sds_write(phydev, RTL8224_SDS_REG0_TX_PAGE, |
| 161 | ++ RTL8224_SDS_REG0_TX_REG, 0x020d); |
| 162 | ++ |
| 163 | ++ rtl8224_sds_write(phydev, 0x2e, 0x09, 0x0601); |
| 164 | ++ |
| 165 | ++ rtl8224_sds_write(phydev, RTL8224_SDS_REG0_TX_PAGE, |
| 166 | ++ RTL8224_SDS_REG0_TX_Z0_REG, 0x222c); |
| 167 | ++ |
| 168 | ++ rtl8224_sds_write(phydev, 0x2e, 0x0c, 0xa217); |
| 169 | ++ rtl8224_sds_write(phydev, 0x2e, 0x0d, 0xfe40); |
| 170 | ++ rtl8224_sds_write(phydev, 0x2e, 0x15, 0xf5f1); |
| 171 | ++ rtl8224_sds_write(phydev, 0x2e, 0x16, 0x0443); |
| 172 | ++ rtl8224_sds_write(phydev, 0x2e, 0x1d, 0xabb0); |
| 173 | ++ |
| 174 | ++ /* Turn SerDes ON in 10G_QXGMII mode */ |
| 175 | ++ phy_modify_mmd(phydev, MDIO_MMD_VEND1, RTL8224_VND1_SERDES_MODE, |
| 176 | ++ RTL8224_VND1_SERDES_SUBMODE_MASK, |
| 177 | ++ RTL8224_VND1_SERDES_SUBMODE_10G_QXGMII); |
| 178 | ++ phy_modify_mmd(phydev, MDIO_MMD_VEND1, RTL8224_VND1_SERDES_MODE, |
| 179 | ++ RTL8224_VND1_SERDES_MODE_MASK, |
| 180 | ++ RTL8224_VND1_SERDES_MODE_USXGMII); |
| 181 | ++ |
| 182 | ++ rtl8224_sds_modify(phydev, 0x20, 0x00, GENMASK(5, 4), 0x30); |
| 183 | ++ rtl8224_sds_modify(phydev, 0x20, 0x00, GENMASK(5, 4), 0x10); |
| 184 | ++ rtl8224_sds_modify(phydev, 0x20, 0x00, GENMASK(5, 4), 0x30); |
| 185 | ++ rtl8224_sds_modify(phydev, 0x20, 0x00, GENMASK(5, 4), 0x00); |
| 186 | ++ |
| 187 | ++ return 0; |
| 188 | ++} |
| 189 | ++ |
| 190 | + static int rtl8224_mdi_config_order(struct phy_device *phydev) |
| 191 | + { |
| 192 | + struct device_node *np = phydev->mdio.dev.of_node; |
| 193 | +@@ -2088,6 +2264,10 @@ static int rtl8224_config_init(struct ph |
| 194 | + { |
| 195 | + int ret; |
| 196 | + |
| 197 | ++ ret = rtl8224_serdes_config(phydev); |
| 198 | ++ if (ret) |
| 199 | ++ return ret; |
| 200 | ++ |
| 201 | + ret = rtl8224_mdi_config_order(phydev); |
| 202 | + if (ret) |
| 203 | + return ret; |
0 commit comments