From patchwork Wed Apr 27 18:07:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Daney X-Patchwork-Id: 8961351 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 82A739F457 for ; Wed, 27 Apr 2016 18:12:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 94FCD20225 for ; Wed, 27 Apr 2016 18:12:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 88F212024D for ; Wed, 27 Apr 2016 18:12:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753737AbcD0SLf (ORCPT ); Wed, 27 Apr 2016 14:11:35 -0400 Received: from mail-pa0-f68.google.com ([209.85.220.68]:36862 "EHLO mail-pa0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753343AbcD0SHi (ORCPT ); Wed, 27 Apr 2016 14:07:38 -0400 Received: by mail-pa0-f68.google.com with SMTP id i5so5678640pag.3; Wed, 27 Apr 2016 11:07:37 -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=93ipIH1kw2fev+8Xgahel6G0VOjwzxShIunSKBVsMpg=; b=ZtpdsKbLidiFlEa8uNmFm7m7hkZV6fbqQS1reuiwYrmUzIHs5y5LxZkxisuXDV37Ay kVOGcFLh74uno7eA0UljkzFFsKZXduYXkSo0M5O2jNrC4To5wKz/aWkxLUaM72x5l+VA Pxlm2YR5xxp6CBiiFyhNAKk+vjLj5I0eEdRP3snVeiCtC7sx6t4Yknvknm7ShLptDvzh MHl5RqiM2icTd8DZv9r4t3HYTjlKf7aAIoDDCISMwwGHnJS4Dl4jc7JznJ9uFQfmV+gl zo3WBoNX1IpJ3ij6Ks0vy9SzvxNT9fkQpKK3TIruyXcmLRalHclyp6jYOTPKHgvDRkNY MUOA== 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=93ipIH1kw2fev+8Xgahel6G0VOjwzxShIunSKBVsMpg=; b=lResS6bAnBDFwEg02EVlXqOlI2ghs+7NCOocPgF+xSjJWIzf05AN7FiWY39ipbgrZB QUMPmWhaFehG5TF+BLlV8teOaEKsni8cnev6tPmlQlSu/UEQ8lBQdNRucsAerd7e2YKT 82yvuWB7om6zXXVxgN374aWoDnUStH4DBM4xV0QN1N7YLTqPpjVK+Fq7qkI3hn0hV5Oe 3sfim7gvuTwZaO41RWrXlyThZ6vRb2f74FFHr4LVY2oniyVn3i954QaCdIakbi2LEipN RUi0GsmAgwXbB9lB99T98X20qPi2XCIJWHGLZcdj7D8TNrJ/8Oc3dggDbyzxgoWmRmgx N7Qw== X-Gm-Message-State: AOPr4FXR8TtSLHDG/vGlIwi9hSrHbZ5HlCk4PhT+LqSMQnd9+lyKQd4/rICE0r84/FLTOg== X-Received: by 10.66.171.164 with SMTP id av4mr13941885pac.135.1461780457415; Wed, 27 Apr 2016 11:07:37 -0700 (PDT) Received: from dl.caveonetworks.com ([64.2.3.194]) by smtp.gmail.com with ESMTPSA id ve11sm8477940pab.21.2016.04.27.11.07.31 (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 27 Apr 2016 11:07:32 -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 u3RI7UoO027251; Wed, 27 Apr 2016 11:07:30 -0700 Received: (from ddaney@localhost) by dl.caveonetworks.com (8.14.5/8.14.5/Submit) id u3RI7UZN027250; Wed, 27 Apr 2016 11:07:30 -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 Cc: linux-kernel@vger.kernel.org, Robert Richter , David Daney Subject: [PATCH v6 05/14] acpi, numa: move acpi_numa_slit_init() to drivers/acpi/numa.c Date: Wed, 27 Apr 2016 11:07:07 -0700 Message-Id: <1461780436-27182-6-git-send-email-ddaney.cavm@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1461780436-27182-1-git-send-email-ddaney.cavm@gmail.com> References: <1461780436-27182-1-git-send-email-ddaney.cavm@gmail.com> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, 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 Identical implementations of acpi_numa_slit_init() are used by both x86 and follow-on arm64 support. Move it to drivers/acpi/numa.c, and guard with CONFIG_X86 || CONFIG_ARM64 because ia64 has its own architecture specific implementation. No code change. Signed-off-by: Hanjun Guo Signed-off-by: Robert Richter Signed-off-by: David Daney --- arch/x86/mm/srat.c | 27 --------------------------- drivers/acpi/numa.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 27 deletions(-) diff --git a/arch/x86/mm/srat.c b/arch/x86/mm/srat.c index 90b6ed9..f242a11 100644 --- a/arch/x86/mm/srat.c +++ b/arch/x86/mm/srat.c @@ -42,33 +42,6 @@ static __init inline int srat_disabled(void) return acpi_numa < 0; } -/* - * Callback for SLIT parsing. pxm_to_node() returns NUMA_NO_NODE for - * I/O localities since SRAT does not list them. I/O localities are - * not supported at this point. - */ -void __init acpi_numa_slit_init(struct acpi_table_slit *slit) -{ - int i, j; - - for (i = 0; i < slit->locality_count; i++) { - const int from_node = pxm_to_node(i); - - if (from_node == NUMA_NO_NODE) - continue; - - for (j = 0; j < slit->locality_count; j++) { - const int to_node = pxm_to_node(j); - - if (to_node == NUMA_NO_NODE) - continue; - - numa_set_distance(from_node, to_node, - slit->entry[slit->locality_count * i + j]); - } - } -} - /* 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 f41f06b..6fa528a 100644 --- a/drivers/acpi/numa.c +++ b/drivers/acpi/numa.c @@ -197,6 +197,35 @@ static int __init slit_valid(struct acpi_table_slit *slit) return 1; } +#if defined(CONFIG_X86) || defined (CONFIG_ARM64) +/* + * Callback for SLIT parsing. pxm_to_node() returns NUMA_NO_NODE for + * I/O localities since SRAT does not list them. I/O localities are + * not supported at this point. + */ +void __init acpi_numa_slit_init(struct acpi_table_slit *slit) +{ + int i, j; + + for (i = 0; i < slit->locality_count; i++) { + const int from_node = pxm_to_node(i); + + if (from_node == NUMA_NO_NODE) + continue; + + for (j = 0; j < slit->locality_count; j++) { + const int to_node = pxm_to_node(j); + + if (to_node == NUMA_NO_NODE) + continue; + + numa_set_distance(from_node, to_node, + slit->entry[slit->locality_count * i + j]); + } + } +} +#endif /* defined(CONFIG_X86) || defined (CONFIG_ARM64) */ + static int __init acpi_parse_slit(struct acpi_table_header *table) { struct acpi_table_slit *slit = (struct acpi_table_slit *)table;