From patchwork Mon Aug 4 15:28:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 4670861 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 11C619F37E for ; Mon, 4 Aug 2014 15:31:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 31BD82014A for ; Mon, 4 Aug 2014 15:31:26 +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 38E8020172 for ; Mon, 4 Aug 2014 15:31:25 +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 1XEKCP-0006pO-9d; Mon, 04 Aug 2014 15:29:21 +0000 Received: from mail-pa0-f53.google.com ([209.85.220.53]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XEKCJ-0006lo-Lp for linux-arm-kernel@lists.infradead.org; Mon, 04 Aug 2014 15:29:19 +0000 Received: by mail-pa0-f53.google.com with SMTP id rd3so10119689pab.26 for ; Mon, 04 Aug 2014 08:28:53 -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=o6oHB7iFGPu68tVqIbl3bLTWHLvfc6kAONya4Ha0pSA=; b=jfeh0jC4phn1J3YXQv5b+Nt49uM8bzydDtsmexJ5e4/k1udEZnij7JeVHK/NjrOgdS o8NXDkEJJhpYrom859cAGtc09QeZw9/nmCLh2YSRw+rfrDtHymuwyMaS8yk1e7OaBE3y tCPw76g0snltPj5BuZEn7zsVdqVwwMl4dZCpjQLNdWzS170O66JG4x5D/czzBGHB23wi l/8uThsButBn72iHwMQYe+CnmrLdlhCYdLLYO+nMHkbuKNtmQGqC25/0g/e3412Jrszj 05T4rL74jnpEDP7mJP8BVQuJay02nba1PKuU3teku8Mnr+y9Dhzqm3GThL1misCkpCgH QcFA== X-Gm-Message-State: ALoCoQm5SLX2IUjLGpIBQa+rM7OCN7DHgsGwqmquR+gc9aitz07f/oV/qk1ojhoRh5HAq7huMe/t X-Received: by 10.68.201.68 with SMTP id jy4mr24795253pbc.64.1407166133794; Mon, 04 Aug 2014 08:28:53 -0700 (PDT) Received: from localhost ([39.182.20.233]) by mx.google.com with ESMTPSA id oq3sm5164779pbb.14.2014.08.04.08.28.46 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 04 Aug 2014 08:28:53 -0700 (PDT) From: Hanjun Guo To: Catalin Marinas , "Rafael J. Wysocki" , Mark Rutland Subject: [PATCH v2 01/18] ARM64: Move the init of cpu_logical_map(0) before unflatten_device_tree() Date: Mon, 4 Aug 2014 23:28:08 +0800 Message-Id: <1407166105-17675-2-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1407166105-17675-1-git-send-email-hanjun.guo@linaro.org> References: <1407166105-17675-1-git-send-email-hanjun.guo@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140804_082915_729521_9E9E5F5E X-CRM114-Status: GOOD ( 10.50 ) X-Spam-Score: -1.4 (-) Cc: linaro-acpi@lists.linaro.org, Liviu Dudau , Lv Zheng , Rob Herring , Lorenzo Pieralisi , Daniel Lezcano , Robert Moore , linux-acpi@vger.kernel.org, Grant Likely , 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 , Olof Johansson 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=-2.6 required=5.0 tests=BAYES_00,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 46d1125..fc50461 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();