From: Yuval Mintz <yuvalmin@broadcom.com>
Date: Tue, 3 Apr 2012 18:41:25 +0000 (+0000)
Subject: bnx2x: enable inta on the pci bus when used
X-Git-Tag: v2.6.39-400.9.0~338^2~91
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1abb93197da7fd1da2188d348607e12f5d55d275;p=users%2Fjedix%2Flinux-maple.git

bnx2x: enable inta on the pci bus when used

During boot-from-SAN, if msix interrupts are unavailable and inta
is requested, it is possible that inta would be disabled in the
pci bus. This patch enables inta when requested.

(cherry picked from commit 79a8557a6d18c3861d64ae110ddd7606c65d7504)
Signed-off-by: Yuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Joe Jin <joe.jin@oracle.com>
---

diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c
index f6500e3a03d8..80cfc5c07ae8 100644
--- a/drivers/net/bnx2x/bnx2x_main.c
+++ b/drivers/net/bnx2x/bnx2x_main.c
@@ -1368,6 +1368,9 @@ static void bnx2x_igu_int_enable(struct bnx2x *bp)
 
 	REG_WR(bp, IGU_REG_PF_CONFIGURATION, val);
 
+	if (val & IGU_PF_CONF_INT_LINE_EN)
+		pci_intx(bp->pdev, true);
+
 	barrier();
 
 	/* init leading/trailing edge */