 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_wm.c,v 1.362 2015/10/13 08:27:11 knakahara Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.363 2015/10/13 08:29:44 knakahara Exp $	*/
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -73,27 +73,27 @@
  * TODO (in order of importance):
+ *
  *	- Check XXX'ed comments
  *	- EEE (Energy Efficiency Ethernet)
  *	- Multi queue
  *	- Image Unique ID
  *	- LPLU other than PCH*
  *	- Virtual Function
  *	- Set LED correctly (based on contents in EEPROM)
  *	- Rework how parameters are loaded from the EEPROM.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.362 2015/10/13 08:27:11 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.363 2015/10/13 08:29:44 knakahara Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kmem.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 @@ -4054,68 +4054,72 @@ wm_setup_legacy(struct wm_softc *sc)
 	    IPL_NET, wm_intr_legacy, sc, device_xname(sc->sc_dev));
 	if (sc->sc_ihs[0] == NULL) {
 		aprint_error_dev(sc->sc_dev,"unable to establish %s\n",
 		    (pci_intr_type(sc->sc_intrs[0])
 			== PCI_INTR_TYPE_MSI) ? "MSI" : "INTx");
 		return ENOMEM;
+	}
 	aprint_normal_dev(sc->sc_dev, "interrupting at %s\n", intrstr);
 	sc->sc_nintrs = 1;
 	return 0;
+}
 struct _msix_matrix {
 	const char *intrname;
 	int(*func)(void *);
 	int intridx;
 	int cpuid;
 } msix_matrix[WM_MSIX_NINTR] = {
 	{ "TX", wm_txintr_msix, WM_MSIX_TXINTR_IDX, WM_MSIX_TXINTR_CPUID },
 	{ "RX", wm_rxintr_msix, WM_MSIX_RXINTR_IDX, WM_MSIX_RXINTR_CPUID },
 	{ "LINK", wm_linkintr_msix, WM_MSIX_LINKINTR_IDX,
 	  WM_MSIX_LINKINTR_CPUID },
 };
 static int
 wm_setup_msix(struct wm_softc *sc)
+{
 	void *vih;
 	kcpuset_t *affinity;
 	int i, error;
 	pci_chipset_tag_t pc = sc->sc_pc;
 	const char *intrstr = NULL;
 	char intrbuf[PCI_INTRSTR_LEN];
 	char intr_xname[INTRDEVNAMEBUF];
 	struct _msix_matrix {
 		const char *intrname;
 		int(*func)(void *);
 		void *arg;
 		int intridx;
 		int cpuid;
 	} msix_matrix[WM_MSIX_NINTR] = {
 		{ "TX", wm_txintr_msix, sc->sc_txq,
 		  WM_MSIX_TXINTR_IDX, WM_MSIX_TXINTR_CPUID },
 		{ "RX", wm_rxintr_msix, sc->sc_rxq,
 		  WM_MSIX_RXINTR_IDX, WM_MSIX_RXINTR_CPUID },
 		{ "LINK", wm_linkintr_msix, sc,
 		  WM_MSIX_LINKINTR_IDX, WM_MSIX_LINKINTR_CPUID },
 	};
 	kcpuset_create(&affinity, false);
 	for (i = 0; i < WM_MSIX_NINTR; i++) {
 		intrstr = pci_intr_string(pc,
 		    sc->sc_intrs[msix_matrix[i].intridx], intrbuf,
 		    sizeof(intrbuf));
 #ifdef WM_MPSAFE
 		pci_intr_setattr(pc,
 		    &sc->sc_intrs[msix_matrix[i].intridx],
 		    PCI_INTR_MPSAFE, true);
 #endif
 		memset(intr_xname, 0, sizeof(intr_xname));
 		strlcat(intr_xname, device_xname(sc->sc_dev),
 		    sizeof(intr_xname));
 		strlcat(intr_xname, msix_matrix[i].intrname,
 		    sizeof(intr_xname));
 		vih = pci_intr_establish_xname(pc,
 		    sc->sc_intrs[msix_matrix[i].intridx], IPL_NET,
-		    msix_matrix[i].func, sc, intr_xname);
+		    msix_matrix[i].func, msix_matrix[i].arg, intr_xname);
 		if (vih == NULL) {
 			aprint_error_dev(sc->sc_dev,
 			    "unable to establish MSI-X(for %s)%s%s\n",
 			    msix_matrix[i].intrname,
 			    intrstr ? " at " : "",
 			    intrstr ? intrstr : "");
 			kcpuset_destroy(affinity);
 			return ENOMEM;
+		}
 		kcpuset_zero(affinity);
 		/* Round-robin affinity */
 		kcpuset_set(affinity, msix_matrix[i].cpuid % ncpu);
 @@ -7051,28 +7055,28 @@ wm_intr_legacy(void *arg)
 	return handled;
+}
 #ifdef WM_MSI_MSIX
 /*
  * wm_txintr_msix:
+ *
  *	Interrupt service routine for TX complete interrupt for MSI-X.
  */
 static int
 wm_txintr_msix(void *arg)
+{
-	struct wm_softc *sc = arg;
+	struct wm_txqueue *txq = arg;
-	struct wm_txqueue *txq = sc->sc_txq;
+	struct wm_softc *sc = txq->txq_sc;
 	struct ifnet *ifp = &sc->sc_ethercom.ec_if;
 	int handled = 0;
 	DPRINTF(WM_DEBUG_TX,
 	    ("%s: TX: got Tx intr\n", device_xname(sc->sc_dev)));
 	if (sc->sc_type == WM_T_82574)
 		CSR_WRITE(sc, WMREG_IMC, ICR_TXQ(0)); /* 82574 only */
 	else if (sc->sc_type == WM_T_82575)
 		CSR_WRITE(sc, WMREG_EIMC, EITR_TX_QUEUE(0));
 	else
 		CSR_WRITE(sc, WMREG_EIMC, 1 << WM_MSIX_TXINTR_IDX);
 @@ -7100,28 +7104,28 @@ out:
+	}
 	return handled;
+}
 /*
  * wm_rxintr_msix:
+ *
  *	Interrupt service routine for RX interrupt for MSI-X.
  */
 static int
 wm_rxintr_msix(void *arg)
+{
-	struct wm_softc *sc = arg;
+	struct wm_rxqueue *rxq = arg;
-	struct wm_rxqueue *rxq = sc->sc_rxq;
+	struct wm_softc *sc = rxq->rxq_sc;
 	DPRINTF(WM_DEBUG_TX,
 	    ("%s: RX: got Rx intr\n", device_xname(sc->sc_dev)));
 	if (sc->sc_type == WM_T_82574)
 		CSR_WRITE(sc, WMREG_IMC, ICR_RXQ(0)); /* 82574 only */
 	else if (sc->sc_type == WM_T_82575)
 		CSR_WRITE(sc, WMREG_EIMC, EITR_RX_QUEUE(0));
 	else
 		CSR_WRITE(sc, WMREG_EIMC, 1 << WM_MSIX_RXINTR_IDX);
 	WM_RX_LOCK(rxq);