Commit 7b7f551b authored by James Smart's avatar James Smart Committed by Jens Axboe
Browse files

lpfc: Commonize lpfc_async_xchg_ctx state and flag definitions 



The last step of commonization is to remove the 'T' suffix from
state and flag field definitions.  This is minor, but removes the
mental association that it solely applies to nvmet use.

Signed-off-by: default avatarPaul Ely <paul.ely@broadcom.com>
Signed-off-by: default avatarJames Smart <jsmart2021@gmail.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 7cacae2a

drivers/scsi/lpfc/lpfc_init.c

+1 −1
Original line number Diff line number Diff line
@@ -1096,7 +1096,7 @@ lpfc_hba_down_post_s4(struct lpfc_hba *phba) 
				 &nvmet_aborts);

		spin_unlock_irq(&phba->sli4_hba.abts_nvmet_buf_list_lock);

		list_for_each_entry_safe(ctxp, ctxp_next, &nvmet_aborts, list) {

			ctxp->flag &= ~(LPFC_NVMET_XBUSY | LPFC_NVMET_ABORT_OP);

			ctxp->flag &= ~(LPFC_NVME_XBUSY | LPFC_NVME_ABORT_OP);

			lpfc_nvmet_ctxbuf_post(phba, ctxp->ctxbuf);

		}

	}

drivers/scsi/lpfc/lpfc_nvme.h

+20 −17
Original line number Diff line number Diff line
@@ -162,6 +162,26 @@ struct lpfc_nvmet_ctx_info { 
#define lpfc_get_ctx_list(phba, cpu, mrq)  \

	(phba->sli4_hba.nvmet_ctx_info + ((cpu * phba->cfg_nvmet_mrq) + mrq))



/* Values for state field of struct lpfc_async_xchg_ctx */

#define LPFC_NVME_STE_LS_RCV		1

#define LPFC_NVME_STE_LS_ABORT		2

#define LPFC_NVME_STE_LS_RSP		3

#define LPFC_NVME_STE_RCV		4

#define LPFC_NVME_STE_DATA		5

#define LPFC_NVME_STE_ABORT		6

#define LPFC_NVME_STE_DONE		7

#define LPFC_NVME_STE_FREE		0xff



/* Values for flag field of struct lpfc_async_xchg_ctx */

#define LPFC_NVME_IO_INP		0x1  /* IO is in progress on exchange */

#define LPFC_NVME_ABORT_OP		0x2  /* Abort WQE issued on exchange */

#define LPFC_NVME_XBUSY			0x4  /* XB bit set on IO cmpl */

#define LPFC_NVME_CTX_RLS		0x8  /* ctx free requested */

#define LPFC_NVME_ABTS_RCV		0x10  /* ABTS received on exchange */

#define LPFC_NVME_CTX_REUSE_WQ		0x20  /* ctx reused via WQ */

#define LPFC_NVME_DEFER_WQFULL		0x40  /* Waiting on a free WQE */

#define LPFC_NVME_TNOTIFY		0x80  /* notify transport of abts */



struct lpfc_async_xchg_ctx {

	union {

		struct nvmefc_tgt_fcp_req fcp_req;
@@ -181,24 +201,7 @@ struct lpfc_async_xchg_ctx { 
	uint16_t cpu;

	uint16_t idx;

	uint16_t state;

	/* States */

#define LPFC_NVMET_STE_LS_RCV		1

#define LPFC_NVMET_STE_LS_ABORT		2

#define LPFC_NVMET_STE_LS_RSP		3

#define LPFC_NVMET_STE_RCV		4

#define LPFC_NVMET_STE_DATA		5

#define LPFC_NVMET_STE_ABORT		6

#define LPFC_NVMET_STE_DONE		7

#define LPFC_NVMET_STE_FREE		0xff

	uint16_t flag;

#define LPFC_NVMET_IO_INP		0x1  /* IO is in progress on exchange */

#define LPFC_NVMET_ABORT_OP		0x2  /* Abort WQE issued on exchange */

#define LPFC_NVMET_XBUSY		0x4  /* XB bit set on IO cmpl */

#define LPFC_NVMET_CTX_RLS		0x8  /* ctx free requested */

#define LPFC_NVMET_ABTS_RCV		0x10  /* ABTS received on exchange */

#define LPFC_NVMET_CTX_REUSE_WQ		0x20  /* ctx reused via WQ */

#define LPFC_NVMET_DEFER_WQFULL		0x40  /* Waiting on a free WQE */

#define LPFC_NVMET_TNOTIFY		0x80  /* notify transport of abts */

	struct rqb_dmabuf *rqb_buffer;

	struct lpfc_nvmet_ctxbuf *ctxbuf;

	struct lpfc_sli4_hdw_queue *hdwq;

drivers/scsi/lpfc/lpfc_nvmet.c

+79 −79

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE