From: Christophe Leroy <christophe.leroy@c-s.fr>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Michael Ellerman <mpe@ellerman.id.au>,
scottwood@freescale.com
Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org
Subject: [PATCH v3 12/23] powerpc32: remove ioremap_base
Date: Tue, 17 Nov 2015 14:32:24 +0100 (CET) [thread overview]
Message-ID: <bd1122b0182bbf6c753a35917344f0fc491e1946.1446893432.git.christophe.leroy@c-s.fr> (raw)
In-Reply-To: <cover.1446893426.git.christophe.leroy@c-s.fr>
ioremap_base is not initialised and is nowhere used so remove it
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
---
v2: no change
v3: fix comment as well
arch/powerpc/include/asm/pgtable-ppc32.h | 2 +-
arch/powerpc/mm/mmu_decl.h | 1 -
arch/powerpc/mm/pgtable_32.c | 3 +--
arch/powerpc/platforms/embedded6xx/mpc10x.h | 10 ----------
4 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/arch/powerpc/include/asm/pgtable-ppc32.h b/arch/powerpc/include/asm/pgtable-ppc32.h
index 351d403..f288d06c 100644
--- a/arch/powerpc/include/asm/pgtable-ppc32.h
+++ b/arch/powerpc/include/asm/pgtable-ppc32.h
@@ -86,7 +86,7 @@ extern int icache_44x_need_flush;
* We no longer map larger than phys RAM with the BATs so we don't have
* to worry about the VMALLOC_OFFSET causing problems. We do have to worry
* about clashes between our early calls to ioremap() that start growing down
- * from ioremap_base being run into the VM area allocations (growing upwards
+ * from IOREMAP_TOP being run into the VM area allocations (growing upwards
* from VMALLOC_START). For this reason we have ioremap_bot to check when
* we actually run into our mappings setup in the early boot with the VM
* system. This really does become a problem for machines with good amounts
diff --git a/arch/powerpc/mm/mmu_decl.h b/arch/powerpc/mm/mmu_decl.h
index 50ed2e9..eb61b24 100644
--- a/arch/powerpc/mm/mmu_decl.h
+++ b/arch/powerpc/mm/mmu_decl.h
@@ -100,7 +100,6 @@ extern void setbat(int index, unsigned long virt, phys_addr_t phys,
extern int __map_without_bats;
extern int __allow_ioremap_reserved;
-extern unsigned long ioremap_base;
extern unsigned int rtas_data, rtas_size;
struct hash_pte;
diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c
index db0d35e..815ccd7 100644
--- a/arch/powerpc/mm/pgtable_32.c
+++ b/arch/powerpc/mm/pgtable_32.c
@@ -37,7 +37,6 @@
#include "mmu_decl.h"
-unsigned long ioremap_base;
unsigned long ioremap_bot;
EXPORT_SYMBOL(ioremap_bot); /* aka VMALLOC_END */
@@ -173,7 +172,7 @@ __ioremap_caller(phys_addr_t addr, unsigned long size, unsigned long flags,
/*
* Choose an address to map it to.
* Once the vmalloc system is running, we use it.
- * Before then, we use space going down from ioremap_base
+ * Before then, we use space going down from IOREMAP_TOP
* (ioremap_bot records where we're up to).
*/
p = addr & PAGE_MASK;
diff --git a/arch/powerpc/platforms/embedded6xx/mpc10x.h b/arch/powerpc/platforms/embedded6xx/mpc10x.h
index b290b63..5ad1202 100644
--- a/arch/powerpc/platforms/embedded6xx/mpc10x.h
+++ b/arch/powerpc/platforms/embedded6xx/mpc10x.h
@@ -24,13 +24,11 @@
* Processor: 0x80000000 - 0x807fffff -> PCI I/O: 0x00000000 - 0x007fffff
* Processor: 0xc0000000 - 0xdfffffff -> PCI MEM: 0x00000000 - 0x1fffffff
* PCI MEM: 0x80000000 -> Processor System Memory: 0x00000000
- * EUMB mapped to: ioremap_base - 0x00100000 (ioremap_base - 1 MB)
*
* MAP B (CHRP Map)
* Processor: 0xfe000000 - 0xfebfffff -> PCI I/O: 0x00000000 - 0x00bfffff
* Processor: 0x80000000 - 0xbfffffff -> PCI MEM: 0x80000000 - 0xbfffffff
* PCI MEM: 0x00000000 -> Processor System Memory: 0x00000000
- * EUMB mapped to: ioremap_base - 0x00100000 (ioremap_base - 1 MB)
*/
/*
@@ -138,14 +136,6 @@
#define MPC10X_EUMB_WP_OFFSET 0x000ff000 /* Data path diagnostic, watchpoint reg offset */
#define MPC10X_EUMB_WP_SIZE 0x00001000 /* Data path diagnostic, watchpoint reg size */
-/*
- * Define some recommended places to put the EUMB regs.
- * For both maps, recommend putting the EUMB from 0xeff00000 to 0xefffffff.
- */
-extern unsigned long ioremap_base;
-#define MPC10X_MAPA_EUMB_BASE (ioremap_base - MPC10X_EUMB_SIZE)
-#define MPC10X_MAPB_EUMB_BASE MPC10X_MAPA_EUMB_BASE
-
enum ppc_sys_devices {
MPC10X_IIC1,
MPC10X_DMA0,
--
2.1.0
next prev parent reply other threads:[~2015-11-17 14:02 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-17 13:31 [PATCH v3 00/23] powerpc/8xx: Use large pages for RAM and IMMR and other improvments Christophe Leroy
2015-11-17 13:32 ` [PATCH v3 01/23] powerpc/8xx: Save r3 all the time in DTLB miss handler Christophe Leroy
2015-11-17 13:32 ` [PATCH v3 02/23] powerpc/8xx: Map linear kernel RAM with 8M pages Christophe Leroy
2015-11-17 13:32 ` [PATCH v3 03/23] powerpc: Update documentation for noltlbs kernel parameter Christophe Leroy
2015-11-17 13:32 ` [PATCH v3 04/23] powerpc/8xx: move setup_initial_memory_limit() into 8xx_mmu.c Christophe Leroy
2015-11-17 13:32 ` [PATCH v3 05/23] powerpc32: Fix pte_offset_kernel() to return NULL for bad pages Christophe Leroy
2015-11-17 13:32 ` [PATCH v3 06/23] powerpc32: refactor x_mapped_by_bats() and x_mapped_by_tlbcam() together Christophe Leroy
2015-11-17 13:32 ` [PATCH v3 07/23] powerpc/8xx: Fix vaddr for IMMR early remap Christophe Leroy
2015-11-17 15:41 ` kbuild test robot
2015-11-17 16:40 ` kbuild test robot
2015-11-17 13:32 ` [PATCH v3 08/23] powerpc/8xx: Map IMMR area with 512k page at a fixed address Christophe Leroy
2015-11-17 13:32 ` [PATCH v3 09/23] powerpc/8xx: CONFIG_PIN_TLB unneeded for CONFIG_PPC_EARLY_DEBUG_CPM Christophe Leroy
2015-11-17 13:32 ` [PATCH v3 10/23] powerpc/8xx: map more RAM at startup when needed Christophe Leroy
2015-11-17 13:32 ` [PATCH v3 11/23] powerpc32: Remove useless/wrong MMU:setio progress message Christophe Leroy
2015-11-17 13:32 ` Christophe Leroy [this message]
2015-11-17 13:32 ` [PATCH v3 13/23] powerpc/8xx: Add missing SPRN defines into reg_8xx.h Christophe Leroy
2015-11-17 13:32 ` [PATCH v3 14/23] powerpc/8xx: Handle CPU6 ERRATA directly in mtspr() macro Christophe Leroy
2015-11-17 13:32 ` [PATCH v3 15/23] powerpc/8xx: remove special handling of CPU6 errata in set_dec() Christophe Leroy
2015-11-17 13:32 ` [PATCH v3 16/23] powerpc/8xx: rewrite set_context() in C Christophe Leroy
2015-11-17 13:32 ` [PATCH v3 17/23] powerpc/8xx: rewrite flush_instruction_cache() " Christophe Leroy
2015-11-17 13:32 ` [PATCH v3 18/23] powerpc: add inline functions for cache related instructions Christophe Leroy
2015-11-17 13:32 ` [PATCH v3 19/23] powerpc32: Remove clear_pages() and define clear_page() inline Christophe Leroy
2015-11-17 13:32 ` [PATCH v3 20/23] powerpc32: move xxxxx_dcache_range() functions inline Christophe Leroy
2015-11-17 13:32 ` [PATCH v3 21/23] powerpc: Simplify test in __dma_sync() Christophe Leroy
2015-11-17 13:32 ` [PATCH v3 22/23] powerpc32: small optimisation in flush_icache_range() Christophe Leroy
2015-11-17 13:32 ` [PATCH v3 23/23] powerpc32: Remove one insn in mulhdu Christophe Leroy
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=bd1122b0182bbf6c753a35917344f0fc491e1946.1446893432.git.christophe.leroy@c-s.fr \
--to=christophe.leroy@c-s.fr \
--cc=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.org \
--cc=scottwood@freescale.com \
/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).