From 02dc1467038c11b18d6481bb613db789eb14042a Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Mon, 18 Oct 2004 08:23:22 -0700 Subject: [PATCH] [PATCH] ppc64: Fix iSeries build (ouch !) The move of iomap out of eeh inadvertently broke iSeries ... Fixed like this. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds --- arch/ppc64/kernel/iSeries_pci.c | 2 ++ include/asm-ppc64/eeh.h | 4 ---- include/asm-ppc64/io.h | 6 ++++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/arch/ppc64/kernel/iSeries_pci.c b/arch/ppc64/kernel/iSeries_pci.c index d3715a1538c6a..7aa56dfe2e51d 100644 --- a/arch/ppc64/kernel/iSeries_pci.c +++ b/arch/ppc64/kernel/iSeries_pci.c @@ -55,6 +55,7 @@ extern int panic_timeout; extern unsigned long iSeries_Base_Io_Memory; extern struct iommu_table *tceTables[256]; +extern unsigned long io_page_mask; extern void iSeries_MmIoTest(void); @@ -196,6 +197,7 @@ void iSeries_pcibios_init(void) PPCDBG(PPCDBG_BUSWALK, "iSeries_pcibios_init Entry.\n"); iSeries_IoMmTable_Initialize(); find_and_init_phbs(); + io_page_mask = -1; /* pci_assign_all_busses = 0; SFRXXX*/ PPCDBG(PPCDBG_BUSWALK, "iSeries_pcibios_init Exit.\n"); } diff --git a/include/asm-ppc64/eeh.h b/include/asm-ppc64/eeh.h index 85bc6850f0815..2f78baa0a15ea 100644 --- a/include/asm-ppc64/eeh.h +++ b/include/asm-ppc64/eeh.h @@ -256,10 +256,6 @@ static inline void eeh_memcpy_toio(volatile void __iomem *dest, const void *src, #undef EEH_CHECK_ALIGN -#define MAX_ISA_PORT 0x10000 -extern unsigned long io_page_mask; -#define _IO_IS_VALID(port) ((port) >= MAX_ISA_PORT || (1 << (port>>PAGE_SHIFT)) & io_page_mask) - static inline u8 eeh_inb(unsigned long port) { u8 val; if (!_IO_IS_VALID(port)) diff --git a/include/asm-ppc64/io.h b/include/asm-ppc64/io.h index 46d47573d1a44..f2db3d86035b1 100644 --- a/include/asm-ppc64/io.h +++ b/include/asm-ppc64/io.h @@ -33,6 +33,12 @@ extern unsigned long isa_io_base; extern unsigned long pci_io_base; +extern unsigned long io_page_mask; + +#define MAX_ISA_PORT 0x10000 + +#define _IO_IS_VALID(port) ((port) >= MAX_ISA_PORT || (1 << (port>>PAGE_SHIFT)) \ + & io_page_mask) #ifdef CONFIG_PPC_ISERIES /* __raw_* accessors aren't supported on iSeries */ -- 2.53.0