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
Unified · Split
| @@ -38,7 +38,7 @@ config SOC_VIRT · 37 unmodified lines | ||
| 38 | 38 | select SIFIVE_PLIC |
| 39 | 39 | select PM_GENERIC_DOMAINS if PM |
| 40 | 40 | select PM_GENERIC_DOMAINS_OF if PM && OF |
| 41 | − select RISCV_SBI_CPUIDLE if CPU_IDLE | |
| 41 | + select RISCV_SBI_CPUIDLE if CPU_IDLE && RISCV_SBI | |
| 42 | 42 | help |
| 43 | 43 | This enables support for QEMU Virt Machine. |
| 44 | 44 | |
| @@ -718,6 +718,7 @@ retry: · 717 unmodified lines | ||
| 718 | 718 | if (!check_l4) { |
| 719 | 719 | disable_pgtable_l5(); |
| 720 | 720 | check_l4 = true; |
| 721 | + memset(early_pg_dir, 0, PAGE_SIZE); | |
| 721 | 722 | goto retry; |
| 722 | 723 | } |
| 723 | 724 | disable_pgtable_l4(); |
| @@ -22,6 +22,7 @@ · 21 unmodified lines | ||
| 22 | 22 | #include <linux/pm_runtime.h> |
| 23 | 23 | #include <asm/cpuidle.h> |
| 24 | 24 | #include <asm/sbi.h> |
| 25 | +#include <asm/smp.h> | |
| 25 | 26 | #include <asm/suspend.h> |
| 26 | 27 | |
| 27 | 28 | #include "dt_idle_states.h" |