diff options
| author | Eliezer Tamir <eliezert@broadcom.com> | 2008-02-28 11:54:54 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-28 11:54:54 -0800 |
| commit | 615f8fd9c2ab475c420d5baa7def37c5cb0d50d3 (patch) | |
| tree | 754b4dbb9bab483b5fdfc02621657e8dbe7c7d14 | |
| parent | 0e39e645b3e83873d59b865df2b671c822e2182c (diff) | |
| download | op-kernel-dev-615f8fd9c2ab475c420d5baa7def37c5cb0d50d3.zip op-kernel-dev-615f8fd9c2ab475c420d5baa7def37c5cb0d50d3.tar.gz | |
[BNX2X]: fix MSI-X/INT#A errata
Errata A0.158 workaround.
Running in INT#A mode after running with MSI-X fails due to a PCI core
bug.
Signed-off-by: Eliezer Tamir <eliezert@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/bnx2x.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/drivers/net/bnx2x.c b/drivers/net/bnx2x.c index a35feee..6f987fa 100644 --- a/drivers/net/bnx2x.c +++ b/drivers/net/bnx2x.c @@ -443,7 +443,7 @@ static void bnx2x_panic_dump(struct bnx2x *bp) DP(BNX2X_MSG_STATS, "stats_state - DISABLE\n"); } -static void bnx2x_enable_int(struct bnx2x *bp) +static void bnx2x_int_enable(struct bnx2x *bp) { int port = bp->port; u32 addr = port ? HC_REG_CONFIG_1 : HC_REG_CONFIG_0; @@ -456,18 +456,26 @@ static void bnx2x_enable_int(struct bnx2x *bp) HC_CONFIG_0_REG_ATTN_BIT_EN_0); } else { val |= (HC_CONFIG_0_REG_SINGLE_ISR_EN_0 | + HC_CONFIG_0_REG_MSI_MSIX_INT_EN_0 | HC_CONFIG_0_REG_INT_LINE_EN_0 | HC_CONFIG_0_REG_ATTN_BIT_EN_0); + + /* Errata A0.158 workaround */ + DP(NETIF_MSG_INTR, "write %x to HC %d (addr 0x%x) MSI-X %d\n", + val, port, addr, msix); + + REG_WR(bp, addr, val); + val &= ~HC_CONFIG_0_REG_MSI_MSIX_INT_EN_0; } - DP(NETIF_MSG_INTR, "write %x to HC %d (addr 0x%x) msi %d\n", + DP(NETIF_MSG_INTR, "write %x to HC %d (addr 0x%x) MSI-X %d\n", val, port, addr, msix); REG_WR(bp, addr, val); } -static void bnx2x_disable_int(struct bnx2x *bp) +static void bnx2x_int_disable(struct bnx2x *bp) { int port = bp->port; u32 addr = port ? HC_REG_CONFIG_1 : HC_REG_CONFIG_0; @@ -486,7 +494,7 @@ static void bnx2x_disable_int(struct bnx2x *bp) BNX2X_ERR("BUG! proper val not read from IGU!\n"); } -static void bnx2x_disable_int_sync(struct bnx2x *bp) +static void bnx2x_int_disable_sync(struct bnx2x *bp) { int msix = (bp->flags & USING_MSIX_FLAG) ? 1 : 0; @@ -494,7 +502,7 @@ static void bnx2x_disable_int_sync(struct bnx2x *bp) atomic_inc(&bp->intr_sem); /* prevent the HW from sending interrupts */ - bnx2x_disable_int(bp); + bnx2x_int_disable(bp); /* make sure all ISRs are done */ if (msix) { @@ -5710,7 +5718,7 @@ static void bnx2x_nic_init(struct bnx2x *bp) bnx2x_init_internal(bp); bnx2x_init_stats(bp); bnx2x_init_ind_table(bp); - bnx2x_enable_int(bp); + bnx2x_int_enable(bp); } @@ -7154,7 +7162,7 @@ stop_netif: napi_disable(&bnx2x_fp(bp, i, napi)); int_disable: - bnx2x_disable_int_sync(bp); + bnx2x_int_disable_sync(bp); bnx2x_free_skbs(bp); bnx2x_free_irq(bp); @@ -7174,7 +7182,7 @@ static void bnx2x_netif_stop(struct bnx2x *bp) bp->rx_mode = BNX2X_RX_MODE_NONE; bnx2x_set_storm_rx_mode(bp); - bnx2x_disable_int_sync(bp); + bnx2x_int_disable_sync(bp); bnx2x_link_reset(bp); for_each_queue(bp, i) |
