Home Home > GIT Browse > stable
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-08-16 22:01:45 +0200
committerJiri Slaby <jslaby@suse.cz>2019-08-16 22:25:10 +0200
commit1be9b9b58d203a604fe5b3b6f188f04cada39362 (patch)
tree29a4f1a6336db9b3bd63fc3ebe305e60bbd85336
parent7ea2d4eecf2962f6fd08cb7fd1ecaa17a0d7fa27 (diff)
nvme: ignore subnqn for ADATA SX6000LNP (bnc#1012628).
-rw-r--r--patches.kernel.org/5.2.9-103-nvme-ignore-subnqn-for-ADATA-SX6000LNP.patch49
-rw-r--r--series.conf1
2 files changed, 50 insertions, 0 deletions
diff --git a/patches.kernel.org/5.2.9-103-nvme-ignore-subnqn-for-ADATA-SX6000LNP.patch b/patches.kernel.org/5.2.9-103-nvme-ignore-subnqn-for-ADATA-SX6000LNP.patch
new file mode 100644
index 0000000000..bc75df6539
--- /dev/null
+++ b/patches.kernel.org/5.2.9-103-nvme-ignore-subnqn-for-ADATA-SX6000LNP.patch
@@ -0,0 +1,49 @@
+From: Misha Nasledov <misha@nasledov.com>
+Date: Mon, 15 Jul 2019 00:11:49 -0700
+Subject: [PATCH] nvme: ignore subnqn for ADATA SX6000LNP
+References: bnc#1012628
+Patch-mainline: 5.2.9
+Git-commit: 08b903b5fd0c49e5f224a9bf085b6329ec3c55c0
+
+[ Upstream commit 08b903b5fd0c49e5f224a9bf085b6329ec3c55c0 ]
+
+The ADATA SX6000LNP NVMe SSDs have the same subnqn and, due to this, a
+system with more than one of these SSDs will only have one usable.
+
+[ 0.942706] nvme nvme1: ignoring ctrl due to duplicate subnqn (nqn.2018-05.com.example:nvme:nvm-subsystem-OUI00E04C).
+[ 0.943017] nvme nvme1: Removing after probe failure status: -22
+
+02:00.0 Non-Volatile memory controller [0108]: Realtek Semiconductor Co., Ltd. Device [10ec:5762] (rev 01)
+71:00.0 Non-Volatile memory controller [0108]: Realtek Semiconductor Co., Ltd. Device [10ec:5762] (rev 01)
+
+There are no firmware updates available from the vendor, unfortunately.
+Applying the NVME_QUIRK_IGNORE_DEV_SUBNQN quirk for these SSDs resolves
+the issue, and they all work after this patch:
+
+/dev/nvme0n1 2J1120050420 ADATA SX6000LNP [...]
+/dev/nvme1n1 2J1120050540 ADATA SX6000LNP [...]
+
+Signed-off-by: Misha Nasledov <misha@nasledov.com>
+Signed-off-by: Christoph Hellwig <hch@lst.de>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ drivers/nvme/host/pci.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
+index 7fbcd72c438f..f9959eaaa185 100644
+--- a/drivers/nvme/host/pci.c
++++ b/drivers/nvme/host/pci.c
+@@ -2959,6 +2959,8 @@ static const struct pci_device_id nvme_id_table[] = {
+ .driver_data = NVME_QUIRK_LIGHTNVM, },
+ { PCI_DEVICE(0x1d1d, 0x2601), /* CNEX Granby */
+ .driver_data = NVME_QUIRK_LIGHTNVM, },
++ { PCI_DEVICE(0x10ec, 0x5762), /* ADATA SX6000LNP */
++ .driver_data = NVME_QUIRK_IGNORE_DEV_SUBNQN, },
+ { PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_EXPRESS, 0xffffff) },
+ { PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2001) },
+ { PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2003) },
+--
+2.22.0
+
diff --git a/series.conf b/series.conf
index 5bcd81c92c..bd16a778de 100644
--- a/series.conf
+++ b/series.conf
@@ -1123,6 +1123,7 @@
patches.kernel.org/5.2.9-100-perf-probe-Avoid-calling-freeing-routine-multip.patch
patches.kernel.org/5.2.9-101-drbd-dynamically-allocate-shash-descriptor.patch
patches.kernel.org/5.2.9-102-ACPI-IORT-Fix-off-by-one-check-in-iort_dev_find.patch
+ patches.kernel.org/5.2.9-103-nvme-ignore-subnqn-for-ADATA-SX6000LNP.patch
########################################################
# Build fixes that apply to the vanilla kernel too.