Commit aa96d6aa authored by Hector Martin's avatar Hector Martin Committed by Christoph Hellwig

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 811f4de0 ("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: 811f4de0 ("nvme: avoid fallback to sequential scan due to transient issues")
Fixes: 5bd2927a ("nvme-apple: Add initial Apple SoC NVMe driver")
Signed-off-by: default avatarHector Martin <marcan@marcan.st>
Reviewed-by: default avatarSven Peter <sven@svenpeter.dev>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 49e4d04f
...@@ -1493,7 +1493,7 @@ static int apple_nvme_probe(struct platform_device *pdev) ...@@ -1493,7 +1493,7 @@ static int apple_nvme_probe(struct platform_device *pdev)
} }
ret = nvme_init_ctrl(&anv->ctrl, anv->dev, &nvme_ctrl_ops, ret = nvme_init_ctrl(&anv->ctrl, anv->dev, &nvme_ctrl_ops,
NVME_QUIRK_SKIP_CID_GEN); NVME_QUIRK_SKIP_CID_GEN | NVME_QUIRK_IDENTIFY_CNS);
if (ret) { if (ret) {
dev_err_probe(dev, ret, "Failed to initialize nvme_ctrl"); dev_err_probe(dev, ret, "Failed to initialize nvme_ctrl");
goto put_dev; goto put_dev;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment