diff options
| author | Jens Axboe <axboe@kernel.dk> | 2023-08-03 20:03:42 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2023-08-03 20:03:42 -0600 |
| commit | a592ab6171bd943ce3b988bd271c79fe275a7bec (patch) | |
| tree | 57333acf97d87f2774a24cb9f814f0e68b284376 /drivers/nvme/host/pci.c | |
| parent | 3e9dce80dbf91972aed972c743f539c396a34312 (diff) | |
| parent | 688b419c57c13637d95d7879e165fff3dec581eb (diff) | |
| download | linux-a592ab6171bd943ce3b988bd271c79fe275a7bec.tar.gz linux-a592ab6171bd943ce3b988bd271c79fe275a7bec.tar.bz2 linux-a592ab6171bd943ce3b988bd271c79fe275a7bec.zip | |
Merge tag 'nvme-6.5-2023-08-02' of git://git.infradead.org/nvme into block-6.5
Pull NVMe fixes from Keith:
"nvme fixes for Linux 6.5
- Fixes for request_queue state (Ming)
- Another uuid quirk (August)"
* tag 'nvme-6.5-2023-08-02' of git://git.infradead.org/nvme:
nvme-pci: add NVME_QUIRK_BOGUS_NID for Samsung PM9B1 256G and 512G
nvme-rdma: fix potential unbalanced freeze & unfreeze
nvme-tcp: fix potential unbalanced freeze & unfreeze
nvme: fix possible hang when removing a controller during error recovery
Diffstat (limited to 'drivers/nvme/host/pci.c')
| -rw-r--r-- | drivers/nvme/host/pci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index baf69af7ea78..2f57da12d983 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -3402,7 +3402,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(0x144d, 0xa802), /* Samsung SM953 */ |