Commit 99e1b683 authored by Quinn Tran's avatar Quinn Tran Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Add ql2xiniexchg parameter 



Previously, the ql2xexchoffld module parameter was used to control the
max number of exchanges to be offload onto host memory.

Module parameter ql_dm_tgt_ex_pct was used to control the percentage of
exchanges allocated to the Target side.

With this patch, module parameter ql_dm_tgt_ex_pct is no longer used to
control exchanges for the driver. New module parameter ql2xiniexchg is
added to control exchanges between target mode and initiator mode.

With the updated module parameters, users can control the exact number
of exchanges for either Initiator or Target. The exchange offload
feature will be automatically enabled when the total number of exchanges
exceeds 2048 limit.

Signed-off-by: default avatarQuinn Tran <quinn.tran@cavium.com>
Signed-off-by: default avatarHimanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent f7e761f5

drivers/scsi/qla2xxx/qla_def.h

+5 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ struct name_list_extended { 
#define RESPONSE_ENTRY_CNT_MQ		128	/* Number of response entries.*/

#define ATIO_ENTRY_CNT_24XX		4096	/* Number of ATIO entries. */

#define RESPONSE_ENTRY_CNT_FX00		256     /* Number of response entries.*/

#define EXTENDED_EXCH_ENTRY_CNT		32768   /* Entries for offload case */

#define FW_DEF_EXCHANGES_CNT 2048



struct req_que;

struct qla_tgt_sess;
@@ -3593,6 +3593,10 @@ struct qla_hw_data { 
#define IS_SHADOW_REG_CAPABLE(ha)  (IS_QLA27XX(ha))

#define IS_DPORT_CAPABLE(ha)  (IS_QLA83XX(ha) || IS_QLA27XX(ha))

#define IS_FAWWN_CAPABLE(ha)	(IS_QLA83XX(ha) || IS_QLA27XX(ha))

#define IS_EXCHG_OFFLD_CAPABLE(ha) \

	(IS_QLA81XX(ha) || IS_QLA83XX(ha) || IS_QLA27XX(ha))

#define IS_EXLOGIN_OFFLD_CAPABLE(ha) \

	(IS_QLA25XX(ha) || IS_QLA81XX(ha) || IS_QLA83XX(ha) || IS_QLA27XX(ha))



	/* HBA serial number */

	uint8_t		serial0;

drivers/scsi/qla2xxx/qla_gbl.h

+2 −1
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ extern int ql2xmdcapmask; 
extern int ql2xmdenable;

extern int ql2xexlogins;

extern int ql2xexchoffld;

extern int ql2xiniexchg;

extern int ql2xfwholdabts;

extern int ql2xmvasynctoatio;
@@ -839,7 +840,7 @@ extern int qla_get_exlogin_status(scsi_qla_host_t *, uint16_t *, 
	uint16_t *);

extern int qla_set_exlogin_mem_cfg(scsi_qla_host_t *vha, dma_addr_t phys_addr);

extern int qla_get_exchoffld_status(scsi_qla_host_t *, uint16_t *, uint16_t *);

extern int qla_set_exchoffld_mem_cfg(scsi_qla_host_t *, dma_addr_t);

extern int qla_set_exchoffld_mem_cfg(scsi_qla_host_t *);

extern void qlt_handle_abts_recv(struct scsi_qla_host *, response_t *);



int qla24xx_async_notify_ack(scsi_qla_host_t *, fc_port_t *,

drivers/scsi/qla2xxx/qla_init.c

+1 −1
Original line number Diff line number Diff line
@@ -2723,7 +2723,7 @@ qla2x00_setup_chip(scsi_qla_host_t *vha) 
			if (ql2xexlogins)

				ha->flags.exlogins_enabled = 1;



			if (ql2xexchoffld)

			if (qla_is_exch_offld_enabled(vha))

				ha->flags.exchoffld_enabled = 1;



			rval = qla2x00_execute_fw(vha, srisc_address);

drivers/scsi/qla2xxx/qla_inline.h

+16 −0
Original line number Diff line number Diff line
@@ -307,3 +307,19 @@ qla2x00_set_retry_delay_timestamp(fc_port_t *fcport, uint16_t retry_delay) 
		fcport->retry_delay_timestamp = jiffies +

		    (retry_delay * HZ / 10);

}



static inline bool

qla_is_exch_offld_enabled(struct scsi_qla_host *vha)

{

	if (qla_ini_mode_enabled(vha) &&

	    (ql2xiniexchg > FW_DEF_EXCHANGES_CNT))

		return true;

	else if (qla_tgt_mode_enabled(vha) &&

	    (ql2xexchoffld > FW_DEF_EXCHANGES_CNT))

		return true;

	else if (qla_dual_mode_enabled(vha) &&

	    ((ql2xiniexchg + ql2xexchoffld) > FW_DEF_EXCHANGES_CNT))

		return true;

	else

		return false;

}

drivers/scsi/qla2xxx/qla_mbx.c

+7 −7
Original line number Diff line number Diff line
@@ -821,7 +821,7 @@ qla_get_exchoffld_status(scsi_qla_host_t *vha, uint16_t *buf_sz, 
 */

#define CONFIG_XCHOFFLD_MEM	0x3

int

qla_set_exchoffld_mem_cfg(scsi_qla_host_t *vha, dma_addr_t phys_addr)

qla_set_exchoffld_mem_cfg(scsi_qla_host_t *vha)

{

	int		rval;

	mbx_cmd_t	mc;
@@ -834,12 +834,12 @@ qla_set_exchoffld_mem_cfg(scsi_qla_host_t *vha, dma_addr_t phys_addr) 
	memset(mcp->mb, 0 , sizeof(mcp->mb));

	mcp->mb[0] = MBC_GET_MEM_OFFLOAD_CNTRL_STAT;

	mcp->mb[1] = CONFIG_XCHOFFLD_MEM;

	mcp->mb[2] = MSW(phys_addr);

	mcp->mb[3] = LSW(phys_addr);

	mcp->mb[6] = MSW(MSD(phys_addr));

	mcp->mb[7] = LSW(MSD(phys_addr));

	mcp->mb[8] = MSW(ha->exlogin_size);

	mcp->mb[9] = LSW(ha->exlogin_size);

	mcp->mb[2] = MSW(ha->exchoffld_buf_dma);

	mcp->mb[3] = LSW(ha->exchoffld_buf_dma);

	mcp->mb[6] = MSW(MSD(ha->exchoffld_buf_dma));

	mcp->mb[7] = LSW(MSD(ha->exchoffld_buf_dma));

	mcp->mb[8] = MSW(ha->exchoffld_size);

	mcp->mb[9] = LSW(ha->exchoffld_size);

	mcp->out_mb = MBX_9|MBX_8|MBX_7|MBX_6|MBX_3|MBX_2|MBX_1|MBX_0;

	mcp->in_mb = MBX_11|MBX_0;

	mcp->tov = MBX_TOV_SECONDS;