Thu Dec 28 06:13:50 2017 UTC ()

 Don't use MSI-X if we can use only one queue to save interrupt resource.
Written by knakahara and tested by me.


(msaitoh)

diff -r1.549 -r1.550 src/sys/dev/pci/if_wm.c

--- src/sys/dev/pci/if_wm.c 2017/12/08 05:22:23	1.549
+++ src/sys/dev/pci/if_wm.c 2017/12/28 06:13:50	1.550

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_wm.c,v 1.549 2017/12/08 05:22:23 ozaki-r Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.550 2017/12/28 06:13:50 msaitoh 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
  *	- TX Multi queue improvement (refine queue selection logic)
  *	- Split header buffer for newer descriptors
  *	- EEE (Energy Efficiency Ethernet)
  *	- Virtual Function
  *	- Set LED correctly (based on contents in EEPROM)
  *	- Rework how parameters are loaded from the EEPROM.
  *	- Image Unique ID
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.549 2017/12/08 05:22:23 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.550 2017/12/28 06:13:50 msaitoh Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
 #include "opt_if_wm.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>
 @@ -1840,36 +1840,45 @@ wm_attach(device_t parent, device_t self
 	preg |= PCI_COMMAND_MASTER_ENABLE;
 	if (sc->sc_type < WM_T_82542_2_1)
 		preg &= ~PCI_COMMAND_INVALIDATE_ENABLE;
 	pci_conf_write(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG, preg);
 	/* power up chip */
 	if ((error = pci_activate(pa->pa_pc, pa->pa_tag, self,
 	    NULL)) && error != EOPNOTSUPP) {
 		aprint_error_dev(sc->sc_dev, "cannot activate %d\n", error);
 		return;
+	}
 	wm_adjust_qnum(sc, pci_msix_count(pa->pa_pc, pa->pa_tag));
 	/* Allocation settings */
 	max_type = PCI_INTR_TYPE_MSIX;
 	/*
-	 * 82583 has a MSI-X capability in the PCI configuration space but
+	 *  Don't use MSI-X if we can use only one queue to save interrupt
-	 * it doesn't support it. At least the document doesn't say anything
+	 * resource.
 	 * about MSI-X.
 	 */
-	counts[PCI_INTR_TYPE_MSIX]
+	if (sc->sc_nqueues > 1) {
-	    = (sc->sc_type == WM_T_82583) ? 0 : sc->sc_nqueues + 1;
+		max_type = PCI_INTR_TYPE_MSIX;
 		/*
 		 *  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;
 	} else {
 		max_type = PCI_INTR_TYPE_MSI;
 		counts[PCI_INTR_TYPE_MSIX] = 0;
+	}
 	/* Allocation settings */
 	counts[PCI_INTR_TYPE_MSI] = 1;
 	counts[PCI_INTR_TYPE_INTX] = 1;
 	/* overridden by disable flags */
 	if (wm_disable_msi != 0) {
 		counts[PCI_INTR_TYPE_MSI] = 0;
 		if (wm_disable_msix != 0) {
 			max_type = PCI_INTR_TYPE_INTX;
 			counts[PCI_INTR_TYPE_MSIX] = 0;
+		}
 	} else if (wm_disable_msix != 0) {
 		max_type = PCI_INTR_TYPE_MSI;
 		counts[PCI_INTR_TYPE_MSIX] = 0;
+	}