Commit 9551a26f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'loongarch-6.19' of... 

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

Pull LoongArch updates from Huacai Chen:

 - Add basic LoongArch32 support

   Note: Build infrastructures of LoongArch32 are not enabled yet,
   because we need to adjust irqchip drivers and wait for GNU toolchain
   be upstream first.

 - Select HAVE_ARCH_BITREVERSE in Kconfig

 - Fix build and boot for CONFIG_RANDSTRUCT

 - Correct the calculation logic of thread_count

 - Some bug fixes and other small changes

* tag 'loongarch-6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson: (22 commits)
  LoongArch: Adjust default config files for 32BIT/64BIT
  LoongArch: Adjust VDSO/VSYSCALL for 32BIT/64BIT
  LoongArch: Adjust misc routines for 32BIT/64BIT
  LoongArch: Adjust user accessors for 32BIT/64BIT
  LoongArch: Adjust system call for 32BIT/64BIT
  LoongArch: Adjust module loader for 32BIT/64BIT
  LoongArch: Adjust time routines for 32BIT/64BIT
  LoongArch: Adjust process management for 32BIT/64BIT
  LoongArch: Adjust memory management for 32BIT/64BIT
  LoongArch: Adjust boot & setup for 32BIT/64BIT
  LoongArch: Adjust common macro definitions for 32BIT/64BIT
  LoongArch: Add adaptive CSR accessors for 32BIT/64BIT
  LoongArch: Add atomic operations for 32BIT/64BIT
  LoongArch: Add new PCI ID for pci_fixup_vgadev()
  LoongArch: Add and use some macros for AVEC
  LoongArch: Correct the calculation logic of thread_count
  LoongArch: Use unsigned long for _end and _text
  LoongArch: Use __pmd()/__pte() for swap entry conversions
  LoongArch: Fix arch_dup_task_struct() for CONFIG_RANDSTRUCT
  LoongArch: Fix build errors for CONFIG_RANDSTRUCT
  ...
parents 187d0801 be77cf43

arch/loongarch/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ config LOONGARCH 
	select GPIOLIB

	select HAS_IOPORT

	select HAVE_ARCH_AUDITSYSCALL

	select HAVE_ARCH_BITREVERSE

	select HAVE_ARCH_JUMP_LABEL

	select HAVE_ARCH_JUMP_LABEL_RELATIVE

	select HAVE_ARCH_KASAN
@@ -567,6 +568,10 @@ config ARCH_STRICT_ALIGN 
	  to run kernel only on systems with h/w unaligned access support in

	  order to optimise for performance.



config CPU_HAS_AMO

	bool

	default 64BIT



config CPU_HAS_FPU

	bool

	default y

arch/loongarch/Makefile

+6 −1
Original line number Diff line number Diff line
@@ -5,7 +5,12 @@ 


boot	:= arch/loongarch/boot



KBUILD_DEFCONFIG := loongson3_defconfig

ifeq ($(shell uname -m),loongarch32)

KBUILD_DEFCONFIG := loongson32_defconfig

else

KBUILD_DEFCONFIG := loongson64_defconfig

endif



KBUILD_DTBS      := dtbs



image-name-y			:= vmlinux

arch/loongarch/configs/loongson32_defconfig

0 → 100644
+1105 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/loongarch/configs/loongson3_defconfig→arch/loongarch/configs/loongson64_defconfig

+4 −3
Original line number Diff line number Diff line
@@ -435,7 +435,6 @@ CONFIG_DEVTMPFS=y 
CONFIG_DEVTMPFS_MOUNT=y

CONFIG_FW_LOADER_COMPRESS=y

CONFIG_FW_LOADER_COMPRESS_ZSTD=y

CONFIG_SYSFB_SIMPLEFB=y

CONFIG_EFI_ZBOOT=y

CONFIG_EFI_BOOTLOADER_CONTROL=m

CONFIG_EFI_CAPSULE_LOADER=m
@@ -530,6 +529,7 @@ CONFIG_PATA_ATIIXP=y 
CONFIG_PATA_PCMCIA=m

CONFIG_MD=y

CONFIG_BLK_DEV_MD=m

CONFIG_MD_LLBITMAP=y

CONFIG_MD_RAID0=m

CONFIG_MD_RAID1=m

CONFIG_MD_RAID10=m
@@ -738,6 +738,7 @@ CONFIG_SERIAL_8250_EXTENDED=y 
CONFIG_SERIAL_8250_MANY_PORTS=y

CONFIG_SERIAL_8250_SHARE_IRQ=y

CONFIG_SERIAL_8250_RSA=y

CONFIG_SERIAL_8250_LOONGSON=y

CONFIG_SERIAL_OF_PLATFORM=y

CONFIG_SERIAL_NONSTANDARD=y

CONFIG_PRINTER=m
@@ -801,6 +802,8 @@ CONFIG_VIDEO_BT848=m 
CONFIG_DVB_BT8XX=m

CONFIG_DRM=y

CONFIG_DRM_LOAD_EDID_FIRMWARE=y

CONFIG_DRM_EFIDRM=y

CONFIG_DRM_SIMPLEDRM=y

CONFIG_DRM_RADEON=m

CONFIG_DRM_RADEON_USERPTR=y

CONFIG_DRM_AMDGPU=m
@@ -811,9 +814,7 @@ CONFIG_DRM_AST=y 
CONFIG_DRM_QXL=m

CONFIG_DRM_VIRTIO_GPU=m

CONFIG_DRM_LOONGSON=y

CONFIG_DRM_SIMPLEDRM=y

CONFIG_FB=y

CONFIG_FB_EFI=y

CONFIG_FB_RADEON=y

CONFIG_FIRMWARE_EDID=y

CONFIG_LCD_CLASS_DEVICE=y

arch/loongarch/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

syscall-y += syscall_table_32.h

syscall-y += syscall_table_64.h

generated-y += orc_hash.h