Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd0053c9 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Linus Walleij
Browse files

ARM: realview: remove sparsemem hack 



The realview-pbx platform has an elaborate way of avoiding the use of highmem
by redefining its phys_to_virt function. In practice this doesn't help all
that much, and it gets in the way of doing multiplatform builds for
realview.

This removes the feature and kills off the mach/memory.h file for realview.
We also lose the ability to do sparsemem with this patch, but that should
be put back into place for generic multiplatform configurations, to save
a little memory on PBX.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 8005c49d

arch/arm/Kconfig

+0 −2
Original line number Original line Diff line number Diff line
@@ -239,7 +239,6 @@ config ARM_PATCH_PHYS_VIRT 
	bool "Patch physical to virtual translations at runtime" if EMBEDDED

	bool "Patch physical to virtual translations at runtime" if EMBEDDED

	default y

	default y

	depends on !XIP_KERNEL && MMU

	depends on !XIP_KERNEL && MMU

	depends on !ARCH_REALVIEW || !SPARSEMEM

	help

	help

	  Patch phys-to-virt and virt-to-phys translation functions at

	  Patch phys-to-virt and virt-to-phys translation functions at

	  boot and module load time according to the position of the

	  boot and module load time according to the position of the
@@ -354,7 +353,6 @@ config ARCH_REALVIEW 
	select GENERIC_CLOCKEVENTS

	select GENERIC_CLOCKEVENTS

	select GPIO_PL061 if GPIOLIB

	select GPIO_PL061 if GPIOLIB

	select ICST

	select ICST

	select NEED_MACH_MEMORY_H

	select PLAT_VERSATILE

	select PLAT_VERSATILE

	select PLAT_VERSATILE_SCHED_CLOCK

	select PLAT_VERSATILE_SCHED_CLOCK

	help

	help

arch/arm/mach-realview/Kconfig

+2 −3
Original line number Original line Diff line number Diff line
@@ -102,14 +102,13 @@ config MACH_REALVIEW_PBA8 




config MACH_REALVIEW_PBX

config MACH_REALVIEW_PBX

	bool "Support RealView(R) Platform Baseboard Explore"

	bool "Support RealView(R) Platform Baseboard Explore"

	select ARCH_SPARSEMEM_ENABLE if CPU_V7 && !REALVIEW_HIGH_PHYS_OFFSET

	select ARM_GIC

	select ARM_GIC

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if SMP

	select HAVE_ARM_TWD if SMP

	select HAVE_PATA_PLATFORM

	select HAVE_PATA_PLATFORM

	select HAVE_SMP

	select HAVE_SMP

	select MIGHT_HAVE_CACHE_L2X0

	select MIGHT_HAVE_CACHE_L2X0

	select ZONE_DMA if SPARSEMEM

	select ZONE_DMA

	help

	help

	  Include support for the ARM(R) RealView(R) Platform Baseboard

	  Include support for the ARM(R) RealView(R) Platform Baseboard

	  Explore.

	  Explore.
@@ -124,6 +123,6 @@ config REALVIEW_HIGH_PHYS_OFFSET 
	  the board supports 512MB of RAM, this option allows the

	  the board supports 512MB of RAM, this option allows the

	  memory to be accessed contiguously at the high physical

	  memory to be accessed contiguously at the high physical

	  offset. On the PBX board, disabling this option allows 1GB of

	  offset. On the PBX board, disabling this option allows 1GB of

	  RAM to be used with SPARSEMEM.

	  RAM to be used with HIGHMEM.





endmenu
 
endmenu

arch/arm/mach-realview/include/mach/memory.h

deleted100644 → 0
+0 −64
Original line number Original line Diff line number Diff line 
/*

 *  arch/arm/mach-realview/include/mach/memory.h

 *

 *  Copyright (C) 2003 ARM Limited

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */

#ifndef __ASM_ARCH_MEMORY_H

#define __ASM_ARCH_MEMORY_H



#ifdef CONFIG_SPARSEMEM



/*

 * Sparsemem definitions for RealView PBX.

 *

 * The RealView PBX board has another block of 512MB of RAM at 0x20000000,

 * however only the block at 0x70000000 (or the 256MB mirror at 0x00000000)

 * may be used for DMA.

 *

 * The macros below define a section size of 256MB and a non-linear virtual to

 * physical mapping:

 *

 * 256MB @ 0x00000000 -> PAGE_OFFSET

 * 512MB @ 0x20000000 -> PAGE_OFFSET + 0x10000000

 * 256MB @ 0x80000000 -> PAGE_OFFSET + 0x30000000

 */

#ifdef CONFIG_REALVIEW_HIGH_PHYS_OFFSET

#error "SPARSEMEM not available with REALVIEW_HIGH_PHYS_OFFSET"

#endif



#define MAX_PHYSMEM_BITS	32

#define SECTION_SIZE_BITS	28



/* bank page offsets */

#define PAGE_OFFSET1	(PAGE_OFFSET + 0x10000000)

#define PAGE_OFFSET2	(PAGE_OFFSET + 0x30000000)



#define PHYS_OFFSET PLAT_PHYS_OFFSET



#define __phys_to_virt(phys)						\

	((phys) >= 0x80000000 ?	(phys) - 0x80000000 + PAGE_OFFSET2 :	\

	 (phys) >= 0x20000000 ?	(phys) - 0x20000000 + PAGE_OFFSET1 :	\

	 (phys) + PAGE_OFFSET)



#define __virt_to_phys(virt)						\

	 ((virt) >= PAGE_OFFSET2 ? (virt) - PAGE_OFFSET2 + 0x80000000 :	\

	  (virt) >= PAGE_OFFSET1 ? (virt) - PAGE_OFFSET1 + 0x20000000 :	\

	  (virt) - PAGE_OFFSET)



#endif	/* CONFIG_SPARSEMEM */



#endif