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: 5573731 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 01EA69F2ED for ; Tue, 6 Jan 2015 13:44:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3E7662020E for ; Tue, 6 Jan 2015 13:44:47 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 09790201EC for ; Tue, 6 Jan 2015 13:44:44 +0000 (UTC) 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-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=v6zsD4weghYUx2tQJR2zgEROHKFokBMftoVW4sxjOtk=; b=OkXP+d6alAvrX5tKboCAOhL7tm7CzZ2ycJ+cMsNzXXlBPjsP4clhL8URPirVO0Ybuy fOAVagaXN53K+LdYpfTJJhq4uX+H5EzeRCfU4A7KGaJLK7srmWG9k4qYeDe4L9YRo2oa SrJA3Jj7ASqJyWoV/m4BSvJpwELXhISm83ZMiHozlxrOn9lf4vnMuBjSBc9CcKJy4/dk br106gaBFbM3DdHm65kRdQM+scRa3lSsmNwOaIkqOpTPgMKSR1bZ5mRugEuJTFcnw0zf fFShfuC+X4LkiS5X00TRX8LsgifDZXUz80GaGXWq7EQezGwO7KqMVlFAloEFqVDgH1Kq ohEw== X-Gm-Message-State: ALoCoQmP/GDCk6oRNFe+o7WwaaeqqvqKlQAgg3qmeBcUrD6m/sWtErLrvz/t9UHBwqMi9YbBk8aW 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 (/) 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+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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(); /*