All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] net: macb: Properly handle phylink on at91sam9x
@ 2020-08-04 12:17 ` Stefan Roese
  0 siblings, 0 replies; 4+ messages in thread
From: Stefan Roese @ 2020-08-04 12:17 UTC (permalink / raw)
  To: netdev
  Cc: linux-arm-kernel, Reto Schneider, Alexandre Belloni,
	Nicolas Ferre, David S . Miller

I just recently noticed that ethernet does not work anymore since v5.5
on the GARDENA smart Gateway, which is based on the AT91SAM9G25.
Debugging showed that the "GEM bits" in the NCFGR register are now
unconditionally accessed, which is incorrect for the !macb_is_gem()
case.

This patch adds the macb_is_gem() checks back to the code
(in macb_mac_config() & macb_mac_link_up()), so that the GEM register
bits are not accessed in this case any more.

Fixes: 7897b071ac3b ("net: macb: convert to phylink")
Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Reto Schneider <reto.schneider@husqvarnagroup.com>
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: Nicolas Ferre <nicolas.ferre@microchip.com>
Cc: David S. Miller <davem@davemloft.net>
---
 drivers/net/ethernet/cadence/macb_main.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 2213e6ab8151..4b1b5928b104 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -578,7 +578,7 @@ static void macb_mac_config(struct phylink_config *config, unsigned int mode,
 	if (bp->caps & MACB_CAPS_MACB_IS_EMAC) {
 		if (state->interface == PHY_INTERFACE_MODE_RMII)
 			ctrl |= MACB_BIT(RM9200_RMII);
-	} else {
+	} else if (macb_is_gem(bp)) {
 		ctrl &= ~(GEM_BIT(SGMIIEN) | GEM_BIT(PCSSEL));
 
 		if (state->interface == PHY_INTERFACE_MODE_SGMII)
@@ -639,10 +639,13 @@ static void macb_mac_link_up(struct phylink_config *config,
 		ctrl |= MACB_BIT(FD);
 
 	if (!(bp->caps & MACB_CAPS_MACB_IS_EMAC)) {
-		ctrl &= ~(GEM_BIT(GBE) | MACB_BIT(PAE));
+		ctrl &= ~MACB_BIT(PAE);
+		if (macb_is_gem(bp)) {
+			ctrl &= ~GEM_BIT(GBE);
 
-		if (speed == SPEED_1000)
-			ctrl |= GEM_BIT(GBE);
+			if (speed == SPEED_1000)
+				ctrl |= GEM_BIT(GBE);
+		}
 
 		/* We do not support MLO_PAUSE_RX yet */
 		if (tx_pause)
-- 
2.28.0


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [PATCH] net: macb: Properly handle phylink on at91sam9x
@ 2020-08-04 12:17 ` Stefan Roese
  0 siblings, 0 replies; 4+ messages in thread
From: Stefan Roese @ 2020-08-04 12:17 UTC (permalink / raw)
  To: netdev
  Cc: Alexandre Belloni, Reto Schneider, linux-arm-kernel, David S . Miller

I just recently noticed that ethernet does not work anymore since v5.5
on the GARDENA smart Gateway, which is based on the AT91SAM9G25.
Debugging showed that the "GEM bits" in the NCFGR register are now
unconditionally accessed, which is incorrect for the !macb_is_gem()
case.

This patch adds the macb_is_gem() checks back to the code
(in macb_mac_config() & macb_mac_link_up()), so that the GEM register
bits are not accessed in this case any more.

Fixes: 7897b071ac3b ("net: macb: convert to phylink")
Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Reto Schneider <reto.schneider@husqvarnagroup.com>
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: Nicolas Ferre <nicolas.ferre@microchip.com>
Cc: David S. Miller <davem@davemloft.net>
---
 drivers/net/ethernet/cadence/macb_main.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 2213e6ab8151..4b1b5928b104 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -578,7 +578,7 @@ static void macb_mac_config(struct phylink_config *config, unsigned int mode,
 	if (bp->caps & MACB_CAPS_MACB_IS_EMAC) {
 		if (state->interface == PHY_INTERFACE_MODE_RMII)
 			ctrl |= MACB_BIT(RM9200_RMII);
-	} else {
+	} else if (macb_is_gem(bp)) {
 		ctrl &= ~(GEM_BIT(SGMIIEN) | GEM_BIT(PCSSEL));
 
 		if (state->interface == PHY_INTERFACE_MODE_SGMII)
@@ -639,10 +639,13 @@ static void macb_mac_link_up(struct phylink_config *config,
 		ctrl |= MACB_BIT(FD);
 
 	if (!(bp->caps & MACB_CAPS_MACB_IS_EMAC)) {
-		ctrl &= ~(GEM_BIT(GBE) | MACB_BIT(PAE));
+		ctrl &= ~MACB_BIT(PAE);
+		if (macb_is_gem(bp)) {
+			ctrl &= ~GEM_BIT(GBE);
 
-		if (speed == SPEED_1000)
-			ctrl |= GEM_BIT(GBE);
+			if (speed == SPEED_1000)
+				ctrl |= GEM_BIT(GBE);
+		}
 
 		/* We do not support MLO_PAUSE_RX yet */
 		if (tx_pause)
-- 
2.28.0


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH] net: macb: Properly handle phylink on at91sam9x
  2020-08-04 12:17 ` Stefan Roese
@ 2020-08-04 23:05   ` David Miller
  -1 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2020-08-04 23:05 UTC (permalink / raw)
  To: sr
  Cc: netdev, linux-arm-kernel, reto.schneider, alexandre.belloni,
	nicolas.ferre

From: Stefan Roese <sr@denx.de>
Date: Tue,  4 Aug 2020 14:17:16 +0200

> I just recently noticed that ethernet does not work anymore since v5.5
> on the GARDENA smart Gateway, which is based on the AT91SAM9G25.
> Debugging showed that the "GEM bits" in the NCFGR register are now
> unconditionally accessed, which is incorrect for the !macb_is_gem()
> case.
> 
> This patch adds the macb_is_gem() checks back to the code
> (in macb_mac_config() & macb_mac_link_up()), so that the GEM register
> bits are not accessed in this case any more.
> 
> Fixes: 7897b071ac3b ("net: macb: convert to phylink")
> Signed-off-by: Stefan Roese <sr@denx.de>

Applied and queued up for -stable, thanks.

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH] net: macb: Properly handle phylink on at91sam9x
@ 2020-08-04 23:05   ` David Miller
  0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2020-08-04 23:05 UTC (permalink / raw)
  To: sr; +Cc: netdev, alexandre.belloni, reto.schneider, linux-arm-kernel

From: Stefan Roese <sr@denx.de>
Date: Tue,  4 Aug 2020 14:17:16 +0200

> I just recently noticed that ethernet does not work anymore since v5.5
> on the GARDENA smart Gateway, which is based on the AT91SAM9G25.
> Debugging showed that the "GEM bits" in the NCFGR register are now
> unconditionally accessed, which is incorrect for the !macb_is_gem()
> case.
> 
> This patch adds the macb_is_gem() checks back to the code
> (in macb_mac_config() & macb_mac_link_up()), so that the GEM register
> bits are not accessed in this case any more.
> 
> Fixes: 7897b071ac3b ("net: macb: convert to phylink")
> Signed-off-by: Stefan Roese <sr@denx.de>

Applied and queued up for -stable, thanks.

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-08-04 23:06 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-04 12:17 [PATCH] net: macb: Properly handle phylink on at91sam9x Stefan Roese
2020-08-04 12:17 ` Stefan Roese
2020-08-04 23:05 ` David Miller
2020-08-04 23:05   ` David Miller

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.