From patchwork Mon Apr 18 21:14:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Daney X-Patchwork-Id: 8875241 Return-Path: X-Original-To: patchwork-linux-arm@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 F03AA9F36E for ; Mon, 18 Apr 2016 21:17:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 12588201C0 for ; Mon, 18 Apr 2016 21:17:05 +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 294BB2010F for ; Mon, 18 Apr 2016 21:17:04 +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 1asGW5-0003uW-Kw; Mon, 18 Apr 2016 21:15:33 +0000 Received: from mail-pa0-x231.google.com ([2607:f8b0:400e:c03::231]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1asGVP-0002Dz-Ie for linux-arm-kernel@lists.infradead.org; Mon, 18 Apr 2016 21:14:53 +0000 Received: by mail-pa0-x231.google.com with SMTP id zm5so82620997pac.0 for ; Mon, 18 Apr 2016 14:14:32 -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=SsHJkT/mJAS1FWmdhyYRaWvDsQ01rvlV3BotE1YWmE4=; b=pUCxPf1xKplvT7XhCRo9DQi0KGpVGmmC3FLkUceHRabovmw11emXjqA0sPOE8nGISs Adq5YGrNsTMRPLevmxAV+foxnk0e1hnuUDtB7JhpIye2tb8WD/UsWHnUPNLneTuPTP3h BRNtyKARiPqWDFKnV6CWv9QzNXK+Jp8YJ1eHuslUDI83Dzx10uTSWsns56YATR4rhchl 6yS9qDzxeCX4zzMd9t4DHnNSA6Of2qyb/5HX3wepiKnQluqR4abb7F9oq7pUTH7miFOi jlSM92OfrES7AuR+leADzBEJfL7BsikPbw50ck7bJ4oquE8m7LRZ3x2knHfbXjY2asku BhJA== 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=SsHJkT/mJAS1FWmdhyYRaWvDsQ01rvlV3BotE1YWmE4=; b=NIZrIbp3GmO4SDK5euJ6f+yCXWrBn0dcIzPk3JCerlGRddDjvAVQxFT7ikQw3g/nY6 LqgCYwDkOwrleTGW3joWBAhiFD/+Od4wJRQqLlet7N2JQwLEQH6RgtW89zSS2WtIVxUe OBJfWYMf/GfVm8hN0Z0i4aEmA3JVKRo9n3nlLLIVLGTEgk/XIxZrgP/FzF4JVyOp+KcJ /kI1qwPoaOEM9r47Gh798/+jUdvrbhkMIQh819t+hAdFufccEuN14VaPoTGbpAlABmV8 VgdBy3JmQSecsv7Tf4g7BvkiuebC/akg16Y/W0zG58vHDU4/0oHLBF2ZjZ2hNw92Kixj eU8A== X-Gm-Message-State: AOPr4FVqsvK1QJDjhkfY2Kp5Iz1Acwz5omK84KWLzwhOuQQOc5toIam+KyhDL1PRFeByYA== X-Received: by 10.66.66.234 with SMTP id i10mr53368854pat.114.1461014072528; Mon, 18 Apr 2016 14:14:32 -0700 (PDT) Received: from dl.caveonetworks.com ([64.2.3.194]) by smtp.gmail.com with ESMTPSA id bk8sm85940549pac.3.2016.04.18.14.14.27 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 18 Apr 2016 14:14:29 -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 u3ILEQjh030857; Mon, 18 Apr 2016 14:14:26 -0700 Received: (from ddaney@localhost) by dl.caveonetworks.com (8.14.5/8.14.5/Submit) id u3ILEQX2030856; Mon, 18 Apr 2016 14:14:26 -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 05/14] acpi, numa: move acpi_numa_slit_init() to drivers/acpi/numa.c Date: Mon, 18 Apr 2016 14:14:03 -0700 Message-Id: <1461014052-30788-6-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_141451_679436_9AF6B20D X-CRM114-Status: GOOD ( 16.35 ) 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 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 mark it as __weak 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 | 27 +++++++++++++++++++++++++++ 2 files changed, 27 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..5403d62 100644 --- a/drivers/acpi/numa.c +++ b/drivers/acpi/numa.c @@ -197,6 +197,33 @@ static int __init slit_valid(struct acpi_table_slit *slit) return 1; } +/* + * 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 __weak 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]); + } + } +} + static int __init acpi_parse_slit(struct acpi_table_header *table) { struct acpi_table_slit *slit = (struct acpi_table_slit *)table;