Commit 4e339e5e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 7200095f bf9bac40

arch/riscv/Kconfig.socs

+1 −1
Original line number Original line Diff line number Diff line
@@ -38,7 +38,7 @@ config SOC_VIRT 
	select SIFIVE_PLIC

	select SIFIVE_PLIC

	select PM_GENERIC_DOMAINS if PM

	select PM_GENERIC_DOMAINS if PM

	select PM_GENERIC_DOMAINS_OF if PM && OF

	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

	help

	  This enables support for QEMU Virt Machine.

	  This enables support for QEMU Virt Machine.

arch/riscv/mm/init.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -718,6 +718,7 @@ static __init void set_satp_mode(void) 
		if (!check_l4) {

		if (!check_l4) {

			disable_pgtable_l5();

			disable_pgtable_l5();

			check_l4 = true;

			check_l4 = true;

			memset(early_pg_dir, 0, PAGE_SIZE);

			goto retry;

			goto retry;

		}

		}

		disable_pgtable_l4();

		disable_pgtable_l4();

drivers/cpuidle/cpuidle-riscv-sbi.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/pm_runtime.h>

#include <linux/pm_runtime.h>

#include <asm/cpuidle.h>

#include <asm/cpuidle.h>

#include <asm/sbi.h>

#include <asm/sbi.h>

#include <asm/smp.h>

#include <asm/suspend.h>

#include <asm/suspend.h>





#include "dt_idle_states.h"

#include "dt_idle_states.h"