[src/trunk]: src/sys/dev/pci Add ASPM workaround for 8257[1234] and 82583 to ...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/68f77a89dc04
branches:  trunk
changeset: 828805:68f77a89dc04
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Thu Jan 04 09:43:27 2018 +0000

description:
Add ASPM workaround for 8257[1234] and 82583 to prevent device timeout or
hangup. Fixes PR#52818 reported by Shinichi Doyashiki.

diffstat:

 sys/dev/pci/if_wm.c |  70 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 68 insertions(+), 2 deletions(-)

diffs (112 lines):

diff -r 19f8ee400661 -r 68f77a89dc04 sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Thu Jan 04 01:42:25 2018 +0000
+++ b/sys/dev/pci/if_wm.c       Thu Jan 04 09:43:27 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wm.c,v 1.551 2018/01/01 08:33:28 jnemeth Exp $      */
+/*     $NetBSD: if_wm.c,v 1.552 2018/01/04 09:43:27 msaitoh Exp $      */
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -83,7 +83,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.551 2018/01/01 08:33:28 jnemeth Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.552 2018/01/04 09:43:27 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -921,6 +921,7 @@
 static void    wm_enable_phy_wakeup(struct wm_softc *);
 static void    wm_igp3_phy_powerdown_workaround_ich8lan(struct wm_softc *);
 static void    wm_enable_wakeup(struct wm_softc *);
+static void    wm_disable_aspm(struct wm_softc *);
 /* LPLU (Low Power Link Up) */
 static void    wm_lplu_d0_disable(struct wm_softc *);
 /* EEE */
@@ -2048,6 +2049,9 @@
                    (sc->sc_flags & WM_F_PCIX) ? "PCIX" : "PCI");
        }
 
+       /* Disable ASPM L0s and/or L1 for workaround */
+       wm_disable_aspm(sc);
+
        /* clear interesting stat counters */
        CSR_READ(sc, WMREG_COLC);
        CSR_READ(sc, WMREG_RXERRC);
@@ -2911,6 +2915,8 @@
 {
        struct wm_softc *sc = device_private(self);
 
+       /* Disable ASPM L0s and/or L1 for workaround */
+       wm_disable_aspm(sc);
        wm_init_manageability(sc);
 
        return true;
@@ -13806,6 +13812,66 @@
        pci_conf_write(sc->sc_pc, sc->sc_pcitag, pmreg + PCI_PMCSR, pmode);
 }
 
+/* Disable ASPM L0s and/or L1 for workaround */
+static void
+wm_disable_aspm(struct wm_softc *sc)
+{
+       pcireg_t reg, mask = 0;
+       unsigned const char *str = "";
+
+       /*
+        *  Only for PCIe device which has PCIe capability in the PCI config
+        * space.
+        */
+       if (((sc->sc_flags & WM_F_PCIE) == 0) || (sc->sc_pcixe_capoff == 0))
+               return;
+
+       switch (sc->sc_type) {
+       case WM_T_82571:
+       case WM_T_82572:
+               /*
+                * 8257[12] Errata 13: Device Does Not Support PCIe Active
+                * State Power management L1 State (ASPM L1).
+                */
+               mask = PCIE_LCSR_ASPM_L1;
+               str = "L1 is";
+               break;
+       case WM_T_82573:
+       case WM_T_82574:
+       case WM_T_82583:
+               /*
+                * The 82573 disappears when PCIe ASPM L0s is enabled.
+                *
+                * The 82574 and 82583 does not support PCIe ASPM L0s with
+                * some chipset.  The document of 82574 and 82583 says that
+                * disabling L0s with some specific chipset is sufficient,
+                * but we follow as of the Intel em driver does.
+                *
+                * References:
+                * Errata 8 of the Specification Update of i82573.
+                * Errata 20 of the Specification Update of i82574.
+                * Errata 9 of the Specification Update of i82583.
+                */
+               mask = PCIE_LCSR_ASPM_L1 | PCIE_LCSR_ASPM_L0S;
+               str = "L0s and L1 are";
+               break;
+       default:
+               return;
+       }
+
+       reg = pci_conf_read(sc->sc_pc, sc->sc_pcitag,
+           sc->sc_pcixe_capoff + PCIE_LCSR);
+       reg &= ~mask;
+       pci_conf_write(sc->sc_pc, sc->sc_pcitag,
+           sc->sc_pcixe_capoff + PCIE_LCSR, reg);
+
+       /* Print only in wm_attach() */
+       if ((sc->sc_flags & WM_F_ATTACHED) == 0)
+               aprint_verbose_dev(sc->sc_dev,
+                   "ASPM %s disabled to workaround the errata.\n",
+                       str);
+}
+
 /* LPLU */
 
 static void