Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b306f5ed authored by Dmitry Kravkov's avatar Dmitry Kravkov Committed by David S. Miller
Browse files

bnx2x: separate FCoE and iSCSI license initialization. 



FCoE license info must be initialized at probe(), but
iSCSI at open().

Signed-off-by: default avatarDmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ad756594

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -1934,6 +1934,8 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode) 
	mod_timer(&bp->timer, jiffies + bp->current_interval);

	mod_timer(&bp->timer, jiffies + bp->current_interval);





#ifdef BCM_CNIC

#ifdef BCM_CNIC

	/* re-read iscsi info */

	bnx2x_get_iscsi_info(bp);

	bnx2x_setup_cnic_irq_info(bp);

	bnx2x_setup_cnic_irq_info(bp);

	if (bp->state == BNX2X_STATE_OPEN)

	if (bp->state == BNX2X_STATE_OPEN)

		bnx2x_cnic_notify(bp, CNIC_CTL_START_CMD);

		bnx2x_cnic_notify(bp, CNIC_CTL_START_CMD);

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h

+10 −0
Original line number Original line Diff line number Diff line
@@ -1489,4 +1489,14 @@ static inline u16 bnx2x_extract_max_cfg(struct bnx2x *bp, u32 mf_cfg) 
	return max_cfg;

	return max_cfg;

}

}





#ifdef BCM_CNIC

/**

 * bnx2x_get_iscsi_info - update iSCSI params according to licensing info.

 *

 * @bp:		driver handle

 *

 */

void bnx2x_get_iscsi_info(struct bnx2x *bp);

#endif



#endif /* BNX2X_CMN_H */
 
#endif /* BNX2X_CMN_H */

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

+34 −11
Original line number Original line Diff line number Diff line
@@ -9268,21 +9268,38 @@ static void __devinit bnx2x_get_port_hwinfo(struct bnx2x *bp) 
}

}





#ifdef BCM_CNIC

#ifdef BCM_CNIC

static void __devinit bnx2x_get_cnic_info(struct bnx2x *bp)

void bnx2x_get_iscsi_info(struct bnx2x *bp)

{

{

	int port = BP_PORT(bp);

	int port = BP_PORT(bp);

	int func = BP_ABS_FUNC(bp);





	u32 max_iscsi_conn = FW_ENCODE_32BIT_PATTERN ^ SHMEM_RD(bp,

	u32 max_iscsi_conn = FW_ENCODE_32BIT_PATTERN ^ SHMEM_RD(bp,

				drv_lic_key[port].max_iscsi_conn);

				drv_lic_key[port].max_iscsi_conn);

	u32 max_fcoe_conn = FW_ENCODE_32BIT_PATTERN ^ SHMEM_RD(bp,

				drv_lic_key[port].max_fcoe_conn);





	/* Get the number of maximum allowed iSCSI and FCoE connections */

	/* Get the number of maximum allowed iSCSI connections */

	bp->cnic_eth_dev.max_iscsi_conn =

	bp->cnic_eth_dev.max_iscsi_conn =

		(max_iscsi_conn & BNX2X_MAX_ISCSI_INIT_CONN_MASK) >>

		(max_iscsi_conn & BNX2X_MAX_ISCSI_INIT_CONN_MASK) >>

		BNX2X_MAX_ISCSI_INIT_CONN_SHIFT;

		BNX2X_MAX_ISCSI_INIT_CONN_SHIFT;





	BNX2X_DEV_INFO("max_iscsi_conn 0x%x\n",

		       bp->cnic_eth_dev.max_iscsi_conn);



	/*

	 * If maximum allowed number of connections is zero -

	 * disable the feature.

	 */

	if (!bp->cnic_eth_dev.max_iscsi_conn)

		bp->flags |= NO_ISCSI_FLAG;

}



static void __devinit bnx2x_get_fcoe_info(struct bnx2x *bp)

{

	int port = BP_PORT(bp);

	int func = BP_ABS_FUNC(bp);



	u32 max_fcoe_conn = FW_ENCODE_32BIT_PATTERN ^ SHMEM_RD(bp,

				drv_lic_key[port].max_fcoe_conn);



	/* Get the number of maximum allowed FCoE connections */

	bp->cnic_eth_dev.max_fcoe_conn =

	bp->cnic_eth_dev.max_fcoe_conn =

		(max_fcoe_conn & BNX2X_MAX_FCOE_INIT_CONN_MASK) >>

		(max_fcoe_conn & BNX2X_MAX_FCOE_INIT_CONN_MASK) >>

		BNX2X_MAX_FCOE_INIT_CONN_SHIFT;

		BNX2X_MAX_FCOE_INIT_CONN_SHIFT;
@@ -9334,20 +9351,26 @@ static void __devinit bnx2x_get_cnic_info(struct bnx2x *bp) 
		}

		}

	}

	}





	BNX2X_DEV_INFO("max_iscsi_conn 0x%x max_fcoe_conn 0x%x\n",

	BNX2X_DEV_INFO("max_fcoe_conn 0x%x\n", bp->cnic_eth_dev.max_fcoe_conn);

		       bp->cnic_eth_dev.max_iscsi_conn,

		       bp->cnic_eth_dev.max_fcoe_conn);





	/*

	/*

	 * If maximum allowed number of connections is zero -

	 * If maximum allowed number of connections is zero -

	 * disable the feature.

	 * disable the feature.

	 */

	 */

	if (!bp->cnic_eth_dev.max_iscsi_conn)

		bp->flags |= NO_ISCSI_OOO_FLAG | NO_ISCSI_FLAG;



	if (!bp->cnic_eth_dev.max_fcoe_conn)

	if (!bp->cnic_eth_dev.max_fcoe_conn)

		bp->flags |= NO_FCOE_FLAG;

		bp->flags |= NO_FCOE_FLAG;

}

}



static void __devinit bnx2x_get_cnic_info(struct bnx2x *bp)

{

	/*

	 * iSCSI may be dynamically disabled but reading

	 * info here we will decrease memory usage by driver

	 * if the feature is disabled for good

	 */

	bnx2x_get_iscsi_info(bp);

	bnx2x_get_fcoe_info(bp);

}

#endif

#endif





static void __devinit bnx2x_get_mac_hwinfo(struct bnx2x *bp)

static void __devinit bnx2x_get_mac_hwinfo(struct bnx2x *bp)