Skip to content

L
linux
Commit 7cd1de6b authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras
Browse files
Options

[POWERPC] Clean up pci-bridge.h 

No semantic changes.
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 96188ce5
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 53 deletions
include/asm-powerpc/pci-bridge.h
View file @ 7cd1de6b
#ifndef _ASM_POWERPC_PCI_BRIDGE_H #ifndef _ASM_POWERPC_PCI_BRIDGE_H
#define _ASM_POWERPC_PCI_BRIDGE_H #define _ASM_POWERPC_PCI_BRIDGE_H
#ifdef __KERNEL__ #ifdef __KERNEL__
/*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version.
*/
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#ifndef CONFIG_PPC64 #ifndef CONFIG_PPC64
struct device_node;
struct pci_controller;
/* /*
* Structure of a PCI controller (host bridge) * Structure of a PCI controller (host bridge)
*/ */
...@@ -51,11 +52,11 @@ struct pci_controller { ...@@ -51,11 +52,11 @@ struct pci_controller {
* set. * set.
* BIG_ENDIAN - cfg_addr is a big endian register * BIG_ENDIAN - cfg_addr is a big endian register
*/ */
#define PPC_INDIRECT_TYPE_SET_CFG_TYPE (0x00000001) #define PPC_INDIRECT_TYPE_SET_CFG_TYPE 0x00000001
#define PPC_INDIRECT_TYPE_EXT_REG (0x00000002) #define PPC_INDIRECT_TYPE_EXT_REG 0x00000002
#define PPC_INDIRECT_TYPE_SURPRESS_PRIMARY_BUS (0x00000004) #define PPC_INDIRECT_TYPE_SURPRESS_PRIMARY_BUS 0x00000004
#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;
/* Currently, we limit ourselves to 1 IO range and 3 mem /* Currently, we limit ourselves to 1 IO range and 3 mem
...@@ -81,18 +82,18 @@ static inline int isa_vaddr_is_ioport(void __iomem *address) ...@@ -81,18 +82,18 @@ static inline int isa_vaddr_is_ioport(void __iomem *address)
/* These are used for config access before all the PCI probing /* These are used for config access before all the PCI probing
has been done. */ has been done. */
int early_read_config_byte(struct pci_controller *hose, int bus, int dev_fn, extern int early_read_config_byte(struct pci_controller *hose, int bus,
int where, u8 *val); int dev_fn, int where, u8 *val);
int early_read_config_word(struct pci_controller *hose, int bus, int dev_fn, extern int early_read_config_word(struct pci_controller *hose, int bus,
int where, u16 *val); int dev_fn, int where, u16 *val);
int early_read_config_dword(struct pci_controller *hose, int bus, int dev_fn, extern int early_read_config_dword(struct pci_controller *hose, int bus,
int where, u32 *val); int dev_fn, int where, u32 *val);
int early_write_config_byte(struct pci_controller *hose, int bus, int dev_fn, extern int early_write_config_byte(struct pci_controller *hose, int bus,
int where, u8 val); int dev_fn, int where, u8 val);
int early_write_config_word(struct pci_controller *hose, int bus, int dev_fn, extern int early_write_config_word(struct pci_controller *hose, int bus,
int where, u16 val); int dev_fn, int where, u16 val);
int early_write_config_dword(struct pci_controller *hose, int bus, int dev_fn, extern int early_write_config_dword(struct pci_controller *hose, int bus,
int where, u32 val); int dev_fn, int where, u32 val);
extern int early_find_capability(struct pci_controller *hose, int bus, extern int early_find_capability(struct pci_controller *hose, int bus,
int dev_fn, int cap); int dev_fn, int cap);
...@@ -104,15 +105,7 @@ extern void setup_grackle(struct pci_controller *hose); ...@@ -104,15 +105,7 @@ extern void setup_grackle(struct pci_controller *hose);
extern void __init update_bridge_resource(struct pci_dev *dev, extern void __init update_bridge_resource(struct pci_dev *dev,
struct resource *res); struct resource *res);
#else #else /* CONFIG_PPC64 */
/*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version.
*/
/* /*
* Structure of a PCI controller (host bridge) * Structure of a PCI controller (host bridge)
...@@ -159,8 +152,8 @@ struct pci_controller { ...@@ -159,8 +152,8 @@ struct pci_controller {
* 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.
*/ */
struct pci_controller;
struct iommu_table; struct iommu_table;
struct device_node;
struct pci_dn { struct pci_dn {
int busno; /* pci bus number */ int busno; /* pci bus number */
...@@ -179,9 +172,9 @@ struct pci_dn { ...@@ -179,9 +172,9 @@ struct pci_dn {
int eeh_mode; /* See eeh.h for possible EEH_MODEs */ int eeh_mode; /* See eeh.h for possible EEH_MODEs */
int eeh_config_addr; int eeh_config_addr;
int eeh_pe_config_addr; /* new-style partition endpoint address */ int eeh_pe_config_addr; /* new-style partition endpoint address */
int eeh_check_count; /* # times driver ignored error */ int eeh_check_count; /* # times driver ignored error */
int eeh_freeze_count; /* # times this device froze up. */ int eeh_freeze_count; /* # times this device froze up. */
int eeh_false_positives; /* # times this device reported #ff's */ int eeh_false_positives; /* # times this device reported #ff's */
u32 config_space[16]; /* saved PCI config space */ u32 config_space[16]; /* saved PCI config space */
#endif #endif
}; };
...@@ -189,7 +182,7 @@ struct pci_dn { ...@@ -189,7 +182,7 @@ struct pci_dn {
/* Get the pointer to a device_node's pci_dn */ /* Get the pointer to a device_node's pci_dn */
#define PCI_DN(dn) ((struct pci_dn *) (dn)->data) #define PCI_DN(dn) ((struct pci_dn *) (dn)->data)
struct device_node *fetch_dev_dn(struct pci_dev *dev); extern struct device_node *fetch_dev_dn(struct pci_dev *dev);
/* Get a device_node from a pci_dev. This code must be fast except /* Get a device_node from a pci_dev. This code must be fast except
* in the case where the sysdata is incorrect and needs to be fixed * in the case where the sysdata is incorrect and needs to be fixed
...@@ -227,14 +220,14 @@ static inline struct device_node *pci_bus_to_OF_node(struct pci_bus *bus) ...@@ -227,14 +220,14 @@ static inline struct device_node *pci_bus_to_OF_node(struct pci_bus *bus)
} }
/** Find the bus corresponding to the indicated device node */ /** Find the bus corresponding to the indicated device node */
struct pci_bus * pcibios_find_pci_bus(struct device_node *dn); extern struct pci_bus *pcibios_find_pci_bus(struct device_node *dn);
/** Remove all of the PCI devices under this bus */ /** Remove all of the PCI devices under this bus */
void pcibios_remove_pci_devices(struct pci_bus *bus); extern void pcibios_remove_pci_devices(struct pci_bus *bus);
/** Discover new pci devices under this bus, and add them */ /** Discover new pci devices under this bus, and add them */
void pcibios_add_pci_devices(struct pci_bus * bus); extern void pcibios_add_pci_devices(struct pci_bus *bus);
void pcibios_fixup_new_pci_devices(struct pci_bus *bus, int fix_bus); extern void pcibios_fixup_new_pci_devices(struct pci_bus *bus, int fix_bus);
extern int pcibios_remove_root_bus(struct pci_controller *phb); extern int pcibios_remove_root_bus(struct pci_controller *phb);
...@@ -270,20 +263,18 @@ extern int pcibios_map_io_space(struct pci_bus *bus); ...@@ -270,20 +263,18 @@ extern int pcibios_map_io_space(struct pci_bus *bus);
#define PHB_SET_NODE(PHB, NODE) ((PHB)->node = -1) #define PHB_SET_NODE(PHB, NODE) ((PHB)->node = -1)
#endif #endif
#endif /* CONFIG_PPC64 */ #endif /* CONFIG_PPC64 */
/* Get the PCI host controller for an OF device */ /* Get the PCI host controller for an OF device */
extern struct pci_controller* extern struct pci_controller *pci_find_hose_for_OF_device(
pci_find_hose_for_OF_device(struct device_node* node); struct device_node* node);
/* Fill up host controller resources from the OF node */ /* Fill up host controller resources from the OF node */
extern void extern void pci_process_bridge_OF_ranges(struct pci_controller *hose,
pci_process_bridge_OF_ranges(struct pci_controller *hose, struct device_node *dev, int primary);
struct device_node *dev, int primary);
/* Allocate & free a PCI host bridge structure */ /* Allocate & free a PCI host bridge structure */
extern struct pci_controller * extern struct pci_controller *pcibios_alloc_controller(struct device_node *dev);
pcibios_alloc_controller(struct device_node *dev);
extern void pcibios_free_controller(struct pci_controller *phb); extern void pcibios_free_controller(struct pci_controller *phb);
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
...@@ -298,9 +289,7 @@ static inline int pcibios_vaddr_is_ioport(void __iomem *address) ...@@ -298,9 +289,7 @@ static inline int pcibios_vaddr_is_ioport(void __iomem *address)
{ {
return 0; return 0;
} }
#endif #endif /* CONFIG_PCI */
#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_PCI_BRIDGE_H */
#endif /* __KERNEL__ */
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7