[PATCH 1/2] powerpc: Make isa_mem_base common to 32 and 64 bits

[PATCH 1/2] powerpc: Make isa_mem_base common to 32 and 64 bits

[Benjamin Herrenschmidt]

This defines isa_mem_base on both 32 and 64 bits (it used to be 32 bits
only). This avoids a few ifdef's in later patches and potentially can
allow support for VGA text mode on 64 bits powerpc.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---

Small cleanup pre-requisite for my next patch

 arch/powerpc/kernel/pci-common.c |    4 ++++
 arch/powerpc/kernel/pci_32.c     |    1 -
 include/asm-powerpc/io.h         |    5 +++--
 3 files changed, 7 insertions(+), 3 deletions(-)

Index: linux-work/arch/powerpc/kernel/pci-common.c
===================================================================
--- linux-work.orig/arch/powerpc/kernel/pci-common.c	2007-11-13 14:11:11.000000000 +1100
+++ linux-work/arch/powerpc/kernel/pci-common.c	2007-11-13 14:15:43.000000000 +1100
@@ -52,6 +52,10 @@ int global_phb_number;		/* Global phb co
 
 extern struct list_head hose_list;
 
+/* ISA Memory physical address (or 0 if none) */
+resource_size_t isa_mem_base    = 0;
+
+
 /*
  * pci_controller(phb) initialized common variables.
  */
Index: linux-work/include/asm-powerpc/io.h
===================================================================
--- linux-work.orig/include/asm-powerpc/io.h	2007-11-13 14:12:01.000000000 +1100
+++ linux-work/include/asm-powerpc/io.h	2007-11-13 14:12:48.000000000 +1100
@@ -50,15 +50,16 @@ extern int check_legacy_ioport(unsigned 
 #define PCI_DRAM_OFFSET	pci_dram_offset
 #else
 #define _IO_BASE	pci_io_base
-#define _ISA_MEM_BASE	0
+#define _ISA_MEM_BASE	isa_mem_base
 #define PCI_DRAM_OFFSET	0
 #endif
 
 extern unsigned long isa_io_base;
-extern unsigned long isa_mem_base;
 extern unsigned long pci_io_base;
 extern unsigned long pci_dram_offset;
 
+extern resource_size_t isa_mem_base;
+
 #if defined(CONFIG_PPC32) && defined(CONFIG_PPC_INDIRECT_IO)
 #error CONFIG_PPC_INDIRECT_IO is not yet supported on 32 bits
 #endif
Index: linux-work/arch/powerpc/kernel/pci_32.c
===================================================================
--- linux-work.orig/arch/powerpc/kernel/pci_32.c	2007-11-13 14:16:15.000000000 +1100
+++ linux-work/arch/powerpc/kernel/pci_32.c	2007-11-13 14:16:17.000000000 +1100
@@ -32,7 +32,6 @@
 #endif
 
 unsigned long isa_io_base     = 0;
-unsigned long isa_mem_base    = 0;
 unsigned long pci_dram_offset = 0;
 int pcibios_assign_bus_offset = 1;
 

Re: [PATCH 1/2] powerpc: Make isa_mem_base common to 32 and 64 bits

[Geert Uytterhoeven]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 1828 bytes --]

On Tue, 13 Nov 2007, Benjamin Herrenschmidt wrote:
> This defines isa_mem_base on both 32 and 64 bits (it used to be 32 bits
> only). This avoids a few ifdef's in later patches and potentially can
> allow support for VGA text mode on 64 bits powerpc.
> 
> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> ---
> 
> Small cleanup pre-requisite for my next patch
> 
>  arch/powerpc/kernel/pci-common.c |    4 ++++
>  arch/powerpc/kernel/pci_32.c     |    1 -
>  include/asm-powerpc/io.h         |    5 +++--
>  3 files changed, 7 insertions(+), 3 deletions(-)
> 
> Index: linux-work/arch/powerpc/kernel/pci-common.c
> ===================================================================
> --- linux-work.orig/arch/powerpc/kernel/pci-common.c	2007-11-13 14:11:11.000000000 +1100
> +++ linux-work/arch/powerpc/kernel/pci-common.c	2007-11-13 14:15:43.000000000 +1100
> @@ -52,6 +52,10 @@ int global_phb_number;		/* Global phb co
>  
>  extern struct list_head hose_list;
>  
> +/* ISA Memory physical address (or 0 if none) */
                                   ^^^^^^^^^^^^
> +resource_size_t isa_mem_base    = 0;

Let's hope this doesn't confuse too many people, as 0 is the valid value on
legacy PC hardware ;-)

With kind regards,
 
Geert Uytterhoeven
Software Architect

Sony Network and Software Technology Center Europe
The Corporate Village · Da Vincilaan 7-D1 · B-1935 Zaventem · Belgium
 
Phone:    +32 (0)2 700 8453	
Fax:      +32 (0)2 700 8622	
E-mail:   Geert.Uytterhoeven@sonycom.com	
Internet: http://www.sony-europe.com/
 	
Sony Network and Software Technology Center Europe	
A division of Sony Service Centre (Europe) N.V.	
Registered office: Technologielaan 7 · B-1840 Londerzeel · Belgium	
VAT BE 0413.825.160 · RPR Brussels	
Fortis Bank Zaventem · Swift GEBABEBB08A · IBAN BE39001382358619

Re: [PATCH 1/2] powerpc: Make isa_mem_base common to 32 and 64 bits

[Benjamin Herrenschmidt]

> > +/* ISA Memory physical address (or 0 if none) */
>                                    ^^^^^^^^^^^^
> > +resource_size_t isa_mem_base    = 0;
> 
> Let's hope this doesn't confuse too many people, as 0 is the valid value on
> legacy PC hardware ;-)

True, but that's been our default so far so I'm just not changing
existing behaviour. If it's bogus, it will need a separate fix.

Cheers,
Ben.