Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 986994a2 authored by Parav Pandit's avatar Parav Pandit Committed by Jens Axboe
Browse files

nvme: Use CNS as 8-bit field and avoid endianness conversion 



This patch defines CNS field as 8-bit field and avoids cpu_to/from_le
conversions.
Also initialize nvme_command cns value explicitly to NVME_ID_CNS_NS
for readability (don't rely on the fact that NVME_ID_CNS_NS = 0).

Reviewed-by: default avatarMax Gurtovoy <maxg@mellanox.com>
Signed-off-by: default avatarParav Pandit <parav@mellanox.com>
Reviewed-by: default avatarKeith Busch <keith.busch@intel.com>
Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 778f067c

drivers/nvme/host/core.c

+3 −2
Original line number Diff line number Diff line
@@ -560,7 +560,7 @@ int nvme_identify_ctrl(struct nvme_ctrl *dev, struct nvme_id_ctrl **id) 


	/* gcc-4.4.4 (at least) has issues with initializers and anon unions */

	c.identify.opcode = nvme_admin_identify;

	c.identify.cns = cpu_to_le32(NVME_ID_CNS_CTRL);

	c.identify.cns = NVME_ID_CNS_CTRL;



	*id = kmalloc(sizeof(struct nvme_id_ctrl), GFP_KERNEL);

	if (!*id)
@@ -578,7 +578,7 @@ static int nvme_identify_ns_list(struct nvme_ctrl *dev, unsigned nsid, __le32 *n 
	struct nvme_command c = { };



	c.identify.opcode = nvme_admin_identify;

	c.identify.cns = cpu_to_le32(NVME_ID_CNS_NS_ACTIVE_LIST);

	c.identify.cns = NVME_ID_CNS_NS_ACTIVE_LIST;

	c.identify.nsid = cpu_to_le32(nsid);

	return nvme_submit_sync_cmd(dev->admin_q, &c, ns_list, 0x1000);

}
@@ -592,6 +592,7 @@ int nvme_identify_ns(struct nvme_ctrl *dev, unsigned nsid, 
	/* gcc-4.4.4 (at least) has issues with initializers and anon unions */

	c.identify.opcode = nvme_admin_identify;

	c.identify.nsid = cpu_to_le32(nsid);

	c.identify.cns = NVME_ID_CNS_NS;



	*id = kmalloc(sizeof(struct nvme_id_ns), GFP_KERNEL);

	if (!*id)

drivers/nvme/target/admin-cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -509,7 +509,7 @@ int nvmet_parse_admin_cmd(struct nvmet_req *req) 
		break;

	case nvme_admin_identify:

		req->data_len = 4096;

		switch (le32_to_cpu(cmd->identify.cns)) {

		switch (cmd->identify.cns) {

		case NVME_ID_CNS_NS:

			req->execute = nvmet_execute_identify_ns;

			return 0;

drivers/nvme/target/discovery.c

+2 −2
Original line number Diff line number Diff line
@@ -186,14 +186,14 @@ int nvmet_parse_discovery_cmd(struct nvmet_req *req) 
		}

	case nvme_admin_identify:

		req->data_len = 4096;

		switch (le32_to_cpu(cmd->identify.cns)) {

		switch (cmd->identify.cns) {

		case NVME_ID_CNS_CTRL:

			req->execute =

				nvmet_execute_identify_disc_ctrl;

			return 0;

		default:

			pr_err("nvmet: unsupported identify cns %d\n",

				le32_to_cpu(cmd->identify.cns));

				cmd->identify.cns);

			return NVME_SC_INVALID_OPCODE | NVME_SC_DNR;

		}

	default:

include/linux/nvme.h

+3 −1
Original line number Diff line number Diff line
@@ -644,7 +644,9 @@ struct nvme_identify { 
	__le32			nsid;

	__u64			rsvd2[2];

	union nvme_data_ptr	dptr;

	__le32			cns;

	__u8			cns;

	__u8			rsvd3;

	__le16			ctrlid;

	__u32			rsvd11[5];

};