xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme initialize core quirks before calling nvme_init_subsystem

Browse Source 
[ Upstream commit 6f2d71524bcfdeb1fcbd22a4a92a5b7b161ab224 ]

A device might have a core quirk for NVME_QUIRK_IGNORE_DEV_SUBNQN
(such as Samsung X5) but it would still give a:

    "missing or invalid SUBNQN field"

warning as core quirks are filled after calling nvme_init_subnqn.  Fill
ctrl->quirks from struct core_quirks before calling nvme_init_subsystem
to fix this.

Tested on a Samsung X5.

Fixes: ab9e00cc72 ("nvme: track subsystems")
Signed-off-by: Pankaj Raghav <p.raghav@samsung.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Pankaj Raghav
2022-12-01 13:52:34 +01:00
committed by Greg Kroah-Hartman
parent 27eb2d7a1b
commit ca26f45083
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/nvme/host/core.c
View File

@@ -3092,10 +3092,6 @@ int nvme_init_identify(struct nvme_ctrl *ctrl)
if (!ctrl->identified) { if (!ctrl->identified) {
int i; int i;
ret = nvme_init_subsystem(ctrl, id);
if (ret)
goto out_free;
/* /*
* Check for quirks. Quirk can depend on firmware version, * Check for quirks. Quirk can depend on firmware version,
* so, in principle, the set of quirks present can change * so, in principle, the set of quirks present can change
@@ -3108,6 +3104,10 @@ int nvme_init_identify(struct nvme_ctrl *ctrl)
if (quirk_matches(id, &core_quirks[i])) if (quirk_matches(id, &core_quirks[i]))
ctrl->quirks |= core_quirks[i].quirks; ctrl->quirks |= core_quirks[i].quirks;
} }
ret = nvme_init_subsystem(ctrl, id);
if (ret)
goto out_free;
} }
memcpy(ctrl->subsys->firmware_rev, id->fr, memcpy(ctrl->subsys->firmware_rev, id->fr,
sizeof(ctrl->subsys->firmware_rev)); sizeof(ctrl->subsys->firmware_rev));