[SCSI] bfa: Changes to support vport disable and enable operations. (dd5aaf45) · Commits · 戴 / test

drivers/scsi/bfa/bfa_core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -51,7 +51,7 @@ static bfa_isr_func_t bfa_isrs[BFI_MC_MAX] = {
		bfa_fcxp_isr, /* BFI_MC_FCXP */
		bfa_lps_isr, /* BFI_MC_LPS */
		bfa_rport_isr, /* BFI_MC_RPORT */
		bfa_itnim_isr, /* BFI_MC_ITNIM */
		bfa_itnim_isr, /* BFI_MC_ITN */
		bfa_isr_unhandled, /* BFI_MC_IOIM_READ */
		bfa_isr_unhandled, /* BFI_MC_IOIM_WRITE */
		bfa_isr_unhandled, /* BFI_MC_IOIM_IO */

drivers/scsi/bfa/bfa_defs_svc.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -47,8 +47,6 @@ struct bfa_iocfc_fwcfg_s {
		u16 num_rports; /* number of remote ports */
		u16 num_ioim_reqs; /* number of IO reqs */
		u16 num_tskim_reqs; /* task management requests */
		u16 num_iotm_reqs; /* number of TM IO reqs */
		u16 num_tsktm_reqs; /* TM task management requests*/
		u16 num_fcxp_reqs; /* unassisted FC exchanges */
		u16 num_uf_bufs; /* unsolicited recv buffers */
		u8 num_cqs;

drivers/scsi/bfa/bfa_fc.h

+0 −9

Original line number	Diff line number	Diff line
		@@ -1048,15 +1048,6 @@ struct fc_vft_s {
		u32 res_c:24;
		};

		/*
		* FCP
		*/
		enum {
		FCP_RJT = 0x01000000, /* SRR reject */
		FCP_SRR_ACCEPT = 0x02000000, /* SRR accept */
		FCP_SRR = 0x14000000, /* Sequence Retransmission Request */
		};

		/*
		* FCP_CMND definitions
		*/

drivers/scsi/bfa/bfa_fcpim.c

+8 −8

Original line number	Diff line number	Diff line
		@@ -1043,7 +1043,7 @@ bfa_itnim_iocdisable(struct bfa_itnim_s *itnim)
		static bfa_boolean_t
		bfa_itnim_send_fwcreate(struct bfa_itnim_s *itnim)
		{
		struct bfi_itnim_create_req_s *m;
		struct bfi_itn_create_req_s *m;

		itnim->msg_no++;

		@@ -1056,7 +1056,7 @@ bfa_itnim_send_fwcreate(struct bfa_itnim_s *itnim)
		return BFA_FALSE;
		}

		bfi_h2i_set(m->mh, BFI_MC_ITNIM, BFI_ITNIM_H2I_CREATE_REQ,
		bfi_h2i_set(m->mh, BFI_MC_ITN, BFI_ITN_H2I_CREATE_REQ,
		bfa_lpuid(itnim->bfa));
		m->fw_handle = itnim->rport->fw_handle;
		m->class = FC_CLASS_3;
		@@ -1074,7 +1074,7 @@ bfa_itnim_send_fwcreate(struct bfa_itnim_s *itnim)
		static bfa_boolean_t
		bfa_itnim_send_fwdelete(struct bfa_itnim_s *itnim)
		{
		struct bfi_itnim_delete_req_s *m;
		struct bfi_itn_delete_req_s *m;

		/*
		* check for room in queue to send request now
		@@ -1085,7 +1085,7 @@ bfa_itnim_send_fwdelete(struct bfa_itnim_s *itnim)
		return BFA_FALSE;
		}

		bfi_h2i_set(m->mh, BFI_MC_ITNIM, BFI_ITNIM_H2I_DELETE_REQ,
		bfi_h2i_set(m->mh, BFI_MC_ITN, BFI_ITN_H2I_DELETE_REQ,
		bfa_lpuid(itnim->bfa));
		m->fw_handle = itnim->rport->fw_handle;
		bfa_stats(itnim, fw_delete);
		@@ -1251,7 +1251,7 @@ void
		bfa_itnim_isr(struct bfa_s bfa, struct bfi_msg_s m)
		{
		struct bfa_fcpim_mod_s *fcpim = BFA_FCPIM_MOD(bfa);
		union bfi_itnim_i2h_msg_u msg;
		union bfi_itn_i2h_msg_u msg;
		struct bfa_itnim_s *itnim;

		bfa_trc(bfa, m->mhdr.msg_id);
		@@ -1259,7 +1259,7 @@ bfa_itnim_isr(struct bfa_s bfa, struct bfi_msg_s m)
		msg.msg = m;

		switch (m->mhdr.msg_id) {
		case BFI_ITNIM_I2H_CREATE_RSP:
		case BFI_ITN_I2H_CREATE_RSP:
		itnim = BFA_ITNIM_FROM_TAG(fcpim,
		msg.create_rsp->bfa_handle);
		WARN_ON(msg.create_rsp->status != BFA_STATUS_OK);
		@@ -1267,7 +1267,7 @@ bfa_itnim_isr(struct bfa_s bfa, struct bfi_msg_s m)
		bfa_sm_send_event(itnim, BFA_ITNIM_SM_FWRSP);
		break;

		case BFI_ITNIM_I2H_DELETE_RSP:
		case BFI_ITN_I2H_DELETE_RSP:
		itnim = BFA_ITNIM_FROM_TAG(fcpim,
		msg.delete_rsp->bfa_handle);
		WARN_ON(msg.delete_rsp->status != BFA_STATUS_OK);
		@@ -1275,7 +1275,7 @@ bfa_itnim_isr(struct bfa_s bfa, struct bfi_msg_s m)
		bfa_sm_send_event(itnim, BFA_ITNIM_SM_FWRSP);
		break;

		case BFI_ITNIM_I2H_SLER_EVENT:
		case BFI_ITN_I2H_SLER_EVENT:
		itnim = BFA_ITNIM_FROM_TAG(fcpim,
		msg.sler_event->bfa_handle);
		bfa_stats(itnim, sler_events);

drivers/scsi/bfa/bfa_fcs.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -269,8 +269,8 @@ bfa_fcs_fabric_sm_created(struct bfa_fcs_fabric_s *fabric,
		break;

		case BFA_FCS_FABRIC_SM_DELETE:
		bfa_sm_set_state(fabric, bfa_fcs_fabric_sm_uninit);
		bfa_wc_down(&fabric->fcs->wc);
		bfa_sm_set_state(fabric, bfa_fcs_fabric_sm_deleting);
		bfa_fcs_fabric_delete(fabric);
		break;

		default:

Admin message