[src/netbsd-8]: src/sys/dev/pci Pull up following revision(s) (requested by m...

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

details:   https://anonhg.NetBSD.org/src/rev/00ae3c25f14f
branches:  netbsd-8
changeset: 851220:00ae3c25f14f
user:      snj <snj%NetBSD.org@localhost>
date:      Sun Dec 10 09:48:04 2017 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #424):
        sys/dev/pci/if_wm.c: 1.545-1.546
  Don't allocate MSI-X interrupt on 82583. 82583 chip has a MSI-X capability in
the PCI configuration space but it doesn't support it. At least the document
doesn't say anything about MSI-X. Fixes PR#52767 reported by
Shinichi Doyashiki.
--
- 82583 supports jumbo frame. Fixes PR#52773 reported by Shinichi Doyashiki.
- Cleanup comment.

diffstat:

 sys/dev/pci/if_wm.c |  16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diffs (55 lines):

diff -r 58c89ae05706 -r 00ae3c25f14f sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Sun Dec 10 09:44:48 2017 +0000
+++ b/sys/dev/pci/if_wm.c       Sun Dec 10 09:48:04 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wm.c,v 1.508.4.7 2017/11/24 08:39:09 martin Exp $   */
+/*     $NetBSD: if_wm.c,v 1.508.4.8 2017/12/10 09:48:04 snj 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.508.4.7 2017/11/24 08:39:09 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.508.4.8 2017/12/10 09:48:04 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -1853,7 +1853,13 @@
 
        /* Allocation settings */
        max_type = PCI_INTR_TYPE_MSIX;
-       counts[PCI_INTR_TYPE_MSIX] = sc->sc_nqueues + 1;
+       /*
+        * 82583 has a MSI-X capability in the PCI configuration space but
+        * it doesn't support it. At least the document doesn't say anything
+        * about MSI-X.
+        */
+       counts[PCI_INTR_TYPE_MSIX]
+           = (sc->sc_type == WM_T_82583) ? 0 : sc->sc_nqueues + 1;
        counts[PCI_INTR_TYPE_MSI] = 1;
        counts[PCI_INTR_TYPE_INTX] = 1;
        /* overridden by disable flags */
@@ -2670,11 +2676,12 @@
        case WM_T_82571:
        case WM_T_82572:
        case WM_T_82574:
+       case WM_T_82583:
        case WM_T_82575:
        case WM_T_82576:
        case WM_T_82580:
        case WM_T_I350:
-       case WM_T_I354: /* XXXX ok? */
+       case WM_T_I354:
        case WM_T_I210:
        case WM_T_I211:
        case WM_T_80003:
@@ -2692,7 +2699,6 @@
                break;
        case WM_T_82542_2_0:
        case WM_T_82542_2_1:
-       case WM_T_82583:
        case WM_T_ICH8:
                /* No support for jumbo frame */
                break;