bnx2: Fix problem of using wrong IRQ handler. (69010313) · Commits · 戴 / test

The MSI-X handler was chosen before the call to pci_enable_msix(). If MSI-X was not available, the wrong MSI-X handler would be used in INTA mode. This would cause a screaming interrupt problem because INTA would not be cleared by the MSI-X handler. Fixed by assigning MSI-X handler after pci_enable_msix() returns successfully. Also update version to 1.9.3. Thomas Chenault <thomas_chenault@dell.com> helped us find this problem. Signed-off-by:

Michael Chan <mchan@broadcom.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/bnx2.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -57,8 +57,8 @@

		#define DRV_MODULE_NAME "bnx2"
		#define PFX DRV_MODULE_NAME ": "
		#define DRV_MODULE_VERSION "1.9.2"
		#define DRV_MODULE_RELDATE "Feb 11, 2009"
		#define DRV_MODULE_VERSION "1.9.3"
		#define DRV_MODULE_RELDATE "March 17, 2009"

		#define RUN_AT(x) (jiffies + (x))

		@@ -5843,9 +5843,6 @@ bnx2_enable_msix(struct bnx2 *bp, int msix_vecs)
		for (i = 0; i < BNX2_MAX_MSIX_VEC; i++) {
		msix_ent[i].entry = i;
		msix_ent[i].vector = 0;

		snprintf(bp->irq_tbl[i].name, len, "%s-%d", dev->name, i);
		bp->irq_tbl[i].handler = bnx2_msi_1shot;
		}

		rc = pci_enable_msix(bp->pdev, msix_ent, BNX2_MAX_MSIX_VEC);
		@@ -5854,8 +5851,11 @@ bnx2_enable_msix(struct bnx2 *bp, int msix_vecs)

		bp->irq_nvecs = msix_vecs;
		bp->flags \|= BNX2_FLAG_USING_MSIX \| BNX2_FLAG_ONE_SHOT_MSI;
		for (i = 0; i < BNX2_MAX_MSIX_VEC; i++)
		for (i = 0; i < BNX2_MAX_MSIX_VEC; i++) {
		bp->irq_tbl[i].vector = msix_ent[i].vector;
		snprintf(bp->irq_tbl[i].name, len, "%s-%d", dev->name, i);
		bp->irq_tbl[i].handler = bnx2_msi_1shot;
		}
		}

		static void

Admin message