[SCSI] lpfc 8.3.9: Discovery changes to the lpfc driver. (ecfd03c6) · Commits · e / devices / android_kernel_sony_msm8998

drivers/scsi/lpfc/lpfc_crtn.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -78,6 +78,7 @@ void lpfc_set_disctmo(struct lpfc_vport *);
		int lpfc_can_disctmo(struct lpfc_vport *);
		int lpfc_unreg_rpi(struct lpfc_vport , struct lpfc_nodelist );
		void lpfc_unreg_all_rpis(struct lpfc_vport *);
		void lpfc_unreg_hba_rpis(struct lpfc_hba *);
		void lpfc_unreg_default_rpis(struct lpfc_vport *);
		void lpfc_issue_reg_vpi(struct lpfc_hba , struct lpfc_vport );

		@@ -202,6 +203,7 @@ void lpfc_reg_fcfi(struct lpfc_hba , struct lpfcMboxq );
		void lpfc_unreg_fcfi(struct lpfcMboxq *, uint16_t);
		void lpfc_resume_rpi(struct lpfcMboxq , struct lpfc_nodelist );
		int lpfc_check_pending_fcoe_event(struct lpfc_hba *, uint8_t);
		void lpfc_issue_init_vpi(struct lpfc_vport *);

		void lpfc_config_hbq(struct lpfc_hba , uint32_t, struct lpfc_hbq_init ,
		uint32_t , LPFC_MBOXQ_t *);
		@@ -211,7 +213,11 @@ struct hbq_dmabuf lpfc_sli4_rb_alloc(struct lpfc_hba );
		void lpfc_sli4_rb_free(struct lpfc_hba , struct hbq_dmabuf );
		void lpfc_sli4_build_dflt_fcf_record(struct lpfc_hba , struct fcf_record ,
		uint16_t);
		void lpfc_unregister_fcf(struct lpfc_hba *);
		void lpfc_unregister_fcf_rescan(struct lpfc_hba *);
		void lpfc_unregister_unused_fcf(struct lpfc_hba *);
		int lpfc_sli4_redisc_fcf_table(struct lpfc_hba *);
		void lpfc_fcf_redisc_wait_start_timer(struct lpfc_hba *);

		int lpfc_mem_alloc(struct lpfc_hba *, int align);
		void lpfc_mem_free(struct lpfc_hba *);
		@@ -370,6 +376,8 @@ void lpfc_free_fast_evt(struct lpfc_hba , struct lpfc_fast_path_event );
		void lpfc_create_static_vport(struct lpfc_hba *);
		void lpfc_stop_hba_timers(struct lpfc_hba *);
		void lpfc_stop_port(struct lpfc_hba *);
		void __lpfc_sli4_stop_fcf_redisc_wait_timer(struct lpfc_hba *);
		void lpfc_sli4_stop_fcf_redisc_wait_timer(struct lpfc_hba *);
		void lpfc_parse_fcoe_conf(struct lpfc_hba , uint8_t , uint32_t);
		int lpfc_parse_vpd(struct lpfc_hba , uint8_t , int);
		void lpfc_start_fdiscs(struct lpfc_hba *phba);

drivers/scsi/lpfc/lpfc_els.c

+14 −2

Original line number	Diff line number	Diff line
		@@ -589,6 +589,15 @@ lpfc_cmpl_els_flogi_fabric(struct lpfc_vport vport, struct lpfc_nodelist ndlp,
		vport->fc_flag \|= FC_VPORT_NEEDS_REG_VPI;
		spin_unlock_irq(shost->host_lock);
		}
		/*
		* If VPI is unreged, driver need to do INIT_VPI
		* before re-registering
		*/
		if (phba->sli_rev == LPFC_SLI_REV4) {
		spin_lock_irq(shost->host_lock);
		vport->fc_flag \|= FC_VPORT_NEEDS_INIT_VPI;
		spin_unlock_irq(shost->host_lock);
		}
		}

		if (phba->sli_rev < LPFC_SLI_REV4) {
		@@ -606,7 +615,7 @@ lpfc_cmpl_els_flogi_fabric(struct lpfc_vport vport, struct lpfc_nodelist ndlp,
		lpfc_start_fdiscs(phba);
		lpfc_do_scr_ns_plogi(phba, vport);
		} else if (vport->fc_flag & FC_VFI_REGISTERED)
		lpfc_register_new_vport(phba, vport, ndlp);
		lpfc_issue_init_vpi(vport);
		else
		lpfc_issue_reg_vfi(vport);
		}
		@@ -6210,10 +6219,13 @@ lpfc_cmpl_els_fdisc(struct lpfc_hba phba, struct lpfc_iocbq cmdiocb,
		lpfc_mbx_unreg_vpi(vport);
		spin_lock_irq(shost->host_lock);
		vport->fc_flag \|= FC_VPORT_NEEDS_REG_VPI;
		vport->fc_flag \|= FC_VPORT_NEEDS_INIT_VPI;
		spin_unlock_irq(shost->host_lock);
		}

		if (vport->fc_flag & FC_VPORT_NEEDS_REG_VPI)
		if (vport->fc_flag & FC_VPORT_NEEDS_INIT_VPI)
		lpfc_issue_init_vpi(vport);
		else if (vport->fc_flag & FC_VPORT_NEEDS_REG_VPI)
		lpfc_register_new_vport(phba, vport, ndlp);
		else
		lpfc_do_scr_ns_plogi(phba, vport);

drivers/scsi/lpfc/lpfc_hbadisc.c

+446 −226

File changed.

Preview size limit exceeded, changes collapsed.

drivers/scsi/lpfc/lpfc_hw4.h

+16 −0

Original line number	Diff line number	Diff line
		@@ -797,6 +797,7 @@ struct mbox_header {
		#define LPFC_MBOX_OPCODE_FCOE_ADD_FCF 0x09
		#define LPFC_MBOX_OPCODE_FCOE_DELETE_FCF 0x0A
		#define LPFC_MBOX_OPCODE_FCOE_POST_HDR_TEMPLATE 0x0B
		#define LPFC_MBOX_OPCODE_FCOE_REDISCOVER_FCF 0x10

		/* Mailbox command structures */
		struct eq_context {
		@@ -1297,6 +1298,19 @@ struct lpfc_mbx_del_fcf_tbl_entry {
		#define lpfc_mbx_del_fcf_tbl_index_WORD word10
		};

		struct lpfc_mbx_redisc_fcf_tbl {
		struct mbox_header header;
		uint32_t word10;
		#define lpfc_mbx_redisc_fcf_count_SHIFT 0
		#define lpfc_mbx_redisc_fcf_count_MASK 0x0000FFFF
		#define lpfc_mbx_redisc_fcf_count_WORD word10
		uint32_t resvd;
		uint32_t word12;
		#define lpfc_mbx_redisc_fcf_index_SHIFT 0
		#define lpfc_mbx_redisc_fcf_index_MASK 0x0000FFFF
		#define lpfc_mbx_redisc_fcf_index_WORD word12
		};

		struct lpfc_mbx_query_fw_cfg {
		struct mbox_header header;
		uint32_t config_number;
		@@ -1859,6 +1873,7 @@ struct lpfc_mqe {
		struct lpfc_mbx_read_fcf_tbl read_fcf_tbl;
		struct lpfc_mbx_add_fcf_tbl_entry add_fcf_entry;
		struct lpfc_mbx_del_fcf_tbl_entry del_fcf_entry;
		struct lpfc_mbx_redisc_fcf_tbl redisc_fcf_tbl;
		struct lpfc_mbx_reg_fcfi reg_fcfi;
		struct lpfc_mbx_unreg_fcfi unreg_fcfi;
		struct lpfc_mbx_mq_create mq_create;
		@@ -1975,6 +1990,7 @@ struct lpfc_acqe_fcoe {
		#define LPFC_FCOE_EVENT_TYPE_FCF_TABLE_FULL 0x2
		#define LPFC_FCOE_EVENT_TYPE_FCF_DEAD 0x3
		#define LPFC_FCOE_EVENT_TYPE_CVL 0x4
		#define LPFC_FCOE_EVENT_TYPE_FCF_PARAM_MOD 0x5
		uint32_t event_tag;
		uint32_t trailer;
		};

drivers/scsi/lpfc/lpfc_init.c

+154 −10

Original line number	Diff line number	Diff line
		@@ -2072,6 +2072,44 @@ lpfc_stop_vport_timers(struct lpfc_vport *vport)
		return;
		}

		/**
		* __lpfc_sli4_stop_fcf_redisc_wait_timer - Stop FCF rediscovery wait timer
		* @phba: pointer to lpfc hba data structure.
		*
		* This routine stops the SLI4 FCF rediscover wait timer if it's on. The
		* caller of this routine should already hold the host lock.
		**/
		void
		__lpfc_sli4_stop_fcf_redisc_wait_timer(struct lpfc_hba *phba)
		{
		/* Clear pending FCF rediscovery wait timer */
		phba->fcf.fcf_flag &= ~FCF_REDISC_PEND;
		/* Now, try to stop the timer */
		del_timer(&phba->fcf.redisc_wait);
		}

		/**
		* lpfc_sli4_stop_fcf_redisc_wait_timer - Stop FCF rediscovery wait timer
		* @phba: pointer to lpfc hba data structure.
		*
		* This routine stops the SLI4 FCF rediscover wait timer if it's on. It
		* checks whether the FCF rediscovery wait timer is pending with the host
		* lock held before proceeding with disabling the timer and clearing the
		* wait timer pendig flag.
		**/
		void
		lpfc_sli4_stop_fcf_redisc_wait_timer(struct lpfc_hba *phba)
		{
		spin_lock_irq(&phba->hbalock);
		if (!(phba->fcf.fcf_flag & FCF_REDISC_PEND)) {
		/* FCF rediscovery timer already fired or stopped */
		spin_unlock_irq(&phba->hbalock);
		return;
		}
		__lpfc_sli4_stop_fcf_redisc_wait_timer(phba);
		spin_unlock_irq(&phba->hbalock);
		}

		/**
		* lpfc_stop_hba_timers - Stop all the timers associated with an HBA
		* @phba: pointer to lpfc hba data structure.
		@@ -2096,6 +2134,7 @@ lpfc_stop_hba_timers(struct lpfc_hba *phba)
		break;
		case LPFC_PCI_DEV_OC:
		/* Stop any OneConnect device sepcific driver timers */
		lpfc_sli4_stop_fcf_redisc_wait_timer(phba);
		break;
		default:
		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
		@@ -2706,7 +2745,7 @@ lpfc_sli_remove_dflt_fcf(struct lpfc_hba *phba)
		del_fcf_record = &mboxq->u.mqe.un.del_fcf_entry;
		bf_set(lpfc_mbx_del_fcf_tbl_count, del_fcf_record, 1);
		bf_set(lpfc_mbx_del_fcf_tbl_index, del_fcf_record,
		phba->fcf.fcf_indx);
		phba->fcf.current_rec.fcf_indx);

		if (!phba->sli4_hba.intr_enable)
		rc = lpfc_sli_issue_mbox(phba, mboxq, MBX_POLL);
		@@ -2729,6 +2768,57 @@ lpfc_sli_remove_dflt_fcf(struct lpfc_hba *phba)
		mempool_free(mboxq, phba->mbox_mem_pool);
		}

		/**
		* lpfc_fcf_redisc_wait_start_timer - Start fcf rediscover wait timer
		* @phba: Pointer to hba for which this call is being executed.
		*
		* This routine starts the timer waiting for the FCF rediscovery to complete.
		**/
		void
		lpfc_fcf_redisc_wait_start_timer(struct lpfc_hba *phba)
		{
		unsigned long fcf_redisc_wait_tmo =
		(jiffies + msecs_to_jiffies(LPFC_FCF_REDISCOVER_WAIT_TMO));
		/* Start fcf rediscovery wait period timer */
		mod_timer(&phba->fcf.redisc_wait, fcf_redisc_wait_tmo);
		spin_lock_irq(&phba->hbalock);
		/* Allow action to new fcf asynchronous event */
		phba->fcf.fcf_flag &= ~(FCF_AVAILABLE \| FCF_SCAN_DONE);
		/* Mark the FCF rediscovery pending state */
		phba->fcf.fcf_flag \|= FCF_REDISC_PEND;
		spin_unlock_irq(&phba->hbalock);
		}

		/**
		* lpfc_sli4_fcf_redisc_wait_tmo - FCF table rediscover wait timeout
		* @ptr: Map to lpfc_hba data structure pointer.
		*
		* This routine is invoked when waiting for FCF table rediscover has been
		* timed out. If new FCF record(s) has (have) been discovered during the
		* wait period, a new FCF event shall be added to the FCOE async event
		* list, and then worker thread shall be waked up for processing from the
		* worker thread context.
		**/
		void
		lpfc_sli4_fcf_redisc_wait_tmo(unsigned long ptr)
		{
		struct lpfc_hba phba = (struct lpfc_hba )ptr;

		/* Don't send FCF rediscovery event if timer cancelled */
		spin_lock_irq(&phba->hbalock);
		if (!(phba->fcf.fcf_flag & FCF_REDISC_PEND)) {
		spin_unlock_irq(&phba->hbalock);
		return;
		}
		/* Clear FCF rediscovery timer pending flag */
		phba->fcf.fcf_flag &= ~FCF_REDISC_PEND;
		/* FCF rediscovery event to worker thread */
		phba->fcf.fcf_flag \|= FCF_REDISC_EVT;
		spin_unlock_irq(&phba->hbalock);
		/* wake up worker thread */
		lpfc_worker_wake_up(phba);
		}

		/**
		* lpfc_sli4_fw_cfg_check - Read the firmware config and verify FCoE support
		* @phba: pointer to lpfc hba data structure.
		@@ -3020,17 +3110,26 @@ lpfc_sli4_async_fcoe_evt(struct lpfc_hba *phba,
		phba->fcoe_eventtag = acqe_fcoe->event_tag;
		switch (event_type) {
		case LPFC_FCOE_EVENT_TYPE_NEW_FCF:
		case LPFC_FCOE_EVENT_TYPE_FCF_PARAM_MOD:
		lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY,
		"2546 New FCF found index 0x%x tag 0x%x\n",
		acqe_fcoe->index,
		acqe_fcoe->event_tag);
		/*
		* If the current FCF is in discovered state, or
		* FCF discovery is in progress do nothing.
		*/
		spin_lock_irq(&phba->hbalock);
		if ((phba->fcf.fcf_flag & FCF_DISCOVERED) \|\|
		if ((phba->fcf.fcf_flag & FCF_SCAN_DONE) \|\|
		(phba->hba_flag & FCF_DISC_INPROGRESS)) {
		/*
		* If the current FCF is in discovered state or
		* FCF discovery is in progress, do nothing.
		*/
		spin_unlock_irq(&phba->hbalock);
		break;
		}
		if (phba->fcf.fcf_flag & FCF_REDISC_EVT) {
		/*
		* If fast FCF failover rescan event is pending,
		* do nothing.
		*/
		spin_unlock_irq(&phba->hbalock);
		break;
		}
		@@ -3057,7 +3156,7 @@ lpfc_sli4_async_fcoe_evt(struct lpfc_hba *phba,
		" tag 0x%x\n", acqe_fcoe->index,
		acqe_fcoe->event_tag);
		/* If the event is not for currently used fcf do nothing */
		if (phba->fcf.fcf_indx != acqe_fcoe->index)
		if (phba->fcf.current_rec.fcf_indx != acqe_fcoe->index)
		break;
		/*
		* Currently, driver support only one FCF - so treat this as
		@@ -3121,6 +3220,18 @@ lpfc_sli4_async_fcoe_evt(struct lpfc_hba *phba,
		ndlp->nlp_last_elscmd = ELS_CMD_FDISC;
		vport->port_state = LPFC_FDISC;
		} else {
		/*
		* Otherwise, we request port to rediscover
		* the entire FCF table for a fast recovery
		* from possible case that the current FCF
		* is no longer valid.
		*/
		rc = lpfc_sli4_redisc_fcf_table(phba);
		if (rc)
		/*
		* Last resort will be re-try on the
		* the current registered FCF entry.
		*/
		lpfc_retry_pport_discovery(phba);
		}
		break;
		@@ -3197,6 +3308,34 @@ void lpfc_sli4_async_event_proc(struct lpfc_hba *phba)
		}
		}

		/**
		* lpfc_sli4_fcf_redisc_event_proc - Process fcf table rediscovery event
		* @phba: pointer to lpfc hba data structure.
		*
		* This routine is invoked by the worker thread to process FCF table
		* rediscovery pending completion event.
		**/
		void lpfc_sli4_fcf_redisc_event_proc(struct lpfc_hba *phba)
		{
		int rc;

		spin_lock_irq(&phba->hbalock);
		/* Clear FCF rediscovery timeout event */
		phba->fcf.fcf_flag &= ~FCF_REDISC_EVT;
		/* Clear driver fast failover FCF record flag */
		phba->fcf.failover_rec.flag = 0;
		/* Set state for FCF fast failover */
		phba->fcf.fcf_flag \|= FCF_REDISC_FOV;
		spin_unlock_irq(&phba->hbalock);

		/* Scan FCF table from the first entry to re-discover SAN */
		rc = lpfc_sli4_read_fcf_record(phba, LPFC_FCOE_FCF_GET_FIRST);
		if (rc)
		lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY,
		"2747 Post FCF rediscovery read FCF record "
		"failed 0x%x\n", rc);
		}

		/**
		* lpfc_api_table_setup - Set up per hba pci-device group func api jump table
		* @phba: pointer to lpfc hba data structure.
		@@ -3512,6 +3651,11 @@ lpfc_sli4_driver_resource_setup(struct lpfc_hba *phba)
		init_timer(&phba->eratt_poll);
		phba->eratt_poll.function = lpfc_poll_eratt;
		phba->eratt_poll.data = (unsigned long) phba;
		/* FCF rediscover timer */
		init_timer(&phba->fcf.redisc_wait);
		phba->fcf.redisc_wait.function = lpfc_sli4_fcf_redisc_wait_tmo;
		phba->fcf.redisc_wait.data = (unsigned long)phba;

		/*
		* We need to do a READ_CONFIG mailbox command here before
		* calling lpfc_get_cfgparam. For VFs this will report the
		@@ -6039,7 +6183,7 @@ lpfc_sli4_fcfi_unreg(struct lpfc_hba *phba, uint16_t fcfi)
		spin_lock_irqsave(&phba->hbalock, flags);
		/* Mark the FCFI is no longer registered */
		phba->fcf.fcf_flag &=
		~(FCF_AVAILABLE \| FCF_REGISTERED \| FCF_DISCOVERED);
		~(FCF_AVAILABLE \| FCF_REGISTERED \| FCF_SCAN_DONE);
		spin_unlock_irqrestore(&phba->hbalock, flags);
		}
		}