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 --- arch/arm64/include/asm/numa.h | 2 +- arch/arm64/kernel/setup.c | 1 + drivers/acpi/Kconfig | 2 +- drivers/acpi/numa.c | 36 ++++++++++++++++++++++++++++++++++++ include/linux/acpi.h | 15 +++++++++++++++ 5 files changed, 54 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/include/asm/numa.h b/arch/arm64/include/asm/numa.h index 8165bc9..3ed6edb 100644 --- a/arch/arm64/include/asm/numa.h +++ b/arch/arm64/include/asm/numa.h @@ -35,7 +35,7 @@ void numa_clear_node(int cpu); void __init build_cpu_to_node_map(void); void __init numa_set_distance(int from, int to, int distance); #else /* CONFIG_NUMA */ -static inline void arm64_numa_init(void); { } +static inline void arm64_numa_init(void) { } static inline void numa_store_cpu_info(int cpu) { } static inline void __init build_cpu_to_node_map(void) { } static inline void __init numa_set_distance(int from, int to, int distance) diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index d5bd782..07a6c6e 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -61,6 +61,7 @@ #include <asm/psci.h> #include <asm/efi.h> #include <asm/acpi.h> +#include <asm/numa.h>
unsigned int processor_id; EXPORT_SYMBOL(processor_id); diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 812596d..c1d4796 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -222,7 +222,7 @@ config ACPI_THERMAL config ACPI_NUMA bool "NUMA support" depends on NUMA - depends on (X86 || IA64) + depends on (X86 || IA64 || ARM64) default y if IA64_GENERIC || IA64_SGI_SN2
config ACPI_CUSTOM_DSDT_FILE diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c index 32916bd..11bafd8 100644 --- a/drivers/acpi/numa.c +++ b/drivers/acpi/numa.c @@ -134,6 +134,19 @@ acpi_table_print_srat_entry(struct acpi_subtable_header *header) } break;
+ case ACPI_SRAT_TYPE_GICC_AFFINITY: + { + struct acpi_srat_gicc_affinity *p = + (struct acpi_srat_gicc_affinity *)header; + pr_debug("SRAT Processor (acpi id[0x%04x]) in" + " proximity domain %d %s\n", + p->acpi_processor_uid, + p->proximity_domain, + (p->flags & ACPI_SRAT_GICC_ENABLED) ? + "enabled" : "disabled"); + } + break; + default: pr_warn("Found unsupported SRAT entry (type = 0x%x)\n", header->type); @@ -224,6 +237,24 @@ acpi_parse_processor_affinity(struct acpi_subtable_header *header, return 0; }
+static int __init +acpi_parse_gicc_affinity(struct acpi_subtable_header *header, + const unsigned long end) +{ + struct acpi_srat_gicc_affinity *processor_affinity; + + processor_affinity = (struct acpi_srat_gicc_affinity *)header; + if (!processor_affinity) + return -EINVAL; + + acpi_table_print_srat_entry(header); + + /* let architecture-dependent part to do it */ + acpi_numa_gicc_affinity_init(processor_affinity); + + return 0; +} + static int __initdata parsed_numa_memblks;
static int __init @@ -271,6 +302,9 @@ int __init acpi_numa_init(void) { int cnt = 0;
+ if (acpi_disabled) + return -EINVAL; + /* * Should not limit number with cpu num that is from NR_CPUS or nr_cpus= * SRAT cpu entries could have different order with that in MADT. @@ -283,6 +317,8 @@ int __init acpi_numa_init(void) acpi_parse_x2apic_affinity, 0); acpi_table_parse_srat(ACPI_SRAT_TYPE_CPU_AFFINITY, acpi_parse_processor_affinity, 0); + acpi_table_parse_srat(ACPI_SRAT_TYPE_GICC_AFFINITY, + acpi_parse_gicc_affinity, 0); cnt = acpi_table_parse_srat(ACPI_SRAT_TYPE_MEMORY_AFFINITY, acpi_parse_memory_affinity, NR_NODE_MEMBLKS); diff --git a/include/linux/acpi.h b/include/linux/acpi.h index de81de3..da2ec1e 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -141,8 +141,23 @@ void acpi_table_print_madt_entry (struct acpi_subtable_header *madt);
/* the following four 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); void acpi_numa_arch_fixup(void);