From patchwork Fri Oct 17 13:36:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 5097511 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 8C838C11AC for ; Fri, 17 Oct 2014 13:41:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BC00920219 for ; Fri, 17 Oct 2014 13:41:05 +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 D55162020E for ; Fri, 17 Oct 2014 13:41:04 +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 1Xf7jd-0006B1-D2; Fri, 17 Oct 2014 13:38:25 +0000 Received: from mail-pd0-f169.google.com ([209.85.192.169]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xf7jQ-00063s-0o for linux-arm-kernel@lists.infradead.org; Fri, 17 Oct 2014 13:38:12 +0000 Received: by mail-pd0-f169.google.com with SMTP id w10so818659pde.14 for ; Fri, 17 Oct 2014 06:37:50 -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=bI+ZXLlDdNe87N1bgLzKBf49m4JZZVPqEYUllU5yWrM=; b=SY0Vh9ev5vZCIGQUOZRxNM8UvMDQ8P+EQmNsgCWrG8pGxHFizihDfZsAxnRaKdQl55 RAsHwhIBJbDoTvoXI3PwUSrvE4ng5m3FMVhSnB52CY1Zoy8vGSiLCh6KcESMzL3ulJ1L 3VafoVFxxgpWluGv1tyu6W4GuWYf86PHU9MixrzmLJ50Iq2YJubweWyo3lhoDMz0JpED hGNn5vBFXNIQiEsYNq7vITa8Or+zkBLj0UAaDnWljvnqkrLsbz0u1SIlGWxS2H/VvaPG Jt33aX6HFhTqd8qsZGIw6nNyQ9QwK9rtoVMuFL+QieJZYVqBTFo182AfCbCvRmS4a104 9G2A== X-Gm-Message-State: ALoCoQkf9Z0T+2t2avy+FbNbNj5eqVvnqazfwGMOOJ+vX+Ts1sAzvlW/MCfGT19MPo2OPbL0ImbW X-Received: by 10.68.246.229 with SMTP id xz5mr8409798pbc.131.1413553070569; Fri, 17 Oct 2014 06:37:50 -0700 (PDT) Received: from localhost ([220.202.153.90]) by mx.google.com with ESMTPSA id m4sm1603873pdr.82.2014.10.17.06.37.45 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 17 Oct 2014 06:37:49 -0700 (PDT) From: Hanjun Guo To: Catalin Marinas , "Rafael J. Wysocki" , Mark Rutland , Olof Johansson , Grant Likely , Will Deacon Subject: [PATCH v5 01/18] ARM64: Move the init of cpu_logical_map(0) before unflatten_device_tree() Date: Fri, 17 Oct 2014 21:36:57 +0800 Message-Id: <1413553034-20956-2-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1413553034-20956-1-git-send-email-hanjun.guo@linaro.org> References: <1413553034-20956-1-git-send-email-hanjun.guo@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141017_063812_118520_B9B8BDEF X-CRM114-Status: GOOD ( 10.49 ) X-Spam-Score: -0.9 (/) 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 , Jon Masters , Mark Brown , Bjorn Helgaas , linux-arm-kernel@lists.infradead.org, Graeme Gregory , Kangkang.Shen@huawei.com, 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=-1.9 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. Acked-by: Olof Johansson Acked-by: Mark Rutland Signed-off-by: Hanjun Guo Acked-by: Catalin Marinas --- 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 edb146d..8f33f72 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -393,11 +393,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();