Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

phy: ocelot-serdes: Add support for SERDES6G muxing

Adding support for SERDES6G muxing required for QSGMII mode of operation.

Signed-off-by: Kavya Sree Kotagiri <kavyasree.kotagiri@microchip.com>
Signed-off-by: Quentin Schulz <quentin.schulz@bootlin.com>
Signed-off-by: Steen Hegelund <Steen.Hegelund@microchip.com>
Co-developed-by: Quentin Schulz <quentin.schulz@bootlin.com>
Co-developed-by: Steen Hegelund <Steen.Hegelund@microchip.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>

authored by

Kavya Sree Kotagiri and committed by
Kishon Vijay Abraham I
61c67bfa eeda879b

+238 -2
+238 -2
drivers/phy/mscc/phy-ocelot-serdes.c
··· 31 31 struct serdes_ctrl *ctrl; 32 32 }; 33 33 34 + #define MCB_S6G_CFG_TIMEOUT 50 35 + 36 + static int __serdes_write_mcb_s6g(struct regmap *regmap, u8 macro, u32 op) 37 + { 38 + unsigned int regval = 0; 39 + 40 + regmap_write(regmap, HSIO_MCB_S6G_ADDR_CFG, op | 41 + HSIO_MCB_S6G_ADDR_CFG_SERDES6G_ADDR(BIT(macro))); 42 + 43 + return regmap_read_poll_timeout(regmap, HSIO_MCB_S6G_ADDR_CFG, regval, 44 + (regval & op) != op, 100, 45 + MCB_S6G_CFG_TIMEOUT * 1000); 46 + } 47 + 48 + static int serdes_commit_mcb_s6g(struct regmap *regmap, u8 macro) 49 + { 50 + return __serdes_write_mcb_s6g(regmap, macro, 51 + HSIO_MCB_S6G_ADDR_CFG_SERDES6G_WR_ONE_SHOT); 52 + } 53 + 54 + static int serdes_update_mcb_s6g(struct regmap *regmap, u8 macro) 55 + { 56 + return __serdes_write_mcb_s6g(regmap, macro, 57 + HSIO_MCB_S6G_ADDR_CFG_SERDES6G_RD_ONE_SHOT); 58 + } 59 + 60 + static int serdes_init_s6g(struct regmap *regmap, u8 serdes, int mode) 61 + { 62 + u32 pll_fsm_ctrl_data; 63 + u32 ob_ena1v_mode; 64 + u32 des_bw_ana; 65 + u32 ob_ena_cas; 66 + u32 if_mode; 67 + u32 ob_lev; 68 + u32 qrate; 69 + int ret; 70 + 71 + if (mode == PHY_INTERFACE_MODE_QSGMII) { 72 + pll_fsm_ctrl_data = 120; 73 + ob_ena1v_mode = 0; 74 + ob_ena_cas = 0; 75 + des_bw_ana = 5; 76 + ob_lev = 24; 77 + if_mode = 3; 78 + qrate = 0; 79 + } else { 80 + pll_fsm_ctrl_data = 60; 81 + ob_ena1v_mode = 1; 82 + ob_ena_cas = 2; 83 + des_bw_ana = 3; 84 + ob_lev = 48; 85 + if_mode = 1; 86 + qrate = 1; 87 + } 88 + 89 + ret = serdes_update_mcb_s6g(regmap, serdes); 90 + if (ret) 91 + return ret; 92 + 93 + /* Test pattern */ 94 + 95 + regmap_update_bits(regmap, HSIO_S6G_COMMON_CFG, 96 + HSIO_S6G_COMMON_CFG_SYS_RST, 0); 97 + 98 + regmap_update_bits(regmap, HSIO_S6G_PLL_CFG, 99 + HSIO_S6G_PLL_CFG_PLL_FSM_ENA, 0); 100 + 101 + regmap_update_bits(regmap, HSIO_S6G_IB_CFG, 102 + HSIO_S6G_IB_CFG_IB_SIG_DET_ENA | 103 + HSIO_S6G_IB_CFG_IB_REG_ENA | 104 + HSIO_S6G_IB_CFG_IB_SAM_ENA | 105 + HSIO_S6G_IB_CFG_IB_EQZ_ENA | 106 + HSIO_S6G_IB_CFG_IB_CONCUR | 107 + HSIO_S6G_IB_CFG_IB_CAL_ENA, 108 + HSIO_S6G_IB_CFG_IB_SIG_DET_ENA | 109 + HSIO_S6G_IB_CFG_IB_REG_ENA | 110 + HSIO_S6G_IB_CFG_IB_SAM_ENA | 111 + HSIO_S6G_IB_CFG_IB_EQZ_ENA | 112 + HSIO_S6G_IB_CFG_IB_CONCUR); 113 + 114 + regmap_update_bits(regmap, HSIO_S6G_IB_CFG1, 115 + HSIO_S6G_IB_CFG1_IB_FRC_OFFSET | 116 + HSIO_S6G_IB_CFG1_IB_FRC_LP | 117 + HSIO_S6G_IB_CFG1_IB_FRC_MID | 118 + HSIO_S6G_IB_CFG1_IB_FRC_HP | 119 + HSIO_S6G_IB_CFG1_IB_FILT_OFFSET | 120 + HSIO_S6G_IB_CFG1_IB_FILT_LP | 121 + HSIO_S6G_IB_CFG1_IB_FILT_MID | 122 + HSIO_S6G_IB_CFG1_IB_FILT_HP, 123 + HSIO_S6G_IB_CFG1_IB_FILT_OFFSET | 124 + HSIO_S6G_IB_CFG1_IB_FILT_HP | 125 + HSIO_S6G_IB_CFG1_IB_FILT_LP | 126 + HSIO_S6G_IB_CFG1_IB_FILT_MID); 127 + 128 + regmap_update_bits(regmap, HSIO_S6G_IB_CFG2, 129 + HSIO_S6G_IB_CFG2_IB_UREG_M, 130 + HSIO_S6G_IB_CFG2_IB_UREG(4)); 131 + 132 + regmap_update_bits(regmap, HSIO_S6G_IB_CFG3, 133 + HSIO_S6G_IB_CFG3_IB_INI_OFFSET_M | 134 + HSIO_S6G_IB_CFG3_IB_INI_LP_M | 135 + HSIO_S6G_IB_CFG3_IB_INI_MID_M | 136 + HSIO_S6G_IB_CFG3_IB_INI_HP_M, 137 + HSIO_S6G_IB_CFG3_IB_INI_OFFSET(31) | 138 + HSIO_S6G_IB_CFG3_IB_INI_LP(1) | 139 + HSIO_S6G_IB_CFG3_IB_INI_MID(31) | 140 + HSIO_S6G_IB_CFG3_IB_INI_HP(0)); 141 + 142 + regmap_update_bits(regmap, HSIO_S6G_MISC_CFG, 143 + HSIO_S6G_MISC_CFG_LANE_RST, 144 + HSIO_S6G_MISC_CFG_LANE_RST); 145 + 146 + ret = serdes_commit_mcb_s6g(regmap, serdes); 147 + if (ret) 148 + return ret; 149 + 150 + /* OB + DES + IB + SER CFG */ 151 + regmap_update_bits(regmap, HSIO_S6G_OB_CFG, 152 + HSIO_S6G_OB_CFG_OB_IDLE | 153 + HSIO_S6G_OB_CFG_OB_ENA1V_MODE | 154 + HSIO_S6G_OB_CFG_OB_POST0_M | 155 + HSIO_S6G_OB_CFG_OB_PREC_M, 156 + (ob_ena1v_mode ? HSIO_S6G_OB_CFG_OB_ENA1V_MODE : 0) | 157 + HSIO_S6G_OB_CFG_OB_POST0(0) | 158 + HSIO_S6G_OB_CFG_OB_PREC(0)); 159 + 160 + regmap_update_bits(regmap, HSIO_S6G_OB_CFG1, 161 + HSIO_S6G_OB_CFG1_OB_ENA_CAS_M | 162 + HSIO_S6G_OB_CFG1_OB_LEV_M, 163 + HSIO_S6G_OB_CFG1_OB_LEV(ob_lev) | 164 + HSIO_S6G_OB_CFG1_OB_ENA_CAS(ob_ena_cas)); 165 + 166 + regmap_update_bits(regmap, HSIO_S6G_DES_CFG, 167 + HSIO_S6G_DES_CFG_DES_PHS_CTRL_M | 168 + HSIO_S6G_DES_CFG_DES_CPMD_SEL_M | 169 + HSIO_S6G_DES_CFG_DES_BW_ANA_M, 170 + HSIO_S6G_DES_CFG_DES_PHS_CTRL(2) | 171 + HSIO_S6G_DES_CFG_DES_CPMD_SEL(0) | 172 + HSIO_S6G_DES_CFG_DES_BW_ANA(des_bw_ana)); 173 + 174 + regmap_update_bits(regmap, HSIO_S6G_IB_CFG, 175 + HSIO_S6G_IB_CFG_IB_SIG_DET_CLK_SEL_M | 176 + HSIO_S6G_IB_CFG_IB_REG_PAT_SEL_OFFSET_M, 177 + HSIO_S6G_IB_CFG_IB_REG_PAT_SEL_OFFSET(0) | 178 + HSIO_S6G_IB_CFG_IB_SIG_DET_CLK_SEL(0)); 179 + 180 + regmap_update_bits(regmap, HSIO_S6G_IB_CFG1, 181 + HSIO_S6G_IB_CFG1_IB_TSDET_M, 182 + HSIO_S6G_IB_CFG1_IB_TSDET(16)); 183 + 184 + regmap_update_bits(regmap, HSIO_S6G_SER_CFG, 185 + HSIO_S6G_SER_CFG_SER_ALISEL_M | 186 + HSIO_S6G_SER_CFG_SER_ENALI, 187 + HSIO_S6G_SER_CFG_SER_ALISEL(0)); 188 + 189 + regmap_update_bits(regmap, HSIO_S6G_PLL_CFG, 190 + HSIO_S6G_PLL_CFG_PLL_DIV4 | 191 + HSIO_S6G_PLL_CFG_PLL_ENA_ROT | 192 + HSIO_S6G_PLL_CFG_PLL_FSM_CTRL_DATA_M | 193 + HSIO_S6G_PLL_CFG_PLL_ROT_DIR | 194 + HSIO_S6G_PLL_CFG_PLL_ROT_FRQ, 195 + HSIO_S6G_PLL_CFG_PLL_FSM_CTRL_DATA 196 + (pll_fsm_ctrl_data)); 197 + 198 + regmap_update_bits(regmap, HSIO_S6G_COMMON_CFG, 199 + HSIO_S6G_COMMON_CFG_SYS_RST | 200 + HSIO_S6G_COMMON_CFG_ENA_LANE | 201 + HSIO_S6G_COMMON_CFG_PWD_RX | 202 + HSIO_S6G_COMMON_CFG_PWD_TX | 203 + HSIO_S6G_COMMON_CFG_HRATE | 204 + HSIO_S6G_COMMON_CFG_QRATE | 205 + HSIO_S6G_COMMON_CFG_ENA_ELOOP | 206 + HSIO_S6G_COMMON_CFG_ENA_FLOOP | 207 + HSIO_S6G_COMMON_CFG_IF_MODE_M, 208 + HSIO_S6G_COMMON_CFG_SYS_RST | 209 + HSIO_S6G_COMMON_CFG_ENA_LANE | 210 + (qrate ? HSIO_S6G_COMMON_CFG_QRATE : 0) | 211 + HSIO_S6G_COMMON_CFG_IF_MODE(if_mode)); 212 + 213 + regmap_update_bits(regmap, HSIO_S6G_MISC_CFG, 214 + HSIO_S6G_MISC_CFG_LANE_RST | 215 + HSIO_S6G_MISC_CFG_DES_100FX_CPMD_ENA | 216 + HSIO_S6G_MISC_CFG_RX_LPI_MODE_ENA | 217 + HSIO_S6G_MISC_CFG_TX_LPI_MODE_ENA, 218 + HSIO_S6G_MISC_CFG_LANE_RST | 219 + HSIO_S6G_MISC_CFG_RX_LPI_MODE_ENA); 220 + 221 + 222 + ret = serdes_commit_mcb_s6g(regmap, serdes); 223 + if (ret) 224 + return ret; 225 + 226 + regmap_update_bits(regmap, HSIO_S6G_PLL_CFG, 227 + HSIO_S6G_PLL_CFG_PLL_FSM_ENA, 228 + HSIO_S6G_PLL_CFG_PLL_FSM_ENA); 229 + 230 + ret = serdes_commit_mcb_s6g(regmap, serdes); 231 + if (ret) 232 + return ret; 233 + 234 + /* Wait for PLL bringup */ 235 + msleep(20); 236 + 237 + regmap_update_bits(regmap, HSIO_S6G_IB_CFG, 238 + HSIO_S6G_IB_CFG_IB_CAL_ENA, 239 + HSIO_S6G_IB_CFG_IB_CAL_ENA); 240 + 241 + regmap_update_bits(regmap, HSIO_S6G_MISC_CFG, 242 + HSIO_S6G_MISC_CFG_LANE_RST, 0); 243 + 244 + ret = serdes_commit_mcb_s6g(regmap, serdes); 245 + if (ret) 246 + return ret; 247 + 248 + /* Wait for calibration */ 249 + msleep(60); 250 + 251 + regmap_update_bits(regmap, HSIO_S6G_IB_CFG, 252 + HSIO_S6G_IB_CFG_IB_REG_PAT_SEL_OFFSET_M | 253 + HSIO_S6G_IB_CFG_IB_SIG_DET_CLK_SEL_M, 254 + HSIO_S6G_IB_CFG_IB_REG_PAT_SEL_OFFSET(0) | 255 + HSIO_S6G_IB_CFG_IB_SIG_DET_CLK_SEL(7)); 256 + 257 + regmap_update_bits(regmap, HSIO_S6G_IB_CFG1, 258 + HSIO_S6G_IB_CFG1_IB_TSDET_M, 259 + HSIO_S6G_IB_CFG1_IB_TSDET(3)); 260 + 261 + /* IB CFG */ 262 + 263 + return 0; 264 + } 265 + 34 266 #define MCB_S1G_CFG_TIMEOUT 50 35 267 36 268 static int __serdes_write_mcb_s1g(struct regmap *regmap, u8 macro, u32 op) ··· 342 110 u32 mux; 343 111 }; 344 112 345 - #define SERDES_MUX(_idx, _port, _mode, _submode, _mask, _mux) { \ 113 + #define SERDES_MUX(_idx, _port, _mode, _submode, _mask, _mux) { \ 346 114 .idx = _idx, \ 347 115 .port = _port, \ 348 116 .mode = _mode, \ ··· 423 191 424 192 if (macro->idx <= SERDES1G_MAX) 425 193 return serdes_init_s1g(macro->ctrl->regs, macro->idx); 194 + else if (macro->idx <= SERDES6G_MAX) 195 + return serdes_init_s6g(macro->ctrl->regs, 196 + macro->idx - (SERDES1G_MAX + 1), 197 + ocelot_serdes_muxes[i].submode); 426 198 427 - /* SERDES6G and PCIe not supported yet */ 199 + /* PCIe not supported yet */ 428 200 return -EOPNOTSUPP; 429 201 } 430 202