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

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

Pull RISC-V fixes from Palmer Dabbelt:

 - A build fix to always build modules with the 'medany' code model, as
   the module loader doesn't support 'medlow'.

 - A Kconfig warning fix for the SiFive errata.

 - A pair of fixes that for regressions to the recent memory layout
   changes.

 - A fix for the FU740 device tree.

* tag 'riscv-for-linus-5.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  riscv: dts: fu740: fix cache-controller interrupts
  riscv: Ensure BPF_JIT_REGION_START aligned with PMD size
  riscv: kasan: Fix MODULES_VADDR evaluation due to local variables' name
  riscv: sifive: fix Kconfig errata warning
  riscv32: Use medany C model for modules
parents e14c779a 7ede12b0

Documentation/riscv/vm-layout.rst

+2 −2
Original line number Diff line number Diff line
@@ -58,6 +58,6 @@ RISC-V Linux Kernel SV39 
                                                              |

  ____________________________________________________________|____________________________________________________________

                    |            |                  |         |

   ffffffff00000000 |   -4    GB | ffffffff7fffffff |    2 GB | modules

   ffffffff80000000 |   -2    GB | ffffffffffffffff |    2 GB | kernel, BPF

   ffffffff00000000 |   -4    GB | ffffffff7fffffff |    2 GB | modules, BPF

   ffffffff80000000 |   -2    GB | ffffffffffffffff |    2 GB | kernel

  __________________|____________|__________________|_________|____________________________________________________________

arch/riscv/Kconfig.socs

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ config SOC_SIFIVE 
	select CLK_SIFIVE

	select CLK_SIFIVE_PRCI

	select SIFIVE_PLIC

	select RISCV_ERRATA_ALTERNATIVE

	select ERRATA_SIFIVE

	help

	  This enables support for SiFive SoC platform hardware.

arch/riscv/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ ifeq ($(CONFIG_DYNAMIC_FTRACE),y) 
	CC_FLAGS_FTRACE := -fpatchable-function-entry=8

endif



ifeq ($(CONFIG_64BIT)$(CONFIG_CMODEL_MEDLOW),yy)

ifeq ($(CONFIG_CMODEL_MEDLOW),y)

KBUILD_CFLAGS_MODULE += -mcmodel=medany

endif

arch/riscv/boot/dts/sifive/fu740-c000.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ 
			cache-size = <2097152>;

			cache-unified;

			interrupt-parent = <&plic0>;

			interrupts = <19 20 21 22>;

			interrupts = <19 21 22 20>;

			reg = <0x0 0x2010000 0x0 0x1000>;

		};

		gpio: gpio@10060000 {

arch/riscv/include/asm/pgtable.h

+2 −3
Original line number Diff line number Diff line
@@ -30,9 +30,8 @@ 


#define BPF_JIT_REGION_SIZE	(SZ_128M)

#ifdef CONFIG_64BIT

/* KASLR should leave at least 128MB for BPF after the kernel */

#define BPF_JIT_REGION_START	PFN_ALIGN((unsigned long)&_end)

#define BPF_JIT_REGION_END	(BPF_JIT_REGION_START + BPF_JIT_REGION_SIZE)

#define BPF_JIT_REGION_START	(BPF_JIT_REGION_END - BPF_JIT_REGION_SIZE)

#define BPF_JIT_REGION_END	(MODULES_END)

#else

#define BPF_JIT_REGION_START	(PAGE_OFFSET - BPF_JIT_REGION_SIZE)

#define BPF_JIT_REGION_END	(VMALLOC_END)