Module Name: src
Committed By: msaitoh
Date: Mon May 30 05:07:38 UTC 2022
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c
Log Message:
Fix a bug that the legacy interrupt doesn't work when MSI-X allocation failed.
Fixes PR kern/56857.
To generate a diff of this commit:
cvs rdiff -u -r1.314 -r1.315 src/sys/dev/pci/ixgbe/ixgbe.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.314 src/sys/dev/pci/ixgbe/ixgbe.c:1.315
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.314 Mon Apr 25 07:56:47 2022
+++ src/sys/dev/pci/ixgbe/ixgbe.c Mon May 30 05:07:38 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.314 2022/04/25 07:56:47 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.315 2022/05/30 05:07:38 msaitoh Exp $ */
/******************************************************************************
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.314 2022/04/25 07:56:47 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.315 2022/05/30 05:07:38 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1131,7 +1131,6 @@ ixgbe_attach(device_t parent, device_t d
ixgbe_free_queues(adapter);
/* Fallback to legacy interrupt */
- adapter->feat_en &= ~IXGBE_FEATURE_MSIX;
if (adapter->feat_cap & IXGBE_FEATURE_MSI)
adapter->feat_en |= IXGBE_FEATURE_MSI;
adapter->num_queues = 1;
@@ -5212,7 +5211,7 @@ ixgbe_enable_intr(struct adapter *adapte
IXGBE_WRITE_REG(hw, IXGBE_EIMS, mask);
/* With MSI-X we use auto clear */
- if (adapter->msix_mem) {
+ if ((adapter->feat_en & IXGBE_FEATURE_MSIX) != 0) {
/*
* We use auto clear for RTX_QUEUE only. Don't use other
* interrupts (e.g. link interrupt). BTW, we don't use
@@ -5244,7 +5243,7 @@ ixgbe_disable_intr_internal(struct adapt
/* disable interrupts other than queues */
IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC, ~IXGBE_EIMC_RTX_QUEUE);
- if (adapter->msix_mem)
+ if ((adapter->feat_en & IXGBE_FEATURE_MSIX) != 0)
IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIAC, 0);
for (int i = 0; i < adapter->num_queues; i++, que++)
@@ -6881,6 +6880,7 @@ ixgbe_allocate_msix(struct adapter *adap
adapter->osdep.nintrs) != 0) {
aprint_error_dev(dev,
"failed to allocate MSI-X interrupt\n");
+ adapter->feat_en &= ~IXGBE_FEATURE_MSIX;
return (ENXIO);
}
@@ -7067,7 +7067,7 @@ ixgbe_configure_interrupts(struct adapte
if (msgs < 2)
goto msi;
- adapter->msix_mem = (void *)1; /* XXX */
+ adapter->feat_en |= IXGBE_FEATURE_MSIX;
/* Figure out a reasonable auto config value */
queues = (ncpu > (msgs - 1)) ? (msgs - 1) : ncpu;
@@ -7121,7 +7121,7 @@ msi:
adapter->feat_en &= ~IXGBE_FEATURE_SRIOV;
msgs = pci_msi_count(adapter->osdep.pc, adapter->osdep.tag);
- adapter->msix_mem = NULL; /* XXX */
+ adapter->feat_en &= ~IXGBE_FEATURE_MSIX;
if (msgs > 1)
msgs = 1;
if (msgs != 0) {
