From patchwork Mon Feb 2 12:45:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 5761201 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 79B43BF440 for ; Mon, 2 Feb 2015 12:51:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A03D32034A for ; Mon, 2 Feb 2015 12:51:01 +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 C221220340 for ; Mon, 2 Feb 2015 12:51:00 +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 1YIGQy-0008C5-Az; Mon, 02 Feb 2015 12:48:56 +0000 Received: from mail-pa0-f50.google.com ([209.85.220.50]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YIGQm-000820-9x for linux-arm-kernel@lists.infradead.org; Mon, 02 Feb 2015 12:48:44 +0000 Received: by mail-pa0-f50.google.com with SMTP id rd3so81969491pab.9 for ; Mon, 02 Feb 2015 04:48:26 -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=2Rp5gnW40Me6Z/ddjjo6vlJghOvMjq1kqMnaRSotxAg=; b=VhK08NkU+tKP6RnhJvLbvwlmshFRO9PTgwi5/JJUejVfpxXQk2rdQcfnZ8WuqXVQ25 0xhfLNKDi4n0Fqfl8FUXy3YVnX4dRStKVLLWlKp4Gf5JlMXYsZBTNcBJiRSnhrkgitE8 qX6rSu+bfE1WJV5FVPf9FuP+VQ/p9hY+VrmT//SVTxi3wKP8hBFZgBAEh/3cWfD9Fv1k 6OONGUsXV+mZbwrQiv0MQ/M8lZUzRcFik5qHlFEAL4QaH7O5uDY40+KvSKfYAJMYUNrp pF3UTSKb/Q5NmdL2G/0YbKsoXkGMsoUQRdFIYPUj/DWcXyBAdZhbffs0tGYIIxSHUho/ z7MA== X-Gm-Message-State: ALoCoQlh7PL4LKKzTB4iAOE9leqUc73RA420ec+4lJyMNzg69Yu9bU+irtRXc3JjsVzyHhKqS9Sq X-Received: by 10.70.36.99 with SMTP id p3mr28719657pdj.81.1422881306888; Mon, 02 Feb 2015 04:48:26 -0800 (PST) Received: from localhost ([180.150.157.4]) by mx.google.com with ESMTPSA id kg12sm18747709pbb.44.2015.02.02.04.48.25 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 02 Feb 2015 04:48:26 -0800 (PST) From: Hanjun Guo To: Catalin Marinas , "Rafael J. Wysocki" , Olof Johansson , Arnd Bergmann , Mark Rutland , Grant Likely , Will Deacon Subject: [PATCH v8 03/21] arm64: allow late use of early_ioremap Date: Mon, 2 Feb 2015 20:45:31 +0800 Message-Id: <1422881149-8177-4-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1422881149-8177-1-git-send-email-hanjun.guo@linaro.org> References: <1422881149-8177-1-git-send-email-hanjun.guo@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150202_044844_368607_1A651068 X-CRM114-Status: GOOD ( 10.41 ) X-Spam-Score: -0.7 (/) Cc: Mark Langsdorf , linaro-acpi@lists.linaro.org, wangyijing@huawei.com, Rob Herring , Lorenzo Pieralisi , Timur Tabi , Daniel Lezcano , linux-acpi@vger.kernel.org, Mark Salter , Charles.Garcia-Tobin@arm.com, phoenix.liyi@huawei.com, Robert Richter , Jason Cooper , Marc Zyngier , Jon Masters , Leif Lindholm , Mark Brown , Bjorn Helgaas , linux-arm-kernel@lists.infradead.org, Ashwin Chaugule , Graeme Gregory , Ard Biesheuvel , Randy Dunlap , linux-kernel@vger.kernel.org, Hanjun Guo , suravee.suthikulpanit@amd.com, Sudeep Holla 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 From: Mark Salter Commit 0e63ea48b4d8 (arm64/efi: add missing call to early_ioremap_reset()) added a missing call to early_ioremap_reset(). This triggers a BUG if code tries using early_ioremap() after the early_ioremap_reset(). This is a problem for some ACPI code which needs short-lived temporary mappings after paging_init() but before acpi_early_init() in start_kernel(). This patch adds definitions for the __late_set_fixmap() and __late_clear_fixmap() which avoids the BUG by allowing later use of early_ioremap(). CC: Leif Lindholm CC: Ard Biesheuvel Tested-by: Suravee Suthikulpanit Tested-by: Mark Langsdorf Tested-by: Jon Masters Signed-off-by: Mark Salter Signed-off-by: Hanjun Guo --- arch/arm64/include/asm/fixmap.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm64/include/asm/fixmap.h b/arch/arm64/include/asm/fixmap.h index 9ef6eca..e629c70 100644 --- a/arch/arm64/include/asm/fixmap.h +++ b/arch/arm64/include/asm/fixmap.h @@ -61,6 +61,9 @@ void __init early_fixmap_init(void); #define __early_set_fixmap __set_fixmap +#define __late_set_fixmap __set_fixmap +#define __late_clear_fixmap(idx) __set_fixmap((idx), 0, FIXMAP_PAGE_CLEAR) + extern void __set_fixmap(enum fixed_addresses idx, phys_addr_t phys, pgprot_t prot); #include