* [PATCH net] net: bcmgenet: Fix RGMII_MODE_EN value for GENET v1/2/3
@ 2019-10-15 17:45 Florian Fainelli
2019-10-15 18:27 ` Doug Berger
2019-10-16 4:00 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Florian Fainelli @ 2019-10-15 17:45 UTC (permalink / raw)
To: netdev
Cc: Florian Fainelli, Doug Berger, David S. Miller,
open list:BROADCOM GENET ETHERNET DRIVER, open list
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 <f.fainelli@gmail.com>
---
drivers/net/ethernet/broadcom/genet/bcmgenet.h | 1 +
drivers/net/ethernet/broadcom/genet/bcmmii.c | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.h b/drivers/net/ethernet/broadcom/genet/bcmgenet.h
index 4a8fc03d82fd..dbc69d8fa05f 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.h
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.h
@@ -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)
diff --git a/drivers/net/ethernet/broadcom/genet/bcmmii.c b/drivers/net/ethernet/broadcom/genet/bcmmii.c
index 94d1dd5d56bf..e7c291bf4ed1 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmmii.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c
@@ -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);
}
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH net] net: bcmgenet: Fix RGMII_MODE_EN value for GENET v1/2/3
2019-10-15 17:45 [PATCH net] net: bcmgenet: Fix RGMII_MODE_EN value for GENET v1/2/3 Florian Fainelli
@ 2019-10-15 18:27 ` Doug Berger
2019-10-16 4:00 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Doug Berger @ 2019-10-15 18:27 UTC (permalink / raw)
To: Florian Fainelli, netdev
Cc: David S. Miller, open list:BROADCOM GENET ETHERNET DRIVER,
open list
On 10/15/19 10:45 AM, Florian Fainelli wrote:
> 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 <f.fainelli@gmail.com>
> ---
> drivers/net/ethernet/broadcom/genet/bcmgenet.h | 1 +
> drivers/net/ethernet/broadcom/genet/bcmmii.c | 6 +++++-
> 2 files changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.h b/drivers/net/ethernet/broadcom/genet/bcmgenet.h
> index 4a8fc03d82fd..dbc69d8fa05f 100644
> --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.h
> +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.h
> @@ -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)
> diff --git a/drivers/net/ethernet/broadcom/genet/bcmmii.c b/drivers/net/ethernet/broadcom/genet/bcmmii.c
> index 94d1dd5d56bf..e7c291bf4ed1 100644
> --- a/drivers/net/ethernet/broadcom/genet/bcmmii.c
> +++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c
> @@ -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);
> }
>
>
Acked-by: Doug Berger <opendmb@gmail.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH net] net: bcmgenet: Fix RGMII_MODE_EN value for GENET v1/2/3
2019-10-15 17:45 [PATCH net] net: bcmgenet: Fix RGMII_MODE_EN value for GENET v1/2/3 Florian Fainelli
2019-10-15 18:27 ` Doug Berger
@ 2019-10-16 4:00 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2019-10-16 4:00 UTC (permalink / raw)
To: f.fainelli; +Cc: netdev, opendmb, bcm-kernel-feedback-list, linux-kernel
From: Florian Fainelli <f.fainelli@gmail.com>
Date: Tue, 15 Oct 2019 10:45:47 -0700
> 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 <f.fainelli@gmail.com>
Applied and queued up for -stable.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-10-16 4:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-10-15 17:45 [PATCH net] net: bcmgenet: Fix RGMII_MODE_EN value for GENET v1/2/3 Florian Fainelli
2019-10-15 18:27 ` Doug Berger
2019-10-16 4:00 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).