34ae6c96a6
Since commit 0536bdf33f (ARM: move iotable mappings within
the vmalloc region), the RealView PB11MP cannot boot anymore.
This is caused by the way the mappings are described on this
platform (define replaced by hex values for clarity):
{ /* GIC CPU interface mapping */
.virtual = IO_ADDRESS(0x1F000100),
.pfn = __phys_to_pfn(0x1F000100),
.length = SZ_4K,
.type = MT_DEVICE,
}, { /* GIC distributor mapping */
.virtual = IO_ADDRESS(0x1F001000),
.pfn = __phys_to_pfn(0x1F001000),
.length = SZ_4K,
.type = MT_DEVICE,
}
The first mapping ends up reserving two pages, and clashes with
the second one, which triggers a BUG_ON in vm_area_add_early().
In order to solve this problem, treat the MPCore private memory
region (containing the SCU, the GIC and the TWD) as a single region,
as described in the TRM:
http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.ddi0360f/CACGDJJC.html
The EB11MP is converted the same way, even if it manages to avoid
the problem.
Tested on both PB11MP and EB11MP.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
97 lines
3.8 KiB
C
97 lines
3.8 KiB
C
/*
|
|
* arch/arm/mach-realview/include/mach/board-eb.h
|
|
*
|
|
* Copyright (C) 2007 ARM Limited
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* 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., 51 Franklin Street, Fifth Floor, Boston,
|
|
* MA 02110-1301, USA.
|
|
*/
|
|
|
|
#ifndef __ASM_ARCH_BOARD_EB_H
|
|
#define __ASM_ARCH_BOARD_EB_H
|
|
|
|
#include <mach/platform.h>
|
|
|
|
/*
|
|
* RealView EB + ARM11MPCore peripheral addresses
|
|
*/
|
|
#define REALVIEW_EB_UART0_BASE 0x10009000 /* UART 0 */
|
|
#define REALVIEW_EB_UART1_BASE 0x1000A000 /* UART 1 */
|
|
#define REALVIEW_EB_UART2_BASE 0x1000B000 /* UART 2 */
|
|
#define REALVIEW_EB_UART3_BASE 0x1000C000 /* UART 3 */
|
|
#define REALVIEW_EB_SSP_BASE 0x1000D000 /* Synchronous Serial Port */
|
|
#define REALVIEW_EB_WATCHDOG_BASE 0x10010000 /* watchdog interface */
|
|
#define REALVIEW_EB_TIMER0_1_BASE 0x10011000 /* Timer 0 and 1 */
|
|
#define REALVIEW_EB_TIMER2_3_BASE 0x10012000 /* Timer 2 and 3 */
|
|
#define REALVIEW_EB_GPIO0_BASE 0x10013000 /* GPIO port 0 */
|
|
#define REALVIEW_EB_RTC_BASE 0x10017000 /* Real Time Clock */
|
|
#define REALVIEW_EB_CLCD_BASE 0x10020000 /* CLCD */
|
|
#define REALVIEW_EB_GIC_CPU_BASE 0x10040000 /* Generic interrupt controller CPU interface */
|
|
#define REALVIEW_EB_GIC_DIST_BASE 0x10041000 /* Generic interrupt controller distributor */
|
|
#define REALVIEW_EB_SMC_BASE 0x10080000 /* Static memory controller */
|
|
|
|
#define REALVIEW_EB_FLASH_BASE 0x40000000
|
|
#define REALVIEW_EB_FLASH_SIZE SZ_64M
|
|
#define REALVIEW_EB_ETH_BASE 0x4E000000 /* Ethernet */
|
|
#define REALVIEW_EB_USB_BASE 0x4F000000 /* USB */
|
|
|
|
#ifdef CONFIG_REALVIEW_EB_ARM11MP_REVB
|
|
#define REALVIEW_EB11MP_PRIV_MEM_BASE 0x1F000000
|
|
#define REALVIEW_EB11MP_L220_BASE 0x10102000 /* L220 registers */
|
|
#define REALVIEW_EB11MP_SYS_PLD_CTRL1 0xD8 /* Register offset for MPCore sysctl */
|
|
#else
|
|
#define REALVIEW_EB11MP_PRIV_MEM_BASE 0x1F000000
|
|
#define REALVIEW_EB11MP_L220_BASE 0x1F002000 /* L220 registers */
|
|
#define REALVIEW_EB11MP_SYS_PLD_CTRL1 0x74 /* Register offset for MPCore sysctl */
|
|
#endif
|
|
|
|
#define REALVIEW_EB11MP_PRIV_MEM_SIZE SZ_8K
|
|
#define REALVIEW_EB11MP_PRIV_MEM_OFF(x) (REALVIEW_EB11MP_PRIV_MEM_BASE + (x))
|
|
|
|
#define REALVIEW_EB11MP_SCU_BASE REALVIEW_EB11MP_PRIV_MEM_OFF(0) /* SCU registers */
|
|
#define REALVIEW_EB11MP_GIC_CPU_BASE REALVIEW_EB11MP_PRIV_MEM_OFF(0x0100) /* Generic interrupt controller CPU interface */
|
|
#define REALVIEW_EB11MP_TWD_BASE REALVIEW_EB11MP_PRIV_MEM_OFF(0x0600)
|
|
#define REALVIEW_EB11MP_GIC_DIST_BASE REALVIEW_EB11MP_PRIV_MEM_OFF(0x1000) /* Generic interrupt controller distributor */
|
|
|
|
/*
|
|
* Core tile identification (REALVIEW_SYS_PROCID)
|
|
*/
|
|
#define REALVIEW_EB_PROC_MASK 0xFF000000
|
|
#define REALVIEW_EB_PROC_ARM7TDMI 0x00000000
|
|
#define REALVIEW_EB_PROC_ARM9 0x02000000
|
|
#define REALVIEW_EB_PROC_ARM11 0x04000000
|
|
#define REALVIEW_EB_PROC_ARM11MP 0x06000000
|
|
#define REALVIEW_EB_PROC_A9MP 0x0C000000
|
|
|
|
#define check_eb_proc(proc_type) \
|
|
((readl(__io_address(REALVIEW_SYS_PROCID)) & REALVIEW_EB_PROC_MASK) \
|
|
== proc_type)
|
|
|
|
#ifdef CONFIG_REALVIEW_EB_ARM11MP
|
|
#define core_tile_eb11mp() check_eb_proc(REALVIEW_EB_PROC_ARM11MP)
|
|
#else
|
|
#define core_tile_eb11mp() 0
|
|
#endif
|
|
|
|
#ifdef CONFIG_REALVIEW_EB_A9MP
|
|
#define core_tile_a9mp() check_eb_proc(REALVIEW_EB_PROC_A9MP)
|
|
#else
|
|
#define core_tile_a9mp() 0
|
|
#endif
|
|
|
|
#define machine_is_realview_eb_mp() \
|
|
(machine_is_realview_eb() && (core_tile_eb11mp() || core_tile_a9mp()))
|
|
|
|
#endif /* __ASM_ARCH_BOARD_EB_H */
|