| Message ID | 1407166105-17675-2-git-send-email-hanjun.guo@linaro.org |
|---|---|
| State | New |
| Headers | show
Return-Path: <patchwork-forward+bncBDWLZTMOWUARBRWN72PAKGQE7NOIP5Q@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f72.google.com (mail-oa0-f72.google.com [209.85.219.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EE8C821F5F for <linaro@patches.linaro.org>; Mon, 4 Aug 2014 15:29:11 +0000 (UTC) Received: by mail-oa0-f72.google.com with SMTP id m1sf41486294oag.7 for <linaro@patches.linaro.org>; Mon, 04 Aug 2014 08:29:11 -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=58KbOzwrA1Qc9KdToESEidgQ839ggW/ymrc/gxHnaf0=; b=T0nrm7d4mK/IsJIR3gMIbakklv9G2/Tawkw7tfd1QhxtZv6QFFjNfQj1gZvjRAZUe/ 6d0AjOnrWSkois4bGcKKQ2V6Tfr8pZbzBRl/uS0/Ai366bHOu3a/YasWvgs9eL8vnsUA hTjBH3XP+Oi+iRjmUIH7muABG0c+NX6grsgWyJptYF3Rkq1MmpjonK1frDeQVFDGyDbm UiZ0DO98NwczbmE2oOp+CEoL+LwDxGJSRKNdoxiWPYarYrGc8ttIjrievzxPGzj2eyrP OIr8ixZ344C8jaYccSQe/oH3JvdeV32LWLibuZ70NpWE0Ep7TTbtGdLu4M9GqLRygO1o WbvA== X-Gm-Message-State: ALoCoQlQfGeWXX39Whu0RlfyhLsnNrL6ITyB3kHHIfA8baACKM/bYKm/Y+nib2i8u4wt9AcailZ7 X-Received: by 10.182.68.17 with SMTP id r17mr8699337obt.26.1407166150470; Mon, 04 Aug 2014 08:29:10 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.31.101 with SMTP id e92ls2315753qge.37.gmail; Mon, 04 Aug 2014 08:29:10 -0700 (PDT) X-Received: by 10.52.142.102 with SMTP id rv6mr20698942vdb.26.1407166150292; Mon, 04 Aug 2014 08:29:10 -0700 (PDT) Received: from mail-vc0-f177.google.com (mail-vc0-f177.google.com [209.85.220.177]) by mx.google.com with ESMTPS id ak16si12152322vdc.93.2014.08.04.08.29.01 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Aug 2014 08:29:01 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.177 as permitted sender) client-ip=209.85.220.177; Received: by mail-vc0-f177.google.com with SMTP id hy4so11159513vcb.8 for <patchwork-forward@linaro.org>; Mon, 04 Aug 2014 08:29:01 -0700 (PDT) X-Received: by 10.52.120.38 with SMTP id kz6mr1750463vdb.86.1407166141204; Mon, 04 Aug 2014 08:29:01 -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.37.5 with SMTP id tc5csp313208vcb; Mon, 4 Aug 2014 08:29:00 -0700 (PDT) X-Received: by 10.70.43.206 with SMTP id y14mr24857891pdl.11.1407166140272; Mon, 04 Aug 2014 08:29:00 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id hs13si9005497pdb.290.2014.08.04.08.28.59 for <multiple recipients>; Mon, 04 Aug 2014 08:29:00 -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 S1752817AbaHDP25 (ORCPT <rfc822;yazen.ghannam@linaro.org> + 21 others); Mon, 4 Aug 2014 11:28:57 -0400 Received: from mail-pa0-f46.google.com ([209.85.220.46]:42509 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751271AbaHDP2y (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Mon, 4 Aug 2014 11:28:54 -0400 Received: by mail-pa0-f46.google.com with SMTP id lj1so10169348pab.19 for <linux-kernel@vger.kernel.org>; Mon, 04 Aug 2014 08:28:53 -0700 (PDT) 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 <multiple recipients> (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 04 Aug 2014 08:28:53 -0700 (PDT) From: Hanjun Guo <hanjun.guo@linaro.org> To: Catalin Marinas <catalin.marinas@arm.com>, "Rafael J. Wysocki" <rjw@rjwysocki.net>, Mark Rutland <mark.rutland@arm.com> Cc: Graeme Gregory <graeme.gregory@linaro.org>, Arnd Bergmann <arnd@arndb.de>, Olof Johansson <olof@lixom.net>, Grant Likely <grant.likely@linaro.org>, Sudeep Holla <Sudeep.Holla@arm.com>, Will Deacon <will.deacon@arm.com>, Jason Cooper <jason@lakedaemon.net>, Marc Zyngier <marc.zyngier@arm.com>, Bjorn Helgaas <bhelgaas@google.com>, Daniel Lezcano <daniel.lezcano@linaro.org>, Mark Brown <broonie@kernel.org>, Rob Herring <robh@kernel.org>, Robert Richter <rric@kernel.org>, Lv Zheng <lv.zheng@intel.com>, Robert Moore <robert.moore@intel.com>, Lorenzo Pieralisi <Lorenzo.Pieralisi@arm.com>, Liviu Dudau <Liviu.Dudau@arm.com>, Randy Dunlap <rdunlap@infradead.org>, 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 <hanjun.guo@linaro.org> 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> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: <patchwork-forward.linaro.org> 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.177 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: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Unsubscribe: <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com>, <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe> |
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();
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 <hanjun.guo@linaro.org> --- arch/arm64/kernel/setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)