Commit ee49686d authored Apr 18, 2023 by Keith Busch Committed by Jialin Zhang Apr 19, 2023

nvme: copy firmware_rev on each init

stable inclusion
from stable-v5.10.150
commit b79da0080d81063868d1cf4715d67ed5075dd9cc
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I6D0XA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=b79da0080d81063868d1cf4715d67ed5075dd9cc



--------------------------------

[ Upstream commit a8eb6c1b ]

The firmware revision can change on after a reset so copy the most
recent info each time instead of just the first time, otherwise the
sysfs firmware_rev entry may contain stale data.

Reported-by: Jeff Lien <jeff.lien@wdc.com>
Signed-off-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: Chao Leng <lengchao@huawei.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Jialin Zhang <zhangjialin11@huawei.com>

parent e90376e3

drivers/nvme/host/core.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2912,7 +2912,6 @@ static int nvme_init_subsystem(struct nvme_ctrl ctrl, struct nvme_id_ctrl id)
		nvme_init_subnqn(subsys, ctrl, id);
		memcpy(subsys->serial, id->sn, sizeof(subsys->serial));
		memcpy(subsys->model, id->mn, sizeof(subsys->model));
		memcpy(subsys->firmware_rev, id->fr, sizeof(subsys->firmware_rev));
		subsys->vendor_id = le16_to_cpu(id->vid);
		subsys->cmic = id->cmic;
		subsys->awupf = le16_to_cpu(id->awupf);
		@@ -3073,6 +3072,8 @@ int nvme_init_identify(struct nvme_ctrl *ctrl)
		ctrl->quirks \|= core_quirks[i].quirks;
		}
		}
		memcpy(ctrl->subsys->firmware_rev, id->fr,
		sizeof(ctrl->subsys->firmware_rev));

		if (force_apst && (ctrl->quirks & NVME_QUIRK_NO_DEEPEST_PS)) {
		dev_warn(ctrl->device, "forcibly allowing all power states due to nvme_core.force_apst -- use at your own risk\n");