]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
lan78xx: Set ASD in MAC_CR when EEE is enabled.
authorRaghuram Chary J <raghuramchary.jallipalli@microchip.com>
Fri, 23 Mar 2018 10:18:08 +0000 (15:48 +0530)
committerDavid S. Miller <davem@davemloft.net>
Mon, 26 Mar 2018 01:06:49 +0000 (21:06 -0400)
Description:
EEE does not work with lan7800 when AutoSpeed is not set.
(This can happen when EEPROM is not populated or configured incorrectly)

Root-Cause:
When EEE is enabled, the mac config register ASD is not set
i.e. in default state, causing EEE fail.

Fix:
Set the register when eeprom is not present.

Fixes: 55d7de9de6c3 ("Microchip's LAN7800 family USB 2/3 to 10/100/1000 Ethernet device driver")
Signed-off-by: Raghuram Chary J <raghuramchary.jallipalli@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/lan78xx.c

index 60a604cc7647e460539d0482c69f9ffc8f882aa1..90d176279152c632f70ca8cb85b11802c3f2fc14 100644 (file)
@@ -2351,6 +2351,7 @@ static int lan78xx_reset(struct lan78xx_net *dev)
        u32 buf;
        int ret = 0;
        unsigned long timeout;
+       u8 sig;
 
        ret = lan78xx_read_reg(dev, HW_CFG, &buf);
        buf |= HW_CFG_LRST_;
@@ -2450,6 +2451,15 @@ static int lan78xx_reset(struct lan78xx_net *dev)
        /* LAN7801 only has RGMII mode */
        if (dev->chipid == ID_REV_CHIP_ID_7801_)
                buf &= ~MAC_CR_GMII_EN_;
+
+       if (dev->chipid == ID_REV_CHIP_ID_7800_) {
+               ret = lan78xx_read_raw_eeprom(dev, 0, 1, &sig);
+               if (!ret && sig != EEPROM_INDICATOR) {
+                       /* Implies there is no external eeprom. Set mac speed */
+                       netdev_info(dev->net, "No External EEPROM. Setting MAC Speed\n");
+                       buf |= MAC_CR_AUTO_DUPLEX_ | MAC_CR_AUTO_SPEED_;
+               }
+       }
        ret = lan78xx_write_reg(dev, MAC_CR, buf);
 
        ret = lan78xx_read_reg(dev, MAC_TX, &buf);