r8152: Fix an error on RTL8153-BD MAC Address Passthrough support

[mirror_ubuntu-bionic-kernel.git] / drivers / net / usb / r8152.c

diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 0657203ffb9174bac37085613100726f30928a1a..8db9392d76b938e16bbb748bea238551371a1b64 100644 (file)
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -129,6 +129,7 @@
 #define USB_UPS_CTRL           0xd800
 #define USB_POWER_CUT          0xd80a
 #define USB_MISC_0             0xd81a
+#define USB_MISC_1             0xd81f
 #define USB_AFE_CTRL2          0xd824
 #define USB_UPS_CFG            0xd842
 #define USB_UPS_FLAGS          0xd848
@@ -555,6 +556,8 @@ enum spd_duplex {
 
 /* MAC PASSTHRU */
 #define AD_MASK                        0xfee0
+#define BND_MASK               0x0004
+#define BD_MASK                        0x0001
 #define EFUSE                  0xcfdb
 #define PASS_THRU_MASK         0x1
 
@@ -1150,7 +1153,7 @@ out1:
        return ret;
 }
 
-/* Devices containing RTL8153-AD can support a persistent
+/* Devices containing proper chips can support a persistent
  * host system provided MAC address.
  * Examples of this are Dell TB15 and Dell WD15 docks
  */
@@ -1165,13 +1168,23 @@ static int vendor_mac_passthru_addr_read(struct r8152 *tp, struct sockaddr *sa)
 
        /* test for -AD variant of RTL8153 */
        ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_MISC_0);
-       if ((ocp_data & AD_MASK) != 0x1000)
-               return -ENODEV;
-
-       /* test for MAC address pass-through bit */
-       ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, EFUSE);
-       if ((ocp_data & PASS_THRU_MASK) != 1)
-               return -ENODEV;
+       if ((ocp_data & AD_MASK) == 0x1000) {
+               /* test for MAC address pass-through bit */
+               ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, EFUSE);
+               if ((ocp_data & PASS_THRU_MASK) != 1) {
+                       netif_dbg(tp, probe, tp->netdev,
+                                 "No efuse for RTL8153-AD MAC pass through\n");
+                       return -ENODEV;
+               }
+       } else {
+               /* test for RTL8153-BND and RTL8153-BD */
+               ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, USB_MISC_1);
+               if ((ocp_data & BND_MASK) == 0 && (ocp_data & BD_MASK) == 0) {
+                       netif_dbg(tp, probe, tp->netdev,
+                                 "Invalid variant for MAC pass through\n");
+                       return -ENODEV;
+               }
+       }
 
        /* returns _AUXMAC_#AABBCCDDEEFF# */
        status = acpi_evaluate_object(NULL, "\\_SB.AMAC", NULL, &buffer);
@@ -1217,9 +1230,8 @@ static int set_ethernet_addr(struct r8152 *tp)
        if (tp->version == RTL_VER_01) {
                ret = pla_ocp_read(tp, PLA_IDR, 8, sa.sa_data);
        } else {
-               /* if this is not an RTL8153-AD, no eFuse mac pass thru set,
-                * or system doesn't provide valid _SB.AMAC this will be
-                * be expected to non-zero
+               /* if device doesn't support MAC pass through this will
+                * be expected to be non-zero
                 */
                ret = vendor_mac_passthru_addr_read(tp, &sa);
                if (ret < 0)
@@ -1794,7 +1806,7 @@ static int r8152_tx_agg_fill(struct r8152 *tp, struct tx_agg *agg)
 
                tx_data += len;
                agg->skb_len += len;
-               agg->skb_num++;
+               agg->skb_num += skb_shinfo(skb)->gso_segs ?: 1;
 
                dev_kfree_skb_any(skb);
 
@@ -3963,7 +3975,8 @@ static int rtl8152_close(struct net_device *netdev)
 #ifdef CONFIG_PM_SLEEP
        unregister_pm_notifier(&tp->pm_notifier);
 #endif
-       napi_disable(&tp->napi);
+       if (!test_bit(RTL8152_UNPLUG, &tp->flags))
+               napi_disable(&tp->napi);
        clear_bit(WORK_ENABLE, &tp->flags);
        usb_kill_urb(tp->intr_urb);
        cancel_delayed_work_sync(&tp->schedule);
@@ -5214,8 +5227,8 @@ static int rtl8152_probe(struct usb_interface *intf,
                netdev->hw_features &= ~NETIF_F_RXCSUM;
        }
 
-       if (le16_to_cpu(udev->descriptor.bcdDevice) == 0x3011 &&
-           udev->serial && !strcmp(udev->serial, "000001000000")) {
+       if (le16_to_cpu(udev->descriptor.bcdDevice) == 0x3011 && udev->serial &&
+           (!strcmp(udev->serial, "000001000000") || !strcmp(udev->serial, "000002000000"))) {
                dev_info(&udev->dev, "Dell TB16 Dock, disable RX aggregation");
                set_bit(DELL_TB_RX_AGG_BUG, &tp->flags);
        }