net: bcmgenet: Fix RGMII_MODE_EN value for GENET v1/2/3
Subsystems (3)
PATCH 1/1 net: bcmgenet: Fix RGMII_MODE_EN value for GENET v1/2/3
The RGMII_MODE_EN bit value was 0 for GENET versions 1 through 3, and became 6 for GENET v4 and above, account for that difference.
Fixes aa09677cba42 ("net: bcmgenet: add MDIO routines")
Signed-off-by Florian Fainelli <[email protected]>
--- drivers/net/ethernet/broadcom/genet/bcmgenet.h | 1 + drivers/net/ethernet/broadcom/genet/bcmmii.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-)
drivers/net/ethernet/broadcom/genet/bcmgenet.h +1 -0
@@ -366,6 +366,7 @@ struct bcmgenet_mib_counters {#define EXT_PWR_DOWN_PHY_EN (1 << 20)#define EXT_RGMII_OOB_CTRL 0x0C +#define RGMII_MODE_EN_V123 (1 << 0)#define RGMII_LINK (1 << 4)#define OOB_DISABLE (1 << 5)#define RGMII_MODE_EN (1 << 6)
drivers/net/ethernet/broadcom/genet/bcmmii.c +5 -1
@@ -258,7 +258,11 @@ int bcmgenet_mii_config(struct net_device *dev, bool init)*/ if (priv->ext_phy) { reg =bcmgenet_ext_readl (priv,EXT_RGMII_OOB_CTRL ); - reg |=RGMII_MODE_EN | id_mode_dis; + reg |= id_mode_dis; +if (GENET_IS_V1 (priv) ||GENET_IS_V2 (priv) ||GENET_IS_V3 (priv)) + reg |=RGMII_MODE_EN_V123 ; +else + reg |=RGMII_MODE_EN ;bcmgenet_ext_writel (priv, reg,EXT_RGMII_OOB_CTRL ); }
Signature · 1 line
2.17.1
Quoted 30 lines · Florian Fainelli
The
RGMII_MODE_ENbit value was 0 for GENET versions 1 through 3, and became 6 for GENET v4 and above, account for that difference.Fixes aa09677cba42 ("net: bcmgenet: add MDIO routines")Signed-off-by Florian Fainelli <[email protected]>--- drivers/net/ethernet/broadcom/genet/bcmgenet.h | 1 + drivers/net/ethernet/broadcom/genet/bcmmii.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-)drivers/net/ethernet/broadcom/genet/bcmgenet.h +1
-0@@ -366,6 +366,7 @@ struct bcmgenet_mib_counters {#define EXT_PWR_DOWN_PHY_EN (1 << 20)#define EXT_RGMII_OOB_CTRL 0x0C +#define RGMII_MODE_EN_V123 (1 << 0)#define RGMII_LINK (1 << 4)#define OOB_DISABLE (1 << 5)#define RGMII_MODE_EN (1 << 6)drivers/net/ethernet/broadcom/genet/bcmmii.c +0
-0@@ -258,7 +258,11 @@ int bcmgenet_mii_config(struct net_device *dev, bool init)*/ if (priv->ext_phy) {
drivers/net/ethernet/broadcom/genet/bcmmii.c int bcmgenet_mii_config(struct net_device *dev, bool init) · line 268
Quoted 10 lines
drivers/net/ethernet/broadcom/genet/bcmmii.c +5
-1reg =bcmgenet_ext_readl (priv,EXT_RGMII_OOB_CTRL ); - reg |=RGMII_MODE_EN | id_mode_dis; + reg |= id_mode_dis; +if (GENET_IS_V1 (priv) ||GENET_IS_V2 (priv) ||GENET_IS_V3 (priv)) + reg |=RGMII_MODE_EN_V123 ; +else + reg |=RGMII_MODE_EN ;bcmgenet_ext_writel (priv, reg,EXT_RGMII_OOB_CTRL ); }
Acked-by Doug Berger <[email protected]>
David Miller
maintainerFrom: Florian Fainelli <[email protected]>
Date: Tue, 15 Oct 2019 10:45:47 -0700
Quoted 5 lines
The
RGMII_MODE_ENbit value was 0 for GENET versions 1 through 3, and became 6 for GENET v4 and above, account for that difference.Fixes aa09677cba42 ("net: bcmgenet: add MDIO routines")Signed-off-by Florian Fainelli <[email protected]>
Applied and queued up for -stable.