From patchwork Mon Sep 1 14:57:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 4820381 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 33130C033A for ; Mon, 1 Sep 2014 15:03:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1E7422015D for ; Mon, 1 Sep 2014 15:03: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 12C5720160 for ; Mon, 1 Sep 2014 15:02:55 +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 1XOT4Q-0006sl-SE; Mon, 01 Sep 2014 14:59:02 +0000 Received: from mail-pa0-f44.google.com ([209.85.220.44]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XOT4N-0006jZ-Gu for linux-arm-kernel@lists.infradead.org; Mon, 01 Sep 2014 14:58:59 +0000 Received: by mail-pa0-f44.google.com with SMTP id rd3so12565580pab.31 for ; Mon, 01 Sep 2014 07:58:38 -0700 (PDT) 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=OoNNHN/lrLV0wqU6GHIQFBh+tvcYZmJlPBOP7/xzPMg=; b=iH2T/OZGhA2pCb5PqnhgusmGzjidUKl/D6wCsoYznHit66iWAiwn/wUgKKa/kOTygS QUlDpJ/D9RKJ1dUNm9wBLkNGC4b+69AiSav2H1v3KVEN7I6BSMGH1vroL3B8aNz1LXUO P+rW/MIpsrAoE/F87OEWY/LICUVbXu1WLMpOSvXuHNcIwkvV4+r9IQI+LBkGqvCRReSR UfPWJqz2syv/Vp4YlLYfYfDgTQRLOy58ZRPqANH88+eNsrsrTh8n0zFkdScxpEZHaaYd bVGQW/CJNgi5DaxMcAdSKSR3sV2qBKZ6EnY0aN113FTS0h1Ihg5dRKWLfNhTCoT92gzE 9DwA== X-Gm-Message-State: ALoCoQm4Vdb4HLPjRa6UiRj5gkEgAq/IscvhHOZ0vr6eWNb0sb/no7AsMA+OkgQigs3MEKVKy6tL X-Received: by 10.70.49.2 with SMTP id q2mr38172690pdn.28.1409583518435; Mon, 01 Sep 2014 07:58:38 -0700 (PDT) Received: from localhost ([202.104.114.248]) by mx.google.com with ESMTPSA id ix8sm3206677pac.32.2014.09.01.07.58.35 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 01 Sep 2014 07:58:37 -0700 (PDT) From: Hanjun Guo To: Catalin Marinas , "Rafael J. Wysocki" , Mark Rutland , Olof Johansson , Grant Likely Subject: [PATCH v3 01/17] ARM64: Move the init of cpu_logical_map(0) before unflatten_device_tree() Date: Mon, 1 Sep 2014 22:57:39 +0800 Message-Id: <1409583475-6978-2-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1409583475-6978-1-git-send-email-hanjun.guo@linaro.org> References: <1409583475-6978-1-git-send-email-hanjun.guo@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140901_075859_593634_6512773E X-CRM114-Status: GOOD ( 10.80 ) X-Spam-Score: -1.5 (-) Cc: linaro-acpi@lists.linaro.org, Liviu Dudau , Lv Zheng , Rob Herring , Lorenzo Pieralisi , Daniel Lezcano , Robert Moore , linux-acpi@vger.kernel.org, Charles.Garcia-Tobin@arm.com, Robert Richter , Jason Cooper , Arnd Bergmann , Marc Zyngier , Will Deacon , Mark Brown , Bjorn Helgaas , linux-arm-kernel@lists.infradead.org, Graeme Gregory , Randy Dunlap , linux-kernel@vger.kernel.org, Hanjun Guo , 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=-3.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, 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 It always make sense to initialize CPU0's logical map entry from the hardware values, so move the initialization of cpu_logical_map(0) before unflatten_device_tree() which is needed by ACPI code later. Signed-off-by: Hanjun Guo --- arch/arm64/kernel/setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index f6f0ccf..c96172a 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -390,11 +390,11 @@ void __init setup_arch(char **cmdline_p) efi_idmap_init(); + cpu_logical_map(0) = read_cpuid_mpidr() & MPIDR_HWID_BITMASK; unflatten_device_tree(); psci_init(); - cpu_logical_map(0) = read_cpuid_mpidr() & MPIDR_HWID_BITMASK; cpu_read_bootcpu_ops(); #ifdef CONFIG_SMP smp_init_cpus();