mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 08:19:28 +00:00
[SCSI] bnx2fc: NPIV ports go offline when interface is brought down & up
When there are 255 NPIV ports, and the interface is brought down & up, both physical and NPIV ports are logged off and never logged back in. Since discovery happens on single CPU, XID resources on that CPU will be limited, which when exhausted the discovery fails. Increase the XID resource range to ensure that the discovery completes successfully. Also ensure that fc_exch_mgr_alloc() doesn't fail on the system that has lower number of CPUs. Signed-off-by: Bhanu Prakash Gollapudi <bprakash@broadcom.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
parent
44c570b5b0
commit
7d742f659e
2 changed files with 11 additions and 2 deletions
|
@ -123,8 +123,10 @@
|
|||
#define BNX2FC_MIN_XID 0
|
||||
#define BNX2FC_MAX_XID \
|
||||
(BNX2FC_MAX_OUTSTANDING_CMNDS + BNX2FC_ELSTM_XIDS - 1)
|
||||
#define FCOE_MAX_NUM_XIDS 0x2000
|
||||
#define FCOE_MIN_XID (BNX2FC_MAX_XID + 1)
|
||||
#define FCOE_MAX_XID (FCOE_MIN_XID + 4095)
|
||||
#define FCOE_MAX_XID (FCOE_MIN_XID + FCOE_MAX_NUM_XIDS - 1)
|
||||
#define FCOE_XIDS_PER_CPU (FCOE_MIN_XID + (512 * nr_cpu_ids) - 1)
|
||||
#define BNX2FC_MAX_LUN 0xFFFF
|
||||
#define BNX2FC_MAX_FCP_TGT 256
|
||||
#define BNX2FC_MAX_CMD_LEN 16
|
||||
|
|
|
@ -940,8 +940,14 @@ static int bnx2fc_libfc_config(struct fc_lport *lport)
|
|||
|
||||
static int bnx2fc_em_config(struct fc_lport *lport)
|
||||
{
|
||||
int max_xid;
|
||||
|
||||
if (nr_cpu_ids <= 2)
|
||||
max_xid = FCOE_XIDS_PER_CPU;
|
||||
else
|
||||
max_xid = FCOE_MAX_XID;
|
||||
if (!fc_exch_mgr_alloc(lport, FC_CLASS_3, FCOE_MIN_XID,
|
||||
FCOE_MAX_XID, NULL)) {
|
||||
max_xid, NULL)) {
|
||||
printk(KERN_ERR PFX "em_config:fc_exch_mgr_alloc failed\n");
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
@ -2056,6 +2062,7 @@ static int bnx2fc_create(struct net_device *netdev, enum fip_state fip_mode)
|
|||
ifput_err:
|
||||
bnx2fc_net_cleanup(interface);
|
||||
bnx2fc_interface_put(interface);
|
||||
goto mod_err;
|
||||
netdev_err:
|
||||
module_put(THIS_MODULE);
|
||||
mod_err:
|
||||
|
|
Loading…
Reference in a new issue