From patchwork Tue Jan 6 13:41:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 42770 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-we0-f198.google.com (mail-we0-f198.google.com [74.125.82.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 185A02055F for ; Tue, 6 Jan 2015 13:44:15 +0000 (UTC) Received: by mail-we0-f198.google.com with SMTP id q59sf4818033wes.9 for ; Tue, 06 Jan 2015 05:44:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version :content-type:content-transfer-encoding:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list; bh=QlHt8HamZQWzC9Wfn1ntjFxFDR3JdyDvamKVbCM2W2U=; b=MKGNaJgIlTAMS8tntuS84Z0YPO6ZvamZUXfL4Vy8HhH8fimpOGeuwo2vR52TL3S2I1 xdALBVST89NvpY1Crh1/5qt7PYMYD0nOjRLn150tFrdSLqjN+bylXtk9xbxqUtA5IJev 0k1SimQFd0kQuHRqrIDsT497eysBYBNfzNrt4z7DfvNyqNq9YgzASEW1xM0eX6WVL5X/ uiiNPXg1Ibl5Q3Ju9EXwDNbtiFLs1dPo1Ls47pERpUUvCfzlzfBk92PcUSBHI4UGuC8L EsCdXkY7CRMqFEMWkdx3BByc3+VbaPKgd2tSxqw3vx9dK6RWc94TVP0rHACKPB42i+rh lXFg== X-Gm-Message-State: ALoCoQndx4hTyNHEWr2JrsLyMonekz70RIvXulVZaicpyd7uBWe+Rg/MlwMPHGt1xHQVpZOYLb3C X-Received: by 10.180.19.42 with SMTP id b10mr2639796wie.0.1420551854373; Tue, 06 Jan 2015 05:44:14 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.5.135 with SMTP id s7ls37101las.33.gmail; Tue, 06 Jan 2015 05:44:14 -0800 (PST) X-Received: by 10.112.25.7 with SMTP id y7mr25963539lbf.94.1420551854210; Tue, 06 Jan 2015 05:44:14 -0800 (PST) Received: from mail-lb0-f173.google.com (mail-lb0-f173.google.com. [209.85.217.173]) by mx.google.com with ESMTPS id pk3si52948373lbc.70.2015.01.06.05.44.14 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 06 Jan 2015 05:44:14 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.173 as permitted sender) client-ip=209.85.217.173; Received: by mail-lb0-f173.google.com with SMTP id z12so19543898lbi.18 for ; Tue, 06 Jan 2015 05:44:14 -0800 (PST) X-Received: by 10.112.89.232 with SMTP id br8mr60851534lbb.69.1420551854086; Tue, 06 Jan 2015 05:44:14 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.9.200 with SMTP id c8csp1178821lbb; Tue, 6 Jan 2015 05:44:13 -0800 (PST) X-Received: by 10.68.68.237 with SMTP id z13mr156039678pbt.151.1420551852050; Tue, 06 Jan 2015 05:44:12 -0800 (PST) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id qq9si88982155pbb.102.2015.01.06.05.44.11 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Jan 2015 05:44:12 -0800 (PST) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Y8UOs-0005VM-CR; Tue, 06 Jan 2015 13:42:22 +0000 Received: from mail-wi0-f180.google.com ([209.85.212.180]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Y8UNo-0004c5-A2 for linux-arm-kernel@lists.infradead.org; Tue, 06 Jan 2015 13:41:17 +0000 Received: by mail-wi0-f180.google.com with SMTP id n3so5376064wiv.1 for ; Tue, 06 Jan 2015 05:40:53 -0800 (PST) X-Received: by 10.180.72.199 with SMTP id f7mr37667104wiv.53.1420551653411; Tue, 06 Jan 2015 05:40:53 -0800 (PST) Received: from mohikan.mushroom.smurfnet.nu (cpc4-cmbg17-2-0-cust71.5-4.cable.virginm.net. [86.14.224.72]) by mx.google.com with ESMTPSA id f1sm68239903wjw.30.2015.01.06.05.40.51 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 06 Jan 2015 05:40:52 -0800 (PST) From: Leif Lindholm To: msalter@redhat.com, linux-arm-kernel@lists.infradead.org, linux-efi@vger.kernel.org, will.deacon@arm.com Subject: [PATCH v2 2/2] arm64: call early_ioremap_reset() in paging_init() Date: Tue, 6 Jan 2015 13:41:13 +0000 Message-Id: <1420551673-31416-3-git-send-email-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1420551673-31416-1-git-send-email-leif.lindholm@linaro.org> References: <1420551673-31416-1-git-send-email-leif.lindholm@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150106_054116_573149_0B4FDFF1 X-CRM114-Status: GOOD ( 10.07 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.212.180 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.212.180 listed in wl.mailspike.net] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Cc: catalin.marinas@arm.com, ard.biesheuvel@linaro.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: leif.lindholm@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.173 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 arm64 does not support early_memremap/memunmap/ioremap/iounmap after paging_init() has been called. The core early_*remap code handles this via the after_paging_init variable, which is set by a call to early_ioremap_reset(). However, arm64 currently does not call early_ioremap_reset(), which has made it possible to poke around in the fixmap region after kmap is enabled. Add the required call. Signed-off-by: Leif Lindholm Fixes: bf4b558eba92 ("arm64: add early_ioremap support") Acked-by: Ard Biesheuvel --- arch/arm64/mm/mmu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 6032f3e..506544f 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -348,6 +348,7 @@ void __init paging_init(void) { void *zero_page; + early_ioremap_reset(); map_mem(); /*