diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2023-06-26 20:59:57 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2023-06-26 20:59:57 +0300 |
| commit | 283810ac54a2b8a179fd4f30fd9f05907b397fcd (patch) | |
| tree | 2f4ea2abdb77d53ecc665fa5ad2a81f8ac92afa8 /include | |
| parent | d0b7b3a422f1f550a1bac9fc3404196c10232d14 (diff) | |
| parent | 88d341716b83abd355558523186ca488918627ee (diff) | |
| download | linux-283810ac54a2b8a179fd4f30fd9f05907b397fcd.tar.xz | |
Merge branch 'pci/virtualization'
- Delay extra 250ms after FLR of Solidigm P44 Pro NVMe to avoid KVM hang
when guest is rebooted (Mike Pastore)
- Add function 1 DMA alias quirk for Marvell 88SE9235 (Robin Murphy)
* pci/virtualization:
PCI: Add function 1 DMA alias quirk for Marvell 88SE9235
PCI: Delay after FLR of Solidigm P44 Pro NVMe
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pci_ids.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 45c3d62e616d..20c3403a62cd 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -158,6 +158,8 @@ #define PCI_VENDOR_ID_LOONGSON 0x0014 +#define PCI_VENDOR_ID_SOLIDIGM 0x025e + #define PCI_VENDOR_ID_TTTECH 0x0357 #define PCI_DEVICE_ID_TTTECH_MC322 0x000a |