[PATCH] nvme: Namepace identification descriptor list is optional

[Ingo Brunberg]

Christoph Hellwig <hch at infradead.org> writes:

> Please try this patch:
>
> diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
> index 05aa568a60af62..0602e0f3e77de9 100644
> --- a/drivers/nvme/host/core.c
> +++ b/drivers/nvme/host/core.c
> @@ -1287,18 +1287,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) && !nvme_multi_css(ctrl))
> -			status = 0;
>  		goto free_data;
>  	}
>
> @@ -1888,7 +1876,9 @@ static int nvme_report_ns_ids(struct nvme_ctrl *ctrl, unsigned int nsid,
>  		memcpy(ids->eui64, id->eui64, sizeof(id->eui64));
>  	if (ctrl->vs >= NVME_VS(1, 2, 0))
>  		memcpy(ids->nguid, id->nguid, sizeof(id->nguid));
> -	if (ctrl->vs >= NVME_VS(1, 3, 0) || nvme_multi_css(ctrl))
> +	if (nvme_multi_css(ctrl) ||
> +	    (ctrl->vs >= NVME_VS(1, 3, 0) &&
> +	     !(ctrl->quirks & NVME_QUIRK_NO_NS_DESC_LIST)))
>  		return nvme_identify_ns_descs(ctrl, nsid, ids);
>  	return 0;
>  }
> diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
> index c5c1bac797aa5a..4cadaea9034ae4 100644
> --- a/drivers/nvme/host/nvme.h
> +++ b/drivers/nvme/host/nvme.h
> @@ -137,6 +137,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),
>  };
>
>  /*
> diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
> index 61e612d52d61d6..bac3a3f9c79e0d 100644
> --- a/drivers/nvme/host/pci.c
> +++ b/drivers/nvme/host/pci.c
> @@ -3181,6 +3181,8 @@ static const struct pci_device_id nvme_id_table[] = {
>  	{ PCI_DEVICE(0x1cc1, 0x8201),   /* ADATA SX8200PNP 512GB */
>  		.driver_data = NVME_QUIRK_NO_DEEPEST_PS |
>  				NVME_QUIRK_IGNORE_DEV_SUBNQN, },
> +	{ PCI_DEVICE(0x126f, 0x2263),
> +		.driver_data = NVME_QUIRK_NO_NS_DESC_LIST, },
>  	{ PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_EXPRESS, 0xffffff) },
>  	{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2001),
>  		.driver_data = NVME_QUIRK_SINGLE_VECTOR },

Thanks, the patch works. Maybe it is not too late to make its way into
kernel 5.8.