Commit 9b6de136 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'loongarch-fixes-6.7-1' of... 

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

Pull LoongArch fixes from Huacai Chen:
 "Fix several build errors, a potential kernel panic, a cpu hotplug
  issue and update links in documentations"

* tag 'loongarch-fixes-6.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson:
  Docs/zh_CN/LoongArch: Update links in LoongArch introduction.rst
  Docs/LoongArch: Update links in LoongArch introduction.rst
  LoongArch: Implement constant timer shutdown interface
  LoongArch: Mark {dmw,tlb}_virt_to_page() exports as non-GPL
  LoongArch: Silence the boot warning about 'nokaslr'
  LoongArch: Add __percpu annotation for __percpu_read()/__percpu_write()
  LoongArch: Record pc instead of offset in la_abs relocation
  LoongArch: Explicitly set -fdirect-access-external-data for vmlinux
  LoongArch: Add dependency between vmlinuz.efi and vmlinux.efi
parents 05c8c94e c517fd27

Documentation/arch/loongarch/introduction.rst

+2 −2
Original line number Diff line number Diff line
@@ -375,9 +375,9 @@ Developer web site of Loongson and LoongArch (Software and Documentation): 


Documentation of LoongArch ISA:



  https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.02-CN.pdf (in Chinese)

  https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.10-CN.pdf (in Chinese)



  https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.02-EN.pdf (in English)

  https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.10-EN.pdf (in English)



Documentation of LoongArch ELF psABI:

Documentation/translations/zh_CN/arch/loongarch/introduction.rst

+2 −2
Original line number Diff line number Diff line
@@ -338,9 +338,9 @@ Loongson与LoongArch的开发者网站（软件与文档资源）： 


LoongArch指令集架构的文档：



  https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.02-CN.pdf （中文版）

  https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.10-CN.pdf （中文版）



  https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.02-EN.pdf （英文版）

  https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.10-EN.pdf （英文版）



LoongArch的ELF psABI文档：

arch/loongarch/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ LDFLAGS_vmlinux += -static -n -nostdlib 
ifdef CONFIG_AS_HAS_EXPLICIT_RELOCS

cflags-y			+= $(call cc-option,-mexplicit-relocs)

KBUILD_CFLAGS_KERNEL		+= $(call cc-option,-mdirect-extern-access)

KBUILD_CFLAGS_KERNEL		+= $(call cc-option,-fdirect-access-external-data)

KBUILD_AFLAGS_MODULE		+= $(call cc-option,-fno-direct-access-external-data)

KBUILD_CFLAGS_MODULE		+= $(call cc-option,-fno-direct-access-external-data)

KBUILD_AFLAGS_MODULE		+= $(call cc-option,-mno-relax) $(call cc-option,-Wa$(comma)-mno-relax)
@@ -142,6 +143,8 @@ vdso-install-y += arch/loongarch/vdso/vdso.so.dbg 


all:	$(notdir $(KBUILD_IMAGE))



vmlinuz.efi: vmlinux.efi



vmlinux.elf vmlinux.efi vmlinuz.efi: vmlinux

	$(Q)$(MAKE) $(build)=$(boot) $(bootvars-y) $(boot)/$@

arch/loongarch/include/asm/asmmacro.h

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

	lu52i.d	\reg, \reg, 0

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

	768:

	.dword	768b-766b

	.dword	766b

	.dword	\sym

	.popsection

#endif

arch/loongarch/include/asm/percpu.h

+5 −6
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ PERCPU_OP(and, and, &) 
PERCPU_OP(or, or, |)

#undef PERCPU_OP



static __always_inline unsigned long __percpu_read(void *ptr, int size)

static __always_inline unsigned long __percpu_read(void __percpu *ptr, int size)

{

	unsigned long ret;
@@ -100,7 +100,7 @@ static __always_inline unsigned long __percpu_read(void *ptr, int size) 
	return ret;

}



static __always_inline void __percpu_write(void *ptr, unsigned long val, int size)

static __always_inline void __percpu_write(void __percpu *ptr, unsigned long val, int size)

{

	switch (size) {

	case 1:
@@ -132,8 +132,7 @@ static __always_inline void __percpu_write(void *ptr, unsigned long val, int siz 
	}

}



static __always_inline unsigned long __percpu_xchg(void *ptr, unsigned long val,

						   int size)

static __always_inline unsigned long __percpu_xchg(void *ptr, unsigned long val, int size)

{

	switch (size) {

	case 1: