Commit 1a87ee65 authored by Keith Busch's avatar Keith Busch Committed by Christoph Hellwig
Browse files

nvme: export get and set features 



Future use intends to make use of both, so export these functions. And
since their implementation is identical except for the opcode, provide a
new function that implement both.

[akinobu.mita@gmail.com>: fix line over 80 characters]
Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Reviewed-by: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Reviewed-by: default avatarMinwoo Im <minwoo.im.dev@gmail.com>
Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 2181e455

drivers/nvme/host/core.c

+21 −3
Original line number Diff line number Diff line
@@ -1113,15 +1113,15 @@ static struct nvme_id_ns *nvme_identify_ns(struct nvme_ctrl *ctrl, 
	return id;

}



static int nvme_set_features(struct nvme_ctrl *dev, unsigned fid, unsigned dword11,

		      void *buffer, size_t buflen, u32 *result)

static int nvme_features(struct nvme_ctrl *dev, u8 op, unsigned int fid,

		unsigned int dword11, void *buffer, size_t buflen, u32 *result)

{

	struct nvme_command c;

	union nvme_result res;

	int ret;



	memset(&c, 0, sizeof(c));

	c.features.opcode = nvme_admin_set_features;

	c.features.opcode = op;

	c.features.fid = cpu_to_le32(fid);

	c.features.dword11 = cpu_to_le32(dword11);
@@ -1132,6 +1132,24 @@ static int nvme_set_features(struct nvme_ctrl *dev, unsigned fid, unsigned dword 
	return ret;

}



int nvme_set_features(struct nvme_ctrl *dev, unsigned int fid,

		      unsigned int dword11, void *buffer, size_t buflen,

		      u32 *result)

{

	return nvme_features(dev, nvme_admin_set_features, fid, dword11, buffer,

			     buflen, result);

}

EXPORT_SYMBOL_GPL(nvme_set_features);



int nvme_get_features(struct nvme_ctrl *dev, unsigned int fid,

		      unsigned int dword11, void *buffer, size_t buflen,

		      u32 *result)

{

	return nvme_features(dev, nvme_admin_get_features, fid, dword11, buffer,

			     buflen, result);

}

EXPORT_SYMBOL_GPL(nvme_get_features);



int nvme_set_queue_count(struct nvme_ctrl *ctrl, int *count)

{

	u32 q_count = (*count - 1) | ((*count - 1) << 16);

drivers/nvme/host/nvme.h

+6 −0
Original line number Diff line number Diff line
@@ -459,6 +459,12 @@ int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd, 
		union nvme_result *result, void *buffer, unsigned bufflen,

		unsigned timeout, int qid, int at_head,

		blk_mq_req_flags_t flags, bool poll);

int nvme_set_features(struct nvme_ctrl *dev, unsigned int fid,

		      unsigned int dword11, void *buffer, size_t buflen,

		      u32 *result);

int nvme_get_features(struct nvme_ctrl *dev, unsigned int fid,

		      unsigned int dword11, void *buffer, size_t buflen,

		      u32 *result);

int nvme_set_queue_count(struct nvme_ctrl *ctrl, int *count);

void nvme_stop_keep_alive(struct nvme_ctrl *ctrl);

int nvme_reset_ctrl(struct nvme_ctrl *ctrl);

CRA Git | Maintained and supported by SUSTech CRA and CCSE