From patchwork Fri Sep 12 13:59:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 4895271 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 C942DBEEA5 for ; Fri, 12 Sep 2014 14:03:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9168920200 for ; Fri, 12 Sep 2014 14:03:56 +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 5420420145 for ; Fri, 12 Sep 2014 14:03: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 1XSRPZ-0000rp-Tb; Fri, 12 Sep 2014 14:01:17 +0000 Received: from mail-pd0-f180.google.com ([209.85.192.180]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XSRPT-0000mk-4b for linux-arm-kernel@lists.infradead.org; Fri, 12 Sep 2014 14:01:11 +0000 Received: by mail-pd0-f180.google.com with SMTP id ft15so1269488pdb.25 for ; Fri, 12 Sep 2014 07:00:49 -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=oArhASs8sDw7eX70QYwcsfgSmR+WTG+srsWbQ9kbDh8=; b=lrHCTuV9f4n86xNvxQnMSNRqj871cz04Hcz5HS2QH/epGtmp5AyQDVtFa5TOuPgAJB DPlSTIHGKp32ZfKus6Ub7ejV5ZMLW4damt0L3NUMzNbnu18J5bhWIN3I6t5XeU05DV+p FexWrFoMfsiQLt77vOru+YzsoQxvcYsY0P/mWyIUGHbPE446FVZsDFpRK3quo0rtzctI OY0TMbbbgNzO9eX6L4oy3Zp8A2r3yhz00BQw4s36bkm69qj/v0PAR2HuA+GaXB5E0Fn9 Jbx6cFLXxXqNvOKUG6CxOlqIGrs4tFxqj3Pog0Y3b8oaQhgbRkmmm/NXpRM2KGayFgKD VL4Q== X-Gm-Message-State: ALoCoQmch5sKkhpj6rIvOhPt8kADmDYwNE8YXg21A8xHFPfApba2zPvomksk9agCDHPED8LKCdU1 X-Received: by 10.70.132.37 with SMTP id or5mr9725000pdb.149.1410530449352; Fri, 12 Sep 2014 07:00:49 -0700 (PDT) Received: from localhost ([111.140.73.43]) by mx.google.com with ESMTPSA id db2sm4080216pbc.16.2014.09.12.07.00.48 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 12 Sep 2014 07:00:48 -0700 (PDT) From: Hanjun Guo To: Catalin Marinas , "Rafael J. Wysocki" , Mark Rutland , Olof Johansson , Grant Likely , Will Deacon Subject: [PATCH v4 01/18] ARM64: Move the init of cpu_logical_map(0) before unflatten_device_tree() Date: Fri, 12 Sep 2014 21:59:59 +0800 Message-Id: <1410530416-30200-2-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1410530416-30200-1-git-send-email-hanjun.guo@linaro.org> References: <1410530416-30200-1-git-send-email-hanjun.guo@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140912_070111_227694_4A893F14 X-CRM114-Status: GOOD ( 10.44 ) X-Spam-Score: -2.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 , Jon Masters , 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=-4.1 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham 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 Acked-by: Olof Johansson Acked-by: Mark Rutland --- 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();