From: David Daney <ddaney.cavm@gmail.com>
To: Will Deacon <will.deacon@arm.com>,
linux-arm-kernel@lists.infradead.org,
Mark Rutland <mark.rutland@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Tony Luck <tony.luck@intel.com>,
Fenghua Yu <fenghua.yu@intel.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org, "Rafael J. Wysocki" <rjw@rjwysocki.net>,
Len Brown <lenb@kernel.org>, Rob Herring <robh+dt@kernel.org>,
Frank Rowand <frowand.list@gmail.com>,
Grant Likely <grant.likely@linaro.org>,
Robert Moore <robert.moore@intel.com>,
Lv Zheng <lv.zheng@intel.com>, Hanjun Guo <hanjun.guo@linaro.org>,
Marc Zyngier <Marc.Zyngier@arm.com>,
linux-ia64@vger.kernel.org, linux-acpi@vger.kernel.org,
devel@acpica.org
Cc: linux-kernel@vger.kernel.org,
Robert Richter <rrichter@cavium.com>,
David Daney <david.daney@cavium.com>
Subject: [PATCH v7 05/15] acpi, numa: move acpi_numa_slit_init() to drivers/acpi/numa.c
Date: Tue, 24 May 2016 15:35:35 -0700 [thread overview]
Message-ID: <1464129345-18985-6-git-send-email-ddaney.cavm@gmail.com> (raw)
In-Reply-To: <1464129345-18985-1-git-send-email-ddaney.cavm@gmail.com>
From: Hanjun Guo <hanjun.guo@linaro.org>
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 <hanjun.guo@linaro.org>
Signed-off-by: Robert Richter <rrichter@cavium.com>
Signed-off-by: David Daney <david.daney@cavium.com>
---
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 fb2c0d6..7e0649d 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;
--
1.7.11.7
next prev parent reply other threads:[~2016-05-24 22:39 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-24 22:35 [PATCH v7 00/15] ACPI NUMA support for ARM64 David Daney
2016-05-24 22:35 ` [PATCH v7 01/15] acpi, numa: Use pr_fmt() instead of printk David Daney
2016-05-24 22:35 ` [PATCH v7 02/15] acpi, numa: Replace ACPI_DEBUG_PRINT() with pr_debug() David Daney
2016-05-24 22:35 ` [PATCH v7 03/15] acpi, numa: remove duplicate NULL check David Daney
2016-05-24 22:35 ` [PATCH v7 04/15] acpi, numa: Move acpi_numa_arch_fixup() to ia64 only David Daney
2016-05-24 22:35 ` David Daney [this message]
2016-05-24 22:35 ` [PATCH v7 06/15] arm64, numa: rework numa_add_memblk() David Daney
2016-05-24 22:35 ` [PATCH v7 07/15] arm64, numa: Cleanup NUMA disabled messages David Daney
2016-05-27 7:58 ` Dennis Chen
2016-05-31 12:28 ` Hanjun Guo
2016-05-24 22:35 ` [PATCH v7 08/15] x86, acpi, numa: cleanup acpi_numa_processor_affinity_init() David Daney
2016-05-24 22:35 ` [PATCH v7 09/15] acpi, numa: move bad_srat() and srat_disabled() to drivers/acpi/numa.c David Daney
2016-05-24 22:35 ` [PATCH v7 10/15] acpi, numa: remove unneeded acpi_numa=1 David Daney
2016-05-24 22:35 ` [PATCH v7 11/15] acpi, numa: Move acpi_numa_memory_affinity_init() to drivers/acpi/numa.c David Daney
2016-05-24 22:35 ` [PATCH v7 12/15] acpi, numa, srat: Improve SRAT error detection and add messages David Daney
2016-05-24 22:35 ` [PATCH v7 13/15] ACPI / processor: Add acpi_map_madt_entry() David Daney
2016-05-25 14:42 ` Catalin Marinas
2016-05-31 13:05 ` Hanjun Guo
2016-05-24 22:35 ` [PATCH v7 14/15] arm64, acpi, numa: NUMA support based on SRAT and SLIT David Daney
2016-05-25 14:42 ` Catalin Marinas
2016-05-27 8:04 ` Dennis Chen
2016-08-15 15:35 ` Catalin Marinas
2016-08-15 22:55 ` David Daney
2016-08-16 11:58 ` Hanjun Guo
2016-05-24 22:35 ` [PATCH v7 15/15] acpi, numa: Enable ACPI based NUMA on ARM64 David Daney
2016-06-09 19:47 ` Matthias Brugger
2016-06-17 2:04 ` Hanjun Guo
2016-06-03 22:07 ` [PATCH v7 00/15] ACPI NUMA support for ARM64 Rafael J. Wysocki
2016-06-10 10:20 ` Robert Richter
2016-06-10 10:26 ` Robert Richter
2016-06-10 13:51 ` Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1464129345-18985-6-git-send-email-ddaney.cavm@gmail.com \
--to=ddaney.cavm@gmail.com \
--cc=Marc.Zyngier@arm.com \
--cc=catalin.marinas@arm.com \
--cc=david.daney@cavium.com \
--cc=devel@acpica.org \
--cc=fenghua.yu@intel.com \
--cc=frowand.list@gmail.com \
--cc=grant.likely@linaro.org \
--cc=hanjun.guo@linaro.org \
--cc=hpa@zytor.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lv.zheng@intel.com \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=rjw@rjwysocki.net \
--cc=robert.moore@intel.com \
--cc=robh+dt@kernel.org \
--cc=rrichter@cavium.com \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=will.deacon@arm.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).