Commit b06e13c3 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'nvme-4.12' of git://git.infradead.org/nvme into for-4.12/post-merge 



Christoph writes:

"A couple more updates for 4.12.  The biggest pile is fc and lpfc
 updates from James, but there are various small fixes and cleanups as
 well."

Fixes up a few merge issues, and also a warning in
lpfc_nvmet_rcv_unsol_abort() if CONFIG_NVME_TARGET_FC isn't enabled.

Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parents c35e30b4 7569b90a

drivers/nvme/host/fc.c

+782 −391

File changed.

Preview size limit exceeded, changes collapsed.

drivers/nvme/host/lightnvm.c

+1 −1
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ static void nvme_nvm_end_io(struct request *rq, int error) 
{

	struct nvm_rq *rqd = rq->end_io_data;



	rqd->ppa_status = nvme_req(rq)->result.u64;

	rqd->ppa_status = le64_to_cpu(nvme_req(rq)->result.u64);

	rqd->error = nvme_req(rq)->status;

	nvm_end_io(rqd);

drivers/nvme/host/scsi.c

+1 −14
Original line number Diff line number Diff line
@@ -1609,7 +1609,7 @@ static int nvme_trans_do_nvme_io(struct nvme_ns *ns, struct sg_io_hdr *hdr, 
	struct nvme_command c;

	u8 opcode = (is_write ? nvme_cmd_write : nvme_cmd_read);

	u16 control;

	u32 max_blocks = queue_max_hw_sectors(ns->queue);

	u32 max_blocks = queue_max_hw_sectors(ns->queue) >> (ns->lba_shift - 9);



	num_cmds = nvme_trans_io_get_num_cmds(hdr, cdb_info, max_blocks);
@@ -2138,15 +2138,6 @@ static int nvme_trans_request_sense(struct nvme_ns *ns, struct sg_io_hdr *hdr, 
	return res;

}



static int nvme_trans_security_protocol(struct nvme_ns *ns,

					struct sg_io_hdr *hdr,

					u8 *cmd)

{

	return nvme_trans_completion(hdr, SAM_STAT_CHECK_CONDITION,

				ILLEGAL_REQUEST, SCSI_ASC_ILLEGAL_COMMAND,

				SCSI_ASCQ_CAUSE_NOT_REPORTABLE);

}



static int nvme_trans_synchronize_cache(struct nvme_ns *ns,

					struct sg_io_hdr *hdr)

{
@@ -2414,10 +2405,6 @@ static int nvme_scsi_translate(struct nvme_ns *ns, struct sg_io_hdr *hdr) 
	case REQUEST_SENSE:

		retcode = nvme_trans_request_sense(ns, hdr, cmd);

		break;

	case SECURITY_PROTOCOL_IN:

	case SECURITY_PROTOCOL_OUT:

		retcode = nvme_trans_security_protocol(ns, hdr, cmd);

		break;

	case SYNCHRONIZE_CACHE:

		retcode = nvme_trans_synchronize_cache(ns, hdr);

		break;

drivers/nvme/target/fc.c

+4 −4
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ struct nvmet_fc_tgt_queue { 
	u16				qid;

	u16				sqsize;

	u16				ersp_ratio;

	u16				sqhd;

	__le16				sqhd;

	int				cpu;

	atomic_t			connected;

	atomic_t			sqtail;
@@ -1058,7 +1058,7 @@ EXPORT_SYMBOL_GPL(nvmet_fc_unregister_targetport); 




static void

nvmet_fc_format_rsp_hdr(void *buf, u8 ls_cmd, u32 desc_len, u8 rqst_ls_cmd)

nvmet_fc_format_rsp_hdr(void *buf, u8 ls_cmd, __be32 desc_len, u8 rqst_ls_cmd)

{

	struct fcnvme_ls_acc_hdr *acc = buf;
@@ -1700,7 +1700,7 @@ nvmet_fc_prep_fcp_rsp(struct nvmet_fc_tgtport *tgtport, 
	    xfr_length != fod->total_length ||

	    (le16_to_cpu(cqe->status) & 0xFFFE) || cqewd[0] || cqewd[1] ||

	    (sqe->flags & (NVME_CMD_FUSE_FIRST | NVME_CMD_FUSE_SECOND)) ||

	    queue_90percent_full(fod->queue, cqe->sq_head))

	    queue_90percent_full(fod->queue, le16_to_cpu(cqe->sq_head)))

		send_ersp = true;



	/* re-set the fields */
@@ -2055,7 +2055,7 @@ nvmet_fc_fcp_nvme_cmd_done(struct nvmet_req *nvme_req) 
/*

 * Actual processing routine for received FC-NVME LS Requests from the LLD

 */

void

static void

nvmet_fc_handle_fcp_rqst(struct nvmet_fc_tgtport *tgtport,

			struct nvmet_fc_fcp_iod *fod)

{

drivers/nvme/target/fcloop.c

+2 −2
Original line number Diff line number Diff line
@@ -666,7 +666,7 @@ fcloop_targetport_delete(struct nvmet_fc_target_port *targetport) 
#define	FCLOOP_SGL_SEGS			256

#define FCLOOP_DMABOUND_4G		0xFFFFFFFF



struct nvme_fc_port_template fctemplate = {

static struct nvme_fc_port_template fctemplate = {

	.localport_delete	= fcloop_localport_delete,

	.remoteport_delete	= fcloop_remoteport_delete,

	.create_queue		= fcloop_create_queue,
@@ -686,7 +686,7 @@ struct nvme_fc_port_template fctemplate = { 
	.fcprqst_priv_sz	= sizeof(struct fcloop_ini_fcpreq),

};



struct nvmet_fc_target_template tgttemplate = {

static struct nvmet_fc_target_template tgttemplate = {

	.targetport_delete	= fcloop_targetport_delete,

	.xmt_ls_rsp		= fcloop_xmt_ls_rsp,

	.fcp_op			= fcloop_fcp_op,

CRA Git | Maintained and supported by SUSTech CRA and CCSE