Skip to content

Commit aa96d6a

Browse files
marcanChristoph Hellwig
authored andcommitted
nvme-apple: add NVME_QUIRK_IDENTIFY_CNS quirk to fix regression
From the get-go, this driver and the ANS syslog have been complaining about namespace identification. In 6.2-rc1, commit 811f4de ("nvme: avoid fallback to sequential scan due to transient issues") regressed the driver by no longer allowing fallback to sequential namespace scans, leaving us with no namespaces. It turns out that the real problem is that this controller claiming NVMe 1.1 compat is treating the CNS field as a binary field, as in NVMe 1.0. This already has a quirk, NVME_QUIRK_IDENTIFY_CNS, so set it for the controller to fix all this nonsense (including other errors triggered by other CNS commands). Fixes: 811f4de ("nvme: avoid fallback to sequential scan due to transient issues") Fixes: 5bd2927 ("nvme-apple: Add initial Apple SoC NVMe driver") Signed-off-by: Hector Martin <[email protected]> Reviewed-by: Sven Peter <[email protected]> Signed-off-by: Christoph Hellwig <[email protected]>
1 parent 49e4d04 commit aa96d6a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/nvme/host/apple.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1493,7 +1493,7 @@ static int apple_nvme_probe(struct platform_device *pdev)
14931493
}
14941494

14951495
ret = nvme_init_ctrl(&anv->ctrl, anv->dev, &nvme_ctrl_ops,
1496-
NVME_QUIRK_SKIP_CID_GEN);
1496+
NVME_QUIRK_SKIP_CID_GEN | NVME_QUIRK_IDENTIFY_CNS);
14971497
if (ret) {
14981498
dev_err_probe(dev, ret, "Failed to initialize nvme_ctrl");
14991499
goto put_dev;

0 commit comments

Comments
 (0)