lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[POWERPC] Consolidate pci_controller

Browse Source 
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Stephen Rothwell
2007-12-11 11:00:13 +11:00
committed by Paul Mackerras
parent 7cd1de6bc1
commit 7211991fa3
1 changed files with 22 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
include/asm-powerpc/pci-bridge.h
View File

@@ -11,33 +11,44 @@
#include <linux/list.h> #include <linux/list.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#ifndef CONFIG_PPC64
/* /*
* Structure of a PCI controller (host bridge) * Structure of a PCI controller (host bridge)
*/ */
struct pci_controller { struct pci_controller {
struct pci_bus *bus; struct pci_bus *bus;
char is_dynamic; char is_dynamic;
#ifdef CONFIG_PPC64
int node;
#endif
void *arch_data; void *arch_data;
struct list_head list_node; struct list_head list_node;
struct device *parent; struct device *parent;
int first_busno; int first_busno;
int last_busno; int last_busno;
#ifndef CONFIG_PPC64
int self_busno; int self_busno;
#endif
void __iomem *io_base_virt; void __iomem *io_base_virt;
#ifdef CONFIG_PPC64
void *io_base_alloc;
#endif
resource_size_t io_base_phys; resource_size_t io_base_phys;
/* Some machines (PReP) have a non 1:1 mapping of /* Some machines (PReP) have a non 1:1 mapping of
* the PCI memory space in the CPU bus space * the PCI memory space in the CPU bus space
*/ */
resource_size_t pci_mem_offset; resource_size_t pci_mem_offset;
#ifdef CONFIG_PPC64
unsigned long pci_io_size;
#endif
struct pci_ops *ops; struct pci_ops *ops;
volatile unsigned int __iomem *cfg_addr; volatile unsigned int __iomem *cfg_addr;
volatile void __iomem *cfg_data; volatile void __iomem *cfg_data;
#ifndef CONFIG_PPC64
/* /*
* Used for variants of PCI indirect handling and possible quirks: * Used for variants of PCI indirect handling and possible quirks:
* SET_CFG_TYPE - used on 4xx or any PHB that does explicit type0/1 * SET_CFG_TYPE - used on 4xx or any PHB that does explicit type0/1
@@ -58,15 +69,24 @@ struct pci_controller {
#define PPC_INDIRECT_TYPE_NO_PCIE_LINK 0x00000008 #define PPC_INDIRECT_TYPE_NO_PCIE_LINK 0x00000008
#define PPC_INDIRECT_TYPE_BIG_ENDIAN 0x00000010 #define PPC_INDIRECT_TYPE_BIG_ENDIAN 0x00000010
u32 indirect_type; u32 indirect_type;
#endif /* !CONFIG_PPC64 */
/* Currently, we limit ourselves to 1 IO range and 3 mem /* Currently, we limit ourselves to 1 IO range and 3 mem
* ranges since the common pci_bus structure can't handle more * ranges since the common pci_bus structure can't handle more
*/ */
struct resource io_resource; struct resource io_resource;
struct resource mem_resources[3]; struct resource mem_resources[3];
int global_number; /* PCI domain number */ int global_number; /* PCI domain number */
#ifdef CONFIG_PPC64
unsigned long buid;
unsigned long dma_window_base_cur;
unsigned long dma_window_size;
void *private_data;
#endif /* CONFIG_PPC64 */
}; };
#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(struct pci_bus *bus)
{ {
return bus->sysdata; return bus->sysdata;
@@ -107,47 +127,6 @@ extern void __init update_bridge_resource(struct pci_dev *dev,
#else /* CONFIG_PPC64 */ #else /* CONFIG_PPC64 */
/*
* Structure of a PCI controller (host bridge)
*/
struct pci_controller {
struct pci_bus *bus;
char is_dynamic;
int node;
void *arch_data;
struct list_head list_node;
struct device *parent;
int first_busno;
int last_busno;
void __iomem *io_base_virt;
void *io_base_alloc;
resource_size_t io_base_phys;
/* Some machines have a non 1:1 mapping of
* the PCI memory space in the CPU bus space
*/
resource_size_t pci_mem_offset;
unsigned long pci_io_size;
struct pci_ops *ops;
volatile unsigned int __iomem *cfg_addr;
volatile void __iomem *cfg_data;
/* Currently, we limit ourselves to 1 IO range and 3 mem
* ranges since the common pci_bus structure can't handle more
*/
struct resource io_resource;
struct resource mem_resources[3];
int global_number;
unsigned long buid;
unsigned long dma_window_base_cur;
unsigned long dma_window_size;
void *private_data;
};
/* /*
* PCI stuff, for nodes representing PCI devices, pointed to * PCI stuff, for nodes representing PCI devices, pointed to
* by device_node->data. * by device_node->data.