[PATCH] lan743x: Use correct MAC_CR configuration for 1 GBit speed

[PATCH] lan743x: Use correct MAC_CR configuration for 1 GBit speed

[Roelof Berg]

Corrected the MAC_CR configuration bits for 1 GBit operation. The data
sheet allows MAC_CR(2:1) to be 10 and also 11 for 1 GBit/s speed, but
only 10 works correctly.

Devices tested:
Microchip Lan7431, fixed-phy mode
Microchip Lan7430, normal phy mode

Signed-off-by: Roelof Berg <rberg@berg-solutions.de>
---
 drivers/net/ethernet/microchip/lan743x_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/microchip/lan743x_main.c b/drivers/net/ethernet/microchip/lan743x_main.c
index 36624e3c633b..c5c5c688b7e2 100644
--- a/drivers/net/ethernet/microchip/lan743x_main.c
+++ b/drivers/net/ethernet/microchip/lan743x_main.c
@@ -985,7 +985,7 @@ static void lan743x_phy_link_status_change(struct net_device *netdev)
 		break;
 		case SPEED_1000:
 			data |= MAC_CR_CFG_H_;
-			data |= MAC_CR_CFG_L_;
+			data &= ~MAC_CR_CFG_L_;
 		break;
 		}
 		lan743x_csr_write(adapter, MAC_CR, data);
-- 
2.25.1

Re: [PATCH] lan743x: Use correct MAC_CR configuration for 1 GBit speed

[Andrew Lunn]

On Wed, Jun 03, 2020 at 11:54:14PM +0200, Roelof Berg wrote:
> Corrected the MAC_CR configuration bits for 1 GBit operation. The data
> sheet allows MAC_CR(2:1) to be 10 and also 11 for 1 GBit/s speed, but
> only 10 works correctly.
> 
> Devices tested:
> Microchip Lan7431, fixed-phy mode
> Microchip Lan7430, normal phy mode
> 
> Signed-off-by: Roelof Berg <rberg@berg-solutions.de>

Fixes: 6f197fb63850 ("lan743x: Added fixed link and RGMII support")
Reviewed-by: Andrew Lunn <andrew@lunn.ch>

This was probably in the pull request for the merge window.

     Andrew

Re: [PATCH] lan743x: Use correct MAC_CR configuration for 1 GBit speed

[David Miller]

From: Roelof Berg <rberg@berg-solutions.de>
Date: Wed,  3 Jun 2020 23:54:14 +0200

> Corrected the MAC_CR configuration bits for 1 GBit operation. The data
> sheet allows MAC_CR(2:1) to be 10 and also 11 for 1 GBit/s speed, but
> only 10 works correctly.
> 
> Devices tested:
> Microchip Lan7431, fixed-phy mode
> Microchip Lan7430, normal phy mode
> 
> Signed-off-by: Roelof Berg <rberg@berg-solutions.de>

Applied, thank you.