From: Haibo Xu <haibo1.xu@intel.com>
Cc: xiaobo55x@gmail.com, ajones@ventanamicro.com,
sunilvl@ventanamicro.com, "Haibo Xu" <haibo1.xu@intel.com>,
"Paul Walmsley" <paul.walmsley@sifive.com>,
"Palmer Dabbelt" <palmer@dabbelt.com>,
"Albert Ou" <aou@eecs.berkeley.edu>,
"Rafael J. Wysocki" <rafael@kernel.org>,
"Len Brown" <lenb@kernel.org>,
"Robert Moore" <robert.moore@intel.com>,
"Conor Dooley" <conor.dooley@microchip.com>,
"Guo Ren" <guoren@kernel.org>, "Björn Töpel" <bjorn@rivosinc.com>,
"Alexandre Ghiti" <alexghiti@rivosinc.com>,
"Greentime Hu" <greentime.hu@sifive.com>,
"Baoquan He" <bhe@redhat.com>, "Evan Green" <evan@rivosinc.com>,
"Zong Li" <zong.li@sifive.com>,
"Sami Tolvanen" <samitolvanen@google.com>,
"Jisheng Zhang" <jszhang@kernel.org>,
"Clément Léger" <cleger@rivosinc.com>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Chen Jiahao" <chenjiahao16@huawei.com>,
"Arnd Bergmann" <arnd@arndb.de>,
"James Morse" <james.morse@arm.com>,
"Samuel Holland" <samuel.holland@sifive.com>,
"Anup Patel" <apatel@ventanamicro.com>,
"Ard Biesheuvel" <ardb@kernel.org>,
"Tony Luck" <tony.luck@intel.com>,
"Yuntao Wang" <ytcoode@gmail.com>,
"Dan Williams" <dan.j.williams@intel.com>,
"Dave Hansen" <dave.hansen@linux.intel.com>,
"Alison Schofield" <alison.schofield@intel.com>,
linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org,
linux-acpi@vger.kernel.org, acpica-devel@lists.linux.dev
Subject: [PATCH v2 0/6] Add ACPI NUMA support for RISC-V
Date: Thu, 7 Mar 2024 16:47:52 +0800 [thread overview]
Message-ID: <cover.1709780590.git.haibo1.xu@intel.com> (raw)
This patch series enable RISC-V ACPI NUMA support which was based on
the recently approved ACPI ECR[1].
Patch 1/6 is generated from the acpica PR[2] and should be merged through
the acpica project. Due to this dependency, other 5 patches can only be
merged after the corresponding ACPICA patch was pulled into linux.
Patch 2/6 add RISC-V specific acpi_numa.c file to parse NUMA information
from SRAT and SLIT ACPI tables.
Patch 3/6 add the common SRAT RINTC affinity structure handler.
Patch 4/6 remove the '#if defined(CONFIG_ARCH)' condition to make some NUMA
related parse functions common for all current architectures that support
ACPI_NUMA
Patch 5/6 remove ARCH depends option in ACPI_NUMA Kconfig which was no
longer needed since all the current architectures that support ACPI would
select ACPI_NUMA by default.
Patch 6/6 add corresponding ACPI_NUMA config for RISC-V Kconfig.
Based-on: https://github.com/linux-riscv/linux-riscv/tree/for-next
[1] https://drive.google.com/file/d/1YTdDx2IPm5IeZjAW932EYU-tUtgS08tX/view?usp=sharing
[2] https://github.com/acpica/acpica/pull/926
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://lore.kernel.org/all/20240129094200.3581037-1-haibo1.xu@intel.com/
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_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
---
Changes since v1
- Switch the order of patch 2/4 and 3/4 - Per Sunil's suggestion
- Add a new patch 4/6 to make some NUMA related parse functions common
for all the architectures that support ACPI NUMA - Per Sunil's suggestion
- Add a new patch 5/6 to remove ARCH depends option in ACPI_NUMA
Kconfig since all the current architectures that support ACPI
would select ACPI_NUMA by default - Per Arnd and Sunil's suggestion
- Other minor fix for code format - Per Sunil's comments
Haibo Xu (6):
ACPICA: SRAT: Add RISC-V RINTC affinity structure
ACPI: RISCV: Add NUMA support based on SRAT and SLIT
ACPI: NUMA: Add handler for SRAT RINTC affinity structure
ACPI: NUMA: Make some NUMA related parse functions common
ACPI: NUMA: Remove ARCH depends option in ACPI_NUMA Kconfig
ACPI: RISCV: Enable ACPI based NUMA
arch/riscv/Kconfig | 1 +
arch/riscv/include/asm/acpi.h | 15 +++-
arch/riscv/kernel/Makefile | 1 +
arch/riscv/kernel/acpi.c | 5 --
arch/riscv/kernel/acpi_numa.c | 131 ++++++++++++++++++++++++++++++++++
arch/riscv/kernel/setup.c | 4 +-
arch/riscv/kernel/smpboot.c | 2 -
drivers/acpi/numa/Kconfig | 1 -
drivers/acpi/numa/srat.c | 40 ++++++++---
include/acpi/actbl3.h | 18 ++++-
include/linux/acpi.h | 6 ++
11 files changed, 203 insertions(+), 21 deletions(-)
create mode 100644 arch/riscv/kernel/acpi_numa.c
--
2.34.1
next reply other threads:[~2024-03-07 8:34 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-07 8:47 Haibo Xu [this message]
2024-03-07 8:47 ` [PATCH v2 1/6] ACPICA: SRAT: Add RISC-V RINTC affinity structure Haibo Xu
2024-03-07 8:47 ` [PATCH v2 2/6] ACPI: RISCV: Add NUMA support based on SRAT and SLIT Haibo Xu
2024-04-01 7:06 ` Sunil V L
2024-04-01 7:41 ` Haibo Xu
2024-04-02 9:31 ` Alexandre Ghiti
2024-04-07 3:09 ` Haibo Xu
2024-03-07 8:47 ` [PATCH v2 3/6] ACPI: NUMA: Add handler for SRAT RINTC affinity structure Haibo Xu
2024-04-01 6:56 ` Sunil V L
2024-03-07 8:47 ` [PATCH v2 4/6] ACPI: NUMA: Make some NUMA related parse functions common Haibo Xu
2024-04-01 7:00 ` Sunil V L
2024-03-07 8:47 ` [PATCH v2 5/6] ACPI: NUMA: Remove ARCH depends option in ACPI_NUMA Kconfig Haibo Xu
2024-03-07 8:44 ` Arnd Bergmann
2024-03-07 9:19 ` Haibo Xu
2024-03-07 9:22 ` Arnd Bergmann
2024-03-07 9:28 ` Haibo Xu
2024-03-07 8:47 ` [PATCH v2 6/6] ACPI: RISCV: Enable ACPI based NUMA Haibo Xu
2024-04-01 7:18 ` Sunil V L
2024-04-01 8:04 ` Haibo Xu
2024-04-01 16:57 ` Luck, Tony
2024-04-03 3:54 ` Sunil V L
2024-04-07 2:53 ` Haibo Xu
2024-03-27 12:37 ` [PATCH v2 0/6] Add ACPI NUMA support for RISC-V Haibo Xu
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=cover.1709780590.git.haibo1.xu@intel.com \
--to=haibo1.xu@intel.com \
--cc=acpica-devel@lists.linux.dev \
--cc=ajones@ventanamicro.com \
--cc=alexghiti@rivosinc.com \
--cc=alison.schofield@intel.com \
--cc=aou@eecs.berkeley.edu \
--cc=apatel@ventanamicro.com \
--cc=ardb@kernel.org \
--cc=arnd@arndb.de \
--cc=bhe@redhat.com \
--cc=bjorn@rivosinc.com \
--cc=chenjiahao16@huawei.com \
--cc=cleger@rivosinc.com \
--cc=conor.dooley@microchip.com \
--cc=dan.j.williams@intel.com \
--cc=dave.hansen@linux.intel.com \
--cc=evan@rivosinc.com \
--cc=greentime.hu@sifive.com \
--cc=gregkh@linuxfoundation.org \
--cc=guoren@kernel.org \
--cc=james.morse@arm.com \
--cc=jszhang@kernel.org \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=rafael@kernel.org \
--cc=robert.moore@intel.com \
--cc=samitolvanen@google.com \
--cc=samuel.holland@sifive.com \
--cc=sunilvl@ventanamicro.com \
--cc=tony.luck@intel.com \
--cc=xiaobo55x@gmail.com \
--cc=ytcoode@gmail.com \
--cc=zong.li@sifive.com \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).