diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2018-06-06 16:10:21 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2018-06-06 16:10:21 -0500 |
| commit | fd83941d50cbbe70e9dc1929d8f4631dd56d8c62 (patch) | |
| tree | e615994d78d95612f349ab299e2c45222ee27973 /include/linux/pci_ids.h | |
| parent | 13fbadcd512c225c907d6e8147fb48a88114bf03 (diff) | |
| parent | 8d85a7a4f2c935013a01964b7e81d5a105bd7a4c (diff) | |
| download | blackbird-op-linux-fd83941d50cbbe70e9dc1929d8f4631dd56d8c62.tar.gz blackbird-op-linux-fd83941d50cbbe70e9dc1929d8f4631dd56d8c62.zip | |
Merge branch 'pci/virtualization'
- add generic enable function for simple SR-IOV hardware (Alexander
Duyck)
- use generic SR-IOV enable for ena, nvme (Alexander Duyck)
- add ACS quirk for Intel 7th & 8th Gen mobile (Alex Williamson)
- add ACS quirk for Intel 300 series (Mika Westerberg)
* pci/virtualization:
PCI/IOV: Allow PF drivers to limit total_VFs to 0
PCI: Add "pci=noats" boot parameter
PCI: Add ACS quirk for Intel 300 series
PCI: Add ACS quirk for Intel 7th & 8th Gen mobile
nvme-pci: Use pci_sriov_configure_simple() to enable VFs
net: ena: Use pci_sriov_configure_simple() to enable VFs
PCI/IOV: Add pci-pf-stub driver for PFs that only enable VFs
PCI/IOV: Add pci_sriov_configure_simple()
Diffstat (limited to 'include/linux/pci_ids.h')
| -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 5aace6cca0d7..2609f7e11d06 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -2555,6 +2555,8 @@ #define PCI_VENDOR_ID_CIRCUITCO 0x1cc8 #define PCI_SUBSYSTEM_ID_CIRCUITCO_MINNOWBOARD 0x0001 +#define PCI_VENDOR_ID_AMAZON 0x1d0f + #define PCI_VENDOR_ID_TEKRAM 0x1de1 #define PCI_DEVICE_ID_TEKRAM_DC290 0xdc29 |
