Unverified Commit 6a4aa4c9 authored by Palmer Dabbelt's avatar Palmer Dabbelt
Browse files

Merge patch series "Add ACPI NUMA support for RISC-V" 

Haibo Xu <haibo1.xu@intel.com> says:

This patch series enable RISC-V ACPI NUMA support which was based on
the recently approved ACPI ECR[1].

Patch 1/4 add RISC-V specific acpi_numa.c file to parse NUMA information
from SRAT and SLIT ACPI tables.
Patch 2/4 add the common SRAT RINTC affinity structure handler.
Patch 3/4 change the ACPI_NUMA to a hidden option since it would be selected
by default on all supported platform.
Patch 4/4 replace pr_info with pr_debug in arch_acpi_numa_init() to avoid
potential boot noise on ACPI platforms that are not NUMA.

Based-on: https://github.com/linux-riscv/linux-riscv/tree/for-next

[1] https://drive.google.com/file/d/1YTdDx2IPm5IeZjAW932EYU-tUtgS08tX/view?usp=sharing

Testing:
Since the ACPI AIA/PLIC support patch set is still under upstream review,
hence it is tested using the poll based HVC SBI console and RAM disk.
1) Build latest Qemu with the following patch backported
   https://github.com/vlsunil/qemu/commit/42bd4eeefd5d4410a68f02d54fee406d8a1269b0

2) Build latest EDK-II
   https://github.com/tianocore/edk2/blob/master/OvmfPkg/RiscVVirt/README.md

3) Build Linux with the following configs enabled
   CONFIG_RISCV_SBI_V01=y
   CONFIG_SERIAL_EARLYCON_RISCV_SBI=y
   CONFIG_NONPORTABLE=y
   CONFIG_HVC_RISCV_SBI=y
   CONFIG_NUMA=y
   CONFIG_ACPI_NUMA=y

4) Build buildroot rootfs.cpio

5) Launch the Qemu machine
   qemu-system-riscv64 -nographic \
   -machine virt,pflash0=pflash0,pflash1=pflash1 -smp 4 -m 8G \
   -blockdev node-name=pflash0,driver=file,read-only=on,filename=RISCV_VIRT_CODE.fd \
   -blockdev node-name=pflash1,driver=file,filename=RISCV_VIRT_VARS.fd \
   -object memory-backend-ram,size=4G,id=m0 \
   -object memory-backend-ram,size=4G,id=m1 \
   -numa node,memdev=m0,cpus=0-1,nodeid=0 \
   -numa node,memdev=m1,cpus=2-3,nodeid=1 \
   -numa dist,src=0,dst=1,val=30 \
   -kernel linux/arch/riscv/boot/Image \
   -initrd buildroot/output/images/rootfs.cpio \
   -append "root=/dev/ram ro console=hvc0 earlycon=sbi"

[    0.000000] ACPI: SRAT: Node 0 PXM 0 [mem 0x80000000-0x17fffffff]
[    0.000000] ACPI: SRAT: Node 1 PXM 1 [mem 0x180000000-0x27fffffff]
[    0.000000] NUMA: NODE_DATA [mem 0x17fe3bc40-0x17fe3cfff]
[    0.000000] NUMA: NODE_DATA [mem 0x27fff4c40-0x27fff5fff]
...
[    0.000000] ACPI: NUMA: SRAT: PXM 0 -> HARTID 0x0 -> Node 0
[    0.000000] ACPI: NUMA: SRAT: PXM 0 -> HARTID 0x1 -> Node 0
[    0.000000] ACPI: NUMA: SRAT: PXM 1 -> HARTID 0x2 -> Node 1
[    0.000000] ACPI: NUMA: SRAT: PXM 1 -> HARTID 0x3 -> Node 1

* b4-shazam-merge:
  ACPI: NUMA: replace pr_info with pr_debug in arch_acpi_numa_init
  ACPI: NUMA: change the ACPI_NUMA to a hidden option
  ACPI: NUMA: Add handler for SRAT RINTC affinity structure
  ACPI: RISCV: Add NUMA support based on SRAT and SLIT

Link: https://lore.kernel.org/r/cover.1718268003.git.haibo1.xu@intel.com


Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parents f557af08 5f76d421

arch/arm64/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -1471,7 +1471,6 @@ config HOTPLUG_CPU 
config NUMA

	bool "NUMA Memory Allocation and Scheduler Support"

	select GENERIC_ARCH_NUMA

	select ACPI_NUMA if ACPI

	select OF_NUMA

	select HAVE_SETUP_PER_CPU_AREA

	select NEED_PER_CPU_EMBED_FIRST_CHUNK

arch/loongarch/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -473,7 +473,6 @@ config NR_CPUS 
config NUMA

	bool "NUMA Support"

	select SMP

	select ACPI_NUMA if ACPI

	help

	  Say Y to compile the kernel with NUMA (Non-Uniform Memory Access)

	  support.  This option improves performance on systems with more

arch/riscv/include/asm/acpi.h

+13 −2
Original line number Diff line number Diff line
@@ -61,11 +61,14 @@ static inline void arch_fix_phys_package_id(int num, u32 slot) { } 


void acpi_init_rintc_map(void);

struct acpi_madt_rintc *acpi_cpu_get_madt_rintc(int cpu);

u32 get_acpi_id_for_cpu(int cpu);

static inline u32 get_acpi_id_for_cpu(int cpu)

{

	return acpi_cpu_get_madt_rintc(cpu)->uid;

}



int acpi_get_riscv_isa(struct acpi_table_header *table,

		       unsigned int cpu, const char **isa);



static inline int acpi_numa_get_nid(unsigned int cpu) { return NUMA_NO_NODE; }

void acpi_get_cbo_block_size(struct acpi_table_header *table, u32 *cbom_size,

			     u32 *cboz_size, u32 *cbop_size);

#else
@@ -87,4 +90,12 @@ static inline void acpi_get_cbo_block_size(struct acpi_table_header *table, 


#endif /* CONFIG_ACPI */



#ifdef CONFIG_ACPI_NUMA

int acpi_numa_get_nid(unsigned int cpu);

void acpi_map_cpus_to_nodes(void);

#else

static inline int acpi_numa_get_nid(unsigned int cpu) { return NUMA_NO_NODE; }

static inline void acpi_map_cpus_to_nodes(void) { }

#endif /* CONFIG_ACPI_NUMA */



#endif /*_ASM_ACPI_H*/

arch/riscv/kernel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -110,3 +110,4 @@ obj-$(CONFIG_COMPAT) += compat_vdso/ 


obj-$(CONFIG_64BIT)		+= pi/

obj-$(CONFIG_ACPI)		+= acpi.o

obj-$(CONFIG_ACPI_NUMA)	+= acpi_numa.o

arch/riscv/kernel/acpi.c

+0 −5
Original line number Diff line number Diff line
@@ -191,11 +191,6 @@ struct acpi_madt_rintc *acpi_cpu_get_madt_rintc(int cpu) 
	return &cpu_madt_rintc[cpu];

}



u32 get_acpi_id_for_cpu(int cpu)

{

	return acpi_cpu_get_madt_rintc(cpu)->uid;

}



/*

 * __acpi_map_table() will be called before paging_init(), so early_ioremap()

 * or early_memremap() should be called here to for ACPI table mapping.