bnx2: Fix reset bug on 5709
Subsystems (2)
PATCH 1/2 bnx2: Fix reset bug on 5709
From: Eddie Wai <[email protected]>
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.
--- drivers/net/bnx2.c | 29 ++++++++++++++++++++++------- drivers/net/bnx2.h | 2 ++ 2 files changed, 24 insertions(+), 7 deletions(-)
drivers/net/bnx2.c +22 -7
@@ -4645,13 +4645,28 @@ bnx2_reset_chip(struct bnx2 *bp, u32 reset_code)/* Wait for the current PCI transaction to complete before * issuing a reset. */ -REG_WR (bp,BNX2_MISC_ENABLE_CLR_BITS , -BNX2_MISC_ENABLE_CLR_BITS_TX_DMA_ENABLE | -BNX2_MISC_ENABLE_CLR_BITS_DMA_ENGINE_ENABLE | -BNX2_MISC_ENABLE_CLR_BITS_RX_DMA_ENABLE | -BNX2_MISC_ENABLE_CLR_BITS_HOST_COALESCE_ENABLE ); - val =REG_RD (bp,BNX2_MISC_ENABLE_CLR_BITS ); -udelay (5 ); +if ((CHIP_NUM (bp) ==CHIP_NUM_5706 ) || + (CHIP_NUM (bp) ==CHIP_NUM_5708 )) { +REG_WR (bp,BNX2_MISC_ENABLE_CLR_BITS , +BNX2_MISC_ENABLE_CLR_BITS_TX_DMA_ENABLE | +BNX2_MISC_ENABLE_CLR_BITS_DMA_ENGINE_ENABLE | +BNX2_MISC_ENABLE_CLR_BITS_RX_DMA_ENABLE | +BNX2_MISC_ENABLE_CLR_BITS_HOST_COALESCE_ENABLE ); + val =REG_RD (bp,BNX2_MISC_ENABLE_CLR_BITS ); +udelay (5 ); + }else {/* 5709 */ + val =REG_RD (bp,BNX2_MISC_NEW_CORE_CTL ); + val &= ~BNX2_MISC_NEW_CORE_CTL_DMA_ENABLE ; +REG_WR (bp,BNX2_MISC_NEW_CORE_CTL , val); + val =REG_RD (bp,BNX2_MISC_NEW_CORE_CTL ); + +for (i =0 ; i <100 ; i++) { +msleep (1 ); + val =REG_RD (bp,BNX2_PCICFG_DEVICE_CONTROL ); +if (!(val &BNX2_PCICFG_DEVICE_STATUS_NO_PEND )) +break ; + } + }/* Wait for the firmware to tell us it is ok to issue a reset. */ bnx2_fw_sync (bp,BNX2_DRV_MSG_DATA_WAIT0 | reset_code,1 ,1 );
drivers/net/bnx2.h +2 -0
@@ -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
Signature · 1 line
1.6.4.GIT
PATCH 2/2 bnx2: Remove config access to non-standard registers
In KVM passthrough mode, the driver may not have config access to non-standard registers. The BNX2_PCICFG_MISC_CONFIG config register access to setup mailbox swapping can be done using MMIO.
Update version to 2.0.20.
--- drivers/net/bnx2.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-)
drivers/net/bnx2.c +8 -8
@@ -56,8 +56,8 @@#include "bnx2_fw.h" #define DRV_MODULE_NAME "bnx2" -#define DRV_MODULE_VERSION "2.0.18" -#define DRV_MODULE_RELDATE "Oct 7, 2010" +#define DRV_MODULE_VERSION "2.0.20" +#define DRV_MODULE_RELDATE "Nov 24, 2010"#define FW_MIPS_FILE_06 "bnx2/bnx2-mips-06-6.0.15.fw"#define FW_RV2P_FILE_06 "bnx2/bnx2-rv2p-06-6.0.15.fw"#define FW_MIPS_FILE_09 "bnx2/bnx2-mips-09-6.0.17.fw"
@@ -4688,7 +4688,7 @@ bnx2_reset_chip(struct bnx2 *bp, u32 reset_code) val =BNX2_PCICFG_MISC_CONFIG_REG_WINDOW_ENA |BNX2_PCICFG_MISC_CONFIG_TARGET_MB_WORD_SWAP ; -pci_write_config_dword (bp->pdev,BNX2_PCICFG_MISC_CONFIG , val); +REG_WR (bp,BNX2_PCICFG_MISC_CONFIG , val); }else { val = BNX2_PCICFG_MISC_CONFIG_CORE_RST_REQ |
@@ -7929,15 +7929,15 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev) goto err_out_release; } +bnx2_set_power_state (bp,PCI_D0 ); +/* Configure byte swap and enable write to the reg_window registers. * Rely on CPU to do target byte swapping on big endian systems * The chip's target access swapping will not swap all accesses */ -pci_write_config_dword (bp->pdev,BNX2_PCICFG_MISC_CONFIG , -BNX2_PCICFG_MISC_CONFIG_REG_WINDOW_ENA | -BNX2_PCICFG_MISC_CONFIG_TARGET_MB_WORD_SWAP ); - -bnx2_set_power_state (bp,PCI_D0 ); +REG_WR (bp,BNX2_PCICFG_MISC_CONFIG , +BNX2_PCICFG_MISC_CONFIG_REG_WINDOW_ENA | +BNX2_PCICFG_MISC_CONFIG_TARGET_MB_WORD_SWAP ); bp->chip_id =REG_RD (bp,BNX2_MISC_ID );
Signature · 1 line
1.6.4.GIT
Re: [PATCH net-next 2/2] bnx2: Remove config access to non-standard registers
From: "Michael Chan" <[email protected]>
Date: Wed, 24 Nov 2010 15:48:55 -0800
Quoted 7 lines
In KVM passthrough mode, the driver may not have config access to non-standard registers. The
BNX2_PCICFG_MISC_CONFIGconfig register access to setup mailbox swapping can be done using MMIO.Update version to 2.0.20.
Signed-off-by Michael Chan <[email protected]>
Applied.
From: "Michael Chan" <[email protected]>
Date: Wed, 24 Nov 2010 15:48:54 -0800
Quoted 8 lines
From: Eddie Wai <[email protected]>
The 5709 chip requires the
BNX2_MISC_NEW_CORE_CTL_DMA_ENABLEbit 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 <[email protected]>Signed-off-by Michael Chan <[email protected]>
Applied.