| .. | .. |
|---|
| 23 | 23 | return reg & GENMASK(7, 0); |
|---|
| 24 | 24 | } |
|---|
| 25 | 25 | |
|---|
| 26 | +static u32 stmmac_get_dev_id(struct stmmac_priv *priv, u32 id_reg) |
|---|
| 27 | +{ |
|---|
| 28 | + u32 reg = readl(priv->ioaddr + id_reg); |
|---|
| 29 | + |
|---|
| 30 | + if (!reg) { |
|---|
| 31 | + dev_info(priv->device, "Version ID not available\n"); |
|---|
| 32 | + return 0x0; |
|---|
| 33 | + } |
|---|
| 34 | + |
|---|
| 35 | + return (reg & GENMASK(15, 8)) >> 8; |
|---|
| 36 | +} |
|---|
| 37 | + |
|---|
| 26 | 38 | #ifdef CONFIG_STMMAC_FULL |
|---|
| 27 | 39 | static void stmmac_dwmac_mode_quirk(struct stmmac_priv *priv) |
|---|
| 28 | 40 | { |
|---|
| .. | .. |
|---|
| 69 | 81 | stmmac_dwmac_mode_quirk(priv); |
|---|
| 70 | 82 | return 0; |
|---|
| 71 | 83 | } |
|---|
| 84 | + |
|---|
| 85 | +static int stmmac_dwxlgmac_quirks(struct stmmac_priv *priv) |
|---|
| 86 | +{ |
|---|
| 87 | + priv->hw->xlgmac = true; |
|---|
| 88 | + return 0; |
|---|
| 89 | +} |
|---|
| 72 | 90 | #endif |
|---|
| 73 | 91 | |
|---|
| 74 | 92 | static const struct stmmac_hwif_entry { |
|---|
| .. | .. |
|---|
| 76 | 94 | bool gmac4; |
|---|
| 77 | 95 | bool xgmac; |
|---|
| 78 | 96 | u32 min_id; |
|---|
| 97 | + u32 dev_id; |
|---|
| 79 | 98 | const struct stmmac_regs_off regs; |
|---|
| 80 | 99 | const void *desc; |
|---|
| 81 | 100 | const void *dma; |
|---|
| 82 | 101 | const void *mac; |
|---|
| 83 | | -#ifdef CONFIG_STMMAC_PTP |
|---|
| 84 | 102 | const void *hwtimestamp; |
|---|
| 85 | | -#endif |
|---|
| 86 | 103 | const void *mode; |
|---|
| 87 | 104 | const void *tc; |
|---|
| 105 | + const void *mmc; |
|---|
| 88 | 106 | int (*setup)(struct stmmac_priv *priv); |
|---|
| 89 | 107 | int (*quirks)(struct stmmac_priv *priv); |
|---|
| 90 | 108 | } stmmac_hw[] = { |
|---|
| .. | .. |
|---|
| 102 | 120 | .desc = NULL, |
|---|
| 103 | 121 | .dma = &dwmac100_dma_ops, |
|---|
| 104 | 122 | .mac = &dwmac100_ops, |
|---|
| 105 | | -#ifdef CONFIG_STMMAC_PTP |
|---|
| 106 | 123 | .hwtimestamp = &stmmac_ptp, |
|---|
| 107 | | -#endif |
|---|
| 108 | 124 | .mode = NULL, |
|---|
| 109 | 125 | .tc = NULL, |
|---|
| 126 | + .mmc = &dwmac_mmc_ops, |
|---|
| 110 | 127 | .setup = dwmac100_setup, |
|---|
| 111 | 128 | .quirks = stmmac_dwmac1_quirks, |
|---|
| 112 | 129 | }, { |
|---|
| .. | .. |
|---|
| 121 | 138 | .desc = NULL, |
|---|
| 122 | 139 | .dma = &dwmac1000_dma_ops, |
|---|
| 123 | 140 | .mac = &dwmac1000_ops, |
|---|
| 124 | | -#ifdef CONFIG_STMMAC_PTP |
|---|
| 125 | 141 | .hwtimestamp = &stmmac_ptp, |
|---|
| 126 | | -#endif |
|---|
| 127 | 142 | .mode = NULL, |
|---|
| 128 | 143 | .tc = NULL, |
|---|
| 144 | + .mmc = &dwmac_mmc_ops, |
|---|
| 129 | 145 | .setup = dwmac1000_setup, |
|---|
| 130 | 146 | .quirks = stmmac_dwmac1_quirks, |
|---|
| 131 | 147 | }, { |
|---|
| .. | .. |
|---|
| 140 | 156 | .desc = &dwmac4_desc_ops, |
|---|
| 141 | 157 | .dma = &dwmac4_dma_ops, |
|---|
| 142 | 158 | .mac = &dwmac4_ops, |
|---|
| 143 | | -#ifdef CONFIG_STMMAC_PTP |
|---|
| 144 | 159 | .hwtimestamp = &stmmac_ptp, |
|---|
| 145 | | -#endif |
|---|
| 146 | 160 | .mode = NULL, |
|---|
| 147 | | - .tc = NULL, |
|---|
| 161 | + .tc = &dwmac510_tc_ops, |
|---|
| 162 | + .mmc = &dwmac_mmc_ops, |
|---|
| 148 | 163 | .setup = dwmac4_setup, |
|---|
| 149 | 164 | .quirks = stmmac_dwmac4_quirks, |
|---|
| 150 | 165 | }, { |
|---|
| .. | .. |
|---|
| 159 | 174 | .desc = &dwmac4_desc_ops, |
|---|
| 160 | 175 | .dma = &dwmac4_dma_ops, |
|---|
| 161 | 176 | .mac = &dwmac410_ops, |
|---|
| 162 | | -#ifdef CONFIG_STMMAC_PTP |
|---|
| 163 | 177 | .hwtimestamp = &stmmac_ptp, |
|---|
| 164 | | -#endif |
|---|
| 165 | 178 | .mode = &dwmac4_ring_mode_ops, |
|---|
| 166 | | - .tc = NULL, |
|---|
| 179 | + .tc = &dwmac510_tc_ops, |
|---|
| 180 | + .mmc = &dwmac_mmc_ops, |
|---|
| 167 | 181 | .setup = dwmac4_setup, |
|---|
| 168 | 182 | .quirks = NULL, |
|---|
| 169 | 183 | }, |
|---|
| .. | .. |
|---|
| 180 | 194 | .desc = &dwmac4_desc_ops, |
|---|
| 181 | 195 | .dma = &dwmac410_dma_ops, |
|---|
| 182 | 196 | .mac = &dwmac410_ops, |
|---|
| 183 | | -#ifdef CONFIG_STMMAC_PTP |
|---|
| 184 | 197 | .hwtimestamp = &stmmac_ptp, |
|---|
| 185 | | -#endif |
|---|
| 186 | 198 | .mode = &dwmac4_ring_mode_ops, |
|---|
| 187 | | - .tc = NULL, |
|---|
| 199 | +#ifdef CONFIG_STMMAC_FULL |
|---|
| 200 | + .tc = &dwmac510_tc_ops, |
|---|
| 201 | +#endif |
|---|
| 202 | + .mmc = &dwmac_mmc_ops, |
|---|
| 188 | 203 | .setup = dwmac4_setup, |
|---|
| 189 | 204 | .quirks = NULL, |
|---|
| 190 | 205 | }, |
|---|
| .. | .. |
|---|
| 201 | 216 | .desc = &dwmac4_desc_ops, |
|---|
| 202 | 217 | .dma = &dwmac410_dma_ops, |
|---|
| 203 | 218 | .mac = &dwmac510_ops, |
|---|
| 204 | | -#ifdef CONFIG_STMMAC_PTP |
|---|
| 205 | 219 | .hwtimestamp = &stmmac_ptp, |
|---|
| 206 | | -#endif |
|---|
| 207 | 220 | .mode = &dwmac4_ring_mode_ops, |
|---|
| 208 | 221 | .tc = &dwmac510_tc_ops, |
|---|
| 222 | + .mmc = &dwmac_mmc_ops, |
|---|
| 209 | 223 | .setup = dwmac4_setup, |
|---|
| 210 | 224 | .quirks = NULL, |
|---|
| 211 | 225 | }, { |
|---|
| .. | .. |
|---|
| 213 | 227 | .gmac4 = false, |
|---|
| 214 | 228 | .xgmac = true, |
|---|
| 215 | 229 | .min_id = DWXGMAC_CORE_2_10, |
|---|
| 230 | + .dev_id = DWXGMAC_ID, |
|---|
| 216 | 231 | .regs = { |
|---|
| 217 | 232 | .ptp_off = PTP_XGMAC_OFFSET, |
|---|
| 218 | | - .mmc_off = 0, |
|---|
| 233 | + .mmc_off = MMC_XGMAC_OFFSET, |
|---|
| 219 | 234 | }, |
|---|
| 220 | 235 | .desc = &dwxgmac210_desc_ops, |
|---|
| 221 | 236 | .dma = &dwxgmac210_dma_ops, |
|---|
| 222 | 237 | .mac = &dwxgmac210_ops, |
|---|
| 223 | | -#ifdef CONFIG_STMMAC_PTP |
|---|
| 224 | 238 | .hwtimestamp = &stmmac_ptp, |
|---|
| 225 | | -#endif |
|---|
| 226 | 239 | .mode = NULL, |
|---|
| 227 | | - .tc = NULL, |
|---|
| 240 | + .tc = &dwmac510_tc_ops, |
|---|
| 241 | + .mmc = &dwxgmac_mmc_ops, |
|---|
| 228 | 242 | .setup = dwxgmac2_setup, |
|---|
| 229 | 243 | .quirks = NULL, |
|---|
| 244 | + }, { |
|---|
| 245 | + .gmac = false, |
|---|
| 246 | + .gmac4 = false, |
|---|
| 247 | + .xgmac = true, |
|---|
| 248 | + .min_id = DWXLGMAC_CORE_2_00, |
|---|
| 249 | + .dev_id = DWXLGMAC_ID, |
|---|
| 250 | + .regs = { |
|---|
| 251 | + .ptp_off = PTP_XGMAC_OFFSET, |
|---|
| 252 | + .mmc_off = MMC_XGMAC_OFFSET, |
|---|
| 253 | + }, |
|---|
| 254 | + .desc = &dwxgmac210_desc_ops, |
|---|
| 255 | + .dma = &dwxgmac210_dma_ops, |
|---|
| 256 | + .mac = &dwxlgmac2_ops, |
|---|
| 257 | + .hwtimestamp = &stmmac_ptp, |
|---|
| 258 | + .mode = NULL, |
|---|
| 259 | + .tc = &dwmac510_tc_ops, |
|---|
| 260 | + .mmc = &dwxgmac_mmc_ops, |
|---|
| 261 | + .setup = dwxlgmac2_setup, |
|---|
| 262 | + .quirks = stmmac_dwxlgmac_quirks, |
|---|
| 230 | 263 | }, |
|---|
| 231 | 264 | #endif |
|---|
| 232 | 265 | }; |
|---|
| .. | .. |
|---|
| 239 | 272 | const struct stmmac_hwif_entry *entry; |
|---|
| 240 | 273 | struct mac_device_info *mac; |
|---|
| 241 | 274 | bool needs_setup = true; |
|---|
| 275 | + u32 id, dev_id = 0; |
|---|
| 242 | 276 | int i, ret; |
|---|
| 243 | | - u32 id; |
|---|
| 244 | 277 | |
|---|
| 245 | 278 | if (needs_gmac) { |
|---|
| 246 | 279 | id = stmmac_get_id(priv, GMAC_VERSION); |
|---|
| 247 | 280 | } else if (needs_gmac4 || needs_xgmac) { |
|---|
| 248 | 281 | id = stmmac_get_id(priv, GMAC4_VERSION); |
|---|
| 282 | + if (needs_xgmac) |
|---|
| 283 | + dev_id = stmmac_get_dev_id(priv, GMAC4_VERSION); |
|---|
| 249 | 284 | } else { |
|---|
| 250 | 285 | id = 0; |
|---|
| 251 | 286 | } |
|---|
| .. | .. |
|---|
| 283 | 318 | /* Use synopsys_id var because some setups can override this */ |
|---|
| 284 | 319 | if (priv->synopsys_id < entry->min_id) |
|---|
| 285 | 320 | continue; |
|---|
| 321 | + if (needs_xgmac && (dev_id ^ entry->dev_id)) |
|---|
| 322 | + continue; |
|---|
| 286 | 323 | |
|---|
| 287 | 324 | /* Only use generic HW helpers if needed */ |
|---|
| 288 | 325 | mac->desc = mac->desc ? : entry->desc; |
|---|
| 289 | 326 | mac->dma = mac->dma ? : entry->dma; |
|---|
| 290 | 327 | mac->mac = mac->mac ? : entry->mac; |
|---|
| 291 | | -#ifdef CONFIG_STMMAC_PTP |
|---|
| 292 | 328 | mac->ptp = mac->ptp ? : entry->hwtimestamp; |
|---|
| 293 | | -#endif |
|---|
| 294 | 329 | mac->mode = mac->mode ? : entry->mode; |
|---|
| 295 | 330 | mac->tc = mac->tc ? : entry->tc; |
|---|
| 331 | + mac->mmc = mac->mmc ? : entry->mmc; |
|---|
| 296 | 332 | |
|---|
| 297 | 333 | priv->hw = mac; |
|---|
| 298 | 334 | priv->ptpaddr = priv->ioaddr + entry->regs.ptp_off; |
|---|