Commit 0e15c3c7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'riscv-for-linus-6.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux 

Pull RISC-V fixes from Palmer Dabbelt:

 - build fix for the NR_CPUS Kconfig SBI version dependency

 - fixes to early memory initialization, to fix page permissions in EFI
   and post-initmem-free

 - build fix for the VDSO, to avoid trying to profile the VDSO functions

 - fixes for kexec crash handling, to fix multi-core and interrupt
   related initialization inside the crash kernel

 - fix for a race condition when handling multiple concurrect kernel
   stack overflows

* tag 'riscv-for-linus-6.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  riscv: kexec: Fixup crash_smp_send_stop without multi cores
  riscv: kexec: Fixup irq controller broken in kexec crash path
  riscv: mm: Proper page permissions after initmem free
  riscv: vdso: fix section overlapping under some conditions
  riscv: fix race when vmap stack overflow
  riscv: Sync efi page table's kernel mappings before switching
  riscv: Fix NR_CPUS range conditions
parents 2df2adc3 39cefc5f

arch/riscv/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -317,9 +317,9 @@ config SMP 
config NR_CPUS

	int "Maximum number of CPUs (2-512)"

	depends on SMP

	range 2 512 if !SBI_V01

	range 2 32 if SBI_V01 && 32BIT

	range 2 64 if SBI_V01 && 64BIT

	range 2 512 if !RISCV_SBI_V01

	range 2 32 if RISCV_SBI_V01 && 32BIT

	range 2 64 if RISCV_SBI_V01 && 64BIT

	default "32" if 32BIT

	default "64" if 64BIT

arch/riscv/include/asm/asm.h

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#define REG_L		__REG_SEL(ld, lw)

#define REG_S		__REG_SEL(sd, sw)

#define REG_SC		__REG_SEL(sc.d, sc.w)

#define REG_AMOSWAP_AQ	__REG_SEL(amoswap.d.aq, amoswap.w.aq)

#define REG_ASM		__REG_SEL(.dword, .word)

#define SZREG		__REG_SEL(8, 4)

#define LGREG		__REG_SEL(3, 2)

arch/riscv/include/asm/efi.h

+5 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <asm/mmu_context.h>

#include <asm/ptrace.h>

#include <asm/tlbflush.h>

#include <asm/pgalloc.h>



#ifdef CONFIG_EFI

extern void efi_init(void);
@@ -20,7 +21,10 @@ extern void efi_init(void); 
int efi_create_mapping(struct mm_struct *mm, efi_memory_desc_t *md);

int efi_set_mapping_permissions(struct mm_struct *mm, efi_memory_desc_t *md);



#define arch_efi_call_virt_setup()      efi_virtmap_load()

#define arch_efi_call_virt_setup()      ({		\

		sync_kernel_mappings(efi_mm.pgd);	\

		efi_virtmap_load();			\

	})

#define arch_efi_call_virt_teardown()   efi_virtmap_unload()



#define ARCH_EFI_IRQ_FLAGS_MASK (SR_IE | SR_SPIE)

arch/riscv/include/asm/pgalloc.h

+8 −3
Original line number Diff line number Diff line
@@ -127,6 +127,13 @@ static inline void p4d_free(struct mm_struct *mm, p4d_t *p4d) 
#define __p4d_free_tlb(tlb, p4d, addr)  p4d_free((tlb)->mm, p4d)

#endif /* __PAGETABLE_PMD_FOLDED */



static inline void sync_kernel_mappings(pgd_t *pgd)

{

	memcpy(pgd + USER_PTRS_PER_PGD,

	       init_mm.pgd + USER_PTRS_PER_PGD,

	       (PTRS_PER_PGD - USER_PTRS_PER_PGD) * sizeof(pgd_t));

}



static inline pgd_t *pgd_alloc(struct mm_struct *mm)

{

	pgd_t *pgd;
@@ -135,9 +142,7 @@ static inline pgd_t *pgd_alloc(struct mm_struct *mm) 
	if (likely(pgd != NULL)) {

		memset(pgd, 0, USER_PTRS_PER_PGD * sizeof(pgd_t));

		/* Copy kernel mappings */

		memcpy(pgd + USER_PTRS_PER_PGD,

			init_mm.pgd + USER_PTRS_PER_PGD,

			(PTRS_PER_PGD - USER_PTRS_PER_PGD) * sizeof(pgd_t));

		sync_kernel_mappings(pgd);

	}

	return pgd;

}

arch/riscv/include/asm/smp.h

+3 −0
Original line number Diff line number Diff line
@@ -50,6 +50,9 @@ void riscv_set_ipi_ops(const struct riscv_ipi_ops *ops); 
/* Clear IPI for current CPU */

void riscv_clear_ipi(void);



/* Check other CPUs stop or not */

bool smp_crash_stop_failed(void);



/* Secondary hart entry */

asmlinkage void smp_callin(void);