| .. | .. |
|---|
| 9 | 9 | #include <linux/if_ether.h> |
|---|
| 10 | 10 | #include <linux/if.h> |
|---|
| 11 | 11 | #include <linux/dma-mapping.h> |
|---|
| 12 | +#include <linux/of_device.h> |
|---|
| 12 | 13 | #include <linux/slab.h> |
|---|
| 13 | 14 | #include <linux/prefetch.h> |
|---|
| 14 | 15 | #include <linux/regmap.h> |
|---|
| .. | .. |
|---|
| 100 | 101 | |
|---|
| 101 | 102 | #define STMMAC_ALIGN(x) __ALIGN_KERNEL(x, SMP_CACHE_BYTES) |
|---|
| 102 | 103 | #define MAX_DELAYLINE 0x7f |
|---|
| 104 | +#define RK3588_MAX_DELAYLINE 0xc7 |
|---|
| 103 | 105 | #define SCAN_STEP 0x5 |
|---|
| 104 | 106 | #define SCAN_VALID_RANGE 0xA |
|---|
| 105 | 107 | |
|---|
| .. | .. |
|---|
| 120 | 122 | .size = 1024, |
|---|
| 121 | 123 | }; |
|---|
| 122 | 124 | |
|---|
| 123 | | -static int dwmac_rk_enable_mac_loopback(struct stmmac_priv *priv, int speed) |
|---|
| 125 | +static int dwmac_rk_enable_mac_loopback(struct stmmac_priv *priv, int speed, |
|---|
| 126 | + int addr, bool phy) |
|---|
| 124 | 127 | { |
|---|
| 125 | 128 | u32 ctrl; |
|---|
| 126 | 129 | int phy_val; |
|---|
| .. | .. |
|---|
| 129 | 132 | ctrl &= ~priv->hw->link.speed_mask; |
|---|
| 130 | 133 | ctrl |= GMAC_CONTROL_LM; |
|---|
| 131 | 134 | |
|---|
| 132 | | - phy_val = mdiobus_read(priv->mii, priv->plat->phy_addr, MII_BMCR); |
|---|
| 135 | + if (phy) |
|---|
| 136 | + phy_val = mdiobus_read(priv->mii, addr, MII_BMCR); |
|---|
| 133 | 137 | |
|---|
| 134 | 138 | switch (speed) { |
|---|
| 135 | 139 | case LOOPBACK_SPEED1000: |
|---|
| 136 | 140 | ctrl |= priv->hw->link.speed1000; |
|---|
| 137 | | - phy_val |= BMCR_ANENABLE; |
|---|
| 138 | | - phy_val |= BMCR_SPEED1000; |
|---|
| 141 | + if (phy) { |
|---|
| 142 | + phy_val &= ~BMCR_SPEED100; |
|---|
| 143 | + phy_val |= BMCR_SPEED1000; |
|---|
| 144 | + } |
|---|
| 139 | 145 | break; |
|---|
| 140 | 146 | case LOOPBACK_SPEED100: |
|---|
| 141 | 147 | ctrl |= priv->hw->link.speed100; |
|---|
| 142 | | - phy_val &= ~BMCR_ANENABLE; |
|---|
| 143 | | - phy_val &= ~BMCR_SPEED1000; |
|---|
| 144 | | - phy_val |= BMCR_SPEED100; |
|---|
| 148 | + if (phy) { |
|---|
| 149 | + phy_val &= ~BMCR_SPEED1000; |
|---|
| 150 | + phy_val |= BMCR_SPEED100; |
|---|
| 151 | + } |
|---|
| 145 | 152 | break; |
|---|
| 146 | 153 | case LOOPBACK_SPEED10: |
|---|
| 147 | 154 | ctrl |= priv->hw->link.speed10; |
|---|
| 148 | | - phy_val &= ~BMCR_ANENABLE; |
|---|
| 149 | | - phy_val &= ~BMCR_SPEED1000; |
|---|
| 150 | | - phy_val &= ~BMCR_SPEED100; |
|---|
| 155 | + if (phy) { |
|---|
| 156 | + phy_val &= ~BMCR_SPEED1000; |
|---|
| 157 | + phy_val &= ~BMCR_SPEED100; |
|---|
| 158 | + } |
|---|
| 151 | 159 | break; |
|---|
| 152 | 160 | default: |
|---|
| 153 | 161 | return -EPERM; |
|---|
| .. | .. |
|---|
| 156 | 164 | ctrl |= priv->hw->link.duplex; |
|---|
| 157 | 165 | writel(ctrl, priv->ioaddr + GMAC_CONTROL); |
|---|
| 158 | 166 | |
|---|
| 159 | | - phy_val |= BMCR_FULLDPLX; |
|---|
| 160 | | - mdiobus_write(priv->mii, priv->plat->phy_addr, MII_BMCR, phy_val); |
|---|
| 161 | | - phy_val = mdiobus_read(priv->mii, priv->plat->phy_addr, MII_BMCR); |
|---|
| 167 | + if (phy) { |
|---|
| 168 | + phy_val &= ~BMCR_PDOWN; |
|---|
| 169 | + phy_val &= ~BMCR_ANENABLE; |
|---|
| 170 | + phy_val &= ~BMCR_PDOWN; |
|---|
| 171 | + phy_val |= BMCR_FULLDPLX; |
|---|
| 172 | + mdiobus_write(priv->mii, addr, MII_BMCR, phy_val); |
|---|
| 173 | + phy_val = mdiobus_read(priv->mii, addr, MII_BMCR); |
|---|
| 174 | + } |
|---|
| 162 | 175 | |
|---|
| 163 | 176 | if (likely(priv->plat->fix_mac_speed)) |
|---|
| 164 | 177 | priv->plat->fix_mac_speed(priv->plat->bsp_priv, speed); |
|---|
| .. | .. |
|---|
| 166 | 179 | return 0; |
|---|
| 167 | 180 | } |
|---|
| 168 | 181 | |
|---|
| 169 | | -static int dwmac_rk_disable_mac_loopback(struct stmmac_priv *priv) |
|---|
| 182 | +static int dwmac_rk_disable_mac_loopback(struct stmmac_priv *priv, int addr) |
|---|
| 170 | 183 | { |
|---|
| 171 | 184 | u32 ctrl; |
|---|
| 172 | 185 | int phy_val; |
|---|
| .. | .. |
|---|
| 175 | 188 | ctrl &= ~GMAC_CONTROL_LM; |
|---|
| 176 | 189 | writel(ctrl, priv->ioaddr + GMAC_CONTROL); |
|---|
| 177 | 190 | |
|---|
| 178 | | - phy_val = mdiobus_read(priv->mii, priv->plat->phy_addr, MII_BMCR); |
|---|
| 191 | + phy_val = mdiobus_read(priv->mii, addr, MII_BMCR); |
|---|
| 179 | 192 | phy_val |= BMCR_ANENABLE; |
|---|
| 180 | 193 | |
|---|
| 181 | | - mdiobus_write(priv->mii, priv->plat->phy_addr, MII_BMCR, phy_val); |
|---|
| 182 | | - phy_val = mdiobus_read(priv->mii, priv->plat->phy_addr, MII_BMCR); |
|---|
| 194 | + mdiobus_write(priv->mii, addr, MII_BMCR, phy_val); |
|---|
| 195 | + phy_val = mdiobus_read(priv->mii, addr, MII_BMCR); |
|---|
| 183 | 196 | |
|---|
| 184 | 197 | return 0; |
|---|
| 185 | 198 | } |
|---|
| 186 | 199 | |
|---|
| 187 | 200 | static int dwmac_rk_set_mac_loopback(struct stmmac_priv *priv, |
|---|
| 188 | | - int speed, bool enable) |
|---|
| 201 | + int speed, bool enable, |
|---|
| 202 | + int addr, bool phy) |
|---|
| 189 | 203 | { |
|---|
| 190 | 204 | if (enable) |
|---|
| 191 | | - return dwmac_rk_enable_mac_loopback(priv, speed); |
|---|
| 205 | + return dwmac_rk_enable_mac_loopback(priv, speed, addr, phy); |
|---|
| 192 | 206 | else |
|---|
| 193 | | - return dwmac_rk_disable_mac_loopback(priv); |
|---|
| 207 | + return dwmac_rk_disable_mac_loopback(priv, addr); |
|---|
| 194 | 208 | } |
|---|
| 195 | 209 | |
|---|
| 196 | | -static int dwmac_rk_enable_phy_loopback(struct stmmac_priv *priv, int speed) |
|---|
| 210 | +static int dwmac_rk_enable_phy_loopback(struct stmmac_priv *priv, int speed, |
|---|
| 211 | + int addr, bool phy) |
|---|
| 197 | 212 | { |
|---|
| 198 | 213 | u32 ctrl; |
|---|
| 199 | 214 | int val; |
|---|
| .. | .. |
|---|
| 201 | 216 | ctrl = readl(priv->ioaddr + MAC_CTRL_REG); |
|---|
| 202 | 217 | ctrl &= ~priv->hw->link.speed_mask; |
|---|
| 203 | 218 | |
|---|
| 204 | | - val = mdiobus_read(priv->mii, 0, MII_BMCR); |
|---|
| 205 | | - |
|---|
| 206 | | - val &= ~BMCR_ANENABLE; |
|---|
| 207 | | - val |= BMCR_LOOPBACK; |
|---|
| 219 | + if (phy) |
|---|
| 220 | + val = mdiobus_read(priv->mii, addr, MII_BMCR); |
|---|
| 208 | 221 | |
|---|
| 209 | 222 | switch (speed) { |
|---|
| 210 | 223 | case LOOPBACK_SPEED1000: |
|---|
| 211 | 224 | ctrl |= priv->hw->link.speed1000; |
|---|
| 212 | | - val |= BMCR_SPEED1000; |
|---|
| 225 | + if (phy) { |
|---|
| 226 | + val &= ~BMCR_SPEED100; |
|---|
| 227 | + val |= BMCR_SPEED1000; |
|---|
| 228 | + } |
|---|
| 213 | 229 | break; |
|---|
| 214 | 230 | case LOOPBACK_SPEED100: |
|---|
| 215 | 231 | ctrl |= priv->hw->link.speed100; |
|---|
| 216 | | - val &= ~BMCR_SPEED1000; |
|---|
| 217 | | - val |= BMCR_SPEED100; |
|---|
| 232 | + if (phy) { |
|---|
| 233 | + val &= ~BMCR_SPEED1000; |
|---|
| 234 | + val |= BMCR_SPEED100; |
|---|
| 235 | + } |
|---|
| 218 | 236 | break; |
|---|
| 219 | 237 | case LOOPBACK_SPEED10: |
|---|
| 220 | 238 | ctrl |= priv->hw->link.speed10; |
|---|
| 221 | | - val &= ~BMCR_SPEED1000; |
|---|
| 222 | | - val &= ~BMCR_SPEED100; |
|---|
| 239 | + if (phy) { |
|---|
| 240 | + val &= ~BMCR_SPEED1000; |
|---|
| 241 | + val &= ~BMCR_SPEED100; |
|---|
| 242 | + } |
|---|
| 223 | 243 | break; |
|---|
| 224 | 244 | default: |
|---|
| 225 | 245 | return -EPERM; |
|---|
| .. | .. |
|---|
| 228 | 248 | ctrl |= priv->hw->link.duplex; |
|---|
| 229 | 249 | writel(ctrl, priv->ioaddr + MAC_CTRL_REG); |
|---|
| 230 | 250 | |
|---|
| 231 | | - val |= BMCR_FULLDPLX; |
|---|
| 232 | | - mdiobus_write(priv->mii, 0, MII_BMCR, val); |
|---|
| 233 | | - val = mdiobus_read(priv->mii, 0, MII_BMCR); |
|---|
| 251 | + if (phy) { |
|---|
| 252 | + val |= BMCR_FULLDPLX; |
|---|
| 253 | + val &= ~BMCR_PDOWN; |
|---|
| 254 | + val &= ~BMCR_ANENABLE; |
|---|
| 255 | + val |= BMCR_LOOPBACK; |
|---|
| 256 | + mdiobus_write(priv->mii, addr, MII_BMCR, val); |
|---|
| 257 | + val = mdiobus_read(priv->mii, addr, MII_BMCR); |
|---|
| 258 | + } |
|---|
| 234 | 259 | |
|---|
| 235 | 260 | if (likely(priv->plat->fix_mac_speed)) |
|---|
| 236 | 261 | priv->plat->fix_mac_speed(priv->plat->bsp_priv, speed); |
|---|
| .. | .. |
|---|
| 238 | 263 | return 0; |
|---|
| 239 | 264 | } |
|---|
| 240 | 265 | |
|---|
| 241 | | -static int dwmac_rk_disable_phy_loopback(struct stmmac_priv *priv) |
|---|
| 266 | +static int dwmac_rk_disable_phy_loopback(struct stmmac_priv *priv, int addr) |
|---|
| 242 | 267 | { |
|---|
| 243 | 268 | int val; |
|---|
| 244 | 269 | |
|---|
| 245 | | - val = mdiobus_read(priv->mii, 0, MII_BMCR); |
|---|
| 270 | + val = mdiobus_read(priv->mii, addr, MII_BMCR); |
|---|
| 246 | 271 | val |= BMCR_ANENABLE; |
|---|
| 247 | 272 | val &= ~BMCR_LOOPBACK; |
|---|
| 248 | 273 | |
|---|
| 249 | | - mdiobus_write(priv->mii, 0, MII_BMCR, val); |
|---|
| 250 | | - val = mdiobus_read(priv->mii, priv->plat->phy_addr, MII_BMCR); |
|---|
| 274 | + mdiobus_write(priv->mii, addr, MII_BMCR, val); |
|---|
| 275 | + val = mdiobus_read(priv->mii, addr, MII_BMCR); |
|---|
| 251 | 276 | |
|---|
| 252 | 277 | return 0; |
|---|
| 253 | 278 | } |
|---|
| 254 | 279 | |
|---|
| 255 | 280 | static int dwmac_rk_set_phy_loopback(struct stmmac_priv *priv, |
|---|
| 256 | | - int speed, bool enable) |
|---|
| 281 | + int speed, bool enable, |
|---|
| 282 | + int addr, bool phy) |
|---|
| 257 | 283 | { |
|---|
| 258 | 284 | if (enable) |
|---|
| 259 | | - return dwmac_rk_enable_phy_loopback(priv, speed); |
|---|
| 285 | + return dwmac_rk_enable_phy_loopback(priv, speed, |
|---|
| 286 | + addr, phy); |
|---|
| 260 | 287 | else |
|---|
| 261 | | - return dwmac_rk_disable_phy_loopback(priv); |
|---|
| 288 | + return dwmac_rk_disable_phy_loopback(priv, addr); |
|---|
| 262 | 289 | } |
|---|
| 263 | 290 | |
|---|
| 264 | 291 | static int dwmac_rk_set_loopback(struct stmmac_priv *priv, |
|---|
| 265 | | - int type, int speed, bool enable) |
|---|
| 292 | + int type, int speed, bool enable, |
|---|
| 293 | + int addr, bool phy) |
|---|
| 266 | 294 | { |
|---|
| 267 | 295 | int ret; |
|---|
| 268 | 296 | |
|---|
| 269 | 297 | switch (type) { |
|---|
| 270 | 298 | case LOOPBACK_TYPE_PHY: |
|---|
| 271 | | - ret = dwmac_rk_set_phy_loopback(priv, speed, enable); |
|---|
| 299 | + ret = dwmac_rk_set_phy_loopback(priv, speed, enable, addr, phy); |
|---|
| 272 | 300 | break; |
|---|
| 273 | 301 | case LOOPBACK_TYPE_GMAC: |
|---|
| 274 | | - ret = dwmac_rk_set_mac_loopback(priv, speed, enable); |
|---|
| 302 | + ret = dwmac_rk_set_mac_loopback(priv, speed, enable, addr, phy); |
|---|
| 275 | 303 | break; |
|---|
| 276 | 304 | default: |
|---|
| 277 | 305 | ret = -EOPNOTSUPP; |
|---|
| .. | .. |
|---|
| 1005 | 1033 | int ret = -ENOMEM; |
|---|
| 1006 | 1034 | |
|---|
| 1007 | 1035 | /* desc dma map */ |
|---|
| 1008 | | - lb_priv->dma_rx = dma_zalloc_coherent(priv->device, |
|---|
| 1009 | | - sizeof(struct dma_desc), |
|---|
| 1010 | | - &lb_priv->dma_rx_phy, |
|---|
| 1011 | | - GFP_KERNEL); |
|---|
| 1036 | + lb_priv->dma_rx = dma_alloc_coherent(priv->device, |
|---|
| 1037 | + sizeof(struct dma_desc), |
|---|
| 1038 | + &lb_priv->dma_rx_phy, |
|---|
| 1039 | + GFP_KERNEL); |
|---|
| 1012 | 1040 | if (!lb_priv->dma_rx) |
|---|
| 1013 | 1041 | return ret; |
|---|
| 1014 | 1042 | |
|---|
| 1015 | | - lb_priv->dma_tx = dma_zalloc_coherent(priv->device, |
|---|
| 1016 | | - sizeof(struct dma_desc), |
|---|
| 1017 | | - &lb_priv->dma_tx_phy, |
|---|
| 1018 | | - GFP_KERNEL); |
|---|
| 1043 | + lb_priv->dma_tx = dma_alloc_coherent(priv->device, |
|---|
| 1044 | + sizeof(struct dma_desc), |
|---|
| 1045 | + &lb_priv->dma_tx_phy, |
|---|
| 1046 | + GFP_KERNEL); |
|---|
| 1019 | 1047 | if (!lb_priv->dma_tx) { |
|---|
| 1020 | 1048 | dma_free_coherent(priv->device, |
|---|
| 1021 | 1049 | sizeof(struct dma_desc), |
|---|
| .. | .. |
|---|
| 1126 | 1154 | } |
|---|
| 1127 | 1155 | } |
|---|
| 1128 | 1156 | |
|---|
| 1157 | +static void dwmac_rk_rx_queue_dma_chan_map(struct stmmac_priv *priv) |
|---|
| 1158 | +{ |
|---|
| 1159 | + u32 rx_queues_count = min_t(u32, priv->plat->rx_queues_to_use, 1); |
|---|
| 1160 | + u32 queue; |
|---|
| 1161 | + u32 chan; |
|---|
| 1162 | + |
|---|
| 1163 | + for (queue = 0; queue < rx_queues_count; queue++) { |
|---|
| 1164 | + chan = priv->plat->rx_queues_cfg[queue].chan; |
|---|
| 1165 | + stmmac_map_mtl_to_dma(priv, priv->hw, queue, chan); |
|---|
| 1166 | + } |
|---|
| 1167 | +} |
|---|
| 1168 | + |
|---|
| 1169 | +static void dwmac_rk_mac_enable_rx_queues(struct stmmac_priv *priv) |
|---|
| 1170 | +{ |
|---|
| 1171 | + u32 rx_queues_count = min_t(u32, priv->plat->rx_queues_to_use, 1); |
|---|
| 1172 | + int queue; |
|---|
| 1173 | + u8 mode; |
|---|
| 1174 | + |
|---|
| 1175 | + for (queue = 0; queue < rx_queues_count; queue++) { |
|---|
| 1176 | + mode = priv->plat->rx_queues_cfg[queue].mode_to_use; |
|---|
| 1177 | + stmmac_rx_queue_enable(priv, priv->hw, mode, queue); |
|---|
| 1178 | + } |
|---|
| 1179 | +} |
|---|
| 1180 | + |
|---|
| 1181 | +static void dwmac_rk_mtl_configuration(struct stmmac_priv *priv) |
|---|
| 1182 | +{ |
|---|
| 1183 | + /* Map RX MTL to DMA channels */ |
|---|
| 1184 | + dwmac_rk_rx_queue_dma_chan_map(priv); |
|---|
| 1185 | + |
|---|
| 1186 | + /* Enable MAC RX Queues */ |
|---|
| 1187 | + dwmac_rk_mac_enable_rx_queues(priv); |
|---|
| 1188 | +} |
|---|
| 1189 | + |
|---|
| 1190 | +static void dwmac_rk_mmc_setup(struct stmmac_priv *priv) |
|---|
| 1191 | +{ |
|---|
| 1192 | + unsigned int mode = MMC_CNTRL_RESET_ON_READ | MMC_CNTRL_COUNTER_RESET | |
|---|
| 1193 | + MMC_CNTRL_PRESET | MMC_CNTRL_FULL_HALF_PRESET; |
|---|
| 1194 | + |
|---|
| 1195 | + stmmac_mmc_intr_all_mask(priv, priv->mmcaddr); |
|---|
| 1196 | + |
|---|
| 1197 | + if (priv->dma_cap.rmon) { |
|---|
| 1198 | + stmmac_mmc_ctrl(priv, priv->mmcaddr, mode); |
|---|
| 1199 | + memset(&priv->mmc, 0, sizeof(struct stmmac_counters)); |
|---|
| 1200 | + } else { |
|---|
| 1201 | + netdev_info(priv->dev, "No MAC Management Counters available\n"); |
|---|
| 1202 | + } |
|---|
| 1203 | +} |
|---|
| 1204 | + |
|---|
| 1129 | 1205 | static int dwmac_rk_init(struct net_device *dev, |
|---|
| 1130 | 1206 | struct dwmac_rk_lb_priv *lb_priv) |
|---|
| 1131 | 1207 | { |
|---|
| .. | .. |
|---|
| 1165 | 1241 | /* Initialize the MAC Core */ |
|---|
| 1166 | 1242 | stmmac_core_init(priv, priv->hw, dev); |
|---|
| 1167 | 1243 | |
|---|
| 1244 | + dwmac_rk_mtl_configuration(priv); |
|---|
| 1245 | + |
|---|
| 1246 | + dwmac_rk_mmc_setup(priv); |
|---|
| 1247 | + |
|---|
| 1168 | 1248 | ret = priv->hw->mac->rx_ipc(priv->hw); |
|---|
| 1169 | 1249 | if (!ret) { |
|---|
| 1170 | 1250 | pr_warn(" RX IPC Checksum Offload disabled\n"); |
|---|
| .. | .. |
|---|
| 1186 | 1266 | writel((mode & ~DMA_CONTROL_OSF), priv->ioaddr + DMA_CONTROL); |
|---|
| 1187 | 1267 | } |
|---|
| 1188 | 1268 | |
|---|
| 1189 | | - stmmac_enable_dma_irq(priv, priv->ioaddr, 0); |
|---|
| 1269 | + stmmac_enable_dma_irq(priv, priv->ioaddr, 0, 1, 1); |
|---|
| 1190 | 1270 | |
|---|
| 1191 | 1271 | if (priv->hw->pcs) |
|---|
| 1192 | 1272 | stmmac_pcs_ctrl_ane(priv, priv->hw, 1, priv->hw->ps, 0); |
|---|
| .. | .. |
|---|
| 1203 | 1283 | { |
|---|
| 1204 | 1284 | struct stmmac_priv *priv = netdev_priv(dev); |
|---|
| 1205 | 1285 | |
|---|
| 1206 | | - stmmac_disable_dma_irq(priv, priv->ioaddr, 0); |
|---|
| 1286 | + stmmac_disable_dma_irq(priv, priv->ioaddr, 0, 0, 0); |
|---|
| 1207 | 1287 | |
|---|
| 1208 | 1288 | /* Release and free the Rx/Tx resources */ |
|---|
| 1209 | 1289 | dwmac_rk_free_dma_desc_resources(priv, lb_priv); |
|---|
| .. | .. |
|---|
| 1211 | 1291 | |
|---|
| 1212 | 1292 | static int dwmac_rk_get_max_delayline(struct stmmac_priv *priv) |
|---|
| 1213 | 1293 | { |
|---|
| 1214 | | - return MAX_DELAYLINE; |
|---|
| 1294 | + if (of_device_is_compatible(priv->device->of_node, |
|---|
| 1295 | + "rockchip,rk3588-gmac")) |
|---|
| 1296 | + return RK3588_MAX_DELAYLINE; |
|---|
| 1297 | + else |
|---|
| 1298 | + return MAX_DELAYLINE; |
|---|
| 1299 | +} |
|---|
| 1300 | + |
|---|
| 1301 | +static int dwmac_rk_phy_poll_reset(struct stmmac_priv *priv, int addr) |
|---|
| 1302 | +{ |
|---|
| 1303 | + /* Poll until the reset bit clears (50ms per retry == 0.6 sec) */ |
|---|
| 1304 | + unsigned int val, retries = 12; |
|---|
| 1305 | + int ret; |
|---|
| 1306 | + |
|---|
| 1307 | + val = mdiobus_read(priv->mii, addr, MII_BMCR); |
|---|
| 1308 | + mdiobus_write(priv->mii, addr, MII_BMCR, val | BMCR_RESET); |
|---|
| 1309 | + |
|---|
| 1310 | + do { |
|---|
| 1311 | + msleep(50); |
|---|
| 1312 | + ret = mdiobus_read(priv->mii, addr, MII_BMCR); |
|---|
| 1313 | + if (ret < 0) |
|---|
| 1314 | + return ret; |
|---|
| 1315 | + } while (ret & BMCR_RESET && --retries); |
|---|
| 1316 | + if (ret & BMCR_RESET) |
|---|
| 1317 | + return -ETIMEDOUT; |
|---|
| 1318 | + |
|---|
| 1319 | + msleep(1); |
|---|
| 1320 | + return 0; |
|---|
| 1215 | 1321 | } |
|---|
| 1216 | 1322 | |
|---|
| 1217 | 1323 | static int dwmac_rk_loopback_run(struct stmmac_priv *priv, |
|---|
| .. | .. |
|---|
| 1219 | 1325 | { |
|---|
| 1220 | 1326 | struct net_device *ndev = priv->dev; |
|---|
| 1221 | 1327 | int phy_iface = dwmac_rk_get_phy_interface(priv); |
|---|
| 1222 | | - int ndev_up; |
|---|
| 1328 | + int ndev_up, phy_addr; |
|---|
| 1223 | 1329 | int ret = -EINVAL; |
|---|
| 1224 | 1330 | |
|---|
| 1225 | 1331 | if (!ndev || !priv->mii) |
|---|
| 1226 | 1332 | return -EINVAL; |
|---|
| 1227 | 1333 | |
|---|
| 1334 | + phy_addr = priv->dev->phydev->mdio.addr; |
|---|
| 1228 | 1335 | lb_priv->max_delay = dwmac_rk_get_max_delayline(priv); |
|---|
| 1229 | 1336 | |
|---|
| 1230 | 1337 | rtnl_lock(); |
|---|
| .. | .. |
|---|
| 1249 | 1356 | |
|---|
| 1250 | 1357 | if (priv->plat->stmmac_rst) |
|---|
| 1251 | 1358 | reset_control_assert(priv->plat->stmmac_rst); |
|---|
| 1252 | | - |
|---|
| 1253 | | - if (priv->mii) |
|---|
| 1254 | | - priv->mii->reset(priv->mii); |
|---|
| 1255 | | - |
|---|
| 1359 | + dwmac_rk_phy_poll_reset(priv, phy_addr); |
|---|
| 1256 | 1360 | if (priv->plat->stmmac_rst) |
|---|
| 1257 | 1361 | reset_control_deassert(priv->plat->stmmac_rst); |
|---|
| 1258 | 1362 | } |
|---|
| 1259 | 1363 | /* wait for phy and controller ready */ |
|---|
| 1260 | 1364 | usleep_range(100000, 200000); |
|---|
| 1261 | 1365 | |
|---|
| 1366 | + dwmac_rk_set_loopback(priv, lb_priv->type, lb_priv->speed, |
|---|
| 1367 | + true, phy_addr, true); |
|---|
| 1368 | + |
|---|
| 1262 | 1369 | ret = dwmac_rk_init(ndev, lb_priv); |
|---|
| 1263 | 1370 | if (ret) |
|---|
| 1264 | 1371 | goto exit_init; |
|---|
| 1265 | | - dwmac_rk_set_loopback(priv, lb_priv->type, lb_priv->speed, true); |
|---|
| 1372 | + |
|---|
| 1373 | + dwmac_rk_set_loopback(priv, lb_priv->type, lb_priv->speed, |
|---|
| 1374 | + true, phy_addr, false); |
|---|
| 1266 | 1375 | |
|---|
| 1267 | 1376 | if (lb_priv->scan) { |
|---|
| 1268 | 1377 | /* scan only support for rgmii mode */ |
|---|
| .. | .. |
|---|
| 1285 | 1394 | |
|---|
| 1286 | 1395 | out: |
|---|
| 1287 | 1396 | dwmac_rk_release(ndev, lb_priv); |
|---|
| 1288 | | - dwmac_rk_set_loopback(priv, lb_priv->type, lb_priv->speed, false); |
|---|
| 1289 | | - |
|---|
| 1397 | + dwmac_rk_set_loopback(priv, lb_priv->type, lb_priv->speed, |
|---|
| 1398 | + false, phy_addr, false); |
|---|
| 1290 | 1399 | exit_init: |
|---|
| 1291 | 1400 | if (ndev_up) |
|---|
| 1292 | 1401 | ndev->netdev_ops->ndo_open(ndev); |
|---|