From patchwork Fri Jun 7 19:21:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Austin X-Patchwork-Id: 249798 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E268D2C00AA for ; Sat, 8 Jun 2013 05:23:19 +1000 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ul2F9-0004RU-3E; Fri, 07 Jun 2013 19:22:35 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ul2F1-0005Ww-JA; Fri, 07 Jun 2013 19:22:27 +0000 Received: from service87.mimecast.com ([91.220.42.44]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ul2Ey-0005WG-EZ for linux-arm-kernel@lists.infradead.org; Fri, 07 Jun 2013 19:22:24 +0000 Received: from cam-owa2.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.21]) by service87.mimecast.com; Fri, 07 Jun 2013 20:22:01 +0100 Received: from [10.1.199.23] ([10.1.255.212]) by cam-owa2.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 7 Jun 2013 20:22:01 +0100 Message-ID: <51B232CA.9060700@arm.com> Date: Fri, 07 Jun 2013 20:21:46 +0100 From: Jonathan Austin User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130308 Thunderbird/17.0.4 MIME-Version: 1.0 To: linux+pull@arm.linux-org.uk, "linux-arm-kernel@lists.infradead.org" Subject: [GIT PULL] nommu-fixes, r7 and MPU support for 3.11 X-OriginalArrivalTime: 07 Jun 2013 19:22:01.0181 (UTC) FILETIME=[4916B0D0:01CE63B4] X-MC-Unique: 113060720220100501 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130607_152224_671192_F19AC2B3 X-CRM114-Status: GOOD ( 13.48 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [91.220.42.44 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Hi Russell, Please could you pull the following changes for 3.11? This includes the following series sent earlier to the list: - nommu-fixes - R7 Support - MPU support I've left out the ARCH_MULTIPLATFORM/!MMU stuff that Arnd and I were discussing today until we've reached a conclusion/that's had some more review. This is rebased (and re-tested) on your devel-stable branch because otherwise there were going to be conflicts with Uwe's V7M work now that you've merged that. I've included the fix for limiting MPU to CPU_V7. Thanks, Jonny -----8<----- The following changes since commit 78ecad0183bd7e49131da2b5aa82bee017db1cf0: Merge tag '3.10-rc2-psci-ops-11-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/sstabellini/xen into devel-stable (2013-05-22 10:53:20 +0100) are available in the git repository at: ssh://laogit@linux-arm.org/linux-ja.git ja-nommu-for-rmk for you to fetch changes up to 99ec449dfcd323266fa0f3d9bf1d671755d0d784: ARM: mpu: Ensure that MPU depends on CPU_V7 (2013-06-07 19:13:33 +0100) ---------------------------------------------------------------- Jonathan Austin (14): ARM: nommu: Don't build smp_tlb.c for !CONFIG_MMU ARM: nommu: add stub local_flush_bp_all() for !CONFIG_MMUU ARM: select CPU_CPU15_MMU/MPU appropriately ARM: add Cortex-R7 Processor Info ARM: vexpress: Add Cortex-R Series UART, selectable via DEBUG_LL ARM: mpu: add PMSA related registers and bitfields to existing headers ARM: mpu: add header for MPU register layouts and region data ARM: mpu: add early bring-up code for the ARMv7 PMSA-compliant MPU ARM: mpu: add MPU probe and initialisation functions in C ARM: mpu: Complete initialisation of the MPU after reaching the C-world ARM: mpu: add MPU initialisation for secondary cores ARM: mpu: Allow enabling of the MPU via kconfig ARM: mpu: protect the vectors page with an MPU region ARM: mpu: Ensure that MPU depends on CPU_V7 Will Deacon (5): ARM: nommu: add entry point for secondary CPUs to head-nommu.S ARM: nommu: define dummy TLB operations for nommu configurations ARM: nommu: provide dummy cpu_switch_mm implementation ARM: nommu: do not initialise page tables in secondary_data structure ARM: suspend: fix CPU suspend code for !CONFIG_MMU configurations arch/arm/Kconfig | 5 +- arch/arm/Kconfig-nommu | 12 ++ arch/arm/Kconfig.debug | 10 +- arch/arm/include/asm/cp15.h | 5 + arch/arm/include/asm/cputype.h | 1 + arch/arm/include/asm/mpu.h | 76 +++++++++++ arch/arm/include/asm/proc-fns.h | 4 + arch/arm/include/asm/smp.h | 5 +- arch/arm/include/asm/smp_plat.h | 4 + arch/arm/include/asm/tlbflush.h | 25 +++- arch/arm/include/debug/vexpress.S | 10 ++ arch/arm/kernel/Makefile | 5 +- arch/arm/kernel/head-nommu.S | 160 ++++++++++++++++++++++- arch/arm/kernel/signal.c | 9 +- arch/arm/kernel/smp.c | 10 +- arch/arm/kernel/suspend.c | 64 +++++---- arch/arm/mm/Kconfig | 3 +- arch/arm/mm/nommu.c | 257 ++++++++++++++++++++++++++++++++++++- arch/arm/mm/proc-v6.S | 6 +- arch/arm/mm/proc-v7.S | 27 +++- 20 files changed, 647 insertions(+), 51 deletions(-) create mode 100644 arch/arm/include/asm/mpu.h