git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-ppc
/
pci-bridge.h
diff --git
a/include/asm-ppc/pci-bridge.h
b/include/asm-ppc/pci-bridge.h
index
ffa4234
..
4d35b84
100644
(file)
--- a/
include/asm-ppc/pci-bridge.h
+++ b/
include/asm-ppc/pci-bridge.h
@@
-20,8
+20,8
@@
extern unsigned long pci_bus_mem_base_phys(unsigned int bus);
extern struct pci_controller* pcibios_alloc_controller(void);
/* Helper function for setting up resources */
extern struct pci_controller* pcibios_alloc_controller(void);
/* Helper function for setting up resources */
-extern void pci_init_resource(struct resource *res,
unsigned long
start,
-
unsigned long
end, int flags, char *name);
+extern void pci_init_resource(struct resource *res,
resource_size_t
start,
+
resource_size_t
end, int flags, char *name);
/* Get the PCI host controller for a bus */
extern struct pci_controller* pci_bus_to_hose(int bus);
/* Get the PCI host controller for a bus */
extern struct pci_controller* pci_bus_to_hose(int bus);
@@
-43,18
+43,19
@@
struct pci_controller {
struct pci_controller *next;
struct pci_bus *bus;
void *arch_data;
struct pci_controller *next;
struct pci_bus *bus;
void *arch_data;
+ struct device *parent;
int first_busno;
int last_busno;
int bus_offset;
void __iomem *io_base_virt;
int first_busno;
int last_busno;
int bus_offset;
void __iomem *io_base_virt;
-
unsigned long
io_base_phys;
+
resource_size_t
io_base_phys;
/* Some machines (PReP) have a non 1:1 mapping of
* the PCI memory space in the CPU bus space
*/
/* Some machines (PReP) have a non 1:1 mapping of
* the PCI memory space in the CPU bus space
*/
-
unsigned long
pci_mem_offset;
+
resource_size_t
pci_mem_offset;
struct pci_ops *ops;
volatile unsigned int __iomem *cfg_addr;
struct pci_ops *ops;
volatile unsigned int __iomem *cfg_addr;
@@
-79,6
+80,11
@@
struct pci_controller {
struct resource mem_space;
};
struct resource mem_space;
};
+static inline struct pci_controller *pci_bus_to_host(struct pci_bus *bus)
+{
+ return bus->sysdata;
+}
+
/* These are used for config access before all the PCI probing
has been done. */
int early_read_config_byte(struct pci_controller *hose, int bus, int dev_fn,
/* These are used for config access before all the PCI probing
has been done. */
int early_read_config_byte(struct pci_controller *hose, int bus, int dev_fn,
@@
-132,5
+138,14
@@
static inline unsigned char bridge_swizzle(unsigned char pin,
*/
extern int pciauto_bus_scan(struct pci_controller *, int);
*/
extern int pciauto_bus_scan(struct pci_controller *, int);
+#ifdef CONFIG_PCI
+extern unsigned long pci_address_to_pio(phys_addr_t address);
+#else
+static inline unsigned long pci_address_to_pio(phys_addr_t address)
+{
+ return (unsigned long)-1;
+}
+#endif
+
#endif
#endif /* __KERNEL__ */
#endif
#endif /* __KERNEL__ */