Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   August Wikerfors <git@augustwikerfors.se>
To:     Keith Busch <kbusch@kernel.org>, Jens Axboe <axboe@fb.com>,
        Christoph Hellwig <hch@lst.de>,
        Sagi Grimberg <sagi@grimberg.me>
Cc:     linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org,
        August Wikerfors <git@augustwikerfors.se>
Subject: [PATCH] nvme-pci: add NVME_QUIRK_BOGUS_NID for Samsung PM9B1 256G and
 512G
Date:   Wed, 16 Nov 2022 18:17:27 +0100
Message-id: <20221116171727.4083-1-git@augustwikerfors.se>
MIME-version: 1.0
Content-transfer-encoding: 8bit
Reporting-Meta: AAEu+0BrTkHBsWLOK63HjpEKIIURzBrIK56dK+jBm3s0DHlxjT4P2/MBeqUBNrmp
 VCVIkws4O2zsNXnjRWGkS5823k/tfg+rw6l4Necjg9kJztS2KXqUh3Xg4rRuERuF
 y59v90MLW5ID7raGwICLysCyEOWQFMjDZS+hM9eFde+qXMfhxSbKKfe8wIYyRSR3
 rou9S/44Ely2QnM4WpJzVcsC5zLhHEXBOWIjc8cJ8O5OOoeiHXB18/OjMw6c3JMb
 j9M1ky8eXkYB7Bl4XksHK/T/GaJCCwYpjnVY3REKJc2mqcoJ0FAU22aJbAZ8hlxG
 BVYpiSO02rAebKgxWgoAVYXOHg22qaejwn6h+htz/Jkbn/DJSNCQMOkNj8q3PBtI
 y8n2CqiJnEzOSq+2GCP7fqYcZhBPFMfqS2DKAWvqRlFpU3IslFJw3VPLL8Zw4P/a aBEiRg==
Precedence: bulk

The Samsung PM9B1 512G SSD found in some Lenovo Yoga 7 14ARB7 laptop units
reports eui as 0001000200030004 when resuming from s2idle, causing the
device to be removed with this error in dmesg:

nvme nvme0: identifiers changed for nsid 1

To fix this, add a quirk to ignore namespace identifiers for this device.

Signed-off-by: August Wikerfors <git@augustwikerfors.se>
---
 drivers/nvme/host/pci.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index f4335519399d..0af51b85c323 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -3500,7 +3500,8 @@ static const struct pci_device_id nvme_id_table[] = {
 	{ PCI_DEVICE(0x1d97, 0x2263),   /* SPCC */
 		.driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES, },
 	{ PCI_DEVICE(0x144d, 0xa80b),   /* Samsung PM9B1 256G and 512G */
-		.driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES, },
+		.driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES |
+				NVME_QUIRK_BOGUS_NID, },
 	{ PCI_DEVICE(0x144d, 0xa809),   /* Samsung MZALQ256HBJD 256G */
 		.driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES, },
 	{ PCI_DEVICE(0x1cc4, 0x6303),   /* UMIS RPJTJ512MGE1QDY 512G */
-- 
2.38.1