summaryrefslogtreecommitdiffstats
path: root/include/linux/acpi.h
diff options
context:
space:
mode:
authorHanjun Guo <hanjun.guo@linaro.org>2016-06-17 11:53:02 +0800
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-06-22 01:36:59 +0200
commit4bac6fa73db77d4ff49a965a7c6dc69d9e235e5f (patch)
tree609ab6024448ebed7f86ba24018a7212ea312984 /include/linux/acpi.h
parentd8b47fca8c233642d1a20fa4025579ebc8be6f1e (diff)
downloadblackbird-obmc-linux-4bac6fa73db77d4ff49a965a7c6dc69d9e235e5f.tar.gz
blackbird-obmc-linux-4bac6fa73db77d4ff49a965a7c6dc69d9e235e5f.zip
ACPI / NUMA: Enable ACPI based NUMA on ARM64
Add function needed for cpu to node mapping, and enable ACPI based NUMA for ARM64 in Kconfig Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org> Signed-off-by: Robert Richter <rrichter@cavium.com> [david.daney@cavium.com added ACPI_NUMA default to y for ARM64] Signed-off-by: David Daney <david.daney@cavium.com> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'include/linux/acpi.h')
-rw-r--r--include/linux/acpi.h17
1 files changed, 16 insertions, 1 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 8010b266e856..9515db6f03f0 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -232,10 +232,25 @@ int acpi_table_parse_madt(enum acpi_madt_type id,
int acpi_parse_mcfg (struct acpi_table_header *header);
void acpi_table_print_madt_entry (struct acpi_subtable_header *madt);
-/* the following four functions are architecture-dependent */
+/* the following numa functions are architecture-dependent */
void acpi_numa_slit_init (struct acpi_table_slit *slit);
+
+#if defined(CONFIG_X86) || defined(CONFIG_IA64)
void acpi_numa_processor_affinity_init (struct acpi_srat_cpu_affinity *pa);
+#else
+static inline void
+acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa) { }
+#endif
+
void acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa);
+
+#ifdef CONFIG_ARM64
+void acpi_numa_gicc_affinity_init(struct acpi_srat_gicc_affinity *pa);
+#else
+static inline void
+acpi_numa_gicc_affinity_init(struct acpi_srat_gicc_affinity *pa) { }
+#endif
+
int acpi_numa_memory_affinity_init (struct acpi_srat_mem_affinity *ma);
#ifndef PHYS_CPUID_INVALID
OpenPOWER on IntegriCloud