From patchwork Mon Jan 5 18:33:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 42757 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f72.google.com (mail-la0-f72.google.com [209.85.215.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 50DB425B5B for ; Mon, 5 Jan 2015 18:36:29 +0000 (UTC) Received: by mail-la0-f72.google.com with SMTP id gq15sf12399595lab.3 for ; Mon, 05 Jan 2015 10:36:28 -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=Mwoyakl4TjIZXxZMCxDaPh0pEsHrei6/IdS7o8A75Ok=; b=gXBz/KaWXOsYSlJUz2hDCHAmWHKzTnsj/oFzMwtwerOfAhyP2LiPABzXOq7aFQ9CXc NLTWCxmb8jpDnJNnmpRwEFyCUX5pljQ+XlKuv6TabXF6pAnpz8wbEK1uH8pMsVXP6ruf 56snTonWfq4jONHUtImOhis2GxdagMFgw51rfNk6pjR7bxuHwEsQRwtnNmx5vCaBzYmI nRbJJdZt0ZB6mhtqea8osJzwmtm0Sj09YVkVZ+qHoKRd5SE29/Ztt4r8wuEUOEHfR6gf f/iujos4cSMdUO9Em+MPIvX40hq9DbOF95BjGl6WlpAKjvP59bVT8yFKzrdJDUp5K+zq D7wQ== X-Gm-Message-State: ALoCoQm+msHAbJXE0frIo0zlNltdJzcTSg9FSsWi2rfU4diItmSqOBJll060okD32LYw7JBqnQ2Z X-Received: by 10.194.92.34 with SMTP id cj2mr431092wjb.5.1420482988273; Mon, 05 Jan 2015 10:36:28 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.37.104 with SMTP id x8ls1793194laj.4.gmail; Mon, 05 Jan 2015 10:36:28 -0800 (PST) X-Received: by 10.152.26.201 with SMTP id n9mr95637013lag.50.1420482988111; Mon, 05 Jan 2015 10:36:28 -0800 (PST) Received: from mail-lb0-f180.google.com (mail-lb0-f180.google.com. [209.85.217.180]) by mx.google.com with ESMTPS id zd4si63043607lbb.75.2015.01.05.10.36.27 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 05 Jan 2015 10:36:27 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.180 as permitted sender) client-ip=209.85.217.180; Received: by mail-lb0-f180.google.com with SMTP id l4so17918985lbv.39 for ; Mon, 05 Jan 2015 10:36:27 -0800 (PST) X-Received: by 10.112.84.225 with SMTP id c1mr72533732lbz.22.1420482987770; Mon, 05 Jan 2015 10:36:27 -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 c8csp960318lbb; Mon, 5 Jan 2015 10:36:27 -0800 (PST) X-Received: by 10.70.128.15 with SMTP id nk15mr146592514pdb.121.1420482982215; Mon, 05 Jan 2015 10:36:22 -0800 (PST) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id as3si28141027pbc.122.2015.01.05.10.36.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Jan 2015 10:36:22 -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 1Y8CTU-00051B-DA; Mon, 05 Jan 2015 18:33:56 +0000 Received: from mail-wi0-f176.google.com ([209.85.212.176]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Y8CTQ-0004vC-W8 for linux-arm-kernel@lists.infradead.org; Mon, 05 Jan 2015 18:33:53 +0000 Received: by mail-wi0-f176.google.com with SMTP id ex7so3896468wid.9 for ; Mon, 05 Jan 2015 10:33:30 -0800 (PST) X-Received: by 10.194.62.19 with SMTP id u19mr185924007wjr.0.1420482810668; Mon, 05 Jan 2015 10:33:30 -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 hn2sm76395248wjc.5.2015.01.05.10.33.29 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 05 Jan 2015 10:33:30 -0800 (PST) From: Leif Lindholm To: msalter@redhat.com, linux-arm-kernel@lists.infradead.org, linux-efi@vger.kernel.org, will.deacon@arm.com, catalin.marinas@arm.com Subject: [PATCH 2/2] arm64: call early_ioremap_reset() in paging_init() Date: Mon, 5 Jan 2015 18:33:55 +0000 Message-Id: <1420482835-6444-3-git-send-email-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1420482835-6444-1-git-send-email-leif.lindholm@linaro.org> References: <1420482835-6444-1-git-send-email-leif.lindholm@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150105_103353_216320_0DDC9FF7 X-CRM114-Status: UNSURE ( 9.19 ) X-CRM114-Notice: Please train this message. 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.176 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.176 listed in wl.mailspike.net] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Cc: 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.180 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 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(); /*