em/emx: Update comment concerning errata number

diff --git a/sys/dev/netif/em/if_em.c b/sys/dev/netif/em/if_em.c
index 2aeb5eb..e3b959d 100644 (file)
--- a/sys/dev/netif/em/if_em.c
+++ b/sys/dev/netif/em/if_em.c
@@ -93,13 +93,6 @@
  *   if_input even if it is not serializer-aware.
  */
 
-/*
- * NOTE:
- *
- * MSI-X MUST NOT be enabled on 82574:
- *   <<82574 specification update>> errata #15
- */
-
 #include "opt_polling.h"
 
 #include <sys/param.h>
@@ -817,10 +810,10 @@ em_attach(device_t dev)
        /*
         * Missing Interrupt Following ICR read:
         *
-        * 82571/82572 specification update #76
-        * 82573 specification update #31
-        * 82574 specification update #12
-        * 82583 specification update #4
+        * 82571/82572 specification update errata #76
+        * 82573 specification update errata #31
+        * 82574 specification update errata #12
+        * 82583 specification update errata #4
         */
        intr_func = em_intr;
        if ((adapter->flags & EM_FLAG_SHARED_INTR) &&
@@ -2221,11 +2214,15 @@ em_alloc_pci_res(struct adapter *adapter)
        }
 
        /*
+        * Don't enable MSI-X on 82574, see:
+        * 82574 specification update errata #15
+        *
         * Don't enable MSI on PCI/PCI-X chips, see:
-        * 82540EP and 82545GM specification update
+        * 82540 specification update errata #6
+        * 82545 specification update errata #4
         *
         * Don't enable MSI on 82571/82572, see:
-        * 82571EB/82572EI specification update
+        * 82571/82572 specification update errata #63
         */
        msi_enable = em_msi_enable;
        if (msi_enable &&
@@ -4204,12 +4201,12 @@ em_disable_aspm(struct adapter *adapter)
        case e1000_82573:
                /*
                 * 82573 specification update
-                * #8 disable L0s
-                * #41 disable L1
+                * errata #8 disable L0s
+                * errata #41 disable L1
                 *
                 * 82571/82572 specification update
-                # #13 disable L1
-                * #68 disable L0s
+                # errata #13 disable L1
+                * errata #68 disable L0s
                 */
                disable = PCIEM_LNKCTL_ASPM_L0S | PCIEM_LNKCTL_ASPM_L1;
                break;
@@ -4217,8 +4214,8 @@ em_disable_aspm(struct adapter *adapter)
        case e1000_82574:
        case e1000_82583:
                /*
-                * 82574 specification update #20
-                * 82583 specification update #9
+                * 82574 specification update errata #20
+                * 82583 specification update errata #9
                 *
                 * There is no need to disable L1
                 */

diff --git a/sys/dev/netif/emx/if_emx.c b/sys/dev/netif/emx/if_emx.c
index 0814cf8..db57267 100644 (file)
--- a/sys/dev/netif/emx/if_emx.c
+++ b/sys/dev/netif/emx/if_emx.c
@@ -64,13 +64,6 @@
  * SUCH DAMAGE.
  */
 
-/*
- * NOTE:
- *
- * MSI-X MUST NOT be enabled on 82574:
- *   <<82574 specification update>> errata #15
- */
-
 #include "opt_ifpoll.h"
 #include "opt_rss.h"
 #include "opt_emx.h"
@@ -469,8 +462,11 @@ emx_attach(device_t dev)
        sc->hw.hw_addr = (uint8_t *)&sc->osdep.mem_bus_space_handle;
 
        /*
+        * Don't enable MSI-X on 82574, see:
+        * 82574 specification update errata #15
+        *
         * Don't enable MSI on 82571/82572, see:
-        * 82571EB/82572EI specification update
+        * 82571/82572 specification update errata #63
         */
        msi_enable = emx_msi_enable;
        if (msi_enable &&
@@ -724,9 +720,9 @@ emx_attach(device_t dev)
        /*
         * Missing Interrupt Following ICR read:
         *
-        * 82571/82572 specification update #76
-        * 82573 specification update #31
-        * 82574 specification update #12
+        * 82571/82572 specification update errata #76
+        * 82573 specification update errata #31
+        * 82574 specification update errata #12
         */
        intr_func = emx_intr;
        if ((sc->flags & EMX_FLAG_SHARED_INTR) &&
@@ -3809,19 +3805,19 @@ emx_disable_aspm(struct emx_softc *sc)
        case e1000_82573:
                /*
                 * 82573 specification update
-                * #8 disable L0s
-                * #41 disable L1
+                * errata #8 disable L0s
+                * errata #41 disable L1
                 *
                 * 82571/82572 specification update
-                # #13 disable L1
-                * #68 disable L0s
+                # errata #13 disable L1
+                * errata #68 disable L0s
                 */
                disable = PCIEM_LNKCTL_ASPM_L0S | PCIEM_LNKCTL_ASPM_L1;
                break;
 
        case e1000_82574:
                /*
-                * 82574 specification update #20
+                * 82574 specification update errata #20
                 *
                 * There is no need to disable L1
                 */