summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
diff options
context:
space:
mode:
authorYuval Mintz2012-04-03 20:41:25 +0200
committerDavid S. Miller2012-04-04 07:37:58 +0200
commit79a8557a6d18c3861d64ae110ddd7606c65d7504 (patch)
treeac282d4fb9dcda01bd26fbbbd9e384f32be8091b /drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
parentbnx2x: remove unnecessary dmae code (diff)
downloadkernel-qcow2-linux-79a8557a6d18c3861d64ae110ddd7606c65d7504.tar.gz
kernel-qcow2-linux-79a8557a6d18c3861d64ae110ddd7606c65d7504.tar.xz
kernel-qcow2-linux-79a8557a6d18c3861d64ae110ddd7606c65d7504.zip
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. 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>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c')
-rw-r--r--drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index a2324a862993..f851153fb5a8 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/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 */