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: 43109 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-we0-f199.google.com (mail-we0-f199.google.com [74.125.82.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B60D6240B9 for ; Wed, 14 Jan 2015 15:07:15 +0000 (UTC) Received: by mail-we0-f199.google.com with SMTP id k11sf5138586wes.2 for ; Wed, 14 Jan 2015 07:07:15 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=h/vjd+WM4eyuUr8cz6MRHmKjuoV4d24V8yliJhtxl9o=; b=lPHMEuMh8wq6lbLLVe2iIQ1XGjuPIe9y8d0ITF4ug9yc5266D5x6DRgJAJ7dxo7Qh6 cYHlyie7BSJH/X/4Mhrk/JDmMVpcNtN4w3mpxqZ0BA8Y4icCG37SAg8j3MRJNzYcRYwH t6sqvipJiMOgWwODrulULqEuMPvb2kQPHuvfcrd6nw0Ezq5Cx4QqO2nebg9fBQO4Fj2M 3OsoAZd/GvOaOYo2116nIfvUSLL/9UJNfl1OX5+wAya0/6B7ARqWud/QD6V2UZms3PU+ cxBVo62ZoWewa4WSxxl1x9qcClwS1uRmIMMHqUNlXKSePYPYOiRMHKJCRn9R5RHoWt08 3wkw== X-Gm-Message-State: ALoCoQldhfmhqLXI0QQjvhy7S/N9ZFGPE1DDQdQW47qaPWx/GuwgQPrnpU9b1fJybvEffraADKAv X-Received: by 10.112.137.136 with SMTP id qi8mr382781lbb.13.1421248034975; Wed, 14 Jan 2015 07:07:14 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.120.132 with SMTP id lc4ls129527lab.1.gmail; Wed, 14 Jan 2015 07:07:14 -0800 (PST) X-Received: by 10.112.181.106 with SMTP id dv10mr4454600lbc.88.1421248034799; Wed, 14 Jan 2015 07:07:14 -0800 (PST) Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com. [209.85.217.182]) by mx.google.com with ESMTPS id lc9si6156602lac.54.2015.01.14.07.07.14 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 14 Jan 2015 07:07:14 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.182 as permitted sender) client-ip=209.85.217.182; Received: by mail-lb0-f182.google.com with SMTP id u10so8309006lbd.13 for ; Wed, 14 Jan 2015 07:07:14 -0800 (PST) X-Received: by 10.152.234.35 with SMTP id ub3mr4470106lac.70.1421248034671; Wed, 14 Jan 2015 07:07: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 c8csp1725945lbb; Wed, 14 Jan 2015 07:07:13 -0800 (PST) X-Received: by 10.68.201.232 with SMTP id kd8mr6449270pbc.164.1421248032068; Wed, 14 Jan 2015 07:07:12 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 6si30946480pdk.217.2015.01.14.07.07.11; Wed, 14 Jan 2015 07:07:12 -0800 (PST) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753403AbbANPHH (ORCPT + 28 others); Wed, 14 Jan 2015 10:07:07 -0500 Received: from mail-pa0-f42.google.com ([209.85.220.42]:42947 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753243AbbANPHB (ORCPT ); Wed, 14 Jan 2015 10:07:01 -0500 Received: by mail-pa0-f42.google.com with SMTP id et14so11044897pad.1 for ; Wed, 14 Jan 2015 07:07:01 -0800 (PST) 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 Cc: Lorenzo Pieralisi , Graeme Gregory , Sudeep Holla , Jon Masters , Jason Cooper , Marc Zyngier , Bjorn Helgaas , Mark Brown , Rob Herring , Robert Richter , Randy Dunlap , Charles.Garcia-Tobin@arm.com, phoenix.liyi@huawei.com, Timur Tabi , suravee.suthikulpanit@amd.com, wangyijing@huawei.com, linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org, Mark Salter , Leif Lindholm , Ard Biesheuvel , Hanjun Guo 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> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: hanjun.guo@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.182 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 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 --- 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