Thu Oct 12 05:50:56 2023 UTC ()

ixg(4): Don't print wrong error message about ixgbe_num_queues.

 Don't override the ixgbe_num_queues global variable. It's the default
value of the number of queues and should not override it because it
will be referenced by later device attach. For example, the number of
MSI-X vector is 64 on X540 and 18 on 82599. When both cards are inserted
to a machine that the number of CPU is 24 and X540 is probed earlier,
ixgbe_num_queues is overridden to 24 and the following error message is
printed when attaching 82599:

	ixg2: autoconfiguration error: ixgbe_num_queues (24) is too large,
	using reduced amount (17).

Note that the number of queues is in sc->num_queuss and referenced
by hw.ixgN.num_queues sysctl.


(msaitoh)

diff -r1.341 -r1.342 src/sys/dev/pci/ixgbe/ixgbe.c

--- src/sys/dev/pci/ixgbe/ixgbe.c 2023/10/12 03:43:55	1.341
+++ src/sys/dev/pci/ixgbe/ixgbe.c 2023/10/12 05:50:55	1.342

 @@ -1,14 +1,14 @@
-/* $NetBSD: ixgbe.c,v 1.341 2023/10/12 03:43:55 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.342 2023/10/12 05:50:55 msaitoh Exp $ */
 /******************************************************************************
   Copyright (c) 2001-2017, Intel Corporation
   All rights reserved.
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
 . Redistributions of source code must retain the above copyright notice,
       this list of conditions and the following disclaimer.
 . Redistributions in binary form must reproduce the above copyright
 @@ -54,27 +54,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.341 2023/10/12 03:43:55 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.342 2023/10/12 05:50:55 msaitoh Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include "ixgbe.h"
 #include "ixgbe_phy.h"
 #include "ixgbe_sriov.h"
 #include <sys/cprng.h>
 #include <dev/mii/mii.h>
 @@ -7111,29 +7111,26 @@ ixgbe_configure_interrupts(struct ixgbe_
 	if (ixgbe_num_queues > queues) {
 		aprint_error_dev(sc->dev,
 		    "ixgbe_num_queues (%d) is too large, "
 		    "using reduced amount (%d).\n", ixgbe_num_queues, queues);
 		ixgbe_num_queues = queues;
+	}
 	if (ixgbe_num_queues != 0)
 		queues = ixgbe_num_queues;
 	else
 		queues = uimin(queues,
 		    uimin(mac->max_tx_queues, mac->max_rx_queues));
 	/* reflect correct sysctl value */
 	ixgbe_num_queues = queues;
 	/*
 	 * Want one vector (RX/TX pair) per queue
 	 * plus an additional for Link.
 	 */
 	want = queues + 1;
 	if (msgs >= want)
 		msgs = want;
 	else {
 		aprint_error_dev(dev, "MSI-X Configuration Problem, "
 		    "%d vectors but %d queues wanted!\n", msgs, want);
 		goto msi;
+	}
 	sc->num_queues = queues;