lpfc: Modularize and cleanup FDMI code in driver (4258e98e) · Commits · 戴 / test

drivers/scsi/lpfc/lpfc.h

+10 −6

Original line number	Diff line number	Diff line
		@@ -386,7 +386,6 @@ struct lpfc_vport {
		uint32_t work_port_events; /* Timeout to be handled */
		#define WORKER_DISC_TMO 0x1 /* vport: Discovery timeout */
		#define WORKER_ELS_TMO 0x2 /* vport: ELS timeout */
		#define WORKER_FDMI_TMO 0x4 /* vport: FDMI timeout */
		#define WORKER_DELAYED_DISC_TMO 0x8 /* vport: delayed discovery */

		#define WORKER_MBOX_TMO 0x100 /* hba: MBOX timeout */
		@@ -396,7 +395,6 @@ struct lpfc_vport {
		#define WORKER_RAMP_UP_QUEUE 0x1000 /* hba: Increase Q depth */
		#define WORKER_SERVICE_TXQ 0x2000 /* hba: IOCBs on the txq */

		struct timer_list fc_fdmitmo;
		struct timer_list els_tmofunc;
		struct timer_list delayed_disc_tmo;

		@@ -405,6 +403,7 @@ struct lpfc_vport {
		uint8_t load_flag;
		#define FC_LOADING 0x1 /* HBA in process of loading drvr */
		#define FC_UNLOADING 0x2 /* HBA in process of unloading drvr */
		#define FC_ALLOW_FDMI 0x4 /* port is ready for FDMI requests */
		/* Vport Config Parameters */
		uint32_t cfg_scan_down;
		uint32_t cfg_lun_queue_depth;
		@@ -414,10 +413,6 @@ struct lpfc_vport {
		uint32_t cfg_peer_port_login;
		uint32_t cfg_fcp_class;
		uint32_t cfg_use_adisc;
		uint32_t cfg_fdmi_on;
		#define LPFC_FDMI_SUPPORT 1 /* bit 0 - FDMI supported? */
		#define LPFC_FDMI_REG_DELAY 2 /* bit 1 - 60 sec registration delay */
		#define LPFC_FDMI_ALL_ATTRIB 4 /* bit 2 - register ALL attributes? */
		uint32_t cfg_discovery_threads;
		uint32_t cfg_log_verbose;
		uint32_t cfg_max_luns;
		@@ -443,6 +438,10 @@ struct lpfc_vport {
		unsigned long rcv_buffer_time_stamp;
		uint32_t vport_flag;
		#define STATIC_VPORT 1

		uint16_t fdmi_num_disc;
		uint32_t fdmi_hba_mask;
		uint32_t fdmi_port_mask;
		};

		struct hbq_s {
		@@ -755,6 +754,11 @@ struct lpfc_hba {
		#define LPFC_DELAY_INIT_LINK 1 /* layered driver hold off */
		#define LPFC_DELAY_INIT_LINK_INDEFINITELY 2 /* wait, manual intervention */
		uint32_t cfg_enable_dss;
		uint32_t cfg_fdmi_on;
		#define LPFC_FDMI_NO_SUPPORT 0 /* FDMI not supported */
		#define LPFC_FDMI_SUPPORT 1 /* FDMI supported? */
		#define LPFC_FDMI_SMART_SAN 2 /* SmartSAN supported */
		uint32_t cfg_enable_SmartSAN;
		lpfc_vpd_t vpd; /* vital product data */

		struct pci_dev *pcidev;

drivers/scsi/lpfc/lpfc_attr.c

+32 −14

Original line number	Diff line number	Diff line
		@@ -4572,19 +4572,27 @@ LPFC_ATTR_R(multi_ring_type, FC_TYPE_IP, 1,
		255, "Identifies TYPE for additional ring configuration");

		/*
		# lpfc_fdmi_on: controls FDMI support.
		# Set NOT Set
		# bit 0 = FDMI support no FDMI support
		# LPFC_FDMI_SUPPORT just turns basic support on/off
		# bit 1 = Register delay no register delay (60 seconds)
		# LPFC_FDMI_REG_DELAY 60 sec registration delay after FDMI login
		# bit 2 = All attributes Use a attribute subset
		# LPFC_FDMI_ALL_ATTRIB applies to both port and HBA attributes
		# Port attrutes subset: 1 thru 6 OR all: 1 thru 0xd 0x101 0x102 0x103
		# HBA attributes subset: 1 thru 0xb OR all: 1 thru 0xc
		# Value range [0,7]. Default value is 0.
		# lpfc_enable_SmartSAN: Sets up FDMI support for SmartSAN
		# 0 = SmartSAN functionality disabled (default)
		# 1 = SmartSAN functionality enabled
		# This parameter will override the value of lpfc_fdmi_on module parameter.
		# Value range is [0,1]. Default value is 0.
		*/
		LPFC_VPORT_ATTR_RW(fdmi_on, 0, 0, 7, "Enable FDMI support");
		LPFC_ATTR_R(enable_SmartSAN, 0, 0, 1, "Enable SmartSAN functionality");

		/*
		# lpfc_fdmi_on: Controls FDMI support.
		# 0 No FDMI support (default)
		# 1 Traditional FDMI support
		# 2 Smart SAN support
		# If lpfc_enable_SmartSAN is set 1, the driver sets lpfc_fdmi_on to value 2
		# overwriting the current value. If lpfc_enable_SmartSAN is set 0, the
		# driver uses the current value of lpfc_fdmi_on provided it has value 0 or 1.
		# A value of 2 with lpfc_enable_SmartSAN set to 0 causes the driver to
		# set lpfc_fdmi_on back to 1.
		# Value range [0,2]. Default value is 0.
		*/
		LPFC_ATTR_R(fdmi_on, 0, 0, 2, "Enable FDMI support");

		/*
		# Specifies the maximum number of ELS cmds we can have outstanding (for
		@@ -4815,6 +4823,7 @@ struct device_attribute *lpfc_hba_attrs[] = {
		&dev_attr_lpfc_multi_ring_rctl,
		&dev_attr_lpfc_multi_ring_type,
		&dev_attr_lpfc_fdmi_on,
		&dev_attr_lpfc_enable_SmartSAN,
		&dev_attr_lpfc_max_luns,
		&dev_attr_lpfc_enable_npiv,
		&dev_attr_lpfc_fcf_failover_policy,
		@@ -4887,7 +4896,6 @@ struct device_attribute *lpfc_vport_attrs[] = {
		&dev_attr_lpfc_fcp_class,
		&dev_attr_lpfc_use_adisc,
		&dev_attr_lpfc_first_burst_size,
		&dev_attr_lpfc_fdmi_on,
		&dev_attr_lpfc_max_luns,
		&dev_attr_nport_evt_cnt,
		&dev_attr_npiv_info,
		@@ -5826,6 +5834,8 @@ lpfc_get_cfgparam(struct lpfc_hba *phba)
		lpfc_enable_npiv_init(phba, lpfc_enable_npiv);
		lpfc_fcf_failover_policy_init(phba, lpfc_fcf_failover_policy);
		lpfc_enable_rrq_init(phba, lpfc_enable_rrq);
		lpfc_fdmi_on_init(phba, lpfc_fdmi_on);
		lpfc_enable_SmartSAN_init(phba, lpfc_enable_SmartSAN);
		lpfc_use_msi_init(phba, lpfc_use_msi);
		lpfc_fcp_imax_init(phba, lpfc_fcp_imax);
		lpfc_fcp_cpu_map_init(phba, lpfc_fcp_cpu_map);
		@@ -5846,6 +5856,15 @@ lpfc_get_cfgparam(struct lpfc_hba *phba)
		phba->cfg_poll = 0;
		else
		phba->cfg_poll = lpfc_poll;

		/* Ensure fdmi_on and enable_SmartSAN don't conflict */
		if (phba->cfg_enable_SmartSAN) {
		phba->cfg_fdmi_on = LPFC_FDMI_SMART_SAN;
		} else {
		if (phba->cfg_fdmi_on == LPFC_FDMI_SMART_SAN)
		phba->cfg_fdmi_on = LPFC_FDMI_SUPPORT;
		}

		phba->cfg_soft_wwnn = 0L;
		phba->cfg_soft_wwpn = 0L;
		lpfc_sg_seg_cnt_init(phba, lpfc_sg_seg_cnt);
		@@ -5879,7 +5898,6 @@ lpfc_get_vport_cfgparam(struct lpfc_vport *vport)
		lpfc_use_adisc_init(vport, lpfc_use_adisc);
		lpfc_first_burst_size_init(vport, lpfc_first_burst_size);
		lpfc_max_scsicmpl_time_init(vport, lpfc_max_scsicmpl_time);
		lpfc_fdmi_on_init(vport, lpfc_fdmi_on);
		lpfc_discovery_threads_init(vport, lpfc_discovery_threads);
		lpfc_max_luns_init(vport, lpfc_max_luns);
		lpfc_scan_down_init(vport, lpfc_scan_down);

drivers/scsi/lpfc/lpfc_crtn.h

+2 −3

Original line number	Diff line number	Diff line
		@@ -168,9 +168,8 @@ void lpfc_ct_unsol_event(struct lpfc_hba , struct lpfc_sli_ring ,
		struct lpfc_iocbq *);
		int lpfc_ct_handle_unsol_abort(struct lpfc_hba , struct hbq_dmabuf );
		int lpfc_ns_cmd(struct lpfc_vport *, int, uint8_t, uint32_t);
		int lpfc_fdmi_cmd(struct lpfc_vport , struct lpfc_nodelist , int);
		void lpfc_fdmi_tmo(unsigned long);
		void lpfc_fdmi_timeout_handler(struct lpfc_vport *);
		int lpfc_fdmi_cmd(struct lpfc_vport , struct lpfc_nodelist , int, uint32_t);
		void lpfc_fdmi_num_disc_check(struct lpfc_vport *);
		void lpfc_delayed_disc_tmo(unsigned long);
		void lpfc_delayed_disc_timeout_handler(struct lpfc_vport *);

drivers/scsi/lpfc/lpfc_ct.c

+1150 −644

File changed.

Preview size limit exceeded, changes collapsed.

drivers/scsi/lpfc/lpfc_els.c

+69 −30

Original line number	Diff line number	Diff line
		@@ -688,6 +688,21 @@ lpfc_cmpl_els_flogi_fabric(struct lpfc_vport vport, struct lpfc_nodelist ndlp,
		sp->cmn.bbRcvSizeLsb;

		fabric_param_changed = lpfc_check_clean_addr_bit(vport, sp);
		if (fabric_param_changed) {
		/* Reset FDMI attribute masks based on config parameter */
		if (phba->cfg_fdmi_on == LPFC_FDMI_NO_SUPPORT) {
		vport->fdmi_hba_mask = 0;
		vport->fdmi_port_mask = 0;
		} else {
		/* Setup appropriate attribute masks */
		vport->fdmi_hba_mask = LPFC_FDMI2_HBA_ATTR;
		if (phba->cfg_fdmi_on == LPFC_FDMI_SMART_SAN)
		vport->fdmi_port_mask = LPFC_FDMI2_SMART_ATTR;
		else
		vport->fdmi_port_mask = LPFC_FDMI2_PORT_ATTR;
		}

		}
		memcpy(&vport->fabric_portname, &sp->portName,
		sizeof(struct lpfc_name));
		memcpy(&vport->fabric_nodename, &sp->nodeName,
		@@ -4690,6 +4705,23 @@ lpfc_rdp_res_link_error(struct fc_rdp_link_error_status_desc *desc,
		desc->length = cpu_to_be32(sizeof(desc->info));
		}

		int
		lpfc_rdp_res_fec_desc(struct fc_fec_rdp_desc desc, READ_LNK_VAR stat)
		{
		if (bf_get(lpfc_read_link_stat_gec2, stat) == 0)
		return 0;
		desc->tag = cpu_to_be32(RDP_FEC_DESC_TAG);

		desc->info.CorrectedBlocks =
		cpu_to_be32(stat->fecCorrBlkCount);
		desc->info.UncorrectableBlocks =
		cpu_to_be32(stat->fecUncorrBlkCount);

		desc->length = cpu_to_be32(sizeof(desc->info));

		return sizeof(struct fc_fec_rdp_desc);
		}

		void
		lpfc_rdp_res_speed(struct fc_rdp_port_speed_desc desc, struct lpfc_hba phba)
		{
		@@ -4800,7 +4832,7 @@ lpfc_els_rdp_cmpl(struct lpfc_hba phba, struct lpfc_rdp_context rdp_context,
		struct ls_rjt *stat;
		struct fc_rdp_res_frame *rdp_res;
		uint32_t cmdsize;
		int rc;
		int rc, fec_size;

		if (status != SUCCESS)
		goto error;
		@@ -4840,8 +4872,9 @@ lpfc_els_rdp_cmpl(struct lpfc_hba phba, struct lpfc_rdp_context rdp_context,
		lpfc_rdp_res_diag_port_names(&rdp_res->diag_port_names_desc, phba);
		lpfc_rdp_res_attach_port_names(&rdp_res->attached_port_names_desc,
		vport, ndlp);
		rdp_res->length = cpu_to_be32(RDP_DESC_PAYLOAD_SIZE);

		fec_size = lpfc_rdp_res_fec_desc(&rdp_res->fec_desc,
		&rdp_context->link_stat);
		rdp_res->length = cpu_to_be32(fec_size + RDP_DESC_PAYLOAD_SIZE);
		elsiocb->iocb_cmpl = lpfc_cmpl_els_rsp;

		phba->fc_stat.elsXmitACC++;
		@@ -7704,6 +7737,35 @@ lpfc_els_unsol_event(struct lpfc_hba phba, struct lpfc_sli_ring pring,
		}
		}

		void
		lpfc_start_fdmi(struct lpfc_vport *vport)
		{
		struct lpfc_hba *phba = vport->phba;
		struct lpfc_nodelist *ndlp;

		/* If this is the first time, allocate an ndlp and initialize
		* it. Otherwise, make sure the node is enabled and then do the
		* login.
		*/
		ndlp = lpfc_findnode_did(vport, FDMI_DID);
		if (!ndlp) {
		ndlp = mempool_alloc(phba->nlp_mem_pool, GFP_KERNEL);
		if (ndlp) {
		lpfc_nlp_init(vport, ndlp, FDMI_DID);
		ndlp->nlp_type \|= NLP_FABRIC;
		} else {
		return;
		}
		}
		if (!NLP_CHK_NODE_ACT(ndlp))
		ndlp = lpfc_enable_node(vport, ndlp, NLP_STE_NPR_NODE);

		if (ndlp) {
		lpfc_nlp_set_state(vport, ndlp, NLP_STE_PLOGI_ISSUE);
		lpfc_issue_els_plogi(vport, ndlp->nlp_DID, 0);
		}
		}

		/**
		* lpfc_do_scr_ns_plogi - Issue a plogi to the name server for scr
		* @phba: pointer to lpfc hba data structure.
		@@ -7720,7 +7782,7 @@ lpfc_els_unsol_event(struct lpfc_hba phba, struct lpfc_sli_ring pring,
		void
		lpfc_do_scr_ns_plogi(struct lpfc_hba phba, struct lpfc_vport vport)
		{
		struct lpfc_nodelist ndlp, ndlp_fdmi;
		struct lpfc_nodelist *ndlp;
		struct Scsi_Host *shost = lpfc_shost_from_vport(vport);

		/*
		@@ -7778,32 +7840,9 @@ lpfc_do_scr_ns_plogi(struct lpfc_hba phba, struct lpfc_vport vport)
		return;
		}

		if (vport->cfg_fdmi_on & LPFC_FDMI_SUPPORT) {
		/* If this is the first time, allocate an ndlp and initialize
		* it. Otherwise, make sure the node is enabled and then do the
		* login.
		*/
		ndlp_fdmi = lpfc_findnode_did(vport, FDMI_DID);
		if (!ndlp_fdmi) {
		ndlp_fdmi = mempool_alloc(phba->nlp_mem_pool,
		GFP_KERNEL);
		if (ndlp_fdmi) {
		lpfc_nlp_init(vport, ndlp_fdmi, FDMI_DID);
		ndlp_fdmi->nlp_type \|= NLP_FABRIC;
		} else
		return;
		}
		if (!NLP_CHK_NODE_ACT(ndlp_fdmi))
		ndlp_fdmi = lpfc_enable_node(vport,
		ndlp_fdmi,
		NLP_STE_NPR_NODE);

		if (ndlp_fdmi) {
		lpfc_nlp_set_state(vport, ndlp_fdmi,
		NLP_STE_PLOGI_ISSUE);
		lpfc_issue_els_plogi(vport, ndlp_fdmi->nlp_DID, 0);
		}
		}
		if ((phba->cfg_fdmi_on > LPFC_FDMI_NO_SUPPORT) &&
		(vport->load_flag & FC_ALLOW_FDMI))
		lpfc_start_fdmi(vport);
		}

		/**

Admin message