diff options
| author |   Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-08-01 08:59:31 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-08-01 08:59:31 -0300 |
| commit | 18808564aa3bc9ae3309fd8a5c0a93f7f9a23f9a (patch) | |
| tree | 4c1732a2dddb246f0d39a492cbf8e6db31f3af3e /drivers/nvme/host/pci.c | |
| parent | perf stat: Add topdown metrics in the default perf stat on the hybrid machine (diff) | |
| parent | Linux 5.19 (diff) | |
| download | linux-dev-18808564aa3bc9ae3309fd8a5c0a93f7f9a23f9a.tar.xz linux-dev-18808564aa3bc9ae3309fd8a5c0a93f7f9a23f9a.zip | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up the fixes that went upstream via acme/perf/urgent and to get
to v5.19.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'drivers/nvme/host/pci.c')
| -rw-r--r-- | drivers/nvme/host/pci.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 58c72d55769a..73d9fcba3b1c 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -3515,6 +3515,8 @@ static const struct pci_device_id nvme_id_table[] = { .driver_data = NVME_QUIRK_BOGUS_NID, }, { PCI_DEVICE(0x1e49, 0x0041), /* ZHITAI TiPro7000 NVMe SSD */ .driver_data = NVME_QUIRK_NO_DEEPEST_PS, }, + { PCI_DEVICE(0xc0a9, 0x540a), /* Crucial P2 */ + .driver_data = NVME_QUIRK_BOGUS_NID, }, { PCI_DEVICE(PCI_VENDOR_ID_AMAZON, 0x0061), .driver_data = NVME_QUIRK_DMA_ADDRESS_BITS_48, }, { PCI_DEVICE(PCI_VENDOR_ID_AMAZON, 0x0065), |