Merge commit 'v2.6.26-rc8' into x86/xen

[firefly-linux-kernel-4.4.55.git] / include / asm-powerpc / pci-bridge.h

diff --git a/include/asm-powerpc/pci-bridge.h b/include/asm-powerpc/pci-bridge.h
index f67d262d9ec635d70bbb59668c82b0c8eda7dfab..b95d033ae6e60eceabac04fbe3432b5f2f630d9a 100644 (file)
--- a/include/asm-powerpc/pci-bridge.h
+++ b/include/asm-powerpc/pci-bridge.h
@@ -11,6 +11,33 @@
 #include <linux/list.h>
 #include <linux/ioport.h>
 
+struct device_node;
+
+extern unsigned int ppc_pci_flags;
+enum {
+       /* Force re-assigning all resources (ignore firmware
+        * setup completely)
+        */
+       PPC_PCI_REASSIGN_ALL_RSRC       = 0x00000001,
+
+       /* Re-assign all bus numbers */
+       PPC_PCI_REASSIGN_ALL_BUS        = 0x00000002,
+
+       /* Do not try to assign, just use existing setup */
+       PPC_PCI_PROBE_ONLY              = 0x00000004,
+
+       /* Don't bother with ISA alignment unless the bridge has
+        * ISA forwarding enabled
+        */
+       PPC_PCI_CAN_SKIP_ISA_ALIGN      = 0x00000008,
+
+       /* Enable domain numbers in /proc */
+       PPC_PCI_ENABLE_PROC_DOMAINS     = 0x00000010,
+       /* ... except for domain 0 */
+       PPC_PCI_COMPAT_DOMAIN_0         = 0x00000020,
+};
+
+
 /*
  * Structure of a PCI controller (host bridge)
  */
@@ -20,7 +47,7 @@ struct pci_controller {
 #ifdef CONFIG_PPC64
        int node;
 #endif
-       void *arch_data;
+       struct device_node *dn;
        struct list_head list_node;
        struct device *parent;
 
@@ -35,6 +62,9 @@ struct pci_controller {
        void *io_base_alloc;
 #endif
        resource_size_t io_base_phys;
+#ifndef CONFIG_PPC64
+       resource_size_t pci_io_size;
+#endif
 
        /* Some machines (PReP) have a non 1:1 mapping of
         * the PCI memory space in the CPU bus space
@@ -45,8 +75,8 @@ struct pci_controller {
 #endif
 
        struct pci_ops *ops;
-       volatile unsigned int __iomem *cfg_addr;
-       volatile void __iomem *cfg_data;
+       unsigned int __iomem *cfg_addr;
+       void __iomem *cfg_data;
 
 #ifndef CONFIG_PPC64
        /*
@@ -87,7 +117,7 @@ struct pci_controller {
 
 #ifndef CONFIG_PPC64
 
-static inline struct pci_controller *pci_bus_to_host(struct pci_bus *bus)
+static inline struct pci_controller *pci_bus_to_host(const struct pci_bus *bus)
 {
        return bus->sysdata;
 }
@@ -122,9 +152,6 @@ extern void setup_indirect_pci(struct pci_controller* hose,
                               resource_size_t cfg_addr,
                               resource_size_t cfg_data, u32 flags);
 extern void setup_grackle(struct pci_controller *hose);
-extern void __init update_bridge_resource(struct pci_dev *dev,
-                                         struct resource *res);
-
 #else  /* CONFIG_PPC64 */
 
 /*
@@ -132,22 +159,20 @@ extern void __init update_bridge_resource(struct pci_dev *dev,
  * by device_node->data.
  */
 struct iommu_table;
-struct device_node;
 
 struct pci_dn {
        int     busno;                  /* pci bus number */
-       int     bussubno;               /* pci subordinate bus number */
        int     devfn;                  /* pci device and function number */
-       int     class_code;             /* pci device class */
 
        struct  pci_controller *phb;    /* for pci devices */
        struct  iommu_table *iommu_table;       /* for phb's or bridges */
-       struct  pci_dev *pcidev;        /* back-pointer to the pci device */
        struct  device_node *node;      /* back-pointer to the device_node */
 
        int     pci_ext_config_space;   /* for pci devices */
 
 #ifdef CONFIG_EEH
+       struct  pci_dev *pcidev;        /* back-pointer to the pci device */
+       int     class_code;             /* pci device class */
        int     eeh_mode;               /* See eeh.h for possible EEH_MODEs */
        int     eeh_config_addr;
        int     eeh_pe_config_addr; /* new-style partition endpoint address */
@@ -206,11 +231,11 @@ extern void pcibios_remove_pci_devices(struct pci_bus *bus);
 
 /** Discover new pci devices under this bus, and add them */
 extern void pcibios_add_pci_devices(struct pci_bus *bus);
-extern void pcibios_fixup_new_pci_devices(struct pci_bus *bus, int fix_bus);
+extern void pcibios_fixup_new_pci_devices(struct pci_bus *bus);
 
 extern int pcibios_remove_root_bus(struct pci_controller *phb);
 
-static inline struct pci_controller *pci_bus_to_host(struct pci_bus *bus)
+static inline struct pci_controller *pci_bus_to_host(const struct pci_bus *bus)
 {
        struct device_node *busdn = bus->sysdata;