[src/trunk]: src/sys/dev/pci fix: XEN3_DOM0(not defined __HAVE_PCI_MSI_MSIX) ...

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

details:   https://anonhg.NetBSD.org/src/rev/5c9251bc73b0
branches:  trunk
changeset: 811121:5c9251bc73b0
user:      knakahara <knakahara%NetBSD.org@localhost>
date:      Tue Oct 13 09:10:01 2015 +0000

description:
fix: XEN3_DOM0(not defined __HAVE_PCI_MSI_MSIX) build

diffstat:

 sys/dev/pci/if_wm.c |  117 ++++++++++++++++++++++++++-------------------------
 1 files changed, 59 insertions(+), 58 deletions(-)

diffs (145 lines):

diff -r 17b19b876617 -r 5c9251bc73b0 sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Tue Oct 13 09:03:58 2015 +0000
+++ b/sys/dev/pci/if_wm.c       Tue Oct 13 09:10:01 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wm.c,v 1.366 2015/10/13 09:03:58 knakahara Exp $    */
+/*     $NetBSD: if_wm.c,v 1.367 2015/10/13 09:10:01 knakahara 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.366 2015/10/13 09:03:58 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.367 2015/10/13 09:10:01 knakahara Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -4046,6 +4046,63 @@
 }
 
 /*
+ * Setup registers for RSS.
+ *
+ * XXX not yet VMDq support
+ */
+static void
+wm_init_rss(struct wm_softc *sc)
+{
+       uint32_t mrqc, reta_reg;
+       int i;
+
+       for (i = 0; i < RETA_NUM_ENTRIES; i++) {
+               int qid, reta_ent;
+
+               qid  = i % sc->sc_nrxqueues;
+               switch(sc->sc_type) {
+               case WM_T_82574:
+                       reta_ent = __SHIFTIN(qid,
+                           RETA_ENT_QINDEX_MASK_82574);
+                       break;
+               case WM_T_82575:
+                       reta_ent = __SHIFTIN(qid,
+                           RETA_ENT_QINDEX1_MASK_82575);
+                       break;
+               default:
+                       reta_ent = __SHIFTIN(qid, RETA_ENT_QINDEX_MASK);
+                       break;
+               }
+
+               reta_reg = CSR_READ(sc, WMREG_RETA_Q(i));
+               reta_reg &= ~RETA_ENTRY_MASK_Q(i);
+               reta_reg |= __SHIFTIN(reta_ent, RETA_ENTRY_MASK_Q(i));
+               CSR_WRITE(sc, WMREG_RETA_Q(i), reta_reg);
+       }
+
+       for (i = 0; i < RSSRK_NUM_REGS; i++)
+               CSR_WRITE(sc, WMREG_RSSRK(i), (uint32_t)random());
+
+       if (sc->sc_type == WM_T_82574)
+               mrqc = MRQC_ENABLE_RSS_MQ_82574;
+       else
+               mrqc = MRQC_ENABLE_RSS_MQ;
+
+       /* XXXX
+        * The same as FreeBSD igb.
+        * Why doesn't use MRQC_RSS_FIELD_IPV6_EX?
+        */
+       mrqc |= (MRQC_RSS_FIELD_IPV4 | MRQC_RSS_FIELD_IPV4_TCP);
+       mrqc |= (MRQC_RSS_FIELD_IPV6 | MRQC_RSS_FIELD_IPV6_TCP);
+       mrqc |= (MRQC_RSS_FIELD_IPV4_UDP | MRQC_RSS_FIELD_IPV6_UDP);
+       mrqc |= (MRQC_RSS_FIELD_IPV6_UDP_EX | MRQC_RSS_FIELD_IPV6_TCP_EX);
+
+       CSR_WRITE(sc, WMREG_MRQC, mrqc);
+}
+
+#ifdef WM_MSI_MSIX
+
+/*
  * Adjust TX and RX queue numbers which the system actulally uses.
  *
  * The numbers are affected by below parameters.
@@ -4145,62 +4202,6 @@
 }
 
 /*
- * Setup registers for RSS.
- *
- * XXX not yet VMDq support
- */
-static void
-wm_init_rss(struct wm_softc *sc)
-{
-       uint32_t mrqc, reta_reg;
-       int i;
-
-       for (i = 0; i < RETA_NUM_ENTRIES; i++) {
-               int qid, reta_ent;
-
-               qid  = i % sc->sc_nrxqueues;
-               switch(sc->sc_type) {
-               case WM_T_82574:
-                       reta_ent = __SHIFTIN(qid,
-                           RETA_ENT_QINDEX_MASK_82574);
-                       break;
-               case WM_T_82575:
-                       reta_ent = __SHIFTIN(qid,
-                           RETA_ENT_QINDEX1_MASK_82575);
-                       break;
-               default:
-                       reta_ent = __SHIFTIN(qid, RETA_ENT_QINDEX_MASK);
-                       break;
-               }
-
-               reta_reg = CSR_READ(sc, WMREG_RETA_Q(i));
-               reta_reg &= ~RETA_ENTRY_MASK_Q(i);
-               reta_reg |= __SHIFTIN(reta_ent, RETA_ENTRY_MASK_Q(i));
-               CSR_WRITE(sc, WMREG_RETA_Q(i), reta_reg);
-       }
-
-       for (i = 0; i < RSSRK_NUM_REGS; i++)
-               CSR_WRITE(sc, WMREG_RSSRK(i), (uint32_t)random());
-
-       if (sc->sc_type == WM_T_82574)
-               mrqc = MRQC_ENABLE_RSS_MQ_82574;
-       else
-               mrqc = MRQC_ENABLE_RSS_MQ;
-
-       /* XXXX
-        * The same as FreeBSD igb.
-        * Why doesn't use MRQC_RSS_FIELD_IPV6_EX?
-        */
-       mrqc |= (MRQC_RSS_FIELD_IPV4 | MRQC_RSS_FIELD_IPV4_TCP);
-       mrqc |= (MRQC_RSS_FIELD_IPV6 | MRQC_RSS_FIELD_IPV6_TCP);
-       mrqc |= (MRQC_RSS_FIELD_IPV4_UDP | MRQC_RSS_FIELD_IPV6_UDP);
-       mrqc |= (MRQC_RSS_FIELD_IPV6_UDP_EX | MRQC_RSS_FIELD_IPV6_TCP_EX);
-
-       CSR_WRITE(sc, WMREG_MRQC, mrqc);
-}
-
-#ifdef WM_MSI_MSIX
-/*
  * Both single interrupt MSI and INTx can use this function.
  */
 static int