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: 36367 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oi0-f69.google.com (mail-oi0-f69.google.com [209.85.218.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E68D72032B for ; Mon, 1 Sep 2014 14:59:03 +0000 (UTC) Received: by mail-oi0-f69.google.com with SMTP id i138sf29860647oig.8 for ; Mon, 01 Sep 2014 07:59:03 -0700 (PDT) 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=mlxQMSF2460bZ0iCNPBV8KaZjCxMDWBTtLIppK7KGBM=; b=eCDTGhfznG9+jfX2KItap6AUWUMpZEn7dLlaS1nYvB2lsjxK4rYWMz75PFkmkWtHqe btJAH0XwgPhkYsldy2p5yiZ7leBe54WU3Q5PkhWKLjhgWZiF4wj/K4oF8JQZOZQdHUCM QLLn9Pc4gX4L2SNVQQAH5Afgqky3iwKy9Ag/KZ5SVb5XfMH+CWxmcbuBXVC5c6fj+Iv+ +LTlFHqt78jql2NDt+ncv975OlPH2/AKNZR0WjiEgK0qYeCEKKs/Z5oVykUZRhfccdpX R7D1ww1Qz+Avi6lOefEnjmOTsqCG9f64E3YegVh9Qw+oODR0ucAwdcV9emLk9GTsai7I RbGA== X-Gm-Message-State: ALoCoQlCBSAhDs0a6Di30ZvccxxWiVmPxk1TjT6uHqgFp9UYNG0OQs4fUN82TT2wIFFC2Qy0JbLl X-Received: by 10.182.24.8 with SMTP id q8mr16024546obf.25.1409583543536; Mon, 01 Sep 2014 07:59:03 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.32.138 with SMTP id h10ls2000003qgh.87.gmail; Mon, 01 Sep 2014 07:59:03 -0700 (PDT) X-Received: by 10.220.196.147 with SMTP id eg19mr609991vcb.60.1409583543461; Mon, 01 Sep 2014 07:59:03 -0700 (PDT) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by mx.google.com with ESMTPS id ut5si562370vcb.26.2014.09.01.07.59.03 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 01 Sep 2014 07:59:03 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.179 as permitted sender) client-ip=209.85.220.179; Received: by mail-vc0-f179.google.com with SMTP id hy4so5502088vcb.24 for ; Mon, 01 Sep 2014 07:59:03 -0700 (PDT) X-Received: by 10.52.138.210 with SMTP id qs18mr1671622vdb.18.1409583543341; Mon, 01 Sep 2014 07:59:03 -0700 (PDT) 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.221.45.67 with SMTP id uj3csp399400vcb; Mon, 1 Sep 2014 07:59:02 -0700 (PDT) X-Received: by 10.70.100.72 with SMTP id ew8mr12410671pdb.128.1409583542479; Mon, 01 Sep 2014 07:59:02 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ib9si1385228pad.238.2014.09.01.07.59.01 for ; Mon, 01 Sep 2014 07:59:02 -0700 (PDT) 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 S1754321AbaIAO6l (ORCPT + 25 others); Mon, 1 Sep 2014 10:58:41 -0400 Received: from mail-pd0-f174.google.com ([209.85.192.174]:45763 "EHLO mail-pd0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754272AbaIAO6j (ORCPT ); Mon, 1 Sep 2014 10:58:39 -0400 Received: by mail-pd0-f174.google.com with SMTP id ft15so6288973pdb.5 for ; Mon, 01 Sep 2014 07:58:38 -0700 (PDT) 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 Cc: Graeme Gregory , Arnd Bergmann , Sudeep Holla , Will Deacon , Jason Cooper , Marc Zyngier , Bjorn Helgaas , Daniel Lezcano , Mark Brown , Rob Herring , Robert Richter , Lv Zheng , Robert Moore , Lorenzo Pieralisi , Liviu Dudau , Randy Dunlap , Charles.Garcia-Tobin@arm.com, linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org, Hanjun Guo 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> 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.220.179 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: , 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();