nvme: extend log page implementation
v2 cover nvme: extend log page implementation
This patch introduces support for get log page offset and extends the number of dwords to be 32 bits.
Changes from v1:
- Suggestion from Johannes that paratheses around (size / 4) - 1 can be removed.
- Make nvme_get_log_ext() static. Expose when the function is used by lightnvm.
- Make sure to use unsigned long long when shifting a u64 with a constant.
Matias Bj?rling (1):
nvme: implement log page low/high offset and dwords
drivers/nvme/host/core.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-)
Signature · 1 line
2.11.0
PATCH v2 1/1 nvme: implement log page low/high offset and dwords
NVMe 1.2.1 extends the get log page interface to include 64 bit offset and increases the number of dwords to 32 bits. Implement for future use.
--- drivers/nvme/host/core.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-)
drivers/nvme/host/core.c +24 -12
@@ -80,11 +80,6 @@ static struct class *nvme_subsys_class;static void nvme_ns_remove (struct nvme_ns *ns);static int nvme_revalidate_disk (struct gendisk *disk); -static __le32 nvme_get_log_dw10 (u8 lid,size_t size) -{ -return cpu_to_le32 ((((size /4 ) -1 ) <<16 ) | lid); -} -int nvme_reset_ctrl (struct nvme_ctrl *ctrl) {if (!nvme_change_ctrl_state (ctrl,NVME_CTRL_RESETTING ))
@@ -2132,16 +2127,33 @@ static int nvme_init_subsystem(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)return ret; } +static int nvme_get_log_ext (struct nvme_ctrl *ctrl,struct nvme_ns *ns, +u8 log_page,void *log, +size_t size,size_t offset) +{ +struct nvme_command c = { }; +unsigned long dwlen = size /4 -1 ; + + c.get_log_page.opcode = nvme_admin_get_log_page; + +if (ns) + c.get_log_page.nsid =cpu_to_le32 (ns->head->ns_id); +else + c.get_log_page.nsid =cpu_to_le32 (NVME_NSID_ALL ); + + c.get_log_page.lid = log_page; + c.get_log_page.numdl =cpu_to_le16 (dwlen & ((1 <<16 ) -1 )); + c.get_log_page.numdu =cpu_to_le16 (dwlen >>16 ); + c.get_log_page.lpol =cpu_to_le32 (offset & ((1ULL <<32 ) -1 )); + c.get_log_page.lpou =cpu_to_le32 (offset >>32ULL ); + +return nvme_submit_sync_cmd (ctrl->admin_q, &c, log, size); +} +static int nvme_get_log (struct nvme_ctrl *ctrl,u8 log_page,void *log,size_t size) { -struct nvme_command c = { }; - - c.common.opcode = nvme_admin_get_log_page; - c.common.nsid =cpu_to_le32 (NVME_NSID_ALL ); - c.common.cdw10[0 ] =nvme_get_log_dw10 (log_page, size); - -return nvme_submit_sync_cmd (ctrl->admin_q, &c, log, size); +return nvme_get_log_ext (ctrl,NULL , log_page, log, size,0 ); }static int nvme_get_effects_log (struct nvme_ctrl *ctrl)
Signature · 1 line
2.11.0
Re: [PATCH v2 1/1] nvme: implement log page low/high offset and dwords
Looks good,
Reviewed-by: Johannes Thumshirn <jthumshirn at suse.de>
Signature · 6 lines
Johannes Thumshirn Storage jthumshirn at suse.de +49 911 74053 689 SUSE LINUX GmbH, Maxfeldstr. 5, 90409 N?rnberg GF: Felix Imend?rffer, Jane Smithard, Graham Norton HRB 21284 (AG N?rnberg) Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
Keith Busch
AppliedRe: [PATCH v2 1/1] nvme: implement log page low/high offset and dwords
Thanks, applied for 4.17.
A side note for those interested, some bug fixing commits introduced in the nvme-4.17 branch were applied to 4.16-rc. I've rebased these on top of linux-block/for-next so we don't have the duplicate commits for the 4.17 merge window. The nvme branch currently may be viewed here:
http://git.infradead.org/nvme.git/shortlog/refs/heads/for-next