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

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

Pull RISC-V fixes from Palmer Dabbelt:

 - Avoid accessing the early boot ACPI tables via unsafe memory
   attributes, which can result in incorrect ACPI table data appearing.
   This can cause all sorts of bad behavior.

 - Avoid compiler-inserted library calls in the VDSO.

 - GCC+Rust builds have been disabled, to avoid issues related to ISA
   string mismatched between the GCC and LLVM Rust implementations.

 - The NX flag is now set in the EFI PE/COFF headers, which is necessary
   for some distro GRUB versions to boot images.

 - A fix to avoid leaking DT node reference counts on ACPI systems
   during cache info parsing.

 - CPU numbers are now printed as unsigned values during hotplug.

 - A pair of build fixes for usused macros, which can trigger warnings
   on some configurations.

* tag 'riscv-for-linus-6.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  riscv: Remove duplicated GET_RM
  riscv: Remove unused GENERATING_ASM_OFFSETS
  riscv: Use '%u' to format the output of 'cpu'
  riscv: Prevent a bad reference count on CPU nodes
  riscv: efi: Set NX compat flag in PE/COFF header
  RISC-V: disallow gcc + rust builds
  riscv: Do not use fortify in early code
  RISC-V: ACPI: fix early_ioremap to early_memremap
  riscv: vdso: Prevent the compiler from inserting calls to memset()
parents 3dfffd50 5f153a69

Documentation/rust/arch-support.rst

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ Architecture Level of support Constraints 
=============  ================  ==============================================

``arm64``      Maintained        Little Endian only.

``loongarch``  Maintained        \-

``riscv``      Maintained        ``riscv64`` only.

``riscv``      Maintained        ``riscv64`` and LLVM/Clang only.

``um``         Maintained        \-

``x86``        Maintained        ``x86_64`` only.

=============  ================  ==============================================

arch/riscv/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ config RISCV 
	select HAVE_REGS_AND_STACK_ACCESS_API

	select HAVE_RETHOOK if !XIP_KERNEL

	select HAVE_RSEQ

	select HAVE_RUST if RUSTC_SUPPORTS_RISCV

	select HAVE_RUST if RUSTC_SUPPORTS_RISCV && CC_IS_CLANG

	select HAVE_SAMPLE_FTRACE_DIRECT

	select HAVE_SAMPLE_FTRACE_DIRECT_MULTI

	select HAVE_STACKPROTECTOR

arch/riscv/errata/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -2,6 +2,12 @@ ifdef CONFIG_RELOCATABLE 
KBUILD_CFLAGS += -fno-pie

endif



ifdef CONFIG_RISCV_ALTERNATIVE_EARLY

ifdef CONFIG_FORTIFY_SOURCE

KBUILD_CFLAGS += -D__NO_FORTIFY

endif

endif



obj-$(CONFIG_ERRATA_ANDES) += andes/

obj-$(CONFIG_ERRATA_SIFIVE) += sifive/

obj-$(CONFIG_ERRATA_THEAD) += thead/

arch/riscv/kernel/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -36,6 +36,11 @@ KASAN_SANITIZE_alternative.o := n 
KASAN_SANITIZE_cpufeature.o := n

KASAN_SANITIZE_sbi_ecall.o := n

endif

ifdef CONFIG_FORTIFY_SOURCE

CFLAGS_alternative.o += -D__NO_FORTIFY

CFLAGS_cpufeature.o += -D__NO_FORTIFY

CFLAGS_sbi_ecall.o += -D__NO_FORTIFY

endif

endif



extra-y += vmlinux.lds

arch/riscv/kernel/acpi.c

+2 −2
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ void __init __iomem *__acpi_map_table(unsigned long phys, unsigned long size) 
	if (!size)

		return NULL;



	return early_ioremap(phys, size);

	return early_memremap(phys, size);

}



void __init __acpi_unmap_table(void __iomem *map, unsigned long size)
@@ -218,7 +218,7 @@ void __init __acpi_unmap_table(void __iomem *map, unsigned long size) 
	if (!map || !size)

		return;



	early_iounmap(map, size);

	early_memunmap(map, size);

}



void __iomem *acpi_os_ioremap(acpi_physical_address phys, acpi_size size)