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

Merge tag 'loongarch-6.11' of... 

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

Pull LoongArch updates from Huacai Chen:

 - Define __ARCH_WANT_NEW_STAT in unistd.h

 - Always enumerate MADT and setup logical-physical CPU mapping

 - Add irq_work support via self IPIs

 - Add RANDOMIZE_KSTACK_OFFSET support

 - Add ARCH_HAS_PTE_DEVMAP support

 - Add ARCH_HAS_DEBUG_VM_PGTABLE support

 - Add writecombine support for DMW-based ioremap()

 - Add architectural preparation for CPUFreq

 - Add ACPI standard hardware register based S3 support

 - Add support for relocating the kernel with RELR relocation

 - Some bug fixes and other small changes

* tag 'loongarch-6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson:
  LoongArch: Make the users of larch_insn_gen_break() constant
  LoongArch: Check TIF_LOAD_WATCH to enable user space watchpoint
  LoongArch: Use rustc option -Zdirect-access-external-data
  LoongArch: Add support for relocating the kernel with RELR relocation
  LoongArch: Remove a redundant checking in relocator
  LoongArch: Use correct API to map cmdline in relocate_kernel()
  LoongArch: Automatically disable KASLR for hibernation
  LoongArch: Add ACPI standard hardware register based S3 support
  LoongArch: Add architectural preparation for CPUFreq
  LoongArch: Add writecombine support for DMW-based ioremap()
  LoongArch: Add ARCH_HAS_DEBUG_VM_PGTABLE support
  LoongArch: Add ARCH_HAS_PTE_DEVMAP support
  LoongArch: Add RANDOMIZE_KSTACK_OFFSET support
  LoongArch: Add irq_work support via self IPIs
  LoongArch: Always enumerate MADT and setup logical-physical CPU mapping
  LoongArch: Define __ARCH_WANT_NEW_STAT in unistd.h
parents 539fbb91 998b17d4

Documentation/features/debug/debug-vm-pgtable/arch-support.txt

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
    |       arm64: |  ok  |

    |        csky: | TODO |

    |     hexagon: | TODO |

    |   loongarch: | TODO |

    |   loongarch: |  ok  |

    |        m68k: | TODO |

    |  microblaze: | TODO |

    |        mips: | TODO |

arch/loongarch/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -16,12 +16,14 @@ config LOONGARCH 
	select ARCH_HAS_ACPI_TABLE_UPGRADE	if ACPI

	select ARCH_HAS_CPU_FINALIZE_INIT

	select ARCH_HAS_CURRENT_STACK_POINTER

	select ARCH_HAS_DEBUG_VM_PGTABLE

	select ARCH_HAS_FAST_MULTIPLIER

	select ARCH_HAS_FORTIFY_SOURCE

	select ARCH_HAS_KCOV

	select ARCH_HAS_KERNEL_FPU_SUPPORT if CPU_HAS_FPU

	select ARCH_HAS_NMI_SAFE_THIS_CPU_OPS

	select ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE

	select ARCH_HAS_PTE_DEVMAP

	select ARCH_HAS_PTE_SPECIAL

	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST

	select ARCH_INLINE_READ_LOCK if !PREEMPTION
@@ -106,6 +108,7 @@ config LOONGARCH 
	select HAVE_ARCH_KFENCE

	select HAVE_ARCH_KGDB if PERF_EVENTS

	select HAVE_ARCH_MMAP_RND_BITS if MMU

	select HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET

	select HAVE_ARCH_SECCOMP

	select HAVE_ARCH_SECCOMP_FILTER

	select HAVE_ARCH_TRACEHOOK
@@ -607,6 +610,7 @@ config ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION 


config RELOCATABLE

	bool "Relocatable kernel"

	select ARCH_HAS_RELR

	help

	  This builds the kernel as a Position Independent Executable (PIE),

	  which retains all relocation metadata required, so as to relocate
@@ -710,6 +714,7 @@ config ARCH_HIBERNATION_POSSIBLE 


source "kernel/power/Kconfig"

source "drivers/acpi/Kconfig"

source "drivers/cpufreq/Kconfig"



endmenu

arch/loongarch/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -105,7 +105,8 @@ KBUILD_CFLAGS += -fno-jump-tables 
endif



KBUILD_RUSTFLAGS		+= --target=loongarch64-unknown-none-softfloat

KBUILD_RUSTFLAGS_MODULE		+= -Crelocation-model=pic

KBUILD_RUSTFLAGS_KERNEL		+= -Zdirect-access-external-data=yes

KBUILD_RUSTFLAGS_MODULE		+= -Zdirect-access-external-data=no



ifeq ($(CONFIG_RELOCATABLE),y)

KBUILD_CFLAGS_KERNEL		+= -fPIE

arch/loongarch/include/asm/addrspace.h

+4 −0
Original line number Diff line number Diff line
@@ -37,6 +37,10 @@ extern unsigned long vm_map_base; 
#define UNCACHE_BASE		CSR_DMW0_BASE

#endif



#ifndef WRITECOMBINE_BASE

#define WRITECOMBINE_BASE	CSR_DMW2_BASE

#endif



#define DMW_PABITS	48

#define TO_PHYS_MASK	((1ULL << DMW_PABITS) - 1)

arch/loongarch/include/asm/asmmacro.h

+1 −0
Original line number Diff line number Diff line
@@ -609,6 +609,7 @@ 
	lu32i.d	\reg, 0

	lu52i.d	\reg, \reg, 0

	.pushsection ".la_abs", "aw", %progbits

	.p2align 3

	.dword	766b

	.dword	\sym

	.popsection