Commit af8d9eb8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull RISC-V fixes from Palmer Dabbelt:

 - Build with '-mno-relax' when using LLVM's linker, which doesn't
   support linker relaxation.

 - A fix to build without SiFive's errata.

 - A fix to use PAs during init_resources()

 - A fix to avoid W+X mappings during boot.

* tag 'riscv-for-linus-5.13-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  RISC-V: Fix memblock_free() usages in init_resources()
  riscv: skip errata_cip_453.o if CONFIG_ERRATA_SIFIVE_CIP_453 is disabled
  riscv: mm: Fix W+X mappings at boot
  riscv: Use -mno-relax when using lld linker
parents 9d32fa5d 160ce364

arch/riscv/Makefile

+9 −0
Original line number Diff line number Diff line
@@ -38,6 +38,15 @@ else 
	KBUILD_LDFLAGS += -melf32lriscv

endif



ifeq ($(CONFIG_LD_IS_LLD),y)

	KBUILD_CFLAGS += -mno-relax

	KBUILD_AFLAGS += -mno-relax

ifneq ($(LLVM_IAS),1)

	KBUILD_CFLAGS += -Wa,-mno-relax

	KBUILD_AFLAGS += -Wa,-mno-relax

endif

endif



# ISA string setting

riscv-march-$(CONFIG_ARCH_RV32I)	:= rv32ima

riscv-march-$(CONFIG_ARCH_RV64I)	:= rv64ima

arch/riscv/errata/sifive/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-y += errata_cip_453.o

obj-$(CONFIG_ERRATA_SIFIVE_CIP_453) += errata_cip_453.o

obj-y += errata.o

arch/riscv/kernel/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -231,13 +231,13 @@ static void __init init_resources(void) 


	/* Clean-up any unused pre-allocated resources */

	mem_res_sz = (num_resources - res_idx + 1) * sizeof(*mem_res);

	memblock_free((phys_addr_t) mem_res, mem_res_sz);

	memblock_free(__pa(mem_res), mem_res_sz);

	return;



 error:

	/* Better an empty resource tree than an inconsistent one */

	release_child_resources(&iomem_resource);

	memblock_free((phys_addr_t) mem_res, mem_res_sz);

	memblock_free(__pa(mem_res), mem_res_sz);

}

arch/riscv/mm/init.c

+6 −2
Original line number Diff line number Diff line
@@ -746,14 +746,18 @@ void __init protect_kernel_text_data(void) 
	unsigned long init_data_start = (unsigned long)__init_data_begin;

	unsigned long rodata_start = (unsigned long)__start_rodata;

	unsigned long data_start = (unsigned long)_data;

	unsigned long max_low = (unsigned long)(__va(PFN_PHYS(max_low_pfn)));

#if defined(CONFIG_64BIT) && defined(CONFIG_MMU)

	unsigned long end_va = kernel_virt_addr + load_sz;

#else

	unsigned long end_va = (unsigned long)(__va(PFN_PHYS(max_low_pfn)));

#endif



	set_memory_ro(text_start, (init_text_start - text_start) >> PAGE_SHIFT);

	set_memory_ro(init_text_start, (init_data_start - init_text_start) >> PAGE_SHIFT);

	set_memory_nx(init_data_start, (rodata_start - init_data_start) >> PAGE_SHIFT);

	/* rodata section is marked readonly in mark_rodata_ro */

	set_memory_nx(rodata_start, (data_start - rodata_start) >> PAGE_SHIFT);

	set_memory_nx(data_start, (max_low - data_start) >> PAGE_SHIFT);

	set_memory_nx(data_start, (end_va - data_start) >> PAGE_SHIFT);

}



void mark_rodata_ro(void)