[4/7] ARM: NOMMU: Disallow MPU for XIP

Message ID	1497344707-14446-5-git-send-email-vladimir.murzin@arm.com
State	New
Headers	show Return-Path: <linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org> From: Vladimir Murzin <vladimir.murzin@arm.com> To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 4/7] ARM: NOMMU: Disallow MPU for XIP Date: Tue, 13 Jun 2017 10:05:04 +0100 Message-Id: <1497344707-14446-5-git-send-email-vladimir.murzin@arm.com> In-Reply-To: <1497344707-14446-1-git-send-email-vladimir.murzin@arm.com> References: <1497344707-14446-1-git-send-email-vladimir.murzin@arm.com> MIME-Version: 1.0 summary: Content analysis details: (-6.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [217.140.101.70 listed in list.dnswl.org] -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Precedence: list Cc: alexandre.torgue@st.com, manabian@gmail.com, linux@armlinux.org.uk, stefan@agner.ch, kbuild-all@01.org, u.kleine-koenig@pengutronix.de, sza@esh.hu Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org

Message ID

1497344707-14446-5-git-send-email-vladimir.murzin@arm.com

State

New

Headers

From: Vladimir Murzin <vladimir.murzin@arm.com>
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 4/7] ARM: NOMMU: Disallow MPU for XIP
Date: Tue, 13 Jun 2017 10:05:04 +0100
Message-Id: <1497344707-14446-5-git-send-email-vladimir.murzin@arm.com>
In-Reply-To: <1497344707-14446-1-git-send-email-vladimir.murzin@arm.com>
References: <1497344707-14446-1-git-send-email-vladimir.murzin@arm.com>
MIME-Version: 1.0
Precedence: list
Cc: alexandre.torgue@st.com, manabian@gmail.com, linux@armlinux.org.uk,
	stefan@agner.ch, kbuild-all@01.org, u.kleine-koenig@pengutronix.de,
	sza@esh.hu
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org>
Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org

Commit Message

Vladimir Murzin June 13, 2017, 9:05 a.m. UTC

It seems that MPU never worked with XIP, so we just disallow such
combination.

Tested-by: Szemző András <sza@esh.hu>
Signed-off-by: Vladimir Murzin <vladimir.murzin@arm.com>
---
 arch/arm/Kconfig-nommu | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/Kconfig-nommu b/arch/arm/Kconfig-nommu
index b757634..6d18395 100644
--- a/arch/arm/Kconfig-nommu
+++ b/arch/arm/Kconfig-nommu
@@ -52,7 +52,7 @@  config REMAP_VECTORS_TO_RAM
 
 config ARM_MPU
        bool 'Use the ARM v7 PMSA Compliant MPU'
-       depends on CPU_V7
+       depends on !XIP_KERNEL && CPU_V7
        default y
        help
          Some ARM systems without an MMU have instead a Memory Protection

[4/7] ARM: NOMMU: Disallow MPU for XIP

Commit Message

Patch