* [PATCH v2] nvme-pci: merge duplicate 1d97:2263 entries in nvme_id_table
@ 2026-11-11 0:09 Platon Miller
2026-11-11 16:45 ` Christoph Hellwig
0 siblings, 1 reply; 2+ messages in thread
From: Platon Miller @ 2026-11-11 0:09 UTC (permalink / raw)
To: linux-nvme; +Cc: kbusch, axboe, hch, sagi, Platon Miller
The nvme_id_table currently contains two separate entries for PCI ID
1d97:2263: one for SPCC with NVME_QUIRK_DISABLE_WRITE_ZEROES, and another
later in the table for Lexar NM610 with NVME_QUIRK_BOGUS_NID.
Because pci_match_device() returns on the first match, the Lexar NM610
entry is unreachable, leaving those drives without NVME_QUIRK_BOGUS_NID.
Merge the quirks for 1d97:2263 into a single entry with both
NVME_QUIRK_DISABLE_WRITE_ZEROES and NVME_QUIRK_BOGUS_NID, and remove the
redundant entry.
Fixes: 200dccd07df2 ("nvme-pci: add NVME_QUIRK_BOGUS_NID for Lexar NM610")
Signed-off-by: Platon Miller <platon.ksenzenkokk@gmail.com>
---
v2:
- Add Fixes tag for commit 200dccd07df2 as suggested by Sashiko AI review
drivers/nvme/host/pci.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index f8088d5aa..bc9d26a86 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -4440,8 +4440,9 @@ static const struct pci_device_id nvme_id_table[] = {
.driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES, },
{ PCI_DEVICE(0x15b7, 0x2001), /* Sandisk Skyhawk */
.driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES, },
- { PCI_DEVICE(0x1d97, 0x2263), /* SPCC */
- .driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES, },
+ { PCI_DEVICE(0x1d97, 0x2263), /* SPCC / Lexar NM610 */
+ .driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES |
+ NVME_QUIRK_BOGUS_NID, },
{ PCI_DEVICE(0x144d, 0xa80b), /* Samsung PM9B1 256G and 512G */
.driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES |
NVME_QUIRK_BOGUS_NID, },
@@ -4501,8 +4502,6 @@ static const struct pci_device_id nvme_id_table[] = {
.driver_data = NVME_QUIRK_NO_DEEPEST_PS, },
{ PCI_DEVICE(0xc0a9, 0x540a), /* Crucial P2 */
.driver_data = NVME_QUIRK_BOGUS_NID, },
- { PCI_DEVICE(0x1d97, 0x2263), /* Lexar NM610 */
- .driver_data = NVME_QUIRK_BOGUS_NID, },
{ PCI_DEVICE(0x1d97, 0x1d97), /* Lexar NM620 */
.driver_data = NVME_QUIRK_BOGUS_NID, },
{ PCI_DEVICE(0x1d97, 0x2269), /* Lexar NM760 */
--
2.56.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] nvme-pci: merge duplicate 1d97:2263 entries in nvme_id_table
2026-11-11 0:09 [PATCH v2] nvme-pci: merge duplicate 1d97:2263 entries in nvme_id_table Platon Miller
@ 2026-11-11 16:45 ` Christoph Hellwig
0 siblings, 0 replies; 2+ messages in thread
From: Christoph Hellwig @ 2026-11-11 16:45 UTC (permalink / raw)
To: Platon Miller; +Cc: linux-nvme, kbusch, axboe, sagi
Looks good:
Reviewed-by: Christoph Hellwig <hch@lst.de>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-11-11 16:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-11 0:09 [PATCH v2] nvme-pci: merge duplicate 1d97:2263 entries in nvme_id_table Platon Miller
2026-11-11 16:45 ` Christoph Hellwig
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox