linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: <linuxppc-dev@ozlabs.org>
Subject: [RFC/PATCH 1/14] powerpc: Make isa_mem_base common to 32 and 64 bits
Date: Wed, 21 Nov 2007 17:16:18 +1100	[thread overview]
Message-ID: <20071121061708.769A1DE810@ozlabs.org> (raw)
In-Reply-To: <1195625777.579001.269266058699.qpush@grosgo>

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-20 14:42:49.000000000 +1100
+++ linux-work/arch/powerpc/kernel/pci-common.c	2007-11-20 15:03:02.000000000 +1100
@@ -52,6 +52,10 @@ int global_phb_number;		/* Global phb co
 
 extern struct list_head hose_list;
 
+/* ISA Memory physical address */
+resource_size_t isa_mem_base;
+
+
 /*
  * pci_controller(phb) initialized common variables.
  */
Index: linux-work/include/asm-powerpc/io.h
===================================================================
--- linux-work.orig/include/asm-powerpc/io.h	2007-11-20 14:42:49.000000000 +1100
+++ linux-work/include/asm-powerpc/io.h	2007-11-20 14:47:11.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-20 14:42:49.000000000 +1100
+++ linux-work/arch/powerpc/kernel/pci_32.c	2007-11-20 15:02:43.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;
 

  reply	other threads:[~2007-11-21  6:16 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-11-21  6:16 [RFC/PATCH 0/14] powerpc: 4xx PCI and PCI-X support Benjamin Herrenschmidt
2007-11-21  6:16 ` Benjamin Herrenschmidt [this message]
2007-11-21  6:16 ` [RFC/PATCH 2/14] powerpc: Merge pci_process_bridge_OF_ranges() Benjamin Herrenschmidt
2007-11-22 18:35   ` Vitaly Bordug
2007-11-21  6:16 ` [RFC/PATCH 3/14] powerpc: Fix declaration of pcibios_free_controller Benjamin Herrenschmidt
2007-11-21  6:16 ` [RFC/PATCH 4/14] powerpc: Fix powerpc 32 bits resource fixup for 64 bits resources Benjamin Herrenschmidt
2007-11-22 18:31   ` Vitaly Bordug
2007-11-21  6:16 ` [RFC/PATCH 5/14] powerpc: Fix 440/440A machine check handling Benjamin Herrenschmidt
2007-11-21 13:12   ` Josh Boyer
2007-11-21 19:48     ` Benjamin Herrenschmidt
2007-11-21 19:51       ` Josh Boyer
2007-11-21 20:05         ` Benjamin Herrenschmidt
2007-11-28 21:34           ` Olof Johansson
2007-11-28 21:52             ` Benjamin Herrenschmidt
2007-11-21  6:16 ` [RFC/PATCH 6/14] powerpc: Add xmon function to dump 44x TLB Benjamin Herrenschmidt
2007-11-21  6:16 ` [RFC/PATCH 7/14] powerpc: Change 32 bits PCI message about resource allocation Benjamin Herrenschmidt
2007-11-21  6:16 ` [RFC/PATCH 8/14] powerpc: Fix kmalloc alignmenent on non-coherent DMA Benjamin Herrenschmidt
2007-11-21  6:16 ` [RFC/PATCH 9/14] powerpc: 4xx PLB to PCI-X support Benjamin Herrenschmidt
2007-11-21  6:16 ` [RFC/PATCH 10/14] powerpc: 4xx PLB to PCI 2.x support Benjamin Herrenschmidt
2007-11-21  6:16 ` [RFC/PATCH 12/14] powerpc: Add early udbg support for 40x processors Benjamin Herrenschmidt
2007-11-21 22:58   ` David Gibson
2007-11-22  0:00     ` Benjamin Herrenschmidt
2007-11-22  0:22       ` David Gibson
2007-11-21  6:16 ` [RFC/PATCH 11/14] powerpc: PCI support for 4xx Ebony board Benjamin Herrenschmidt
2007-11-21  6:16 ` [RFC/PATCH 13/14] powerpc: EP405 boards support for arch/powerpc Benjamin Herrenschmidt
2007-11-21 13:21   ` Josh Boyer
2007-11-21 19:49     ` Benjamin Herrenschmidt
2007-11-21  6:16 ` [RFC/PATCH 14/14] powerpc: Add PCI to Walnut platform Benjamin Herrenschmidt
2007-11-21 13:24   ` Josh Boyer
2007-11-21  6:35 ` [RFC/PATCH 0/14] powerpc: 4xx PCI and PCI-X support Benjamin Herrenschmidt
2007-11-21 13:23 ` Josh Boyer
2007-11-21 14:04   ` Stefan Roese
2007-11-21 14:33     ` Josh Boyer
2007-11-21 19:51     ` Benjamin Herrenschmidt
2007-11-21 19:50   ` Benjamin Herrenschmidt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20071121061708.769A1DE810@ozlabs.org \
    --to=benh@kernel.crashing.org \
    --cc=linuxppc-dev@ozlabs.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).