| From 5bedd3afee8eb01ccd256f0cd2cc0fa6f841417a Mon Sep 17 00:00:00 2001 |
| From: Christoph Hellwig <hch@lst.de> |
| Date: Tue, 28 Jul 2020 13:09:03 +0200 |
| Subject: nvme: add a Identify Namespace Identification Descriptor list quirk |
| |
| From: Christoph Hellwig <hch@lst.de> |
| |
| commit 5bedd3afee8eb01ccd256f0cd2cc0fa6f841417a upstream. |
| |
| Add a quirk for a device that does not support the Identify Namespace |
| Identification Descriptor list despite claiming 1.3 compliance. |
| |
| Fixes: ea43d9709f72 ("nvme: fix identify error status silent ignore") |
| Reported-by: Ingo Brunberg <ingo_brunberg@web.de> |
| Signed-off-by: Christoph Hellwig <hch@lst.de> |
| Tested-by: Ingo Brunberg <ingo_brunberg@web.de> |
| Reviewed-by: Sagi Grimberg <sagi@grimberg.me> |
| Cc: Plamen Lyutov <plamen.lyutov@gmail.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/nvme/host/core.c | 15 +++------------ |
| drivers/nvme/host/nvme.h | 7 +++++++ |
| drivers/nvme/host/pci.c | 2 ++ |
| 3 files changed, 12 insertions(+), 12 deletions(-) |
| |
| --- a/drivers/nvme/host/core.c |
| +++ b/drivers/nvme/host/core.c |
| @@ -1074,6 +1074,9 @@ static int nvme_identify_ns_descs(struct |
| int pos; |
| int len; |
| |
| + if (ctrl->quirks & NVME_QUIRK_NO_NS_DESC_LIST) |
| + return 0; |
| + |
| c.identify.opcode = nvme_admin_identify; |
| c.identify.nsid = cpu_to_le32(nsid); |
| c.identify.cns = NVME_ID_CNS_NS_DESC_LIST; |
| @@ -1087,18 +1090,6 @@ static int nvme_identify_ns_descs(struct |
| if (status) { |
| dev_warn(ctrl->device, |
| "Identify Descriptors failed (%d)\n", status); |
| - /* |
| - * Don't treat non-retryable errors as fatal, as we potentially |
| - * already have a NGUID or EUI-64. If we failed with DNR set, |
| - * we want to silently ignore the error as we can still |
| - * identify the device, but if the status has DNR set, we want |
| - * to propagate the error back specifically for the disk |
| - * revalidation flow to make sure we don't abandon the |
| - * device just because of a temporal retry-able error (such |
| - * as path of transport errors). |
| - */ |
| - if (status > 0 && (status & NVME_SC_DNR)) |
| - status = 0; |
| goto free_data; |
| } |
| |
| --- a/drivers/nvme/host/nvme.h |
| +++ b/drivers/nvme/host/nvme.h |
| @@ -115,6 +115,13 @@ enum nvme_quirks { |
| * Prevent tag overlap between queues |
| */ |
| NVME_QUIRK_SHARED_TAGS = (1 << 13), |
| + |
| + /* |
| + * The controller doesn't handle the Identify Namespace |
| + * Identification Descriptor list subcommand despite claiming |
| + * NVMe 1.3 compliance. |
| + */ |
| + NVME_QUIRK_NO_NS_DESC_LIST = (1 << 15), |
| }; |
| |
| /* |
| --- a/drivers/nvme/host/pci.c |
| +++ b/drivers/nvme/host/pci.c |
| @@ -3117,6 +3117,8 @@ static const struct pci_device_id nvme_i |
| { PCI_VDEVICE(INTEL, 0x5845), /* Qemu emulated controller */ |
| .driver_data = NVME_QUIRK_IDENTIFY_CNS | |
| NVME_QUIRK_DISABLE_WRITE_ZEROES, }, |
| + { PCI_DEVICE(0x126f, 0x2263), /* Silicon Motion unidentified */ |
| + .driver_data = NVME_QUIRK_NO_NS_DESC_LIST, }, |
| { PCI_DEVICE(0x1bb1, 0x0100), /* Seagate Nytro Flash Storage */ |
| .driver_data = NVME_QUIRK_DELAY_BEFORE_CHK_RDY, }, |
| { PCI_DEVICE(0x1c58, 0x0003), /* HGST adapter */ |