just cleanups and fixes

-----BEGIN PGP SIGNATURE-----
 
 iQJOBAABCAA4FiEEbt46xwy6kEcDOXoUeZbBVTGwZHAFAmk4DwkaHHRzYm9nZW5k
 QGFscGhhLmZyYW5rZW4uZGUACgkQeZbBVTGwZHD/dA//d44V2BXq3KQa1mAfHVzL
 uujZ3wAs5mTuz/NRYWpwy5nmcyvXvRww3FoABA9ILhk6mAc3IXs0La6Q9PKulRfk
 GX3w5PpHrxS+p3cuX+UY/xEDlhjNrE9F7UUzJjMgbGAKGJHmP54tNqp4tuJ0WtHC
 XPfhXjvNBzDVRykXWhp0M4YoGyYzo8Gb6JqFQuZzBOwTK/0H1JwV7ArGWXfpQFNQ
 NLzsX5tuM9K7JnTZ3q22aJMzBhAF/qdwe0G8TPEZauUEFeDmg8HFyS4HRIK3OWPG
 NIVTDTgbTFmqr4kBKP9ymSdJha2AGwhHlPlcHZdM6UIyJui3tOZUuWXyluaDHKal
 ZG7YVW9pUmjsSaBzFNd0l9QNzeWOSJN7NUeM7Xdcko0SzlMuQiCoS1QcPp8g6JU9
 5uPe6dT01PrgE9Io6atiqNgZK0+tdzqY7Ny6tB2ar8HBfSh5Y6JTmat9SeQI51LP
 kBOCIgUw5+tjekym4UCqlC2x7CFJhxtzLT6VssZtsqrENk2NFisQKBE+IDLjwp7o
 Olc43SVok/ZBxLQus5g4UL0DvenOG965jj9Qb4tvIF3w6wmLsLr07TVew1BcC6k8
 thEtIcmoP+WTw27ESuPj0UejAX0v4tf8IRnePyJnfAtlz834rm26C/p3eN5MCcY4
 9vge9trDsy1GOzMDQRPOKvg=
 =X6/w
 -----END PGP SIGNATURE-----

Merge tag 'mips_6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

Pull MIPS updates from Thomas Bogendoerfer:
 "Just cleanups and fixes"

* tag 'mips_6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  MIPS: Fix whitespace damage in r4k_wait from VS timer fix
  mips: kvm: simplify kvm_mips_deliver_interrupts()
  MIPS: alchemy: mtx1: switch to static device properties
  mips: Remove __GFP_HIGHMEM masking
  MIPS: ftrace: Fix memory corruption when kernel is located beyond 32 bits
  MIPS: dts: Always descend vendor subdirectories
  mips: configs: loongson1: Update defconfig
  MIPS: Fix HOTPLUG_PARALLEL dependency

arch/mips/Kconfig

@@ -658,7 +658,7 @@ config EYEQ
 	select USB_UHCI_BIG_ENDIAN_DESC if CPU_BIG_ENDIAN
 	select USB_UHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN
 	select USE_OF
-	select HOTPLUG_PARALLEL if SMP
+	select HOTPLUG_PARALLEL if HOTPLUG_CPU
 	help
 	  Select this to build a kernel supporting EyeQ SoC from Mobileye.
 

arch/mips/alchemy/board-mtx1.c

@@ -9,10 +9,8 @@
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
-#include <linux/leds.h>
-#include <linux/gpio.h>
 #include <linux/gpio/machine.h>
-#include <linux/gpio_keys.h>
+#include <linux/gpio/property.h>
 #include <linux/input.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
@@ -80,63 +78,133 @@ void __init board_setup(void)
 
 /******************************************************************************/
 
-static struct gpio_keys_button mtx1_gpio_button[] = {
+static const struct software_node mtx1_gpiochip_node = {
-	{
+	.name = "alchemy-gpio2",
-		.gpio = 207,
+};
-		.code = BTN_0,
+
-		.desc = "System button",
+static const struct software_node mtx1_gpio_keys_node = {
+	.name = "mtx1-gpio-keys",
+};
+
+static const struct property_entry mtx1_button_props[] = {
+	PROPERTY_ENTRY_U32("linux,code", BTN_0),
+	PROPERTY_ENTRY_GPIO("gpios", &mtx1_gpiochip_node, 7, GPIO_ACTIVE_HIGH),
+	PROPERTY_ENTRY_STRING("label", "System button"),
+	{ }
+};
+
+static const struct software_node mtx1_button_node = {
+	.parent = &mtx1_gpio_keys_node,
+	.properties = mtx1_button_props,
+};
+
+static const struct software_node *mtx1_gpio_keys_swnodes[] __initconst = {
+	&mtx1_gpio_keys_node,
+	&mtx1_button_node,
+	NULL
+};
+
+static void __init mtx1_keys_init(void)
+{
+	struct platform_device_info keys_info = {
+		.name	= "gpio-keys",
+		.id	= PLATFORM_DEVID_NONE,
+	};
+	struct platform_device *pd;
+	int err;
+
+	err = software_node_register_node_group(mtx1_gpio_keys_swnodes);
+	if (err) {
+		pr_err("failed to register gpio-keys software nodes: %d\n", err);
+		return;
 	}
+
+	keys_info.fwnode = software_node_fwnode(&mtx1_gpio_keys_node);
+
+	pd = platform_device_register_full(&keys_info);
+	err = PTR_ERR_OR_ZERO(pd);
+	if (err)
+		pr_err("failed to create gpio-keys device: %d\n", err);
+}
+
+/* Global number 215 is offset 15 on Alchemy GPIO 2 */
+static const struct property_entry mtx1_wdt_props[] = {
+	PROPERTY_ENTRY_GPIO("gpios", &mtx1_gpiochip_node, 15, GPIO_ACTIVE_HIGH),
+	{ }
 };
 
-static struct gpio_keys_platform_data mtx1_buttons_data = {
+static struct platform_device_info mtx1_wdt_info __initconst = {
-	.buttons = mtx1_gpio_button,
-	.nbuttons = ARRAY_SIZE(mtx1_gpio_button),
-};
-
-static struct platform_device mtx1_button = {
-	.name = "gpio-keys",
-	.id = -1,
-	.dev = {
-		.platform_data = &mtx1_buttons_data,
-	}
-};
-
-static struct gpiod_lookup_table mtx1_wdt_gpio_table = {
-	.dev_id = "mtx1-wdt.0",
-	.table = {
-		/* Global number 215 is offset 15 on Alchemy GPIO 2 */
-		GPIO_LOOKUP("alchemy-gpio2", 15, NULL, GPIO_ACTIVE_HIGH),
-		{ },
-	},
-};
-
-static struct platform_device mtx1_wdt = {
 	.name = "mtx1-wdt",
 	.id = 0,
+	.properties = mtx1_wdt_props,
 };
 
-static const struct gpio_led default_leds[] = {
+static void __init mtx1_wdt_init(void)
-	{
+{
-		.name	= "mtx1:green",
+	struct platform_device *pd;
-		.gpio = 211,
+	int err;
-	}, {
+
-		.name = "mtx1:red",
+	pd = platform_device_register_full(&mtx1_wdt_info);
-		.gpio = 212,
+	err = PTR_ERR_OR_ZERO(pd);
-	},
+	if (err)
+		pr_err("failed to create gpio-keys device: %d\n", err);
+}
+
+static const struct software_node mtx1_gpio_leds_node = {
+	.name = "mtx1-leds",
 };
 
-static struct gpio_led_platform_data mtx1_led_data = {
+static const struct property_entry mtx1_green_led_props[] = {
-	.num_leds = ARRAY_SIZE(default_leds),
+	PROPERTY_ENTRY_GPIO("gpios", &mtx1_gpiochip_node, 11, GPIO_ACTIVE_HIGH),
-	.leds = default_leds,
+	{ }
 };
 
-static struct platform_device mtx1_gpio_leds = {
+static const struct software_node mtx1_green_led_node = {
-	.name = "leds-gpio",
+	.name = "mtx1:green",
-	.id = -1,
+	.parent = &mtx1_gpio_leds_node,
-	.dev = {
+	.properties = mtx1_green_led_props,
-		.platform_data = &mtx1_led_data,
+};
+
+static const struct property_entry mtx1_red_led_props[] = {
+	PROPERTY_ENTRY_GPIO("gpios", &mtx1_gpiochip_node, 12, GPIO_ACTIVE_HIGH),
+	{ }
+};
+
+static const struct software_node mtx1_red_led_node = {
+	.name = "mtx1:red",
+	.parent = &mtx1_gpio_leds_node,
+	.properties = mtx1_red_led_props,
+};
+
+static const struct software_node *mtx1_gpio_leds_swnodes[] = {
+	&mtx1_gpio_leds_node,
+	&mtx1_green_led_node,
+	&mtx1_red_led_node,
+	NULL
+};
+
+static void __init mtx1_leds_init(void)
+{
+	struct platform_device_info led_info = {
+		.name	= "leds-gpio",
+		.id	= PLATFORM_DEVID_NONE,
+	};
+	struct platform_device *led_dev;
+	int err;
+
+	err = software_node_register_node_group(mtx1_gpio_leds_swnodes);
+	if (err) {
+		pr_err("failed to register LED software nodes: %d\n", err);
+		return;
 	}
-};
+
+	led_info.fwnode = software_node_fwnode(&mtx1_gpio_leds_node);
+
+	led_dev = platform_device_register_full(&led_info);
+	err = PTR_ERR_OR_ZERO(led_dev);
+	if (err)
+		pr_err("failed to create LED device: %d\n", err);
+}
 
 static struct mtd_partition mtx1_mtd_partitions[] = {
 	{
@@ -247,9 +315,6 @@ static struct platform_device mtx1_pci_host = {
 
 static struct platform_device *mtx1_devs[] __initdata = {
 	&mtx1_pci_host,
-	&mtx1_gpio_leds,
-	&mtx1_wdt,
-	&mtx1_button,
 	&mtx1_mtd,
 };
 
@@ -270,16 +335,18 @@ static int __init mtx1_register_devices(void)
 
 	au1xxx_override_eth_cfg(0, &mtx1_au1000_eth0_pdata);
 
-	rc = gpio_request(mtx1_gpio_button[0].gpio,
+	rc = software_node_register(&mtx1_gpiochip_node);
-					mtx1_gpio_button[0].desc);
+	if (rc)
-	if (rc < 0) {
+		return rc;
-		printk(KERN_INFO "mtx1: failed to request %d\n",
+
-					mtx1_gpio_button[0].gpio);
+	rc = platform_add_devices(mtx1_devs, ARRAY_SIZE(mtx1_devs));
-		goto out;
+	if (rc)
-	}
+		return rc;
-	gpio_direction_input(mtx1_gpio_button[0].gpio);
+
-out:
+	mtx1_leds_init();
-	gpiod_add_lookup_table(&mtx1_wdt_gpio_table);
+	mtx1_wdt_init();
-	return platform_add_devices(mtx1_devs, ARRAY_SIZE(mtx1_devs));
+	mtx1_keys_init();
+
+	return 0;
 }
 arch_initcall(mtx1_register_devices);

arch/mips/boot/dts/Makefile

@@ -1,20 +1,17 @@
 # SPDX-License-Identifier: GPL-2.0
-subdir-$(CONFIG_BMIPS_GENERIC)		+= brcm
+subdir-y	+= brcm
-subdir-$(CONFIG_CAVIUM_OCTEON_SOC)	+= cavium-octeon
+subdir-y	+= cavium-octeon
-subdir-$(CONFIG_ECONET)			+= econet
+subdir-y	+= econet
-subdir-$(CONFIG_EYEQ)			+= mobileye
+subdir-y	+= mobileye
-subdir-$(CONFIG_FIT_IMAGE_FDT_MARDUK)   += img
+subdir-y	+= img
-subdir-$(CONFIG_FIT_IMAGE_FDT_BOSTON)	+= img
+subdir-y	+= ingenic
-subdir-$(CONFIG_MACH_INGENIC)		+= ingenic
+subdir-y	+= lantiq
-subdir-$(CONFIG_LANTIQ)			+= lantiq
+subdir-y	+= loongson
-subdir-$(CONFIG_MACH_LOONGSON64)	+= loongson
+subdir-y	+= mscc
-subdir-$(CONFIG_MACH_LOONGSON32)	+= loongson
+subdir-y	+= mti
-subdir-$(CONFIG_SOC_VCOREIII)		+= mscc
+subdir-y	+= ni
-subdir-$(CONFIG_MIPS_MALTA)		+= mti
+subdir-y	+= pic32
-subdir-$(CONFIG_LEGACY_BOARD_SEAD3)	+= mti
+subdir-y	+= qca
-subdir-$(CONFIG_FIT_IMAGE_FDT_NI169445)	+= ni
+subdir-y	+= ralink
-subdir-$(CONFIG_MACH_PIC32)		+= pic32
+subdir-y	+= realtek
-subdir-$(CONFIG_ATH79)			+= qca
+subdir-y	+= xilfpga
-subdir-$(CONFIG_RALINK)			+= ralink
-subdir-$(CONFIG_MACH_REALTEK_RTL)	+= realtek
-subdir-$(CONFIG_FIT_IMAGE_FDT_XILFPGA)	+= xilfpga

arch/mips/boot/dts/realtek/Makefile

@@ -1,3 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0
-dtb-y	+= cisco_sg220-26.dtb
+dtb-$(CONFIG_MACH_REALTEK_RTL)	+= cisco_sg220-26.dtb
-dtb-y	+= cameo-rtl9302c-2x-rtl8224-2xge.dtb
+dtb-$(CONFIG_MACH_REALTEK_RTL)	+= cameo-rtl9302c-2x-rtl8224-2xge.dtb

arch/mips/configs/loongson1_defconfig

@@ -13,6 +13,7 @@ CONFIG_EXPERT=y
 CONFIG_PERF_EVENTS=y
 CONFIG_MACH_LOONGSON32=y
 # CONFIG_SUSPEND is not set
+CONFIG_JUMP_LABEL=y
 # CONFIG_SECCOMP is not set
 # CONFIG_GCC_PLUGINS is not set
 CONFIG_MODULES=y
@@ -30,8 +31,8 @@ CONFIG_IP_PNP_DHCP=y
 CONFIG_SYN_COOKIES=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_IPV6 is not set
+# CONFIG_BQL is not set
 # CONFIG_WIRELESS is not set
-# CONFIG_ETHTOOL_NETLINK is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
@@ -39,7 +40,7 @@ CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_BLOCK=y
 CONFIG_MTD_RAW_NAND=y
-CONFIG_MTD_NAND_LOONGSON1=y
+CONFIG_MTD_NAND_LOONGSON=y
 CONFIG_MTD_UBI=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_SCSI=m
@@ -72,6 +73,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_NET_VENDOR_MICROCHIP is not set
 # CONFIG_NET_VENDOR_MICROSEMI is not set
 # CONFIG_NET_VENDOR_MICROSOFT is not set
+# CONFIG_NET_VENDOR_MUCSE is not set
 # CONFIG_NET_VENDOR_NI is not set
 # CONFIG_NET_VENDOR_NATSEMI is not set
 # CONFIG_NET_VENDOR_NETRONOME is not set
@@ -166,15 +168,11 @@ CONFIG_ROOT_NFS=y
 CONFIG_NLS_CODEPAGE_437=m
 CONFIG_NLS_ISO8859_1=m
 # CONFIG_CRYPTO_HW is not set
-# CONFIG_XZ_DEC_X86 is not set
-# CONFIG_XZ_DEC_POWERPC is not set
-# CONFIG_XZ_DEC_ARM is not set
-# CONFIG_XZ_DEC_ARMTHUMB is not set
-# CONFIG_XZ_DEC_ARM64 is not set
-# CONFIG_XZ_DEC_SPARC is not set
-# CONFIG_XZ_DEC_RISCV is not set
 CONFIG_DYNAMIC_DEBUG=y
 # CONFIG_DEBUG_MISC is not set
 CONFIG_MAGIC_SYSRQ=y
+# CONFIG_SLUB_DEBUG is not set
+# CONFIG_RCU_TRACE is not set
 # CONFIG_FTRACE is not set
 # CONFIG_EARLY_PRINTK is not set
+CONFIG_TEST_DHRY=m

arch/mips/include/asm/pgalloc.h

@@ -81,8 +81,7 @@ static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long address)
 {
 	pud_t *pud;
-	struct ptdesc *ptdesc = pagetable_alloc(GFP_KERNEL & ~__GFP_HIGHMEM,
+	struct ptdesc *ptdesc = pagetable_alloc(GFP_KERNEL, PUD_TABLE_ORDER);
-			PUD_TABLE_ORDER);
 
 	if (!ptdesc)
 		return NULL;

arch/mips/kernel/ftrace.c

@@ -54,10 +54,20 @@ static inline void ftrace_dyn_arch_init_insns(void)
 	u32 *buf;
 	unsigned int v1;
 
-	/* la v1, _mcount */
+	/* If we are not in compat space, the number of generated
-	v1 = 3;
+	 * instructions will exceed the maximum expected limit of 2.
-	buf = (u32 *)&insn_la_mcount[0];
+	 * To prevent buffer overflow, we avoid generating them.
-	UASM_i_LA(&buf, v1, MCOUNT_ADDR);
+	 * insn_la_mcount will not be used later in ftrace_make_call.
+	 */
+	if (uasm_in_compat_space_p(MCOUNT_ADDR)) {
+		/* la v1, _mcount */
+		v1 = 3;
+		buf = (u32 *)&insn_la_mcount[0];
+		UASM_i_LA(&buf, v1, MCOUNT_ADDR);
+	} else {
+		pr_warn("ftrace: mcount address beyond 32 bits is not supported (%lX)\n",
+			MCOUNT_ADDR);
+	}
 
 	/* jal (ftrace_caller + 8), jump over the first two instruction */
 	buf = (u32 *)&insn_jal_ftrace_caller;
@@ -189,6 +199,13 @@ int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
 	unsigned int new;
 	unsigned long ip = rec->ip;
 
+	/* When the code to patch does not belong to the kernel code
+	 * space, we must use insn_la_mcount. However, if MCOUNT_ADDR
+	 * is not in compat space, insn_la_mcount is not usable.
+	 */
+	if (!core_kernel_text(ip) && !uasm_in_compat_space_p(MCOUNT_ADDR))
+		return -EFAULT;
+
 	new = core_kernel_text(ip) ? insn_jal_ftrace_caller : insn_la_mcount[0];
 
 #ifdef CONFIG_64BIT

arch/mips/kernel/genex.S

@@ -109,7 +109,7 @@ handle_vcei:
 	.align	5
 LEAF(r4k_wait)
 	/* Keep the ISA bit clear for calculations on local labels here. */
-0:	.fill 	0
+0:	.fill	0
 	/* Start of idle interrupt region. */
 	local_irq_enable
 	/*
@@ -121,7 +121,7 @@ LEAF(r4k_wait)
 	 */
 1:	.fill	0
 	/* The R2 EI/EHB sequence takes 8 bytes, otherwise pad up.  */
-	.if		1b - 0b > 32
+	.if	1b - 0b > 32
 	.error	"overlong idle interrupt region"
 	.elseif	1b - 0b > 8
 	.align	4
@@ -146,10 +146,10 @@ r4k_wait_exit:
 	MFC0	k0, CP0_EPC
 	/* Subtract/add 2 to let the ISA bit propagate through the mask.  */
 	PTR_LA	k1, r4k_wait_insn - 2
-	ori 	k0, r4k_wait_idle_size - 2
+	ori	k0, r4k_wait_idle_size - 2
 	.set	noreorder
 	bne	k0, k1, \handler
-	PTR_ADDIU 	k0, r4k_wait_exit - r4k_wait_insn + 2
+	 PTR_ADDIU	k0, r4k_wait_exit - r4k_wait_insn + 2
 	.set	reorder
 	MTC0	k0, CP0_EPC
 	.set pop

arch/mips/kvm/interrupt.c

@@ -27,27 +27,11 @@ void kvm_mips_deliver_interrupts(struct kvm_vcpu *vcpu, u32 cause)
 	unsigned long *pending_clr = &vcpu->arch.pending_exceptions_clr;
 	unsigned int priority;
 
-	if (!(*pending) && !(*pending_clr))
+	for_each_set_bit(priority, pending_clr, MIPS_EXC_MAX + 1)
-		return;
-
-	priority = __ffs(*pending_clr);
-	while (priority <= MIPS_EXC_MAX) {
 		kvm_mips_callbacks->irq_clear(vcpu, priority, cause);
 
-		priority = find_next_bit(pending_clr,
+	for_each_set_bit(priority, pending, MIPS_EXC_MAX + 1)
-					 BITS_PER_BYTE * sizeof(*pending_clr),
-					 priority + 1);
-	}
-
-	priority = __ffs(*pending);
-	while (priority <= MIPS_EXC_MAX) {
 		kvm_mips_callbacks->irq_deliver(vcpu, priority, cause);
-
-		priority = find_next_bit(pending,
-					 BITS_PER_BYTE * sizeof(*pending),
-					 priority + 1);
-	}
-
 }
 
 int kvm_mips_pending_timer(struct kvm_vcpu *vcpu)