Commit ca84dfb9 authored by LABBE Corentin's avatar LABBE Corentin Committed by David S. Miller

net-next: stmmac: rework the speed selection

The current stmmac_adjust_link() part which handle speed have
some if (has_platform) code and my dwmac-sun8i will add more of them.

So we need to handle better speed selection.
Moreover the struct link member speed and port are hard to guess their
purpose. And their unique usage are to be combined for writing speed.

So this patch replace speed/port by simpler
speed10/speed100/speed1000/speed_mask variables.

In dwmac4_core_init and dwmac1000_core_init, port/speed value was used
directly without using the struct link. This patch convert also their
usage to speedxxx.
Signed-off-by: default avatarCorentin Labbe <clabbe.montjoie@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4d869b03
...@@ -549,9 +549,11 @@ extern const struct stmmac_hwtimestamp stmmac_ptp; ...@@ -549,9 +549,11 @@ extern const struct stmmac_hwtimestamp stmmac_ptp;
extern const struct stmmac_mode_ops dwmac4_ring_mode_ops; extern const struct stmmac_mode_ops dwmac4_ring_mode_ops;
struct mac_link { struct mac_link {
int port; u32 speed_mask;
int duplex; u32 speed10;
int speed; u32 speed100;
u32 speed1000;
u32 duplex;
}; };
struct mii_regs { struct mii_regs {
......
...@@ -45,15 +45,17 @@ static void dwmac1000_core_init(struct mac_device_info *hw, int mtu) ...@@ -45,15 +45,17 @@ static void dwmac1000_core_init(struct mac_device_info *hw, int mtu)
if (hw->ps) { if (hw->ps) {
value |= GMAC_CONTROL_TE; value |= GMAC_CONTROL_TE;
if (hw->ps == SPEED_1000) { value &= ~hw->link.speed_mask;
value &= ~GMAC_CONTROL_PS; switch (hw->ps) {
} else { case SPEED_1000:
value |= GMAC_CONTROL_PS; value |= hw->link.speed1000;
break;
if (hw->ps == SPEED_10) case SPEED_100:
value &= ~GMAC_CONTROL_FES; value |= hw->link.speed100;
else break;
value |= GMAC_CONTROL_FES; case SPEED_10:
value |= hw->link.speed10;
break;
} }
} }
...@@ -531,9 +533,11 @@ struct mac_device_info *dwmac1000_setup(void __iomem *ioaddr, int mcbins, ...@@ -531,9 +533,11 @@ struct mac_device_info *dwmac1000_setup(void __iomem *ioaddr, int mcbins,
mac->mac = &dwmac1000_ops; mac->mac = &dwmac1000_ops;
mac->dma = &dwmac1000_dma_ops; mac->dma = &dwmac1000_dma_ops;
mac->link.port = GMAC_CONTROL_PS;
mac->link.duplex = GMAC_CONTROL_DM; mac->link.duplex = GMAC_CONTROL_DM;
mac->link.speed = GMAC_CONTROL_FES; mac->link.speed10 = GMAC_CONTROL_PS;
mac->link.speed100 = GMAC_CONTROL_PS | GMAC_CONTROL_FES;
mac->link.speed1000 = 0;
mac->link.speed_mask = GMAC_CONTROL_PS | GMAC_CONTROL_FES;
mac->mii.addr = GMAC_MII_ADDR; mac->mii.addr = GMAC_MII_ADDR;
mac->mii.data = GMAC_MII_DATA; mac->mii.data = GMAC_MII_DATA;
mac->mii.addr_shift = 11; mac->mii.addr_shift = 11;
......
...@@ -175,9 +175,11 @@ struct mac_device_info *dwmac100_setup(void __iomem *ioaddr, int *synopsys_id) ...@@ -175,9 +175,11 @@ struct mac_device_info *dwmac100_setup(void __iomem *ioaddr, int *synopsys_id)
mac->mac = &dwmac100_ops; mac->mac = &dwmac100_ops;
mac->dma = &dwmac100_dma_ops; mac->dma = &dwmac100_dma_ops;
mac->link.port = MAC_CONTROL_PS;
mac->link.duplex = MAC_CONTROL_F; mac->link.duplex = MAC_CONTROL_F;
mac->link.speed = 0; mac->link.speed10 = 0;
mac->link.speed100 = 0;
mac->link.speed1000 = 0;
mac->link.speed_mask = MAC_CONTROL_PS;
mac->mii.addr = MAC_MII_ADDR; mac->mii.addr = MAC_MII_ADDR;
mac->mii.data = MAC_MII_DATA; mac->mii.data = MAC_MII_DATA;
mac->mii.addr_shift = 11; mac->mii.addr_shift = 11;
......
...@@ -35,15 +35,17 @@ static void dwmac4_core_init(struct mac_device_info *hw, int mtu) ...@@ -35,15 +35,17 @@ static void dwmac4_core_init(struct mac_device_info *hw, int mtu)
if (hw->ps) { if (hw->ps) {
value |= GMAC_CONFIG_TE; value |= GMAC_CONFIG_TE;
if (hw->ps == SPEED_1000) { value &= hw->link.speed_mask;
value &= ~GMAC_CONFIG_PS; switch (hw->ps) {
} else { case SPEED_1000:
value |= GMAC_CONFIG_PS; value |= hw->link.speed1000;
break;
if (hw->ps == SPEED_10) case SPEED_100:
value &= ~GMAC_CONFIG_FES; value |= hw->link.speed100;
else break;
value |= GMAC_CONFIG_FES; case SPEED_10:
value |= hw->link.speed10;
break;
} }
} }
...@@ -747,9 +749,11 @@ struct mac_device_info *dwmac4_setup(void __iomem *ioaddr, int mcbins, ...@@ -747,9 +749,11 @@ struct mac_device_info *dwmac4_setup(void __iomem *ioaddr, int mcbins,
if (mac->multicast_filter_bins) if (mac->multicast_filter_bins)
mac->mcast_bits_log2 = ilog2(mac->multicast_filter_bins); mac->mcast_bits_log2 = ilog2(mac->multicast_filter_bins);
mac->link.port = GMAC_CONFIG_PS;
mac->link.duplex = GMAC_CONFIG_DM; mac->link.duplex = GMAC_CONFIG_DM;
mac->link.speed = GMAC_CONFIG_FES; mac->link.speed10 = GMAC_CONFIG_PS;
mac->link.speed100 = GMAC_CONFIG_FES | GMAC_CONFIG_PS;
mac->link.speed1000 = 0;
mac->link.speed_mask = GMAC_CONFIG_FES | GMAC_CONFIG_PS;
mac->mii.addr = GMAC_MDIO_ADDR; mac->mii.addr = GMAC_MDIO_ADDR;
mac->mii.data = GMAC_MDIO_DATA; mac->mii.data = GMAC_MDIO_DATA;
mac->mii.addr_shift = 21; mac->mii.addr_shift = 21;
......
...@@ -801,29 +801,16 @@ static void stmmac_adjust_link(struct net_device *dev) ...@@ -801,29 +801,16 @@ static void stmmac_adjust_link(struct net_device *dev)
if (phydev->speed != priv->speed) { if (phydev->speed != priv->speed) {
new_state = true; new_state = true;
ctrl &= ~priv->hw->link.speed_mask;
switch (phydev->speed) { switch (phydev->speed) {
case SPEED_1000: case SPEED_1000:
if (priv->plat->has_gmac || ctrl |= priv->hw->link.speed1000;
priv->plat->has_gmac4)
ctrl &= ~priv->hw->link.port;
break; break;
case SPEED_100: case SPEED_100:
if (priv->plat->has_gmac || ctrl |= priv->hw->link.speed100;
priv->plat->has_gmac4) {
ctrl |= priv->hw->link.port;
ctrl |= priv->hw->link.speed;
} else {
ctrl &= ~priv->hw->link.port;
}
break; break;
case SPEED_10: case SPEED_10:
if (priv->plat->has_gmac || ctrl |= priv->hw->link.speed10;
priv->plat->has_gmac4) {
ctrl |= priv->hw->link.port;
ctrl &= ~(priv->hw->link.speed);
} else {
ctrl &= ~priv->hw->link.port;
}
break; break;
default: default:
netif_warn(priv, link, priv->dev, netif_warn(priv, link, priv->dev,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment