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

Commit 3a3a8d75 authored by Keith Busch's avatar Keith Busch Committed by Greg Kroah-Hartman
Browse files

nvme: copy firmware_rev on each init 



[ Upstream commit a8eb6c1ba48bddea82e8d74cbe6e119f006be97d ]

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: default avatarJeff Lien <jeff.lien@wdc.com>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: default avatarChao Leng <lengchao@huawei.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent e5d8f05e

drivers/nvme/host/core.c

+2 −1
Original line number Diff line number Diff line
@@ -2671,7 +2671,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);
@@ -2824,6 +2823,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");