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

Merge tag 'loongarch-6.13' of... 

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

Pull LoongArch updates from Huacai Chen:

 - Fix build failure with GCC 15 due to default -std=gnu23

 - Add PREEMPT_RT/PREEMPT_LAZY support

 - Add I2S in DTS for Loongson-2K1000/Loongson-2K2000

 - Some bug fixes and other small changes

* tag 'loongarch-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson:
  LoongArch: Update Loongson-3 default config file
  LoongArch: dts: Add I2S support to Loongson-2K2000
  LoongArch: dts: Add I2S support to Loongson-2K1000
  LoongArch: Allow to enable PREEMPT_LAZY
  LoongArch: Allow to enable PREEMPT_RT
  LoongArch: Select HAVE_POSIX_CPU_TIMERS_TASK_WORK
  LoongArch: Fix sleeping in atomic context for PREEMPT_RT
  LoongArch: Reduce min_delta for the arch clockevent device
  LoongArch: BPF: Sign-extend return values
  LoongArch: Fix build failure with GCC 15 (-std=gnu23)
  LoongArch: Explicitly specify code model in Makefile
parents ab952fc5 3c272a75

arch/loongarch/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ config LOONGARCH 
	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_PREEMPT_LAZY

	select ARCH_HAS_PTE_DEVMAP

	select ARCH_HAS_PTE_SPECIAL

	select ARCH_HAS_SET_MEMORY
@@ -66,6 +67,7 @@ config LOONGARCH 
	select ARCH_SUPPORTS_LTO_CLANG

	select ARCH_SUPPORTS_LTO_CLANG_THIN

	select ARCH_SUPPORTS_NUMA_BALANCING

	select ARCH_SUPPORTS_RT

	select ARCH_USE_BUILTIN_BSWAP

	select ARCH_USE_CMPXCHG_LOCKREF

	select ARCH_USE_QUEUED_RWLOCKS
@@ -155,6 +157,7 @@ config LOONGARCH 
	select HAVE_PERF_EVENTS

	select HAVE_PERF_REGS

	select HAVE_PERF_USER_STACK_DUMP

	select HAVE_POSIX_CPU_TIMERS_TASK_WORK

	select HAVE_PREEMPT_DYNAMIC_KEY

	select HAVE_REGS_AND_STACK_ACCESS_API

	select HAVE_RELIABLE_STACKTRACE if UNWINDER_ORC

arch/loongarch/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ endif 


ifdef CONFIG_64BIT

ld-emul			= $(64bit-emul)

cflags-y		+= -mabi=lp64s

cflags-y		+= -mabi=lp64s -mcmodel=normal

endif



cflags-y			+= -pipe $(CC_FLAGS_NO_FPU)
@@ -104,7 +104,7 @@ ifdef CONFIG_OBJTOOL 
KBUILD_CFLAGS			+= -fno-jump-tables

endif



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

KBUILD_RUSTFLAGS		+= --target=loongarch64-unknown-none-softfloat -Ccode-model=small

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

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

arch/loongarch/boot/dts/loongson-2k1000.dtsi

+15 −2
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ dma-controller@1fe00c10 { 
			status = "disabled";

		};



		dma-controller@1fe00c20 {

		apbdma2: dma-controller@1fe00c20 {

			compatible = "loongson,ls2k1000-apbdma";

			reg = <0x0 0x1fe00c20 0x0 0x8>;

			interrupt-parent = <&liointc1>;
@@ -276,7 +276,7 @@ dma-controller@1fe00c20 { 
			status = "disabled";

		};



		dma-controller@1fe00c30 {

		apbdma3: dma-controller@1fe00c30 {

			compatible = "loongson,ls2k1000-apbdma";

			reg = <0x0 0x1fe00c30 0x0 0x8>;

			interrupt-parent = <&liointc1>;
@@ -352,6 +352,19 @@ rtc0: rtc@1fe27800 { 
			status = "disabled";

		};



		i2s: i2s@1fe2d000 {

			compatible = "loongson,ls2k1000-i2s";

			reg = <0 0x1fe2d000 0 0x14>,

			      <0 0x1fe00438 0 0x8>;

			interrupt-parent = <&liointc0>;

			interrupts = <5 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&clk LOONGSON2_APB_CLK>;

			dmas = <&apbdma2 0>, <&apbdma3 0>;

			dma-names = "tx", "rx";

			#sound-dai-cells = <0>;

			status = "disabled";

		};



		spi0: spi@1fff0220 {

			compatible = "loongson,ls2k1000-spi";

			reg = <0x0 0x1fff0220 0x0 0x10>;

arch/loongarch/boot/dts/loongson-2k2000.dtsi

+20 −2
Original line number Diff line number Diff line
@@ -173,6 +173,22 @@ rtc0: rtc@100d0100 { 
			status = "disabled";

		};



		i2c@1fe00120 {

			compatible = "loongson,ls2k-i2c";

			reg = <0x0 0x1fe00120 0x0 0x8>;

			interrupt-parent = <&liointc>;

			interrupts = <8 IRQ_TYPE_LEVEL_HIGH>;

			status = "disabled";

		};



		i2c@1fe00130 {

			compatible = "loongson,ls2k-i2c";

			reg = <0x0 0x1fe00130 0x0 0x8>;

			interrupt-parent = <&liointc>;

			interrupts = <9 IRQ_TYPE_LEVEL_HIGH>;

			status = "disabled";

		};



		uart0: serial@1fe001e0 {

			compatible = "ns16550a";

			reg = <0x0 0x1fe001e0 0x0 0x10>;
@@ -243,9 +259,11 @@ display@6,1 { 
				status = "disabled";

			};



			hda@7,0 {

			i2s@7,0 {

				reg = <0x3800 0x0 0x0 0x0 0x0>;

				interrupts = <58 IRQ_TYPE_LEVEL_HIGH>;

				interrupts = <78 IRQ_TYPE_LEVEL_HIGH>,

					     <79 IRQ_TYPE_LEVEL_HIGH>;

				interrupt-names = "tx", "rx";

				interrupt-parent = <&pic>;

				status = "disabled";

			};

arch/loongarch/configs/loongson3_defconfig

+81 −10
Original line number Diff line number Diff line 
# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_KERNEL_ZSTD=y

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_NO_HZ=y
@@ -70,6 +71,14 @@ CONFIG_ACPI_IPMI=m 
CONFIG_ACPI_HOTPLUG_CPU=y

CONFIG_ACPI_PCI_SLOT=y

CONFIG_ACPI_HOTPLUG_MEMORY=y

CONFIG_ACPI_BGRT=y

CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ_GOV_POWERSAVE=y

CONFIG_CPU_FREQ_GOV_USERSPACE=y

CONFIG_CPU_FREQ_GOV_ONDEMAND=y

CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y

CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y

CONFIG_LOONGSON3_CPUFREQ=m

CONFIG_VIRTUALIZATION=y

CONFIG_KVM=m

CONFIG_JUMP_LABEL=y
@@ -78,6 +87,9 @@ CONFIG_MODULE_FORCE_LOAD=y 
CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y

CONFIG_MODVERSIONS=y

CONFIG_MODULE_COMPRESS=y

CONFIG_MODULE_COMPRESS_ZSTD=y

CONFIG_MODULE_DECOMPRESS=y

CONFIG_BLK_DEV_ZONED=y

CONFIG_BLK_DEV_THROTTLING=y

CONFIG_BLK_WBT=y
@@ -85,6 +97,8 @@ CONFIG_BLK_CGROUP_IOLATENCY=y 
CONFIG_BLK_CGROUP_FC_APPID=y

CONFIG_BLK_CGROUP_IOCOST=y

CONFIG_BLK_CGROUP_IOPRIO=y

CONFIG_BLK_INLINE_ENCRYPTION=y

CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_BSD_DISKLABEL=y

CONFIG_UNIXWARE_DISKLABEL=y
@@ -413,7 +427,16 @@ CONFIG_PARPORT_PC=y 
CONFIG_PARPORT_SERIAL=y

CONFIG_PARPORT_PC_FIFO=y

CONFIG_ZRAM=m

CONFIG_ZRAM_BACKEND_LZ4=y

CONFIG_ZRAM_BACKEND_LZ4HC=y

CONFIG_ZRAM_BACKEND_ZSTD=y

CONFIG_ZRAM_BACKEND_DEFLATE=y

CONFIG_ZRAM_BACKEND_842=y

CONFIG_ZRAM_BACKEND_LZO=y

CONFIG_ZRAM_DEF_COMP_ZSTD=y

CONFIG_ZRAM_WRITEBACK=y

CONFIG_ZRAM_MEMORY_TRACKING=y

CONFIG_ZRAM_MULTI_COMP=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_DRBD=m

CONFIG_BLK_DEV_NBD=m
@@ -433,6 +456,9 @@ CONFIG_NVME_TARGET_RDMA=m 
CONFIG_NVME_TARGET_FC=m

CONFIG_NVME_TARGET_TCP=m

CONFIG_EEPROM_AT24=m

CONFIG_PVPANIC=y

CONFIG_PVPANIC_MMIO=m

CONFIG_PVPANIC_PCI=m

CONFIG_BLK_DEV_SD=y

CONFIG_BLK_DEV_SR=y

CONFIG_CHR_DEV_SG=y
@@ -470,12 +496,10 @@ CONFIG_PATA_ATIIXP=y 
CONFIG_PATA_PCMCIA=m

CONFIG_MD=y

CONFIG_BLK_DEV_MD=m

CONFIG_MD_LINEAR=m

CONFIG_MD_RAID0=m

CONFIG_MD_RAID1=m

CONFIG_MD_RAID10=m

CONFIG_MD_RAID456=m

CONFIG_MD_MULTIPATH=m

CONFIG_BCACHE=m

CONFIG_BLK_DEV_DM=y

CONFIG_DM_CRYPT=m
@@ -489,6 +513,16 @@ CONFIG_DM_ZERO=m 
CONFIG_DM_MULTIPATH=m

CONFIG_DM_MULTIPATH_QL=m

CONFIG_DM_MULTIPATH_ST=m

CONFIG_DM_MULTIPATH_HST=m

CONFIG_DM_MULTIPATH_IOA=m

CONFIG_DM_INIT=y

CONFIG_DM_UEVENT=y

CONFIG_DM_VERITY=m

CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y

CONFIG_DM_VERITY_FEC=y

CONFIG_DM_INTEGRITY=m

CONFIG_DM_ZONED=m

CONFIG_DM_VDO=m

CONFIG_TARGET_CORE=m

CONFIG_TCM_IBLOCK=m

CONFIG_TCM_FILEIO=m
@@ -500,6 +534,13 @@ CONFIG_NETDEVICES=y 
CONFIG_BONDING=m

CONFIG_DUMMY=y

CONFIG_WIREGUARD=m

CONFIG_IFB=m

CONFIG_NET_TEAM=m

CONFIG_NET_TEAM_MODE_BROADCAST=m

CONFIG_NET_TEAM_MODE_ROUNDROBIN=m

CONFIG_NET_TEAM_MODE_RANDOM=m

CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m

CONFIG_NET_TEAM_MODE_LOADBALANCE=m

CONFIG_MACVLAN=m

CONFIG_MACVTAP=m

CONFIG_IPVLAN=m
@@ -580,12 +621,14 @@ CONFIG_PPP_ASYNC=m 
CONFIG_PPP_SYNC_TTY=m

CONFIG_USB_RTL8150=m

CONFIG_USB_RTL8152=m

CONFIG_USB_USBNET=m

# CONFIG_USB_NET_AX8817X is not set

# CONFIG_USB_NET_AX88179_178A is not set

CONFIG_USB_NET_CDC_EEM=m

CONFIG_USB_NET_HUAWEI_CDC_NCM=m

CONFIG_USB_NET_CDC_MBIM=m

# CONFIG_USB_NET_NET1080 is not set

CONFIG_USB_NET_RNDIS_HOST=m

# CONFIG_USB_BELKIN is not set

# CONFIG_USB_ARMLINUX is not set

# CONFIG_USB_NET_ZAURUS is not set
@@ -594,10 +637,11 @@ CONFIG_ATH9K_HTC=m 
CONFIG_IWLWIFI=m

CONFIG_IWLDVM=m

CONFIG_IWLMVM=m

CONFIG_HOSTAP=m

CONFIG_MT7601U=m

CONFIG_RT2X00=m

CONFIG_RT2800USB=m

CONFIG_RTL8180=m

CONFIG_RTL8187=m

CONFIG_RTL8192CE=m

CONFIG_RTL8192SE=m

CONFIG_RTL8192DE=m
@@ -607,18 +651,26 @@ CONFIG_RTL8188EE=m 
CONFIG_RTL8192EE=m

CONFIG_RTL8821AE=m

CONFIG_RTL8192CU=m

CONFIG_RTL8192DU=m

# CONFIG_RTLWIFI_DEBUG is not set

CONFIG_RTL8XXXU=m

CONFIG_RTW88=m

CONFIG_RTW88_8822BE=m

CONFIG_RTW88_8822BU=m

CONFIG_RTW88_8822CE=m

CONFIG_RTW88_8822CU=m

CONFIG_RTW88_8723DE=m

CONFIG_RTW88_8723DU=m

CONFIG_RTW88_8821CE=m

CONFIG_RTW88_8821CU=m

CONFIG_RTW89=m

CONFIG_RTW89_8851BE=m

CONFIG_RTW89_8852AE=m

CONFIG_RTW89_8852BE=m

CONFIG_RTW89_8852BTE=m

CONFIG_RTW89_8852CE=m

CONFIG_RTW89_8922AE=m

CONFIG_ZD1211RW=m

CONFIG_USB_NET_RNDIS_WLAN=m

CONFIG_USB4_NET=m

CONFIG_INPUT_MOUSEDEV=y

CONFIG_INPUT_MOUSEDEV_PSAUX=y
@@ -651,6 +703,9 @@ CONFIG_HW_RANDOM=y 
CONFIG_HW_RANDOM_VIRTIO=m

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_PIIX4=y

CONFIG_I2C_DESIGNWARE_CORE=y

CONFIG_I2C_DESIGNWARE_SLAVE=y

CONFIG_I2C_DESIGNWARE_PCI=y

CONFIG_I2C_GPIO=y

CONFIG_I2C_LS2X=y

CONFIG_SPI=y
@@ -727,11 +782,22 @@ CONFIG_SND_HDA_CODEC_CONEXANT=y 
CONFIG_SND_USB_AUDIO=m

CONFIG_SND_SOC=m

CONFIG_SND_SOC_LOONGSON_CARD=m

CONFIG_SND_SOC_ES7134=m

CONFIG_SND_SOC_ES7241=m

CONFIG_SND_SOC_ES8311=m

CONFIG_SND_SOC_ES8316=m

CONFIG_SND_SOC_ES8323=m

CONFIG_SND_SOC_ES8326=m

CONFIG_SND_SOC_ES8328_I2C=m

CONFIG_SND_SOC_ES8328_SPI=m

CONFIG_SND_SOC_UDA1334=m

CONFIG_SND_SOC_UDA1342=m

CONFIG_SND_VIRTIO=m

CONFIG_HIDRAW=y

CONFIG_UHID=m

CONFIG_HID_A4TECH=m

CONFIG_HID_CHERRY=m

CONFIG_HID_ELAN=m

CONFIG_HID_LOGITECH=m

CONFIG_HID_LOGITECH_DJ=m

CONFIG_LOGITECH_FF=y
@@ -740,7 +806,11 @@ CONFIG_LOGIG940_FF=y 
CONFIG_HID_MICROSOFT=m

CONFIG_HID_MULTITOUCH=m

CONFIG_HID_SUNPLUS=m

CONFIG_HID_WACOM=m

CONFIG_USB_HIDDEV=y

CONFIG_I2C_HID_ACPI=m

CONFIG_I2C_HID_OF=m

CONFIG_I2C_HID_OF_ELAN=m

CONFIG_USB=y

CONFIG_USB_OTG=y

CONFIG_USB_MON=y
@@ -852,6 +922,9 @@ CONFIG_F2FS_FS=m 
CONFIG_F2FS_FS_SECURITY=y

CONFIG_F2FS_CHECK_FS=y

CONFIG_F2FS_FS_COMPRESSION=y

CONFIG_FS_ENCRYPTION=y

CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y

CONFIG_FS_VERITY=y

CONFIG_FANOTIFY=y

CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y

CONFIG_QUOTA=y
@@ -904,16 +977,14 @@ CONFIG_SQUASHFS_ZSTD=y 
CONFIG_MINIX_FS=m

CONFIG_ROMFS_FS=m

CONFIG_PSTORE=m

CONFIG_PSTORE_LZO_COMPRESS=m

CONFIG_PSTORE_LZ4_COMPRESS=m

CONFIG_PSTORE_LZ4HC_COMPRESS=m

CONFIG_PSTORE_842_COMPRESS=y

CONFIG_PSTORE_ZSTD_COMPRESS=y

CONFIG_PSTORE_ZSTD_COMPRESS_DEFAULT=y

CONFIG_PSTORE_COMPRESS=y

CONFIG_SYSV_FS=m

CONFIG_UFS_FS=m

CONFIG_EROFS_FS=m

CONFIG_EROFS_FS_ZIP_LZMA=y

CONFIG_EROFS_FS_ZIP_DEFLATE=y

CONFIG_EROFS_FS_ZIP_ZSTD=y

CONFIG_EROFS_FS_ONDEMAND=y

CONFIG_EROFS_FS_PCPU_KTHREAD=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3_ACL=y