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

2 files changed, 74 insertions, 0 deletions

diff --git a/include/linux/efi.h b/include/linux/efi.h
index 8670eb1eb8cd..8eb1be17c801 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -196,6 +196,77 @@ typedef struct {
         void *create_event_ex;
 } efi_boot_services_t;
 
+typedef enum {
+        EfiPciIoWidthUint8,
+        EfiPciIoWidthUint16,
+        EfiPciIoWidthUint32,
+        EfiPciIoWidthUint64,
+        EfiPciIoWidthFifoUint8,
+        EfiPciIoWidthFifoUint16,
+        EfiPciIoWidthFifoUint32,
+        EfiPciIoWidthFifoUint64,
+        EfiPciIoWidthFillUint8,
+        EfiPciIoWidthFillUint16,
+        EfiPciIoWidthFillUint32,
+        EfiPciIoWidthFillUint64,
+        EfiPciIoWidthMaximum
+} EFI_PCI_IO_PROTOCOL_WIDTH;
+
+typedef enum {
+        EfiPciIoAttributeOperationGet,
+        EfiPciIoAttributeOperationSet,
+        EfiPciIoAttributeOperationEnable,
+        EfiPciIoAttributeOperationDisable,
+        EfiPciIoAttributeOperationSupported,
+    EfiPciIoAttributeOperationMaximum
+} EFI_PCI_IO_PROTOCOL_ATTRIBUTE_OPERATION;
+
+
+typedef struct {
+        void *read;
+        void *write;
+} efi_pci_io_protocol_access_t;
+
+typedef struct {
+        void *poll_mem;
+        void *poll_io;
+        efi_pci_io_protocol_access_t mem;
+        efi_pci_io_protocol_access_t io;
+        efi_pci_io_protocol_access_t pci;
+        void *copy_mem;
+        void *map;
+        void *unmap;
+        void *allocate_buffer;
+        void *free_buffer;
+        void *flush;
+        void *get_location;
+        void *attributes;
+        void *get_bar_attributes;
+        void *set_bar_attributes;
+        uint64_t romsize;
+        void *romimage;
+} efi_pci_io_protocol;
+
+#define EFI_PCI_IO_ATTRIBUTE_ISA_MOTHERBOARD_IO 0x0001
+#define EFI_PCI_IO_ATTRIBUTE_ISA_IO 0x0002
+#define EFI_PCI_IO_ATTRIBUTE_VGA_PALETTE_IO 0x0004
+#define EFI_PCI_IO_ATTRIBUTE_VGA_MEMORY 0x0008
+#define EFI_PCI_IO_ATTRIBUTE_VGA_IO 0x0010
+#define EFI_PCI_IO_ATTRIBUTE_IDE_PRIMARY_IO 0x0020
+#define EFI_PCI_IO_ATTRIBUTE_IDE_SECONDARY_IO 0x0040
+#define EFI_PCI_IO_ATTRIBUTE_MEMORY_WRITE_COMBINE 0x0080
+#define EFI_PCI_IO_ATTRIBUTE_IO 0x0100
+#define EFI_PCI_IO_ATTRIBUTE_MEMORY 0x0200
+#define EFI_PCI_IO_ATTRIBUTE_BUS_MASTER 0x0400
+#define EFI_PCI_IO_ATTRIBUTE_MEMORY_CACHED 0x0800
+#define EFI_PCI_IO_ATTRIBUTE_MEMORY_DISABLE 0x1000
+#define EFI_PCI_IO_ATTRIBUTE_EMBEDDED_DEVICE 0x2000
+#define EFI_PCI_IO_ATTRIBUTE_EMBEDDED_ROM 0x4000
+#define EFI_PCI_IO_ATTRIBUTE_DUAL_ADDRESS_CYCLE 0x8000
+#define EFI_PCI_IO_ATTRIBUTE_ISA_IO_16 0x10000
+#define EFI_PCI_IO_ATTRIBUTE_VGA_PALETTE_IO_16 0x20000
+#define EFI_PCI_IO_ATTRIBUTE_VGA_IO_16 0x40000
+
 /*
  * Types and defines for EFI ResetSystem
  */
diff --git a/include/linux/pci.h b/include/linux/pci.h
index a98a5f9ac1d5..ea41a0a52a59 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -333,6 +333,8 @@ struct pci_dev {
         };
         struct pci_ats  *ats;   /* Address Translation Service */
 #endif
+        void *rom; /* Physical pointer to ROM if it's not from the BAR */
+        size_t romlen; /* Length of ROM if it's not from the BAR */
 };
 
 static inline struct pci_dev *pci_physfn(struct pci_dev *dev)
@@ -1599,6 +1601,7 @@ void pcibios_disable_device(struct pci_dev *dev);
 void pcibios_set_master(struct pci_dev *dev);
 int pcibios_set_pcie_reset_state(struct pci_dev *dev,
                                  enum pcie_reset_state state);
+int pcibios_add_device(struct pci_dev *dev);
 
 #ifdef CONFIG_PCI_MMCONFIG
 extern void __init pci_mmcfg_early_init(void);