diff options
| author | Eddie Wai | 2010-11-24 14:48:54 +0100 |
|---|---|---|
| committer | David S. Miller | 2010-11-28 19:47:19 +0100 |
| commit | a5dac108d57072eec4d6745f32c162524509f2cb (patch) | |
| tree | e5177d7c181866ecea357ef1a9c0109d7ca39b90 /drivers/net/bnx2.h | |
| parent | 8021q: vlan device is lockless do not transfer real_num_{tx|rx}_queues (diff) | |
| download | kernel-qcow2-linux-a5dac108d57072eec4d6745f32c162524509f2cb.tar.gz kernel-qcow2-linux-a5dac108d57072eec4d6745f32c162524509f2cb.tar.xz kernel-qcow2-linux-a5dac108d57072eec4d6745f32c162524509f2cb.zip | |
bnx2: Fix reset bug on 5709
The 5709 chip requires the BNX2_MISC_NEW_CORE_CTL_DMA_ENABLE bit to be
cleared and polling for pending DMAs to complete before chip reset.
Without this step, we've seen NMIs during repeated resets of the chip.
Signed-off-by: Eddie Wai <waie@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2.h')
| -rw-r--r-- | drivers/net/bnx2.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h index bf4c3421067d..5488a2e82fe9 100644 --- a/drivers/net/bnx2.h +++ b/drivers/net/bnx2.h @@ -461,6 +461,8 @@ struct l2_fhdr { #define BNX2_PCICFG_MAILBOX_QUEUE_ADDR 0x00000090 #define BNX2_PCICFG_MAILBOX_QUEUE_DATA 0x00000094 +#define BNX2_PCICFG_DEVICE_CONTROL 0x000000b4 +#define BNX2_PCICFG_DEVICE_STATUS_NO_PEND ((1L<<5)<<16) /* * pci_reg definition |