From patchwork Wed Feb 25 08:39:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 5878661 Return-Path: X-Original-To: patchwork-linux-acpi@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 9C4CD9F269 for ; Wed, 25 Feb 2015 08:46:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B734E20375 for ; Wed, 25 Feb 2015 08:46:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C8EEF20304 for ; Wed, 25 Feb 2015 08:46:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752970AbbBYIlW (ORCPT ); Wed, 25 Feb 2015 03:41:22 -0500 Received: from mail-pa0-f51.google.com ([209.85.220.51]:37613 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752945AbbBYIlU (ORCPT ); Wed, 25 Feb 2015 03:41:20 -0500 Received: by pabrd3 with SMTP id rd3so3645243pab.4 for ; Wed, 25 Feb 2015 00:41:19 -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=jW/GypZZ1OqJwLZNjaOElYCglRo1c+eC9I6ekolxehA=; b=ikMSkruo6CMyE8lLjiwZ5p+6vOZl54x9yocMT4tUbH+Qge8BWHm9ZXUFnyz6FP59D3 CuNym3YuCHLlvUahq3sh/lQ+lRJxUlqMwdPhRZj8YDyJCfFzlDnho4sJUeyM/hOk0jKU 4LVzsjmKMlmxHBciCDgLhdyn0GqoA1Clbm2Bzow6Bvt0yYiuCa/jcDQXH4TGe2jSp+1y gl4Gkgwkuo51H5nuyXNt5y4HgC84WmRXCxoQM3iCEBZ1cAAaq6RqVzkNXCC8Gp6kQvyT pmX0X7uzZgH9WNIzy0adXbwIITNTRgbB6n0teziJwMVCknxSCEgE37KImwsdO73+DpzL QmgQ== X-Gm-Message-State: ALoCoQk6HV5Jmn4+zCmZYspsAIusHyc3pP5ccIp5xFN/3LpvvORU+JdEEe28SdOURJFnKizebOig X-Received: by 10.70.123.70 with SMTP id ly6mr3693367pdb.154.1424853679817; Wed, 25 Feb 2015 00:41:19 -0800 (PST) Received: from localhost ([167.160.116.82]) by mx.google.com with ESMTPSA id di10sm41681237pad.41.2015.02.25.00.41.17 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 25 Feb 2015 00:41:19 -0800 (PST) From: Hanjun Guo To: Catalin Marinas , "Rafael J. Wysocki" , Will Deacon , Olof Johansson , Grant Likely Cc: Lorenzo Pieralisi , Arnd Bergmann , Mark Rutland , Graeme Gregory , Sudeep Holla , Jon Masters , Marc Zyngier , Mark Brown , Robert Richter , Timur Tabi , Ashwin Chaugule , suravee.suthikulpanit@amd.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 v9 04/21] ARM64: allow late use of early_ioremap Date: Wed, 25 Feb 2015 16:39:44 +0800 Message-Id: <1424853601-6675-5-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1424853601-6675-1-git-send-email-hanjun.guo@linaro.org> References: <1424853601-6675-1-git-send-email-hanjun.guo@linaro.org> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Tested-by: Robert Richter Acked-by: Robert Richter Signed-off-by: Mark Salter Signed-off-by: Hanjun Guo Reviewed-by: Grant Likely --- 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 defa0ff9..f196e40 100644 --- a/arch/arm64/include/asm/fixmap.h +++ b/arch/arm64/include/asm/fixmap.h @@ -62,6 +62,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