diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-04-22 13:53:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-04-22 13:53:14 -0700 |
| commit | 4e339e5e2dbf91e6499ef65389035b2795518c3d (patch) | |
| tree | ababfba6f8face7a1452da34a3e32450dbf119c8 | |
| parent | 7200095feadfb9792b744a5a6e20249ce77bc6d7 (diff) | |
| parent | bf9bac40b7635e2ce43ba0051a64c3fd44312405 (diff) | |
| download | linux-4e339e5e2dbf91e6499ef65389035b2795518c3d.tar.gz | |
Merge tag 'riscv-for-linus-5.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux
Pull RISC-V fixes Palmer Dabbelt:
- A pair of build fixes for the recent cpuidle driver
- A fix for systems without sv57 that manifests as a crash
early in boot
* tag 'riscv-for-linus-5.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
RISC-V: cpuidle: fix Kconfig select for RISCV_SBI_CPUIDLE
RISC-V: mm: Fix set_satp_mode() for platform not having Sv57
cpuidle: riscv: support non-SMP config
| -rw-r--r-- | arch/riscv/Kconfig.socs | 2 | ||||
| -rw-r--r-- | arch/riscv/mm/init.c | 1 | ||||
| -rw-r--r-- | drivers/cpuidle/cpuidle-riscv-sbi.c | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/arch/riscv/Kconfig.socs b/arch/riscv/Kconfig.socs index 34592d00dde8c6..f6ef358d8a2cf6 100644 --- a/arch/riscv/Kconfig.socs +++ b/arch/riscv/Kconfig.socs @@ -38,7 +38,7 @@ config SOC_VIRT select SIFIVE_PLIC select PM_GENERIC_DOMAINS if PM select PM_GENERIC_DOMAINS_OF if PM && OF - select RISCV_SBI_CPUIDLE if CPU_IDLE + select RISCV_SBI_CPUIDLE if CPU_IDLE && RISCV_SBI help This enables support for QEMU Virt Machine. diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index 9535bea8688c09..b0793dc0c291e9 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -718,6 +718,7 @@ retry: if (!check_l4) { disable_pgtable_l5(); check_l4 = true; + memset(early_pg_dir, 0, PAGE_SIZE); goto retry; } disable_pgtable_l4(); diff --git a/drivers/cpuidle/cpuidle-riscv-sbi.c b/drivers/cpuidle/cpuidle-riscv-sbi.c index b459eda2cd375f..5c852e6719924b 100644 --- a/drivers/cpuidle/cpuidle-riscv-sbi.c +++ b/drivers/cpuidle/cpuidle-riscv-sbi.c @@ -22,6 +22,7 @@ #include <linux/pm_runtime.h> #include <asm/cpuidle.h> #include <asm/sbi.h> +#include <asm/smp.h> #include <asm/suspend.h> #include "dt_idle_states.h" |