From patchwork Thu Jul 24 13:00:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 4617971 Return-Path: X-Original-To: patchwork-linux-acpi@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 932F09F295 for ; Thu, 24 Jul 2014 13:06:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 948D6201E4 for ; Thu, 24 Jul 2014 13:06:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B0311201D3 for ; Thu, 24 Jul 2014 13:06:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759220AbaGXNCe (ORCPT ); Thu, 24 Jul 2014 09:02:34 -0400 Received: from mail-pa0-f48.google.com ([209.85.220.48]:58732 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758771AbaGXNCb (ORCPT ); Thu, 24 Jul 2014 09:02:31 -0400 Received: by mail-pa0-f48.google.com with SMTP id et14so3887774pad.35 for ; Thu, 24 Jul 2014 06:02:31 -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=TXZ/H59Zd9bMk8eTnW87i7f1icbMRMoZIEDZ6k6v+lY=; b=J2pwojOPXuC9iFAqRT4tHC1P9D1YkOmOtsXj8gYfZPT4jLbKODX1aXPnHqti+stsKE p95MvwN3hfBE6PZJ6BbpAXMag/+EobZp+n7EoKB5sxmyT43tR20O+d1KREBl4DaG0atJ PBM57ImUMfN8UvcSWpPw0pSCt/qfdcOQlzKp7tGjWuuqTyOF12mRUvnFpcngJJG+egdn 5n3O9rKmOQZ/+hoiI1ZWA44jqcWRRgRL/IYUZBdheA4PLs+zS4PCGWDNLyxKyhdqNse4 dKUNXOWYwpjuBdAkbwH9E86lYXvxuWjplZNzidBK3F/7wrac73ZMmSQLVlpoGo231+hR EOlQ== X-Gm-Message-State: ALoCoQkv7Sac0nz8lZN7IbTry0HvJyBUT6kYTnNMhmRqCm7vEkUalbJ5qDpEDZRe5ywQ1efwgnx/ X-Received: by 10.66.66.133 with SMTP id f5mr9926132pat.81.1406206951176; Thu, 24 Jul 2014 06:02:31 -0700 (PDT) Received: from localhost ([183.247.163.231]) by mx.google.com with ESMTPSA id xy4sm20587484pac.19.2014.07.24.06.02.24 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 24 Jul 2014 06:02:30 -0700 (PDT) From: Hanjun Guo To: Catalin Marinas , "Rafael J. Wysocki" , Mark Rutland Cc: Graeme Gregory , Arnd Bergmann , Grant Likely , Sudeep Holla , Will Deacon , Jason Cooper , Marc Zyngier , Bjorn Helgaas , Daniel Lezcano , Mark Brown , 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-private@linaro.org, Hanjun Guo Subject: [PATCH 09/19] ARM64 / ACPI: Move the initialization of cpu_logical_map(0) before acpi_boot_init() Date: Thu, 24 Jul 2014 21:00:15 +0800 Message-Id: <1406206825-15590-10-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1406206825-15590-1-git-send-email-hanjun.guo@linaro.org> References: <1406206825-15590-1-git-send-email-hanjun.guo@linaro.org> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 Move the initialization of cpu_logical_map(0) before acpi_boot_init() to remove the duplicated initialization of cpu_logical_map(0). Signed-off-by: Hanjun Guo --- arch/arm64/kernel/acpi.c | 3 --- arch/arm64/kernel/setup.c | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c index 801e268..ff0f6a0 100644 --- a/arch/arm64/kernel/acpi.c +++ b/arch/arm64/kernel/acpi.c @@ -244,9 +244,6 @@ int __init acpi_boot_init(void) if (err) pr_err("Can't find FADT\n"); - /* Get the boot CPU's MPIDR before MADT parsing */ - cpu_logical_map(0) = read_cpuid_mpidr() & MPIDR_HWID_BITMASK; - err = acpi_parse_madt_gic_cpu_interface_entries(); return err; diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index e00d40c..17ab98e 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -394,13 +394,14 @@ void __init setup_arch(char **cmdline_p) efi_idmap_init(); + /* Get the boot CPU's MPIDR before cpu logical map is built */ + cpu_logical_map(0) = read_cpuid_mpidr() & MPIDR_HWID_BITMASK; acpi_boot_init(); 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();