From patchwork Tue Jun 13 09:05:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vladimir Murzin X-Patchwork-Id: 9783389 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8B42060325 for ; Tue, 13 Jun 2017 09:07:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7FBA627FB7 for ; Tue, 13 Jun 2017 09:07:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7469B283AE; Tue, 13 Jun 2017 09:07:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C3A6C27FB7 for ; Tue, 13 Jun 2017 09:07:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=k4WRZVonYo/qYY5tMxreK2DReKgF16nBvSW68eogGMw=; b=hOfMJU4xTFmSXB lKnSu/vcezQsQgckP3l1/+EWf2wUPfpnlRk6xTxEve/HSSJ3QFkNa4+3hkyrL6dcXuw1iHEU4UOLp emctNhTmB6Mn4Gdez66/DNvMC9Jsnm/P7jm97UvMmUC2ZzjxWkgjuBmBPOGSb2427S9hf5CtLGU+/ D1jCVRsZt2KmhP0ht79SUouHBLbkuUnyAfTSf5hnWpGKSd71rYcXP1cFgcojECMR5R/U1XwMsYK05 kny13ua6Xy6OsUEY5uPbVbGtFk6jIaU2xWXH2oTJ/bbJhxyZKQRwHKo/YTaPhpA5ugValv4JKQss0 P/a04GJqVpHv/LHLOf0Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dKhn0-0005CQ-G8; Tue, 13 Jun 2017 09:07:06 +0000 Received: from foss.arm.com ([217.140.101.70]) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dKhlp-0003kv-2q for linux-arm-kernel@lists.infradead.org; Tue, 13 Jun 2017 09:05:55 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4540F1610; Tue, 13 Jun 2017 02:05:34 -0700 (PDT) Received: from bc-e9-2-15.euhpc.arm.com. (bc-e9-2-15.euhpc.arm.com [10.6.2.247]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id EB2BD3F581; Tue, 13 Jun 2017 02:05:32 -0700 (PDT) From: Vladimir Murzin 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> X-Mailer: git-send-email 2.0.0 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170613_020553_140568_5CDA99CB X-CRM114-Status: UNSURE ( 7.70 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP It seems that MPU never worked with XIP, so we just disallow such combination. Tested-by: Szemző András Signed-off-by: Vladimir Murzin --- 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