From patchwork Mon Apr 18 21:14:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Daney X-Patchwork-Id: 8875281 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0C02BBF29F for ; Mon, 18 Apr 2016 21:17:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 084E2201C0 for ; Mon, 18 Apr 2016 21:17:29 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1B40E2010F for ; Mon, 18 Apr 2016 21:17:28 +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 1asGWT-0004LR-OD; Mon, 18 Apr 2016 21:15:57 +0000 Received: from mail-pa0-x22b.google.com ([2607:f8b0:400e:c03::22b]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1asGVR-0002E7-Ui for linux-arm-kernel@lists.infradead.org; Mon, 18 Apr 2016 21:14:55 +0000 Received: by mail-pa0-x22b.google.com with SMTP id r5so26069577pag.1 for ; Mon, 18 Apr 2016 14:14:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lGDLx42Iwronb5UyDgVF7PvFl9T6qDzGElj6JQiIMqQ=; b=utVZ83qylRDJ+aJx+4U4OxL1dHofFNExbuVIgAIBTFmgeN7lzU3YOD7V8bZ6JgEytH Im3ykEuu3EH5zXvP3/peSQP7fXgaMyi5LcncY0IpuwisipeROz3gLX9efyw0MT6Zo4Es o9BJODTDqxWbxNP7qKNeW+NR88XCalaPf/tbPkQ7p759ruoi3LQ0sTTcURCvPof+pZ2Y 1ptSf3ViFoNsVi0dD9uaS4M0Uq1Ir7lgnvfT9F7UFEwfLrQgVcHaaMnGPsTtl6p7Ob6s BeboVCj2uArRPlEAMpPa+6WiOWxgMvBsdB1busIzEYVtSa5JcWioRgbn+8AEntHVx9x6 9Y/g== 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=lGDLx42Iwronb5UyDgVF7PvFl9T6qDzGElj6JQiIMqQ=; b=aHbDTvIh3DfPPdR8k9VphoCHHF9pkHt8vZjBaVgINSiErKA164U/veCcs1hpDUCDcr rDa16AAAmYeUjFhGaiMA1tGd/1cnWaKUZXRUJkXf5JWCGJvVv2Pj3Fjn8C8EodWsnUey 84k30Bj4JvggQFtRpLdG6BKEZCMkVxJLRiT7679fx8CvKonASK5KNbuGULFMFRgjQroK cupru+5mmDoZPGAYvwjajuvaXAkV1Z+md1dszc4t5+1aRnPY/jPqVsqYzd94aiiC/7aE lL1Ye8OOgzNt2tlEFk7JOGziPBq1VBuukmqOuB8KwSuEGBa7lolgeiBIJTZNQySKlgi0 3SjQ== X-Gm-Message-State: AOPr4FUp5AXG1egpak+rMlAYvmJ+CadZsNDTrOoDlmtoL7z+lbC5wBQ7u45p5jwic3Q5Sw== X-Received: by 10.66.40.236 with SMTP id a12mr52919157pal.58.1461014075878; Mon, 18 Apr 2016 14:14:35 -0700 (PDT) Received: from dl.caveonetworks.com ([64.2.3.194]) by smtp.gmail.com with ESMTPSA id m22sm6586706pfi.79.2016.04.18.14.14.28 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 18 Apr 2016 14:14:30 -0700 (PDT) Received: from dl.caveonetworks.com (localhost.localdomain [127.0.0.1]) by dl.caveonetworks.com (8.14.5/8.14.5) with ESMTP id u3ILERXQ030869; Mon, 18 Apr 2016 14:14:27 -0700 Received: (from ddaney@localhost) by dl.caveonetworks.com (8.14.5/8.14.5/Submit) id u3ILERLK030868; Mon, 18 Apr 2016 14:14:27 -0700 From: David Daney To: Will Deacon , linux-arm-kernel@lists.infradead.org, Mark Rutland , Catalin Marinas , Tony Luck , Fenghua Yu , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, "Rafael J. Wysocki" , Len Brown , Rob Herring , Frank Rowand , Grant Likely , Robert Moore , Lv Zheng , Hanjun Guo , Marc Zyngier , linux-ia64@vger.kernel.org, linux-acpi@vger.kernel.org, devel@acpica.org Subject: [PATCH v4 08/14] acpi, numa: move bad_srat() and srat_disabled() to drivers/acpi/numa.c Date: Mon, 18 Apr 2016 14:14:06 -0700 Message-Id: <1461014052-30788-9-git-send-email-ddaney.cavm@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1461014052-30788-1-git-send-email-ddaney.cavm@gmail.com> References: <1461014052-30788-1-git-send-email-ddaney.cavm@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160418_141454_098345_0C7D6536 X-CRM114-Status: GOOD ( 16.28 ) X-Spam-Score: -2.7 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Robert Richter , linux-kernel@vger.kernel.org, David Daney 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=-5.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 From: Hanjun Guo bad_srat() and srat_disabled() are shared by x86 and follow-on arm64 patches. Move them to drivers/acpi/numa.c in preparation for arm64 support. Signed-off-by: Hanjun Guo Signed-off-by: Robert Richter Signed-off-by: David Daney --- arch/x86/include/asm/acpi.h | 1 - arch/x86/mm/numa.c | 2 +- arch/x86/mm/srat.c | 13 ------------- drivers/acpi/numa.c | 1 + include/acpi/acpi_numa.h | 12 ++++++++++++ 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h index 94c18eb..65f1e95 100644 --- a/arch/x86/include/asm/acpi.h +++ b/arch/x86/include/asm/acpi.h @@ -145,7 +145,6 @@ static inline void disable_acpi(void) { } #define ARCH_HAS_POWER_INIT 1 #ifdef CONFIG_ACPI_NUMA -extern int acpi_numa; extern int x86_acpi_numa_init(void); #endif /* CONFIG_ACPI_NUMA */ diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c index f70c1ff..57673f5 100644 --- a/arch/x86/mm/numa.c +++ b/arch/x86/mm/numa.c @@ -1,4 +1,5 @@ /* Common code for 32 and 64-bit NUMA */ +#include #include #include #include @@ -15,7 +16,6 @@ #include #include #include -#include #include #include "numa_internal.h" diff --git a/arch/x86/mm/srat.c b/arch/x86/mm/srat.c index 9e2a833..4217071f 100644 --- a/arch/x86/mm/srat.c +++ b/arch/x86/mm/srat.c @@ -24,19 +24,6 @@ #include #include -int acpi_numa __initdata; - -static __init void bad_srat(void) -{ - printk(KERN_ERR "SRAT: SRAT not used.\n"); - acpi_numa = -1; -} - -static __init inline int srat_disabled(void) -{ - return acpi_numa < 0; -} - /* Callback for Proximity Domain -> x2APIC mapping */ void __init acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa) diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c index 5403d62..9b35ba9 100644 --- a/drivers/acpi/numa.c +++ b/drivers/acpi/numa.c @@ -40,6 +40,7 @@ static int node_to_pxm_map[MAX_NUMNODES] = { [0 ... MAX_NUMNODES - 1] = PXM_INVAL }; unsigned char acpi_srat_revision __initdata; +int acpi_numa __initdata; int pxm_to_node(int pxm) { diff --git a/include/acpi/acpi_numa.h b/include/acpi/acpi_numa.h index 94a37cd..28f06a6 100644 --- a/include/acpi/acpi_numa.h +++ b/include/acpi/acpi_numa.h @@ -15,6 +15,18 @@ extern int pxm_to_node(int); extern int node_to_pxm(int); extern int acpi_map_pxm_to_node(int); extern unsigned char acpi_srat_revision; +extern int acpi_numa __initdata; + +static inline void bad_srat(void) +{ + pr_err("SRAT: SRAT not used.\n"); + acpi_numa = -1; +} + +static inline int srat_disabled(void) +{ + return acpi_numa < 0; +} #endif /* CONFIG_ACPI_NUMA */ #endif /* __ACP_NUMA_H */