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

Merge tag 'loongarch-6.14' of... 

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

Pull LoongArch updates from Huacai Chen:

 - Migrate to the generic rule for built-in DTB

 - Disable FIX_EARLYCON_MEM when ARCH_IOREMAP is enabled

 - Derive timer max_delta from PRCFG1's timer_bits

 - Correct the cacheinfo sharing information

 - Add pgprot_nx() implementation

 - Add debugfs entries to switch SFB/TSO state

 - Change the maximum number of watchpoints

 - Some bug fixes and other small changes

* tag 'loongarch-6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson:
  LoongArch: Extend the maximum number of watchpoints
  LoongArch: Change 8 to 14 for LOONGARCH_MAX_{BRP,WRP}
  LoongArch: Add debugfs entries to switch SFB/TSO state
  LoongArch: Fix warnings during S3 suspend
  LoongArch: Adjust SETUP_SLEEP and SETUP_WAKEUP
  LoongArch: Refactor bug_handler() implementation
  LoongArch: Add pgprot_nx() implementation
  LoongArch: Correct the __switch_to() prototype in comments
  LoongArch: Correct the cacheinfo sharing information
  LoongArch: Derive timer max_delta from PRCFG1's timer_bits
  LoongArch: Disable FIX_EARLYCON_MEM when ARCH_IOREMAP is enabled
  LoongArch: Migrate to the generic rule for built-in DTB
parents a37eea94 531936de

arch/loongarch/Kbuild

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ obj-y += net/ 
obj-y += vdso/



obj-$(CONFIG_KVM) += kvm/

obj-$(CONFIG_BUILTIN_DTB) += boot/dts/



# for cleaning

subdir- += boot

arch/loongarch/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ config MACH_LOONGSON64 
	def_bool 64BIT



config FIX_EARLYCON_MEM

	def_bool y

	def_bool !ARCH_IOREMAP



config PGTABLE_2LEVEL

	bool
@@ -400,6 +400,7 @@ endchoice 
config BUILTIN_DTB

	bool "Enable built-in dtb in kernel"

	depends on OF

	select GENERIC_BUILTIN_DTB

	help

	  Some existing systems do not provide a canonical device tree to

	  the kernel at boot time. Let's provide a device tree table in the

arch/loongarch/boot/dts/Makefile

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



dtb-y = loongson-2k0500-ref.dtb loongson-2k1000-ref.dtb loongson-2k2000-ref.dtb
 


obj-$(CONFIG_BUILTIN_DTB)	+= $(addsuffix .dtb.o, $(CONFIG_BUILTIN_DTB_NAME))

arch/loongarch/include/asm/cpu-info.h

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ struct cpuinfo_loongarch { 
	int			global_id; /* physical global thread number */

	int			vabits; /* Virtual Address size in bits */

	int			pabits; /* Physical Address size in bits */

	int			timerbits; /* Width of arch timer in bits */

	unsigned int		ksave_mask; /* Usable KSave mask. */

	unsigned int		watch_dreg_count;   /* Number data breakpoints */

	unsigned int		watch_ireg_count;   /* Number instruction breakpoints */

arch/loongarch/include/asm/hw_breakpoint.h

+2 −2
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ struct arch_hw_breakpoint { 
 * Limits.

 * Changing these will require modifications to the register accessors.

 */

#define LOONGARCH_MAX_BRP		8

#define LOONGARCH_MAX_WRP		8

#define LOONGARCH_MAX_BRP		14

#define LOONGARCH_MAX_WRP		14



/* Virtual debug register bases. */

#define CSR_CFG_ADDR	0