OSDN Git Service

lan743x: Remove MAC Reset from initialization
authorBryan Whitehead <Bryan.Whitehead@microchip.com>
Wed, 19 Dec 2018 21:55:15 +0000 (16:55 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 13 Jan 2019 08:51:03 +0000 (09:51 +0100)
[ Upstream commit e0e587878f538c9e3400219b6c516b8199dc2042 ]

The MAC Reset was noticed to erase important EEPROM settings.
It is also unnecessary since a chip wide reset was done earlier
in initialization, and that reset preserves EEPROM settings.

There for this patch removes the unnecessary MAC specific reset.

Signed-off-by: Bryan Whitehead <Bryan.Whitehead@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/microchip/lan743x_main.c

index ff196a6..1393252 100644 (file)
@@ -802,14 +802,8 @@ static int lan743x_mac_init(struct lan743x_adapter *adapter)
        u32 mac_addr_hi = 0;
        u32 mac_addr_lo = 0;
        u32 data;
-       int ret;
 
        netdev = adapter->netdev;
-       lan743x_csr_write(adapter, MAC_CR, MAC_CR_RST_);
-       ret = lan743x_csr_wait_for_bit(adapter, MAC_CR, MAC_CR_RST_,
-                                      0, 1000, 20000, 100);
-       if (ret)
-               return ret;
 
        /* setup auto duplex, and speed detection */
        data = lan743x_csr_read(adapter, MAC_CR);