Commit 5bedd3af authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

nvme: add a Identify Namespace Identification Descriptor list quirk 



Add a quirk for a device that does not support the Identify Namespace
Identification Descriptor list despite claiming 1.3 compliance.

Fixes: ea43d970 ("nvme: fix identify error status silent ignore")
Reported-by: default avatarIngo Brunberg <ingo_brunberg@web.de>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Tested-by: default avatarIngo Brunberg <ingo_brunberg@web.de>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
parent 5611ec2b

drivers/nvme/host/core.c

+3 −12
Original line number Diff line number Diff line
@@ -1102,6 +1102,9 @@ static int nvme_identify_ns_descs(struct nvme_ctrl *ctrl, unsigned nsid, 
	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;
@@ -1115,18 +1118,6 @@ static int nvme_identify_ns_descs(struct nvme_ctrl *ctrl, unsigned nsid, 
	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;

	}

drivers/nvme/host/nvme.h

+7 −0
Original line number Diff line number Diff line
@@ -129,6 +129,13 @@ enum nvme_quirks { 
	 * Don't change the value of the temperature threshold feature

	 */

	NVME_QUIRK_NO_TEMP_THRESH_CHANGE	= (1 << 14),



	/*

	 * 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),

};



/*

drivers/nvme/host/pci.c

+2 −0
Original line number Diff line number Diff line
@@ -3099,6 +3099,8 @@ static const struct pci_device_id nvme_id_table[] = { 
	{ 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 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE