Commit 1c241cba authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'loongarch-6.15' of... 

Merge tag 'loongarch-6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson

Pull LoongArch updates from Huacai Chen:

 - Always select HAVE_VIRT_CPU_ACCOUNTING_GEN

 - Enable UBSAN (Undefined Behavior Sanitizer)

 - Increase MAX_IO_PICS up to 8

 - Increase ARCH_DMA_MINALIGN up to 16

 - Fix and improve BPF JIT

 - Fix and improve vDSO implementation

 - Update the default config file

 - Some bug fixes and other small changes

* tag 'loongarch-6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson:
  LoongArch: Update Loongson-3 default config file
  LoongArch: vDSO: Make use of the t8 register for vgetrandom-chacha
  LoongArch: vDSO: Remove --hash-style=sysv
  LoongArch: BPF: Don't override subprog's return value
  LoongArch: BPF: Use move_addr() for BPF_PSEUDO_FUNC
  LoongArch: BPF: Fix off-by-one error in build_prologue()
  LoongArch: Rework the arch_kgdb_breakpoint() implementation
  LoongArch: Fix device node refcount leak in fdt_cpu_clk_init()
  LoongArch: Increase ARCH_DMA_MINALIGN up to 16
  LoongArch: Increase MAX_IO_PICS up to 8
  LoongArch: Fix help text of CMDLINE_EXTEND in Kconfig
  LoongArch: Enable UBSAN (Undefined Behavior Sanitizer)
  LoongArch: Always select HAVE_VIRT_CPU_ACCOUNTING_GEN
  rust: Fix enabling Rust and building with GCC for LoongArch
parents 6cb09458 17ba839c

arch/loongarch/Kconfig

+4 −3
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ config LOONGARCH 
	select ARCH_HAS_SET_MEMORY

	select ARCH_HAS_SET_DIRECT_MAP

	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST

	select ARCH_HAS_UBSAN

	select ARCH_HAS_VDSO_ARCH_DATA

	select ARCH_INLINE_READ_LOCK if !PREEMPTION

	select ARCH_INLINE_READ_LOCK_BH if !PREEMPTION
@@ -177,7 +178,7 @@ config LOONGARCH 
	select HAVE_STACKPROTECTOR

	select HAVE_SYSCALL_TRACEPOINTS

	select HAVE_TIF_NOHZ

	select HAVE_VIRT_CPU_ACCOUNTING_GEN if !SMP

	select HAVE_VIRT_CPU_ACCOUNTING_GEN

	select IRQ_FORCED_THREADING

	select IRQ_LOONGARCH_CPU

	select LOCK_MM_AND_FIND_VMA
@@ -387,8 +388,8 @@ config CMDLINE_BOOTLOADER 
config CMDLINE_EXTEND

	bool "Use built-in to extend bootloader kernel arguments"

	help

	  The command-line arguments provided during boot will be

	  appended to the built-in command line. This is useful in

	  The built-in command line will be appended to the command-

	  line arguments provided during boot. This is useful in

	  cases where the provided arguments are insufficient and

	  you don't want to or cannot modify them.

arch/loongarch/configs/loongson3_defconfig

+10 −1
Original line number Diff line number Diff line
@@ -24,9 +24,9 @@ CONFIG_NUMA_BALANCING=y 
CONFIG_MEMCG=y

CONFIG_BLK_CGROUP=y

CONFIG_CFS_BANDWIDTH=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_CGROUP_PIDS=y

CONFIG_CGROUP_RDMA=y

CONFIG_CGROUP_DMEM=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CGROUP_HUGETLB=y

CONFIG_CPUSETS=y
@@ -665,6 +665,10 @@ CONFIG_RTW88_8723DE=m 
CONFIG_RTW88_8723DU=m

CONFIG_RTW88_8821CE=m

CONFIG_RTW88_8821CU=m

CONFIG_RTW88_8821AU=m

CONFIG_RTW88_8812AU=m

CONFIG_RTW88_8814AE=m

CONFIG_RTW88_8814AU=m

CONFIG_RTW89=m

CONFIG_RTW89_8851BE=m

CONFIG_RTW89_8852AE=m
@@ -748,6 +752,7 @@ CONFIG_MEDIA_PCI_SUPPORT=y 
CONFIG_VIDEO_BT848=m

CONFIG_DVB_BT8XX=m

CONFIG_DRM=y

CONFIG_DRM_LOAD_EDID_FIRMWARE=y

CONFIG_DRM_RADEON=m

CONFIG_DRM_RADEON_USERPTR=y

CONFIG_DRM_AMDGPU=m
@@ -761,6 +766,7 @@ CONFIG_DRM_LOONGSON=y 
CONFIG_FB=y

CONFIG_FB_EFI=y

CONFIG_FB_RADEON=y

CONFIG_FIRMWARE_EDID=y

CONFIG_LCD_CLASS_DEVICE=y

CONFIG_LCD_PLATFORM=m

# CONFIG_VGA_CONSOLE is not set
@@ -843,6 +849,9 @@ CONFIG_TYPEC_TCPCI=m 
CONFIG_TYPEC_UCSI=m

CONFIG_UCSI_ACPI=m

CONFIG_INFINIBAND=m

CONFIG_EDAC=y

# CONFIG_EDAC_LEGACY_SYSFS is not set

CONFIG_EDAC_LOONGSON=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_EFI=y

CONFIG_RTC_DRV_LOONGSON=y

arch/loongarch/include/asm/cache.h

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ 
#define L1_CACHE_SHIFT		CONFIG_L1_CACHE_SHIFT

#define L1_CACHE_BYTES		(1 << L1_CACHE_SHIFT)



#define ARCH_DMA_MINALIGN	(16)



#define __read_mostly __section(".data..read_mostly")



#endif /* _ASM_CACHE_H */

arch/loongarch/include/asm/irq.h

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ void spurious_interrupt(void); 
#define arch_trigger_cpumask_backtrace arch_trigger_cpumask_backtrace

void arch_trigger_cpumask_backtrace(const struct cpumask *mask, int exclude_cpu);



#define MAX_IO_PICS 2

#define MAX_IO_PICS 8

#define NR_IRQS	(64 + NR_VECTORS * (NR_CPUS + MAX_IO_PICS))



struct acpi_vector_group {

arch/loongarch/kernel/env.c

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ static int __init fdt_cpu_clk_init(void) 
		return -ENODEV;



	clk = of_clk_get(np, 0);

	of_node_put(np);



	if (IS_ERR(clk))

		return -ENODEV;