From patchwork Thu Dec 1 13:26:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 128698 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 323A7B6F76 for ; Fri, 2 Dec 2011 00:31:12 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1RW6eu-0001eh-ID; Thu, 01 Dec 2011 13:26:40 +0000 Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1RW6eq-0001eT-Kx for linux-arm-kernel@lists.infradead.org; Thu, 01 Dec 2011 13:26:38 +0000 Received: from mudshark.cambridge.arm.com (mudshark.cambridge.arm.com [10.1.79.58]) by cam-admin0.cambridge.arm.com (8.12.6/8.12.6) with ESMTP id pB1DQQWJ017335; Thu, 1 Dec 2011 13:26:26 GMT Date: Thu, 1 Dec 2011 13:26:25 +0000 From: Will Deacon To: Russell King - ARM Linux Subject: Re: [PATCH v2 0/6] Consolidate identity mapping code in idmap.c Message-ID: <20111201132625.GA27656@mudshark.cambridge.arm.com> References: <1322504937-24718-1-git-send-email-will.deacon@arm.com> <20111130221800.GV9581@n2100.arm.linux.org.uk> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20111130221800.GV9581@n2100.arm.linux.org.uk> User-Agent: Mutt/1.5.21 (2010-09-15) X-Spam-Note: CRM114 invocation failed X-Spam-Score: -5.4 (-----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-5.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [217.140.96.50 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.2 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: "linux-arm-kernel@lists.infradead.org" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org 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, On Wed, Nov 30, 2011 at 10:18:00PM +0000, Russell King - ARM Linux wrote: > On Mon, Nov 28, 2011 at 06:28:51PM +0000, Will Deacon wrote: > > This is version 2 of the patch series originally posted here: > > > > http://lists.infradead.org/pipermail/linux-arm-kernel/2011-November/073033.html > > > > Changes from v1 include: > > * Updated following Catalin's comments > > * Rebased onto rmk/devel-stable > > * Includes update to SMP booting so that the idmap_pgd can be > > used there too > > > > This is a pre-requisite for my kexec patches, which I will post separately. > > > > All feedback welcome. > > This patch set looks fine. Great, thanks for looking at it. Here's the pull request against devel-stable. I can use another commit as a base if you prefer. Once you've taken this, I'll post another series of my soft reboot patch series to the list (not required for LPAE but I think it could be merged for 3.3 since it fixes soft reboot along with the reset changes you've made). Cheers, Will The following changes since commit 2d13ccaa8797d7e599f3792aed4b1e44b47f94a5: Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable (2011-11-21 21:56:56 +0000) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git kexec/idmap Will Deacon (6): ARM: idmap: populate identity map pgd at init time using .init.text ARM: suspend: use idmap_pgd instead of suspend_pgd ARM: proc-*.S: place cpu_reset functions into .idmap.text section ARM: idmap: use idmap_pgd when setting up mm for reboot ARM: head.S: only include __turn_mmu_on in the initial identity mapping ARM: SMP: use idmap_pgd for mapping MMU enable during secondary booting arch/arm/include/asm/idmap.h | 14 +++++++++ arch/arm/include/asm/pgtable.h | 3 -- arch/arm/kernel/head.S | 18 ++++++----- arch/arm/kernel/sleep.S | 2 + arch/arm/kernel/smp.c | 32 +------------------- arch/arm/kernel/suspend.c | 18 ++--------- arch/arm/kernel/vmlinux.lds.S | 7 ++++ arch/arm/mm/idmap.c | 63 +++++++++++++++++++--------------------- arch/arm/mm/proc-arm1020.S | 3 ++ arch/arm/mm/proc-arm1020e.S | 3 ++ arch/arm/mm/proc-arm1022.S | 3 ++ arch/arm/mm/proc-arm1026.S | 3 ++ arch/arm/mm/proc-arm6_7.S | 4 ++ arch/arm/mm/proc-arm720.S | 3 ++ arch/arm/mm/proc-arm740.S | 3 ++ arch/arm/mm/proc-arm7tdmi.S | 3 ++ arch/arm/mm/proc-arm920.S | 3 ++ arch/arm/mm/proc-arm922.S | 3 ++ arch/arm/mm/proc-arm925.S | 3 ++ arch/arm/mm/proc-arm926.S | 3 ++ arch/arm/mm/proc-arm940.S | 3 ++ arch/arm/mm/proc-arm946.S | 3 ++ arch/arm/mm/proc-arm9tdmi.S | 3 ++ arch/arm/mm/proc-fa526.S | 3 ++ arch/arm/mm/proc-feroceon.S | 3 ++ arch/arm/mm/proc-mohawk.S | 3 ++ arch/arm/mm/proc-sa110.S | 3 ++ arch/arm/mm/proc-sa1100.S | 3 ++ arch/arm/mm/proc-v6.S | 3 ++ arch/arm/mm/proc-v7.S | 2 + arch/arm/mm/proc-xsc3.S | 3 ++ arch/arm/mm/proc-xscale.S | 3 ++ 32 files changed, 140 insertions(+), 89 deletions(-) create mode 100644 arch/arm/include/asm/idmap.h