RISC-V: ACPI: Add LPI support
Subsystems (6)
Sunil V L
maintainerv3 cover RISC-V: ACPI: Add LPI support
This series adds support for Low Power Idle (LPI) on ACPI based platforms.
LPI is described in the ACPI spec [1]. RISC-V FFH spec required to enable this is available at [2].
[1] - https://uefi.org/specs/ACPI/6.5/08_Processor_Configuration_and_Control.html#lpi-low-power-idle-states
[2] - https://github.com/riscv-non-isa/riscv-acpi-ffh/releases/download/v/riscv-ffh.pdf
Changes since v2:
1) Added "riscv_" prefix for functions made non static (Feedback from Drew)
2) Added RB tags from Drew.
Changes since v1:
1) Reordered the commits such that the patch which enables ACPI_PROCESSOR is the last one in the series.
2) Used GENMASK and other changes to address Drew's comments.
3) Moved common functions required by both DT and ACPI based cpuidle drivers from the DT driver to common arch/riscv/suspend.c.
4) ACPI cpuidle driver is added under drivers/acpi/riscv
5) Rebased to latest for-next branch of linux-riscv.
Sunil V L (3):
cpuidle: RISC-V: Move few functions to arch/riscv
ACPI: RISC-V: Add LPI driver
ACPI: Enable ACPI_PROCESSOR for RISC-V
arch/riscv/include/asm/suspend.h | 3 ++ arch/riscv/kernel/suspend.c | 49 +++++++++++++++++ drivers/acpi/Kconfig | 2 +- drivers/acpi/riscv/Makefile | 3 +- drivers/acpi/riscv/cpuidle.c | 81 +++++++++++++++++++++++++++++ drivers/cpuidle/cpuidle-riscv-sbi.c | 49 ++--------------- 6 files changed, 141 insertions(+), 46 deletions(-) create mode 100644 drivers/acpi/riscv/cpuidle.c
Signature · 1 line
2.34.1
Sunil V L
maintainerPATCH v3 1/3 cpuidle: RISC-V: Move few functions to arch/riscv
To support ACPI Low Power Idle (LPI), few functions are required which are currently static functions in the DT based cpuidle driver. Hence, move them under arch/riscv so that ACPI driver also can use them. Since they are no longer static functions, append "riscv_" prefix to the function name.
--- arch/riscv/include/asm/suspend.h | 3 ++ arch/riscv/kernel/suspend.c | 49 +++++++++++++++++++++++++++++ drivers/cpuidle/cpuidle-riscv-sbi.c | 49 +++-------------------------- 3 files changed, 57 insertions(+), 44 deletions(-)
arch/riscv/include/asm/suspend.h +3 -0
@@ -55,4 +55,7 @@ int hibernate_resume_nonboot_cpu_disable(void); asmlinkage void hibernate_restore_image(unsigned long resume_satp, unsigned long satp_temp,unsigned long cpu_resume); asmlinkage int hibernate_core_restore_code(void); +bool riscv_sbi_hsm_is_supported (void ); +bool riscv_sbi_suspend_state_is_valid (u32 state); +int riscv_sbi_hart_suspend (u32 state);#endif
arch/riscv/kernel/suspend.c +49 -0
53 lines not on this page · raw message
drivers/cpuidle/cpuidle-riscv-sbi.c +5 -44
87 lines not on this page · raw message
Signature · 1 line
2.34.1
Sunil V L
maintainerPATCH v3 2/3 ACPI: RISC-V: Add LPI driver
In reply to Sunil V LEnable Low Power Idle (LPI) based cpuidle driver for RISC-V platforms. It depends on SBI HSM calls for idle state transitions.
--- drivers/acpi/riscv/Makefile | 3 +- drivers/acpi/riscv/cpuidle.c | 81 ++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 drivers/acpi/riscv/cpuidle.c
drivers/acpi/riscv/Makefile +2 -1
@@ -1,2 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-y += rhct.o +obj-y += rhct.o +obj-$(CONFIG_ACPI_PROCESSOR_IDLE) += cpuidle.o
drivers/acpi/riscv/cpuidle.c new file +81 -0
81 lines not on this page · raw message
Signature · 1 line
2.34.1
Re: [PATCH v3 -next 2/3] ACPI: RISC-V: Add LPI driver
Quoted 70 lines · Sunil V L
Enable Low Power Idle (LPI) based cpuidle driver for RISC-V platforms. It depends on SBI HSM calls for idle state transitions.
Signed-off-by Sunil V L <[email protected]>Reviewed-by Andrew Jones <[email protected]>--- drivers/acpi/riscv/Makefile | 3 +- drivers/acpi/riscv/cpuidle.c | 81 ++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 drivers/acpi/riscv/cpuidle.cdrivers/acpi/riscv/Makefile +2
-1@@ -1,2 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-y += rhct.o +obj-y += rhct.o +obj-$(CONFIG_ACPI_PROCESSOR_IDLE) += cpuidle.odrivers/acpi/riscv/cpuidle.c new file +44
-0@@ -0,0 +1,81 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Copyright (C) 2024, Ventana Micro Systems Inc +* Author: Sunil V L <[email protected]> +* +*/ + +#include <linux/acpi.h> +#include <acpi/processor.h> +#include <linux/cpu_pm.h> +#include <linux/cpuidle.h> +#include <linux/suspend.h> +#include <asm/cpuidle.h> +#include <asm/sbi.h> +#include <asm/suspend.h> + +#define RISCV_FFH_LPI_TYPE_MASK GENMASK_ULL(63, 60) +#define RISCV_FFH_LPI_RSVD_MASK GENMASK_ULL(59, 32) + +#define RISCV_FFH_LPI_TYPE_SBI BIT_ULL(60) + +static int acpi_cpu_init_idle (unsigned int cpu) +{ +int i; +struct acpi_lpi_state *lpi; +struct acpi_processor *pr =per_cpu (processors, cpu); + +if (unlikely (!pr || !pr->flags.has_lpi)) +return -EINVAL ; + +if (!riscv_sbi_hsm_is_supported ()) +return -ENODEV ; + +if (pr->power.count <=1 ) +return -ENODEV ; + +for (i =1 ; i < pr->power.count; i++) { +u32 state; + + lpi = &pr->power.lpi_states[i]; + +/* +* Validate Entry Method as per FFH spec. +* bits[63:60] should be 0x1
drivers/acpi/riscv/cpuidle.c line 54
Quoted 10 lines
drivers/acpi/riscv/cpuidle.c new file +10
-0+* bits[59:32] should be 0x0 +* bits[31:0] represent a SBI power_state +*/ +if (((lpi->address &RISCV_FFH_LPI_TYPE_MASK ) !=RISCV_FFH_LPI_TYPE_SBI ) || + (lpi->address &RISCV_FFH_LPI_RSVD_MASK )) { +pr_warn ("Invalid LPI entry method %#llx\n" , lpi->address); +return -EINVAL ; + } + + state = lpi->address;
It seems that acpi_lpi_state.address is u64, so shouldn't state be u64 instead of u32?
thanks,
drew
Sunil V L
maintainerRe: [PATCH v3 -next 2/3] ACPI: RISC-V: Add LPI driver
Quoted 76 lines · Drew Fustini
Quoted 75 lines · Sunil V L
Enable Low Power Idle (LPI) based cpuidle driver for RISC-V platforms. It depends on SBI HSM calls for idle state transitions.
Signed-off-by Sunil V L <[email protected]>Reviewed-by Andrew Jones <[email protected]>--- drivers/acpi/riscv/Makefile | 3 +- drivers/acpi/riscv/cpuidle.c | 81 ++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 drivers/acpi/riscv/cpuidle.cdrivers/acpi/riscv/Makefile +2
-1@@ -1,2 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-y += rhct.o +obj-y += rhct.o +obj-$(CONFIG_ACPI_PROCESSOR_IDLE) += cpuidle.odrivers/acpi/riscv/cpuidle.c new file +49
-0@@ -0,0 +1,81 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Copyright (C) 2024, Ventana Micro Systems Inc +* Author: Sunil V L <[email protected]> +* +*/ + +#include <linux/acpi.h> +#include <acpi/processor.h> +#include <linux/cpu_pm.h> +#include <linux/cpuidle.h> +#include <linux/suspend.h> +#include <asm/cpuidle.h> +#include <asm/sbi.h> +#include <asm/suspend.h> + +#define RISCV_FFH_LPI_TYPE_MASK GENMASK_ULL(63, 60) +#define RISCV_FFH_LPI_RSVD_MASK GENMASK_ULL(59, 32) + +#define RISCV_FFH_LPI_TYPE_SBI BIT_ULL(60) + +static int acpi_cpu_init_idle (unsigned int cpu) +{ +int i; +struct acpi_lpi_state *lpi; +struct acpi_processor *pr =per_cpu (processors, cpu); + +if (unlikely (!pr || !pr->flags.has_lpi)) +return -EINVAL ; + +if (!riscv_sbi_hsm_is_supported ()) +return -ENODEV ; + +if (pr->power.count <=1 ) +return -ENODEV ; + +for (i =1 ; i < pr->power.count; i++) { +u32 state; + + lpi = &pr->power.lpi_states[i]; + +/* +* Validate Entry Method as per FFH spec. +* bits[63:60] should be 0x1 +* bits[59:32] should be 0x0 +* bits[31:0] represent a SBI power_state +*/ +if (((lpi->address &RISCV_FFH_LPI_TYPE_MASK ) !=RISCV_FFH_LPI_TYPE_SBI ) || + (lpi->address &RISCV_FFH_LPI_RSVD_MASK )) {
Quoted 9 lines
drivers/acpi/riscv/cpuidle.c line 54
Quoted 5 lines
drivers/acpi/riscv/cpuidle.c new file +5
-0+pr_warn ("Invalid LPI entry method %#llx\n" , lpi->address); +return -EINVAL ; + } + + state = lpi->address;It seems that acpi_lpi_state.address is u64, so shouldn't state be u64 instead of u32?
SBI suspend state is only 32 bits represented by lower 32 bits of lpi->address.
Thanks,
Sunil
Sunil V L
maintainerPATCH v3 3/3 ACPI: Enable ACPI_PROCESSOR for RISC-V
In reply to Sunil V LThe ACPI processor driver is not currently enabled for RISC-V. This is required to enable CPU related functionalities like LPI and CPPC. Hence, enable ACPI_PROCESSOR for RISC-V.
--- drivers/acpi/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/acpi/Kconfig +1 -1
@@ -282,7 +282,7 @@ config ACPI_CPPC_LIB config ACPI_PROCESSOR tristate "Processor" - depends on X86 || ARM64 || LOONGARCH + depends on X86 || ARM64 || LOONGARCH || RISCV select ACPI_PROCESSOR_IDLE select ACPI_CPU_FREQ_PSS if X86 || LOONGARCH select THERMAL
Signature · 1 line
2.34.1
Sunil V L
maintainerHi Rafel,
Quoted 9 lines · Sunil V L
This series adds support for Low Power Idle (LPI) on ACPI based platforms.
LPI is described in the ACPI spec [1]. RISC-V FFH spec required to enable this is available at [2].
[1] - https://uefi.org/specs/ACPI/6.5/08_Processor_Configuration_and_Control.html#lpi-low-power-idle-states
[2] - https://github.com/riscv-non-isa/riscv-acpi-ffh/releases/download/v/riscv-ffh.pdf
Could you please take a look at this series also and provide ACK if looks fine?
Thanks,
Sunil
Quoted 31 lines
Changes since v2:
1) Added "riscv_" prefix for functions made non static (Feedback from Drew)
2) Added RB tags from Drew.Changes since v1:
1) Reordered the commits such that the patch which enablesACPI_PROCESSORis the last one in the series.
2) Used GENMASK and other changes to address Drew's comments.
3) Moved common functions required by both DT and ACPI based cpuidle drivers from the DT driver to commonarch/riscv/suspend.c.
4) ACPI cpuidle driver is added underdrivers/acpi/riscv
5) Rebased to latest for-next branch of linux-riscv.Sunil V L (3):
cpuidle: RISC-V: Move few functions toarch/riscv
ACPI: RISC-V: Add LPI driver
ACPI: EnableACPI_PROCESSORfor RISC-Varch/riscv/include/asm/suspend.h | 3 ++ arch/riscv/kernel/suspend.c | 49 +++++++++++++++++ drivers/acpi/Kconfig | 2 +- drivers/acpi/riscv/Makefile | 3 +- drivers/acpi/riscv/cpuidle.c | 81 +++++++++++++++++++++++++++++ drivers/cpuidle/cpuidle-riscv-sbi.c | 49 ++--------------- 6 files changed, 141 insertions(+), 46 deletions(-) create mode 100644 drivers/acpi/riscv/cpuidle.cSignature · 1 line
2.34.1
Quoted 7 lines · Sunil V L
Hi Rafel,
Quoted 3 lines · Sunil V L
This series adds support for Low Power Idle (LPI) on ACPI based platforms.
Quoted 8 lines
Quoted 6 lines
LPI is described in the ACPI spec [1]. RISC-V FFH spec required to enable this is available at [2].
[1] - https://uefi.org/specs/ACPI/6.5/08_Processor_Configuration_and_Control.html#lpi-low-power-idle-states
[2] - https://github.com/riscv-non-isa/riscv-acpi-ffh/releases/download/v/riscv-ffh.pdfCould you please take a look at this series also and provide ACK if looks fine?
I cannot really comment on RISC-V-specific changes.
As for the ACPI Kconfig change, please feel free to add
to that patch.
Quoted 5 lines · Sunil V L
This series adds support for Low Power Idle (LPI) on ACPI based platforms.
LPI is described in the ACPI spec [1]. RISC-V FFH spec required to enable this is available at [2].
I'm interested in trying out this series. Might you be able to provide some guidance on how to setup a test environment?
Are there specific branches of qemu and edk2 that I should use?
thanks,
drew
Sunil V L
maintainerHi Drew,
Quoted 4 lines · Drew Fustini
Quoted 3 lines · Sunil V L
This series adds support for Low Power Idle (LPI) on ACPI based platforms.
Quoted 8 lines
Quoted 2 lines
LPI is described in the ACPI spec [1]. RISC-V FFH spec required to enable this is available at [2].
I'm interested in trying out this series. Might you be able to provide some guidance on how to setup a test environment?
Are there specific branches of qemu and edk2 that I should use?
1) You need LPI objects in the platform. I have added dummy objects for testing this for qemu virt machine. Please use below branch.
https://github.com/vlsunil/qemu/tree/lpi_exp
Since interrupt controllers are not merged yet in linux, we need to boot without any IO devices and use only polling based console and ram disk. Above qemu branch disables IO devices as well.
2) Enable below config options while building linux kernel. RISCV_SBI_V01HVC_RISCV_SBI
3) Use upstream EDK2 (RiscVVirt)
4) Boot:
qemu-system-riscv64 \
-M virt,pflash0=pflash0,pflash1=pflash1 \
-m 2G -smp 8 \
-serial mon:stdio \
-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 \
-kernel arch/riscv/boot/Image \
-initrd buildroot/output/images/rootfs.cpio \
-append "root=/dev/ram ro console=hvc earlycon=sbi"
Feel free to ping me if you have any difficulties.
Thanks!
Sunil
This series was applied to riscv/linux.git (for-next) by Palmer Dabbelt <[email protected]>:
Hello:
This series was applied to riscv/linux.git (for-next) by Palmer Dabbelt <[email protected]>:
Quoted 10 lines · On Thu, 18 Jan 2024 11:59:27 +0530 you wrote:
This series adds support for Low Power Idle (LPI) on ACPI based platforms.
LPI is described in the ACPI spec [1]. RISC-V FFH spec required to enable this is available at [2].
[1] - https://uefi.org/specs/ACPI/6.5/08_Processor_Configuration_and_Control.html#lpi-low-power-idle-states
[2] - https://github.com/riscv-non-isa/riscv-acpi-ffh/releases/download/v/riscv-ffh.pdf[...]
Here is the summary with links:
- [v3,-next,1/3] cpuidle: RISC-V: Move few functions to arch/riscv
https://git.kernel.org/riscv/c/6649182a383c - [v3,-next,2/3] ACPI: RISC-V: Add LPI driver https://git.kernel.org/riscv/c/4877fc92142f - [v3,-next,3/3] ACPI: Enable ACPI_PROCESSOR for RISC-V https://git.kernel.org/riscv/c/359df7c5be4b
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html