Commit a4bc3379 authored by James Smart's avatar James Smart Committed by James Bottomley
Browse files

[SCSI] lpfc 8.1.11 : Fix lpfc_multi_ring_support 



It was not accounted for in the fast/slow rings.
Genericize the implementation and control it via sysfs

Signed-off-by: default avatarJames Smart <James.Smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 2fb9bd8b

drivers/scsi/lpfc/lpfc.h

+2 −0
Original line number Diff line number Diff line
@@ -296,6 +296,8 @@ struct lpfc_hba { 
	uint32_t cfg_cr_delay;

	uint32_t cfg_cr_count;

	uint32_t cfg_multi_ring_support;

	uint32_t cfg_multi_ring_rctl;

	uint32_t cfg_multi_ring_type;

	uint32_t cfg_fdmi_on;

	uint32_t cfg_discovery_threads;

	uint32_t cfg_max_luns;

drivers/scsi/lpfc/lpfc_attr.c

+20 −1
Original line number Diff line number Diff line
@@ -802,7 +802,6 @@ static CLASS_DEVICE_ATTR(lpfc_devloss_tmo, S_IRUGO | S_IWUSR, 
# LOG_MBOX                      0x4        Mailbox events

# LOG_INIT                      0x8        Initialization events

# LOG_LINK_EVENT                0x10       Link events

# LOG_IP                        0x20       IP traffic history

# LOG_FCP                       0x40       FCP traffic history

# LOG_NODE                      0x80       Node table events

# LOG_MISC                      0x400      Miscellaneous events
@@ -915,6 +914,22 @@ LPFC_ATTR_RW(cr_count, 1, 1, 255, "A count of I/O completions after which an " 
LPFC_ATTR_R(multi_ring_support, 1, 1, 2, "Determines number of primary "

		"SLI rings to spread IOCB entries across");



/*

# lpfc_multi_ring_rctl:  If lpfc_multi_ring_support is enabled, this

# identifies what rctl value to configure the additional ring for.

# Value range is [1,0xff]. Default value is 4 (Unsolicated Data).

*/

LPFC_ATTR_R(multi_ring_rctl, FC_UNSOL_DATA, 1,

	     255, "Identifies RCTL for additional ring configuration");



/*

# lpfc_multi_ring_type:  If lpfc_multi_ring_support is enabled, this

# identifies what type value to configure the additional ring for.

# Value range is [1,0xff]. Default value is 5 (LLC/SNAP).

*/

LPFC_ATTR_R(multi_ring_type, FC_LLC_SNAP, 1,

	     255, "Identifies TYPE for additional ring configuration");



/*

# lpfc_fdmi_on: controls FDMI support.

#       0 = no FDMI support
@@ -974,6 +989,8 @@ struct class_device_attribute *lpfc_host_attrs[] = { 
	&class_device_attr_lpfc_cr_delay,

	&class_device_attr_lpfc_cr_count,

	&class_device_attr_lpfc_multi_ring_support,

	&class_device_attr_lpfc_multi_ring_rctl,

	&class_device_attr_lpfc_multi_ring_type,

	&class_device_attr_lpfc_fdmi_on,

	&class_device_attr_lpfc_max_luns,

	&class_device_attr_nport_evt_cnt,
@@ -1771,6 +1788,8 @@ lpfc_get_cfgparam(struct lpfc_hba *phba) 
	lpfc_cr_delay_init(phba, lpfc_cr_delay);

	lpfc_cr_count_init(phba, lpfc_cr_count);

	lpfc_multi_ring_support_init(phba, lpfc_multi_ring_support);

	lpfc_multi_ring_rctl_init(phba, lpfc_multi_ring_rctl);

	lpfc_multi_ring_type_init(phba, lpfc_multi_ring_type);

	lpfc_lun_queue_depth_init(phba, lpfc_lun_queue_depth);

	lpfc_fcp_class_init(phba, lpfc_fcp_class);

	lpfc_use_adisc_init(phba, lpfc_use_adisc);

drivers/scsi/lpfc/lpfc_els.c

+3 −3
Original line number Diff line number Diff line
@@ -1128,7 +1128,7 @@ lpfc_cmpl_els_adisc(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb, 
						mempool_free(mbox,

						     phba->mbox_mem_pool);

						lpfc_disc_flush_list(phba);

						psli->ring[(psli->ip_ring)].

						psli->ring[(psli->extra_ring)].

						    flag &=

						    ~LPFC_STOP_IOCB_EVENT;

						psli->ring[(psli->fcp_ring)].
@@ -3046,7 +3046,7 @@ lpfc_els_rcv_farp(struct lpfc_hba * phba, 
	/* FARP-REQ received from DID <did> */

	lpfc_printf_log(phba,

			 KERN_INFO,

			 LOG_IP,

			 LOG_ELS,

			 "%d:0601 FARP-REQ received from DID x%x\n",

			 phba->brd_no, did);
@@ -3108,7 +3108,7 @@ lpfc_els_rcv_farpr(struct lpfc_hba * phba, 
	/* FARP-RSP received from DID <did> */

	lpfc_printf_log(phba,

			 KERN_INFO,

			 LOG_IP,

			 LOG_ELS,

			 "%d:0600 FARP-RSP received from DID x%x\n",

			 phba->brd_no, did);

drivers/scsi/lpfc/lpfc_hbadisc.c

+6 −6
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ lpfc_mbx_cmpl_clear_la(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb) 
	psli = &phba->sli;

	mb = &pmb->mb;

	/* Since we don't do discovery right now, turn these off here */

	psli->ring[psli->ip_ring].flag &= ~LPFC_STOP_IOCB_EVENT;

	psli->ring[psli->extra_ring].flag &= ~LPFC_STOP_IOCB_EVENT;

	psli->ring[psli->fcp_ring].flag &= ~LPFC_STOP_IOCB_EVENT;

	psli->ring[psli->next_ring].flag &= ~LPFC_STOP_IOCB_EVENT;
@@ -641,7 +641,7 @@ lpfc_mbx_cmpl_local_config_link(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) 
	if (rc == MBX_NOT_FINISHED) {

		mempool_free(pmb, phba->mbox_mem_pool);

		lpfc_disc_flush_list(phba);

		psli->ring[(psli->ip_ring)].flag &= ~LPFC_STOP_IOCB_EVENT;

		psli->ring[(psli->extra_ring)].flag &= ~LPFC_STOP_IOCB_EVENT;

		psli->ring[(psli->fcp_ring)].flag &= ~LPFC_STOP_IOCB_EVENT;

		psli->ring[(psli->next_ring)].flag &= ~LPFC_STOP_IOCB_EVENT;

		phba->hba_state = LPFC_HBA_READY;
@@ -696,7 +696,7 @@ lpfc_mbx_cmpl_read_sparam(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb) 
		    == MBX_NOT_FINISHED) {

			mempool_free( pmb, phba->mbox_mem_pool);

			lpfc_disc_flush_list(phba);

			psli->ring[(psli->ip_ring)].flag &=

			psli->ring[(psli->extra_ring)].flag &=

			    ~LPFC_STOP_IOCB_EVENT;

			psli->ring[(psli->fcp_ring)].flag &=

			    ~LPFC_STOP_IOCB_EVENT;
@@ -1424,7 +1424,7 @@ lpfc_check_sli_ndlp(struct lpfc_hba * phba, 
			if (iocb->context1 == (uint8_t *) ndlp)

				return 1;

		}

	} else if (pring->ringno == psli->ip_ring) {

	} else if (pring->ringno == psli->extra_ring) {



	} else if (pring->ringno == psli->fcp_ring) {

		/* Skip match check if waiting to relogin to FCP target */
@@ -1889,7 +1889,7 @@ lpfc_disc_start(struct lpfc_hba * phba) 
			if (rc == MBX_NOT_FINISHED) {

				mempool_free( mbox, phba->mbox_mem_pool);

				lpfc_disc_flush_list(phba);

				psli->ring[(psli->ip_ring)].flag &=

				psli->ring[(psli->extra_ring)].flag &=

					~LPFC_STOP_IOCB_EVENT;

				psli->ring[(psli->fcp_ring)].flag &=

					~LPFC_STOP_IOCB_EVENT;
@@ -2268,7 +2268,7 @@ lpfc_disc_timeout_handler(struct lpfc_hba *phba) 


	if (clrlaerr) {

		lpfc_disc_flush_list(phba);

		psli->ring[(psli->ip_ring)].flag &= ~LPFC_STOP_IOCB_EVENT;

		psli->ring[(psli->extra_ring)].flag &= ~LPFC_STOP_IOCB_EVENT;

		psli->ring[(psli->fcp_ring)].flag &= ~LPFC_STOP_IOCB_EVENT;

		psli->ring[(psli->next_ring)].flag &= ~LPFC_STOP_IOCB_EVENT;

		phba->hba_state = LPFC_HBA_READY;

drivers/scsi/lpfc/lpfc_hw.h

+3 −3
Original line number Diff line number Diff line
@@ -42,14 +42,14 @@ 
#define FCELSSIZE             1024	/* maximum ELS transfer size */



#define LPFC_FCP_RING            0	/* ring 0 for FCP initiator commands */

#define LPFC_IP_RING             1	/* ring 1 for IP commands */

#define LPFC_EXTRA_RING          1	/* ring 1 for other protocols */

#define LPFC_ELS_RING            2	/* ring 2 for ELS commands */

#define LPFC_FCP_NEXT_RING       3



#define SLI2_IOCB_CMD_R0_ENTRIES    172	/* SLI-2 FCP command ring entries */

#define SLI2_IOCB_RSP_R0_ENTRIES    134	/* SLI-2 FCP response ring entries */

#define SLI2_IOCB_CMD_R1_ENTRIES      4	/* SLI-2 IP command ring entries */

#define SLI2_IOCB_RSP_R1_ENTRIES      4	/* SLI-2 IP response ring entries */

#define SLI2_IOCB_CMD_R1_ENTRIES      4	/* SLI-2 extra command ring entries */

#define SLI2_IOCB_RSP_R1_ENTRIES      4	/* SLI-2 extra response ring entries */

#define SLI2_IOCB_CMD_R1XTRA_ENTRIES 36	/* SLI-2 extra FCP cmd ring entries */

#define SLI2_IOCB_RSP_R1XTRA_ENTRIES 52	/* SLI-2 extra FCP rsp ring entries */

#define SLI2_IOCB_CMD_R2_ENTRIES     20	/* SLI-2 ELS command ring entries */