openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

bnx2: Read iSCSI config from shared memory during ->probe() 

The scratchpad location that we were reading from has not been
initialized yet during ->probe(), so we were getting inaccurate
information.

Update version to 2.1.10.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Reviewed-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Michael Chan 2011-07-13 17:24:22 +00:00 committed by David S. Miller
parent ecdbf6e0d5
commit 41c2178adc
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/bnx2.c
View File

@ -56,8 +56,8 @@
#include "bnx2_fw.h" #include "bnx2_fw.h"
#define DRV_MODULE_NAME "bnx2" #define DRV_MODULE_NAME "bnx2"
#define DRV_MODULE_VERSION "2.1.6" #define DRV_MODULE_VERSION "2.1.10"
#define DRV_MODULE_RELDATE "Mar 7, 2011" #define DRV_MODULE_RELDATE "July 12, 2011"
#define FW_MIPS_FILE_06 "bnx2/bnx2-mips-06-6.2.1.fw" #define FW_MIPS_FILE_06 "bnx2/bnx2-mips-06-6.2.1.fw"
#define FW_RV2P_FILE_06 "bnx2/bnx2-rv2p-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.2.1a.fw" #define FW_MIPS_FILE_09 "bnx2/bnx2-mips-09-6.2.1a.fw"
@ -385,6 +385,9 @@ static int bnx2_register_cnic(struct net_device *dev, struct cnic_ops *ops,
if (cp->drv_state & CNIC_DRV_STATE_REGD) if (cp->drv_state & CNIC_DRV_STATE_REGD)
return -EBUSY; return -EBUSY;
if (!bnx2_reg_rd_ind(bp, BNX2_FW_MAX_ISCSI_CONN))
return -ENODEV;
bp->cnic_data = data; bp->cnic_data = data;
rcu_assign_pointer(bp->cnic_ops, ops); rcu_assign_pointer(bp->cnic_ops, ops);
@ -8215,8 +8218,10 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
bp->timer.function = bnx2_timer; bp->timer.function = bnx2_timer;
#ifdef BCM_CNIC #ifdef BCM_CNIC
bp->cnic_eth_dev.max_iscsi_conn = if (bnx2_shmem_rd(bp, BNX2_ISCSI_INITIATOR) & BNX2_ISCSI_INITIATOR_EN)
bnx2_reg_rd_ind(bp, BNX2_FW_MAX_ISCSI_CONN); bp->cnic_eth_dev.max_iscsi_conn =
(bnx2_shmem_rd(bp, BNX2_ISCSI_MAX_CONN) &
BNX2_ISCSI_MAX_CONN_MASK) >> BNX2_ISCSI_MAX_CONN_SHIFT;
#endif #endif
pci_save_state(pdev); pci_save_state(pdev);

7
drivers/net/bnx2.h
View File

@ -7368,6 +7368,13 @@ struct bnx2_rv2p_fw_file {
#define BNX2_RPHY_SERDES_LINK 0x374 #define BNX2_RPHY_SERDES_LINK 0x374
#define BNX2_RPHY_COPPER_LINK 0x378 #define BNX2_RPHY_COPPER_LINK 0x378
#define BNX2_ISCSI_INITIATOR 0x3dc
#define BNX2_ISCSI_INITIATOR_EN 0x00080000
#define BNX2_ISCSI_MAX_CONN 0x3e4
#define BNX2_ISCSI_MAX_CONN_MASK 0xffff0000
#define BNX2_ISCSI_MAX_CONN_SHIFT 16
#define HOST_VIEW_SHMEM_BASE 0x167c00 #define HOST_VIEW_SHMEM_BASE 0x167c00
#define DP_SHMEM_LINE(bp, offset) \ #define DP_SHMEM_LINE(bp, offset) \