diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-12-06 22:37:32 +0100 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-12-06 22:37:32 +0100 |
| commit | 72e1e868ca8f14ef34c95e0e8b73f64b6acf5934 (patch) | |
| tree | d3bc99f121693ab8f09c03ea555254c9314ff98d /arch/x86/include/asm/pci.h | |
| parent | Merge branch 'pci/huang-d3cold-fixes' into next (diff) | |
| parent | x86: Use PCI setup data (diff) | |
| download | linux-72e1e868ca8f14ef34c95e0e8b73f64b6acf5934.tar.xz linux-72e1e868ca8f14ef34c95e0e8b73f64b6acf5934.zip | |
Merge branch 'pci/mjg-pci-roms-from-efi' into next
* pci/mjg-pci-roms-from-efi:
x86: Use PCI setup data
PCI: Add support for non-BAR ROMs
PCI: Add pcibios_add_device
EFI: Stash ROMs if they're not in the PCI BAR
Diffstat (limited to 'arch/x86/include/asm/pci.h')
| -rw-r--r-- | arch/x86/include/asm/pci.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h index 6e41b9343928..dba7805176bf 100644 --- a/arch/x86/include/asm/pci.h +++ b/arch/x86/include/asm/pci.h @@ -171,4 +171,16 @@ cpumask_of_pcibus(const struct pci_bus *bus) } #endif +struct pci_setup_rom { + struct setup_data data; + uint16_t vendor; + uint16_t devid; + uint64_t pcilen; + unsigned long segment; + unsigned long bus; + unsigned long device; + unsigned long function; + uint8_t romdata[0]; +}; + #endif /* _ASM_X86_PCI_H */ |