From patchwork Wed Jan 14 15:04:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 5632181 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 B19449F357 for ; Wed, 14 Jan 2015 15:10:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D05162034C for ; Wed, 14 Jan 2015 15:10:58 +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 08FBB20155 for ; Wed, 14 Jan 2015 15:10:58 +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 1YBPXh-0006JR-3j; Wed, 14 Jan 2015 15:07:33 +0000 Received: from mail-pa0-f49.google.com ([209.85.220.49]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YBPXW-00068w-Cp for linux-arm-kernel@lists.infradead.org; Wed, 14 Jan 2015 15:07:23 +0000 Received: by mail-pa0-f49.google.com with SMTP id eu11so10973792pac.8 for ; Wed, 14 Jan 2015 07:07:01 -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=R3P1Qx9nKVsoOjYQshlYGpT5b4Qn66Kj45ThaLvB96o=; b=J35ceShWVaiGRah8jnXjoStKOD3lKT1LyMKOH0kxyuWbL5Riis1EX9dVsDdVT7DKC4 +mGS+c363V7iK5LFI80PT3KB++7utVM+tCNfo5hE7JhmFRAv6wIjDwAVKB9J15mQuI0b F/+wHbCYVDJ21Hmbz2XoQfSGQlcf4Lt5lhapPzXyt+6mFFyKw53U87EAK5zspf/b199E k1zOY8s3cNfwR8TKcpouHscgTikOBbJYf901kc3sQxufo7D1dHkE9PAdYG7Goa4MR/XA o2QU/zvS0ckt+EQEDeLQjAq37XuBMJO5x9/uI3OqKg/ZynWSFaOGLnDspqBWAqNDRcGm gIyA== X-Gm-Message-State: ALoCoQm3MpXnZ4RFMGfoaNTB0n/dE0ufY+Erre07mqxWMGPPsuVX8SGWrrctl3ldEya7Nbn01G7c X-Received: by 10.68.230.105 with SMTP id sx9mr6513217pbc.64.1421248021007; Wed, 14 Jan 2015 07:07:01 -0800 (PST) Received: from localhost (119.81.172.112-static.reverse.softlayer.com. [119.81.172.112]) by mx.google.com with ESMTPSA id bx13sm20033564pdb.19.2015.01.14.07.06.57 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 14 Jan 2015 07:07:00 -0800 (PST) From: Hanjun Guo To: Catalin Marinas , "Rafael J. Wysocki" , Olof Johansson , Arnd Bergmann , Mark Rutland , Grant Likely , Will Deacon Subject: [PATCH v7 01/17] arm64: allow late use of early_ioremap Date: Wed, 14 Jan 2015 23:04:49 +0800 Message-Id: <1421247905-3749-2-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1421247905-3749-1-git-send-email-hanjun.guo@linaro.org> References: <1421247905-3749-1-git-send-email-hanjun.guo@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150114_070722_525256_27CF4D7D X-CRM114-Status: GOOD ( 10.22 ) X-Spam-Score: -0.7 (/) Cc: linaro-acpi@lists.linaro.org, wangyijing@huawei.com, Rob Herring , Lorenzo Pieralisi , Timur Tabi , 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, 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(). Signed-off-by: Mark Salter CC: Leif Lindholm CC: Ard Biesheuvel [hj: update the change log] Signed-off-by: Hanjun Guo Tested-by: Mark Langsdorf --- 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