From: gregory.clement@free-electrons•com (Gregory CLEMENT)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v3 02/13] ARM: append ARCH_MULTI_V7_LPAE
Date: Fri, 18 Apr 2014 08:56:27 +0200 [thread overview]
Message-ID: <5350CC9B.2090102@free-electrons.com> (raw)
In-Reply-To: <1397801156-25682-3-git-send-email-haojian.zhuang@linaro.org>
Hi Haojian,
On 18/04/2014 08:05, Haojian Zhuang wrote:
> Add new ARCH_MULTI_V7_LPAE config. It will select ARM_LPAE only both
> ARCH_MULTI_V6 & ARCH_MULTI_V7 is disabled.
>
> ARCH_MULTI_V7 means non-LPAE platform.
>
> Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro•org>
> ---
> arch/arm/Kconfig | 9 ++++++++-
> arch/arm/mach-berlin/Kconfig | 2 +-
> arch/arm/mach-highbank/Kconfig | 2 +-
> arch/arm/mach-mvebu/Kconfig | 6 +++---
> arch/arm/mach-omap2/Kconfig | 4 ++--
> arch/arm/mach-qcom/Kconfig | 2 +-
> arch/arm/mach-shmobile/Kconfig | 2 +-
> arch/arm/mach-tegra/Kconfig | 2 +-
> arch/arm/mach-vexpress/Kconfig | 2 +-
> 9 files changed, 19 insertions(+), 12 deletions(-)
>
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index ab438cb..9a2214e 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -918,12 +918,19 @@ config ARCH_MULTI_V6
> select CPU_V6K
>
> config ARCH_MULTI_V7
> - bool "ARMv7 based platforms (Cortex-A, PJ4, Scorpion, Krait)"
> + bool "ARMv7 non-LPAE based platforms (Cortex-A5/A8/A9, PJ4, Scorpion)"
Actually some PJ4B are also non LPAE capable
> default y
> select ARCH_MULTI_V6_V7
> select CPU_V7
> select HAVE_SMP
>
> +config ARCH_MULTI_V7_LPAE
> + bool "ARMv7 LPAE based platforms (Cortex-A7/A12/A15/A17, Brahma-B15, PJ4B, Krait)"
Only Armada XP is LPAE capable, and and the CPU is not a "simple" PJ4B
but a PJ4B-MP
> + select ARCH_MULTI_V6_V7
> + select CPU_V7
> + select HAVE_SMP
> + select ARM_LPAE if !(ARCH_MULTI_V6 || ARCH_MULTI_V7)
> +
> config ARCH_MULTI_V6_V7
> bool
> select MIGHT_HAVE_CACHE_L2X0
> diff --git a/arch/arm/mach-berlin/Kconfig b/arch/arm/mach-berlin/Kconfig
> index b0cb072..be0512d 100644
> --- a/arch/arm/mach-berlin/Kconfig
> +++ b/arch/arm/mach-berlin/Kconfig
> @@ -1,5 +1,5 @@
> config ARCH_BERLIN
> - bool "Marvell Berlin SoCs" if ARCH_MULTI_V7
> + bool "Marvell Berlin SoCs" if (ARCH_MULTI_V7 || ARCH_MULTI_V7_LPAE)
> select ARM_GIC
> select GENERIC_IRQ_CHIP
> select DW_APB_ICTL
> diff --git a/arch/arm/mach-highbank/Kconfig b/arch/arm/mach-highbank/Kconfig
> index 830b76e..9b6b3f8 100644
> --- a/arch/arm/mach-highbank/Kconfig
> +++ b/arch/arm/mach-highbank/Kconfig
> @@ -1,5 +1,5 @@
> config ARCH_HIGHBANK
> - bool "Calxeda ECX-1000/2000 (Highbank/Midway)" if ARCH_MULTI_V7
> + bool "Calxeda ECX-1000/2000 (Highbank/Midway)" if ARCH_MULTI_V7_LPAE
> select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
> select ARCH_HAS_CPUFREQ
> select ARCH_HAS_HOLES_MEMORYMODEL
> diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
> index 3f73eec..16f69ae 100644
> --- a/arch/arm/mach-mvebu/Kconfig
> +++ b/arch/arm/mach-mvebu/Kconfig
> @@ -1,5 +1,5 @@
> config ARCH_MVEBU
> - bool "Marvell Engineering Business Unit (MVEBU) SoCs" if (ARCH_MULTI_V7 || ARCH_MULTI_V5)
> + bool "Marvell Engineering Business Unit (MVEBU) SoCs" if (ARCH_MULTI_V7 || ARCH_MULTI_V7_LPAE || ARCH_MULTI_V5)
> select ARCH_SUPPORTS_BIG_ENDIAN
> select CLKSRC_MMIO
> select GENERIC_IRQ_CHIP
> @@ -23,7 +23,7 @@ config MACH_MVEBU_V7
> select CACHE_L2X0
>
> config MACH_ARMADA_370
> - bool "Marvell Armada 370 boards" if ARCH_MULTI_V7
> + bool "Marvell Armada 370 boards" if ARCH_MULTI_V7_LPAE
Armada 370 is not LPAE capable
> select ARMADA_370_CLK
> select CPU_PJ4B
> select MACH_MVEBU_V7
> @@ -59,7 +59,7 @@ config MACH_ARMADA_38X
> on the Marvell Armada 380/385 SoC with device tree.
>
> config MACH_ARMADA_XP
> - bool "Marvell Armada XP boards" if ARCH_MULTI_V7
> + bool "Marvell Armada XP boards" if ARCH_MULTI_V7_LPAE
> select ARMADA_XP_CLK
> select CPU_PJ4B
> select MACH_MVEBU_V7
Thanks,
Gregory
--
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
next prev parent reply other threads:[~2014-04-18 6:56 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-18 6:05 [PATCH v3 00/13] enable Hisilicon HiP04 SoC Haojian Zhuang
2014-04-18 6:05 ` [PATCH v3 01/13] ARM: debug: add HiP04 debug uart Haojian Zhuang
2014-04-18 6:05 ` [PATCH v3 02/13] ARM: append ARCH_MULTI_V7_LPAE Haojian Zhuang
2014-04-18 6:56 ` Gregory CLEMENT [this message]
2014-04-18 7:08 ` Haojian Zhuang
2014-04-18 7:18 ` Gregory CLEMENT
2014-04-18 7:40 ` Haojian Zhuang
2014-04-18 7:44 ` Gregory CLEMENT
2014-04-18 6:05 ` [PATCH v3 03/13] ARM: hisi: add ARCH_HISI Haojian Zhuang
2014-04-18 6:05 ` [PATCH v3 04/13] irq: gic: use mask field in GICC_IAR Haojian Zhuang
2014-04-18 6:05 ` [PATCH v3 05/13] irq: gic: support hip04 gic Haojian Zhuang
2014-04-22 10:47 ` Marc Zyngier
2014-04-25 2:52 ` Haojian Zhuang
2014-04-18 6:05 ` [PATCH v3 06/13] ARM: mcpm: support 4 clusters in HiP04 Haojian Zhuang
2014-04-22 3:09 ` Nicolas Pitre
2014-04-18 6:05 ` [PATCH v3 07/13] ARM: hisi: add hip04 SoC support Haojian Zhuang
2014-04-22 4:08 ` Nicolas Pitre
2014-04-25 3:00 ` Haojian Zhuang
2014-04-18 6:05 ` [PATCH v3 08/13] ARM: dts: add hip04-d01 dts file Haojian Zhuang
2014-04-18 6:05 ` [PATCH v3 09/13] ARM: config: append hip04_defconfig Haojian Zhuang
2014-04-18 6:05 ` [PATCH v3 10/13] ARM: config: select ARCH_HISI in hi3xxx_defconfig Haojian Zhuang
2014-04-18 6:05 ` [PATCH v3 11/13] ARM: hisi: enable erratum 798181 of A15 on HiP04 Haojian Zhuang
2014-04-18 6:05 ` [PATCH v3 12/13] ARM: dts: Add PMU support in HiP04 Haojian Zhuang
2014-04-18 6:05 ` [PATCH v3 13/13] virt: arm: support hip04 gic Haojian Zhuang
2014-04-22 12:15 ` Marc Zyngier
2014-04-25 1:16 ` Haojian Zhuang
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=5350CC9B.2090102@free-electrons.com \
--to=gregory.clement@free-electrons$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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