Unverified Commit 60166b3c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'hisi-armv7soc-for-5.19' of https://github.com/hisilicon/linux-hisi into arm/soc 

HiSilicon ARMv7 SoC updates for v5.19

- Add of_node_put to avoid the refcount leak

* tag 'hisi-armv7soc-for-5.19' of https://github.com/hisilicon/linux-hisi:
  ARM: hisi: Add missing of_node_put after of_find_compatible_node

Link: https://lore.kernel.org/r/62762DF0.30602@hisilicon.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents baf7cbbe 9bc72e47

arch/arm/mach-hisi/platsmp.c

+4 −0
Original line number Diff line number Diff line
@@ -67,14 +67,17 @@ static void __init hi3xxx_smp_prepare_cpus(unsigned int max_cpus) 
		}

		ctrl_base = of_iomap(np, 0);

		if (!ctrl_base) {

			of_node_put(np);

			pr_err("failed to map address\n");

			return;

		}

		if (of_property_read_u32(np, "smp-offset", &offset) < 0) {

			of_node_put(np);

			pr_err("failed to find smp-offset property\n");

			return;

		}

		ctrl_base += offset;

		of_node_put(np);

	}

}
@@ -160,6 +163,7 @@ static int hip01_boot_secondary(unsigned int cpu, struct task_struct *idle) 
	if (WARN_ON(!node))

		return -1;

	ctrl_base = of_iomap(node, 0);

	of_node_put(node);



	/* set the secondary core boot from DDR */

	remap_reg_value = readl_relaxed(ctrl_base + REG_SC_CTRL);