ppc/powerpc: Fix io.h for config with CONFIG_PCI not set
PATCH 1/1 ppc/powerpc: Fix io.h for config with CONFIG_PCI not set
When CONFIG_PCI option is not set, the variables pci_dram_offset, isa_io_base and isa_mem_base are not defined.
Currently, the test is handled in each platform header. This patch moves the test in io.h once and for all.
--- include/asm-powerpc/mpc85xx.h | 8 -------- include/asm-ppc/io.h | 8 +------- include/asm-ppc/mpc52xx.h | 11 ----------- include/asm-ppc/mpc83xx.h | 8 -------- include/asm-ppc/mpc85xx.h | 8 -------- 5 files changed, 1 insertions(+), 42 deletions(-)
include/asm-powerpc/mpc85xx.h +0 -8
@@ -31,14 +31,6 @@ #ifdef CONFIG_MPC85xx_CDS#include <platforms/85xx/mpc85xx_cds.h> #endif -#define _IO_BASE isa_io_base -#define _ISA_MEM_BASE isa_mem_base -#ifdef CONFIG_PCI -#define PCI_DRAM_OFFSET pci_dram_offset -#else -#define PCI_DRAM_OFFSET 0 -#endif -/* Let modules/drivers get at CCSRBAR */ extern phys_addr_t get_ccsrbar (void );
include/asm-ppc/io.h +1 -7
@@ -26,17 +26,11 @@ #define PREP_PCI_DRAM_OFFSET 0x80000000#if defined(CONFIG_4xx)#include <asm/ibm4xx.h> -#elif defined(CONFIG_PPC_MPC52xx) -#include <asm/mpc52xx.h> #elif defined(CONFIG_8xx)#include <asm/mpc8xx.h> #elif defined(CONFIG_8260 )#include <asm/mpc8260.h> -#elif defined(CONFIG_83xx) -#include <asm/mpc83xx.h> -#elif defined(CONFIG_85xx) -#include <asm/mpc85xx.h> -#elif defined(CONFIG_APUS ) +#elif defined(CONFIG_APUS ) || !defined(CONFIG_PCI )#define _IO_BASE 0#define _ISA_MEM_BASE 0#define PCI_DRAM_OFFSET 0
include/asm-ppc/mpc52xx.h +0 -11
@@ -29,17 +29,6 @@ struct pt_regs;#endif /* __ASSEMBLY__ */ -#ifdef CONFIG_PCI -#define _IO_BASE isa_io_base -#define _ISA_MEM_BASE isa_mem_base -#define PCI_DRAM_OFFSET pci_dram_offset -#else -#define _IO_BASE 0 -#define _ISA_MEM_BASE 0 -#define PCI_DRAM_OFFSET 0 -#endif - -/* ======================================================================== */ /* PPC Sys devices definition */ /* ======================================================================== */
include/asm-ppc/mpc83xx.h +0 -8
@@ -25,14 +25,6 @@ #ifdef CONFIG_MPC834x_SYS#include <platforms/83xx/mpc834x_sys.h> #endif -#define _IO_BASE isa_io_base -#define _ISA_MEM_BASE isa_mem_base -#ifdef CONFIG_PCI -#define PCI_DRAM_OFFSET pci_dram_offset -#else -#define PCI_DRAM_OFFSET 0 -#endif -/* * The "residual" board information structure the boot loader passes * into the kernel.
include/asm-ppc/mpc85xx.h +0 -8
@@ -44,14 +44,6 @@ #if defined(CONFIG_TQM8540) || defined(C#include <platforms/85xx/tqm85xx.h> #endif -#define _IO_BASE isa_io_base -#define _ISA_MEM_BASE isa_mem_base -#ifdef CONFIG_PCI -#define PCI_DRAM_OFFSET pci_dram_offset -#else -#define PCI_DRAM_OFFSET 0 -#endif -/* * The "residual" board information structure the boot loader passes * into the kernel.
Signature · 1 line
1.4.2
Quoted 5 lines · Sylvain Munaut
When
CONFIG_PCIoption is not set, the variablespci_dram_offset,isa_io_baseandisa_mem_baseare not defined.Currently, the test is handled in each platform header. This patch moves the test in
io.honce and for all.
Be careful with _IO_BASE... I'm not 100% sure some platforms don't need it set to something else even when PCI is not present.
Ben.
Quoted 5 lines · Benjamin Herrenschmidt
Quoted 3 lines · Sylvain Munaut
When
CONFIG_PCIoption is not set, the variablespci_dram_offset,isa_io_baseandisa_mem_baseare not defined.
Quoted 7 lines
Quoted 3 lines
Currently, the test is handled in each platform header. This patch moves the test in
io.honce and for all.Be careful with
_IO_BASE... I'm not 100% sure some platforms don't need it set to something else even when PCI is not present.
When I saw in mpc83xx.h and mpc85xx.h that they still defined them, I wondered.
But when looking at the code :
unsigned long isa_io_base = 0;
unsigned long isa_mem_base = 0;are both defined in pci_{32/64}.c and won't be included if CONFIG_PCI is not set.
Sylvain