virtio: clarify that ABI is usable by any implementations

[linux-2.6-omap-h63xx.git] / include / asm-powerpc / pci-bridge.h

diff --git a/include/asm-powerpc/pci-bridge.h b/include/asm-powerpc/pci-bridge.h
index 29324047779d2719bfef0bbd63882f1eccec298e..ae2ea803a0f2502daff6e2ffcd24359c1f602675 100644 (file)
--- a/include/asm-powerpc/pci-bridge.h
+++ b/include/asm-powerpc/pci-bridge.h
@@ -92,12 +92,15 @@ struct pci_controller {
         *   anything but the PHB.  Only allow talking to the PHB if this is
         *   set.
         *  BIG_ENDIAN - cfg_addr is a big endian register
+        *  BROKEN_MRM - the 440EPx/GRx chips have an errata that causes hangs on
+        *   the PLB4.  Effectively disable MRM commands by setting this.
         */
 #define PPC_INDIRECT_TYPE_SET_CFG_TYPE         0x00000001
 #define PPC_INDIRECT_TYPE_EXT_REG              0x00000002
 #define PPC_INDIRECT_TYPE_SURPRESS_PRIMARY_BUS 0x00000004
 #define PPC_INDIRECT_TYPE_NO_PCIE_LINK         0x00000008
 #define PPC_INDIRECT_TYPE_BIG_ENDIAN           0x00000010
+#define PPC_INDIRECT_TYPE_BROKEN_MRM           0x00000020
        u32 indirect_type;
 #endif /* !CONFIG_PPC64 */
        /* Currently, we limit ourselves to 1 IO range and 3 mem
@@ -117,7 +120,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;
 }
@@ -152,9 +155,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 */
 
 /*
@@ -165,7 +165,6 @@ struct iommu_table;
 
 struct pci_dn {
        int     busno;                  /* pci bus number */
-       int     bussubno;               /* pci subordinate bus number */
        int     devfn;                  /* pci device and function number */
 
        struct  pci_controller *phb;    /* for pci devices */
@@ -239,7 +238,7 @@ 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;