r8169: revert 2ab19de62d67 ("r8169: remove ASPM restrictions now that ASPM is disable...

[platform/kernel/linux-rpi.git] / drivers / net / ethernet / realtek / r8169_main.c

diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index 4b19803..8a8b7d8 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -623,6 +623,7 @@ struct rtl8169_private {
        int cfg9346_usage_count;
 
        unsigned supports_gmii:1;
+       unsigned aspm_manageable:1;
        dma_addr_t counters_phys_addr;
        struct rtl8169_counters *counters;
        struct rtl8169_tc_offsets tc_offset;
@@ -2746,7 +2747,15 @@ static void rtl_hw_aspm_clkreq_enable(struct rtl8169_private *tp, bool enable)
        if (tp->mac_version < RTL_GIGA_MAC_VER_32)
                return;
 
-       if (enable) {
+       /* Don't enable ASPM in the chip if OS can't control ASPM */
+       if (enable && tp->aspm_manageable) {
+               /* On these chip versions ASPM can even harm
+                * bus communication of other PCI devices.
+                */
+               if (tp->mac_version == RTL_GIGA_MAC_VER_42 ||
+                   tp->mac_version == RTL_GIGA_MAC_VER_43)
+                       return;
+
                rtl_mod_config5(tp, 0, ASPM_en);
                rtl_mod_config2(tp, 0, ClkReqEn);
 
@@ -5158,12 +5167,23 @@ done:
        rtl_rar_set(tp, mac_addr);
 }
 
+/* register is set if system vendor successfully tested ASPM 1.2 */
+static bool rtl_aspm_is_safe(struct rtl8169_private *tp)
+{
+       if (tp->mac_version >= RTL_GIGA_MAC_VER_61 &&
+           r8168_mac_ocp_read(tp, 0xc0b2) & 0xf)
+               return true;
+
+       return false;
+}
+
 static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
        struct rtl8169_private *tp;
        int jumbo_max, region, rc;
        enum mac_version chipset;
        struct net_device *dev;
+       u32 txconfig;
        u16 xid;
 
        dev = devm_alloc_etherdev(&pdev->dev, sizeof (*tp));
@@ -5195,40 +5215,50 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
        /* enable device (incl. PCI PM wakeup and hotplug setup) */
        rc = pcim_enable_device(pdev);
-       if (rc < 0) {
-               dev_err(&pdev->dev, "enable failure\n");
-               return rc;
-       }
+       if (rc < 0)
+               return dev_err_probe(&pdev->dev, rc, "enable failure\n");
 
        if (pcim_set_mwi(pdev) < 0)
                dev_info(&pdev->dev, "Mem-Wr-Inval unavailable\n");
 
        /* use first MMIO region */
        region = ffs(pci_select_bars(pdev, IORESOURCE_MEM)) - 1;
-       if (region < 0) {
-               dev_err(&pdev->dev, "no MMIO resource found\n");
-               return -ENODEV;
-       }
+       if (region < 0)
+               return dev_err_probe(&pdev->dev, -ENODEV, "no MMIO resource found\n");
 
        rc = pcim_iomap_regions(pdev, BIT(region), KBUILD_MODNAME);
-       if (rc < 0) {
-               dev_err(&pdev->dev, "cannot remap MMIO, aborting\n");
-               return rc;
-       }
+       if (rc < 0)
+               return dev_err_probe(&pdev->dev, rc, "cannot remap MMIO, aborting\n");
 
        tp->mmio_addr = pcim_iomap_table(pdev)[region];
 
-       xid = (RTL_R32(tp, TxConfig) >> 20) & 0xfcf;
+       txconfig = RTL_R32(tp, TxConfig);
+       if (txconfig == ~0U)
+               return dev_err_probe(&pdev->dev, -EIO, "PCI read failed\n");
+
+       xid = (txconfig >> 20) & 0xfcf;
 
        /* Identify chip attached to board */
        chipset = rtl8169_get_mac_version(xid, tp->supports_gmii);
-       if (chipset == RTL_GIGA_MAC_NONE) {
-               dev_err(&pdev->dev, "unknown chip XID %03x, contact r8169 maintainers (see MAINTAINERS file)\n", xid);
-               return -ENODEV;
-       }
-
+       if (chipset == RTL_GIGA_MAC_NONE)
+               return dev_err_probe(&pdev->dev, -ENODEV,
+                                    "unknown chip XID %03x, contact r8169 maintainers (see MAINTAINERS file)\n",
+                                    xid);
        tp->mac_version = chipset;
 
+       /* Disable ASPM L1 as that cause random device stop working
+        * problems as well as full system hangs for some PCIe devices users.
+        * Chips from RTL8168h partially have issues with L1.2, but seem
+        * to work fine with L1 and L1.1.
+        */
+       if (rtl_aspm_is_safe(tp))
+               rc = 0;
+       else if (tp->mac_version >= RTL_GIGA_MAC_VER_46)
+               rc = pci_disable_link_state(pdev, PCIE_LINK_STATE_L1_2);
+       else
+               rc = pci_disable_link_state(pdev, PCIE_LINK_STATE_L1);
+       tp->aspm_manageable = !rc;
+
        tp->dash_type = rtl_check_dash(tp);
 
        tp->cp_cmd = RTL_R16(tp, CPlusCmd) & CPCMD_MASK;
@@ -5246,10 +5276,9 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        rtl_hw_reset(tp);
 
        rc = rtl_alloc_irq(tp);
-       if (rc < 0) {
-               dev_err(&pdev->dev, "Can't allocate interrupt\n");
-               return rc;
-       }
+       if (rc < 0)
+               return dev_err_probe(&pdev->dev, rc, "Can't allocate interrupt\n");
+
        tp->irq = pci_irq_vector(pdev, 0);
 
        INIT_WORK(&tp->wk.work, rtl_task);