mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-03 17:40:04 +00:00
powerpc: Move isa bridge definitions to separate include
We'll be adding non-PCI isa bridge support so let's not have all the definition in pci-bridge.h Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
parent
b48ff52043
commit
38e9d36bc1
7 changed files with 33 additions and 18 deletions
28
arch/powerpc/include/asm/isa-bridge.h
Normal file
28
arch/powerpc/include/asm/isa-bridge.h
Normal file
|
@ -0,0 +1,28 @@
|
|||
#ifndef __ISA_BRIDGE_H
|
||||
#define __ISA_BRIDGE_H
|
||||
|
||||
#ifdef CONFIG_PPC64
|
||||
|
||||
extern void isa_bridge_find_early(struct pci_controller *hose);
|
||||
|
||||
static inline int isa_vaddr_is_ioport(void __iomem *address)
|
||||
{
|
||||
/* Check if address hits the reserved legacy IO range */
|
||||
unsigned long ea = (unsigned long)address;
|
||||
return ea >= ISA_IO_BASE && ea < ISA_IO_END;
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
static inline int isa_vaddr_is_ioport(void __iomem *address)
|
||||
{
|
||||
/* No specific ISA handling on ppc32 at this stage, it
|
||||
* all goes through PCI
|
||||
*/
|
||||
return 0;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#endif /* __ISA_BRIDGE_H */
|
||||
|
|
@ -174,14 +174,6 @@ extern int pci_device_from_OF_node(struct device_node *node,
|
|||
u8 *bus, u8 *devfn);
|
||||
extern void pci_create_OF_bus_map(void);
|
||||
|
||||
static inline int isa_vaddr_is_ioport(void __iomem *address)
|
||||
{
|
||||
/* No specific ISA handling on ppc32 at this stage, it
|
||||
* all goes through PCI
|
||||
*/
|
||||
return 0;
|
||||
}
|
||||
|
||||
#else /* CONFIG_PPC64 */
|
||||
|
||||
/*
|
||||
|
@ -269,16 +261,6 @@ extern void pci_hp_remove_devices(struct pci_bus *bus);
|
|||
/** Discover new pci devices under this bus, and add them */
|
||||
extern void pci_hp_add_devices(struct pci_bus *bus);
|
||||
|
||||
|
||||
extern void isa_bridge_find_early(struct pci_controller *hose);
|
||||
|
||||
static inline int isa_vaddr_is_ioport(void __iomem *address)
|
||||
{
|
||||
/* Check if address hits the reserved legacy IO range */
|
||||
unsigned long ea = (unsigned long)address;
|
||||
return ea >= ISA_IO_BASE && ea < ISA_IO_END;
|
||||
}
|
||||
|
||||
extern int pcibios_unmap_io_space(struct pci_bus *bus);
|
||||
extern int pcibios_map_io_space(struct pci_bus *bus);
|
||||
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
#include <linux/export.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/pci-bridge.h>
|
||||
#include <asm/isa-bridge.h>
|
||||
|
||||
/*
|
||||
* Here comes the ppc64 implementation of the IOMAP
|
||||
|
|
|
@ -29,6 +29,7 @@
|
|||
#include <asm/pci-bridge.h>
|
||||
#include <asm/machdep.h>
|
||||
#include <asm/ppc-pci.h>
|
||||
#include <asm/isa-bridge.h>
|
||||
|
||||
unsigned long isa_io_base; /* NULL if no ISA bus */
|
||||
EXPORT_SYMBOL(isa_io_base);
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
#include <asm/machdep.h>
|
||||
#include <asm/iommu.h>
|
||||
#include <asm/ppc-pci.h>
|
||||
#include <asm/isa-bridge.h>
|
||||
|
||||
#include "maple.h"
|
||||
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
#include <asm/prom.h>
|
||||
#include <linux/uaccess.h>
|
||||
#include <asm/debug.h>
|
||||
#include <asm/isa-bridge.h>
|
||||
|
||||
static int opal_lpc_chip_id = -1;
|
||||
|
||||
|
|
|
@ -66,6 +66,7 @@
|
|||
#include <asm/reg.h>
|
||||
#include <asm/plpar_wrappers.h>
|
||||
#include <asm/kexec.h>
|
||||
#include <asm/isa-bridge.h>
|
||||
|
||||
#include "pseries.h"
|
||||
|
||||
|
|
Loading…
Reference in a new issue