Merge tag 'block-5.8-2020-07-30' of git://git.kernel.dk/linux-block (e2c46b57) · Commits · 戴 / test

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;
		}

+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),
		};

		/*

+4 −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 */
		@@ -3122,6 +3124,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(0x1c5c, 0x1504), /* SK Hynix PC400 */
		.driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES, },
		{ PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_EXPRESS, 0xffffff) },
		{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2001),
		.driver_data = NVME_QUIRK_SINGLE_VECTOR },

+3 −0

Original line number	Diff line number	Diff line
		@@ -1382,6 +1382,9 @@ static int nvme_tcp_alloc_queue(struct nvme_ctrl *nctrl,
		if (nctrl->opts->tos >= 0)
		ip_sock_set_tos(queue->sock->sk, nctrl->opts->tos);

		/* Set 10 seconds timeout for icresp recvmsg */
		queue->sock->sk->sk_rcvtimeo = 10 * HZ;

		queue->sock->sk->sk_allocation = GFP_ATOMIC;
		nvme_tcp_set_queue_io_cpu(queue);
		queue->request = NULL;