Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

cpuidle: riscv-sbi: Fix CPU_PM_CPU_IDLE_ENTER_xyz() macro usage

Currently, we are using CPU_PM_CPU_IDLE_ENTER_PARAM() for all SBI HSM
suspend types so retentive suspend types are also treated non-retentive
and kernel will do redundant additional work for these states.

The BIT[31] of SBI HSM suspend types allows us to differentiate between
retentive and non-retentive suspend types so we should use this BIT
to call appropriate CPU_PM_CPU_IDLE_ENTER_xyz() macro.

Fixes: 6abf32f1d9c5 ("cpuidle: Add RISC-V SBI CPU idle driver")
Signed-off-by: Anup Patel <apatel@ventanamicro.com>
Link: https://lore.kernel.org/r/20220718084553.2056169-1-apatel@ventanamicro.com/
Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>

authored by

Anup Patel and committed by
Palmer Dabbelt
cfadbb9d 096b52fd

+6 -1
+6 -1
drivers/cpuidle/cpuidle-riscv-sbi.c
··· 97 97 struct cpuidle_driver *drv, int idx) 98 98 { 99 99 u32 *states = __this_cpu_read(sbi_cpuidle_data.states); 100 + u32 state = states[idx]; 100 101 101 - return CPU_PM_CPU_IDLE_ENTER_PARAM(sbi_suspend, idx, states[idx]); 102 + if (state & SBI_HSM_SUSP_NON_RET_BIT) 103 + return CPU_PM_CPU_IDLE_ENTER_PARAM(sbi_suspend, idx, state); 104 + else 105 + return CPU_PM_CPU_IDLE_ENTER_RETENTION_PARAM(sbi_suspend, 106 + idx, state); 102 107 } 103 108 104 109 static int __sbi_enter_domain_idle_state(struct cpuidle_device *dev,