Skip to contentSkip to conversation

DT cpu node iterator

PATCH In review Rob Herring 15 participants 50 messages Sep 5, 2018 – Nov 1, 2018 1 message not in the archive

Subsystems (20)
lore
Share & tools
lore

Rob Herring

author maintainer
#0 lore raw

cover DT cpu node iterator

This series adds an iterator for cpu nodes and converts users over to use it or of_get_cpu_node in some cases. This allows us to remove the dependency on device_type property for cpu nodes though removing that from DTS files will have to wait for some time. In some cases, this makes the DT search more strict by only looking in /cpus child nodes rather than any node with the device_type == cpu. The iterator also honors the status property which is often forgotten.

I've only tested on ARM under QEMU and compiled powerpc.

Rob

Rob Herring (21):
of: Add cpu node iterator for_each_of_cpu_node()
of: Support matching cpu nodes with no 'reg' property
ARM: use for_each_of_cpu_node iterator
ARM: topology: remove unneeded check for /cpus node
ARM: shmobile: use for_each_of_cpu_node iterator
arm64: use for_each_of_cpu_node iterator
c6x: use for_each_of_cpu_node iterator
microblaze: get cpu node with of_get_cpu_node
nios2: get cpu node with of_get_cpu_node
openrisc: use for_each_of_cpu_node iterator
powerpc: use for_each_of_cpu_node iterator
powerpc: 4xx: get cpu node with of_get_cpu_node
powerpc: 8xx: get cpu node with of_get_cpu_node
riscv: use for_each_of_cpu_node iterator
SH: use for_each_of_cpu_node iterator
x86: DT: use for_each_of_cpu_node iterator
clk: mvebu: use for_each_of_cpu_node iterator
edac: cpc925: use for_each_of_cpu_node iterator
iommu: fsl_pamu: use for_each_of_cpu_node iterator
of: use for_each_of_cpu_node iterator
fbdev: fsl-diu: get cpu node with of_get_cpu_node

 arch/arm/kernel/devtree.c                 |  5 +--
 arch/arm/kernel/topology.c                |  6 ---
 arch/arm/mach-shmobile/pm-rcar-gen2.c     |  8 +---
 arch/arm/mach-shmobile/pm-rmobile.c       |  2 +-
 arch/arm/mach-shmobile/timer.c            | 10 +----
 arch/arm64/kernel/smp.c                   |  2 +-
 arch/c6x/kernel/setup.c                   | 11 ++---
 arch/microblaze/kernel/cpu/cpuinfo.c      |  4 +-
 arch/nios2/kernel/cpuinfo.c               |  4 +-
 arch/openrisc/kernel/setup.c              |  3 +-
 arch/powerpc/platforms/4xx/soc.c          |  2 +-
 arch/powerpc/platforms/8xx/m8xx_setup.c   |  5 ++-
 arch/powerpc/platforms/powermac/feature.c | 51 ++++++++---------------
 arch/powerpc/platforms/powermac/setup.c   | 15 +++----
 arch/riscv/kernel/smpboot.c               |  2 +-
 arch/sh/boards/of-generic.c               |  2 +-
 arch/x86/kernel/devicetree.c              |  2 +-
 drivers/clk/mvebu/clk-cpu.c               |  4 +-
 drivers/edac/cpc925_edac.c                | 20 +--------
 drivers/iommu/fsl_pamu.c                  |  2 +-
 drivers/of/base.c                         | 43 ++++++++++++++++++-
 drivers/of/of_numa.c                      | 15 +------
 drivers/video/fbdev/fsl-diu-fb.c          |  2 +-
 include/linux/of.h                        | 11 +++++
 24 files changed, 111 insertions(+), 120 deletions(-)

--
2.17.1

author maintainer
#1 lore raw

PATCH 1/21 of: Add cpu node iterator for_each_of_cpu_node()

Iterating thru cpu nodes is a common pattern. Create a common iterator which can find child nodes either by node name or device_type == cpu. Using the former will allow for eventually dropping device_type properties which are deprecated for FDT.

---
 drivers/of/base.c  | 39 +++++++++++++++++++++++++++++++++++++++
 include/linux/of.h | 11 +++++++++++
 2 files changed, 50 insertions(+)
drivers/of/base.c +39 -0
index a055cd1ef96d..4807db0a35b3 100644
@@ -741,6 +741,45 @@ struct device_node *of_get_next_available_child(const struct device_node *node,
 }
 EXPORT_SYMBOL(of_get_next_available_child);
 
+/**
+ *	of_get_next_cpu_node - Iterate on cpu nodes
+ *	@prev:	previous child of the /cpus node, or NULL to get first
+ *
+ *	Returns a cpu node pointer with refcount incremented, use of_node_put()
+ *	on it when done. Returns NULL when prev is the last child. Decrements
+ *	the refcount of prev.
+ */
+struct device_node *of_get_next_cpu_node(struct device_node *prev)
+{
+	struct device_node *next = NULL;
+	unsigned long flags;
+	struct device_node *node;
+
+	if (!prev)
+		node = of_find_node_by_path("/cpus");
+
+	raw_spin_lock_irqsave(&devtree_lock, flags);
+	if (prev)
+		next = prev->sibling;
+	else if (node) {
+		next = node->child;
+		of_node_put(node);
+	}
+	for (; next; next = next->sibling) {
+		if (!(of_node_name_eq(next, "cpu") ||
+		      (next->type && !of_node_cmp(next->type, "cpu"))))
+			continue;
+		if (!__of_device_is_available(next))
+			continue;
+		if (of_node_get(next))
+			break;
+	}
+	of_node_put(prev);
+	raw_spin_unlock_irqrestore(&devtree_lock, flags);
+	return next;
+}
+EXPORT_SYMBOL(of_get_next_cpu_node);
+
 /**
  * of_get_compatible_child - Find compatible child node
  * @parent:	parent node
include/linux/of.h +11 -0
index 99b0ebf49632..1aca0dbd35df 100644
@@ -353,6 +353,8 @@ extern const void *of_get_property(const struct device_node *node,
 				const char *name,
 				int *lenp);
 extern struct device_node *of_get_cpu_node(int cpu, unsigned int *thread);
+extern struct device_node *of_get_next_cpu_node(struct device_node *prev);
+
 #define for_each_property_of_node(dn, pp) \
 	for (pp = dn->properties; pp != NULL; pp = pp->next)
 
@@ -754,6 +756,11 @@ static inline struct device_node *of_get_cpu_node(int cpu,
 	return NULL;
 }
 
+static inline struct device_node *of_get_next_cpu_node(struct device_node *prev)
+{
+	return NULL;
+}
+
 static inline int of_n_addr_cells(struct device_node *np)
 {
 	return 0;
@@ -1217,6 +1224,10 @@ static inline int of_property_read_s32(const struct device_node *np,
 	for (child = of_get_next_available_child(parent, NULL); child != NULL; \
 	     child = of_get_next_available_child(parent, child))
 
+#define for_each_of_cpu_node(cpu) \
+	for (cpu = of_get_next_cpu_node(NULL); cpu != NULL; \
+	     cpu = of_get_next_cpu_node(cpu))
+
 #define for_each_node_with_property(dn, prop_name) \
 	for (dn = of_find_node_with_property(NULL, prop_name); dn; \
 	     dn = of_find_node_with_property(dn, prop_name))

--
2.17.1

Reviewed-by on v1 1/21
#2 lore raw

Re: [PATCH 01/21] of: Add cpu node iterator for_each_of_cpu_node()

Quoted 7 lines · Rob Herring

Iterating thru cpu nodes is a common pattern. Create a common iterator which can find child nodes either by node name or device_type == cpu. Using the former will allow for eventually dropping device_type properties which are deprecated for FDT.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

#3 lore raw

Re: [PATCH 01/21] of: Add cpu node iterator for_each_of_cpu_node()

In reply to Rob Herring

Hi Rob,

Sorry I missed this when you posted it.

Quoted 4 lines · Rob Herring

Iterating thru cpu nodes is a common pattern. Create a common iterator which can find child nodes either by node name or device_type == cpu. Using the former will allow for eventually dropping device_type properties which are deprecated for FDT.

Device trees we see on powerpc generally don't (never?) use "cpu" as the node name for CPU nodes. And many of those device trees come from firmware, so we can't update them.

So dropping support for device_type is a non-starter from our POV.

cheers

Quoted 95 lines
---
 drivers/of/base.c  | 39 +++++++++++++++++++++++++++++++++++++++
 include/linux/of.h | 11 +++++++++++
 2 files changed, 50 insertions(+)
drivers/of/base.c +39 -0
index a055cd1ef96d..4807db0a35b3 100644
@@ -741,6 +741,45 @@ struct device_node *of_get_next_available_child(const struct device_node *node,
 }
 EXPORT_SYMBOL(of_get_next_available_child);
 
+/**
+ *	of_get_next_cpu_node - Iterate on cpu nodes
+ *	@prev:	previous child of the /cpus node, or NULL to get first
+ *
+ *	Returns a cpu node pointer with refcount incremented, use of_node_put()
+ *	on it when done. Returns NULL when prev is the last child. Decrements
+ *	the refcount of prev.
+ */
+struct device_node *of_get_next_cpu_node(struct device_node *prev)
+{
+	struct device_node *next = NULL;
+	unsigned long flags;
+	struct device_node *node;
+
+	if (!prev)
+		node = of_find_node_by_path("/cpus");
+
+	raw_spin_lock_irqsave(&devtree_lock, flags);
+	if (prev)
+		next = prev->sibling;
+	else if (node) {
+		next = node->child;
+		of_node_put(node);
+	}
+	for (; next; next = next->sibling) {
+		if (!(of_node_name_eq(next, "cpu") ||
+		      (next->type && !of_node_cmp(next->type, "cpu"))))
+			continue;
+		if (!__of_device_is_available(next))
+			continue;
+		if (of_node_get(next))
+			break;
+	}
+	of_node_put(prev);
+	raw_spin_unlock_irqrestore(&devtree_lock, flags);
+	return next;
+}
+EXPORT_SYMBOL(of_get_next_cpu_node);
+
 /**
  * of_get_compatible_child - Find compatible child node
  * @parent:	parent node
include/linux/of.h +11 -1
index 99b0ebf49632..1aca0dbd35df 100644
@@ -353,6 +353,8 @@ extern const void *of_get_property(const struct device_node *node,
 				const char *name,
 				int *lenp);
 extern struct device_node *of_get_cpu_node(int cpu, unsigned int *thread);
+extern struct device_node *of_get_next_cpu_node(struct device_node *prev);
+
 #define for_each_property_of_node(dn, pp) \
 	for (pp = dn->properties; pp != NULL; pp = pp->next)
 
@@ -754,6 +756,11 @@ static inline struct device_node *of_get_cpu_node(int cpu,
 	return NULL;
 }
 
+static inline struct device_node *of_get_next_cpu_node(struct device_node *prev)
+{
+	return NULL;
+}
+
 static inline int of_n_addr_cells(struct device_node *np)
 {
 	return 0;
@@ -1217,6 +1224,10 @@ static inline int of_property_read_s32(const struct device_node *np,
 	for (child = of_get_next_available_child(parent, NULL); child != NULL; \
 	     child = of_get_next_available_child(parent, child))
 
+#define for_each_of_cpu_node(cpu) \
+	for (cpu = of_get_next_cpu_node(NULL); cpu != NULL; \
+	     cpu = of_get_next_cpu_node(cpu))
+
 #define for_each_node_with_property(dn, prop_name) \
 	for (dn = of_find_node_with_property(NULL, prop_name); dn; \
 	     dn = of_find_node_with_property(dn, prop_name))
--

2.17.1

#4 lore raw

Re: [PATCH 01/21] of: Add cpu node iterator for_each_of_cpu_node()

Quoted 10 lines · Michael Ellerman

Hi Rob,

Sorry I missed this when you posted it.

Quoted 4 lines · Rob Herring

Iterating thru cpu nodes is a common pattern. Create a common iterator which can find child nodes either by node name or device_type == cpu. Using the former will allow for eventually dropping device_type properties which are deprecated for FDT.

Quoted 5 lines

Device trees we see on powerpc generally don't (never?) use "cpu" as the node name for CPU nodes. And many of those device trees come from firmware, so we can't update them.

So dropping support for device_type is a non-starter from our POV.

ps. presumably that's what you meant by deprecated *for FDT*.

But anyway just wanted to make sure we are on the same page.

cheers

author maintainer
#5 lore raw

Re: [PATCH 01/21] of: Add cpu node iterator for_each_of_cpu_node()

Quoted 12 lines · Michael Ellerman
Quoted 10 lines · Michael Ellerman

Hi Rob,

Sorry I missed this when you posted it.

Quoted 4 lines · Rob Herring

Iterating thru cpu nodes is a common pattern. Create a common iterator which can find child nodes either by node name or device_type == cpu. Using the former will allow for eventually dropping device_type properties which are deprecated for FDT.

Quoted 7 lines
Quoted 5 lines

Device trees we see on powerpc generally don't (never?) use "cpu" as the node name for CPU nodes. And many of those device trees come from firmware, so we can't update them.

So dropping support for device_type is a non-starter from our POV.

ps. presumably that's what you meant by deprecated *for FDT*.

Right.

Quoted 1 line

But anyway just wanted to make sure we are on the same page.

Yes, I was aware at least older powerpc DTs don't use 'cpu' for node names.

Rob

#6 lore raw

Re: [PATCH 01/21] of: Add cpu node iterator for_each_of_cpu_node()

Quoted 19 lines · Rob Herring
Quoted 18 lines · Michael Ellerman
Quoted 15 lines · Michael Ellerman

Hi Rob,

Sorry I missed this when you posted it.

Quoted 4 lines · Rob Herring

Iterating thru cpu nodes is a common pattern. Create a common iterator which can find child nodes either by node name or device_type == cpu. Using the former will allow for eventually dropping device_type properties which are deprecated for FDT.

Device trees we see on powerpc generally don't (never?) use "cpu" as the node name for CPU nodes. And many of those device trees come from firmware, so we can't update them.

So dropping support for device_type is a non-starter from our POV.

Quoted 7 lines
Quoted 1 line

ps. presumably that's what you meant by deprecated *for FDT*.

Right.

Quoted 1 line

But anyway just wanted to make sure we are on the same page.

Yes, I was aware at least older powerpc DTs don't use 'cpu' for node names.

Actually newer ones too, see below :)

And there's code out there that expects this, so we can't realistically change it any time soon :/

https://github.com/ibm-power-utilities/powerpc-utils/blob/master/src/drmgr/common_cpu.c#L186
https://github.com/ibm-power-utilities/powerpc-utils/blob/master/src/ppc64_cpu.c#L344

cheers

$ ls -d1 /proc/device-tree/cpus/PowerPC\,POWER9@*
/proc/device-tree/cpus/PowerPC,POWER9@14
/proc/device-tree/cpus/PowerPC,POWER9@1c
/proc/device-tree/cpus/PowerPC,POWER9@34
/proc/device-tree/cpus/PowerPC,POWER9@3c
/proc/device-tree/cpus/PowerPC,POWER9@4
/proc/device-tree/cpus/PowerPC,POWER9@48
/proc/device-tree/cpus/PowerPC,POWER9@54
/proc/device-tree/cpus/PowerPC,POWER9@804
/proc/device-tree/cpus/PowerPC,POWER9@80c
/proc/device-tree/cpus/PowerPC,POWER9@814
/proc/device-tree/cpus/PowerPC,POWER9@81c
/proc/device-tree/cpus/PowerPC,POWER9@834
/proc/device-tree/cpus/PowerPC,POWER9@83c
/proc/device-tree/cpus/PowerPC,POWER9@844
/proc/device-tree/cpus/PowerPC,POWER9@84c
/proc/device-tree/cpus/PowerPC,POWER9@c
#7 lore raw

Re: [PATCH 01/21] of: Add cpu node iterator for_each_of_cpu_node()

Quoted 4 lines · Michael Ellerman
Quoted 1 line · Rob Herring

Yes, I was aware at least older powerpc DTs don't use 'cpu' for node names.

Actually newer ones too, see below :)

Good, because that is required by the Open Firmware standard (the PowerPC binding, to be exact):

http://www.openbios.org/data/docs/ppc-2_1.ps

(see 5.1.4, "name").

Segher

author maintainer
#8 lore raw

Re: [PATCH 01/21] of: Add cpu node iterator for_each_of_cpu_node()

Quoted 5 lines · Segher Boessenkool
Quoted 3 lines · Michael Ellerman
Quoted 1 line · Rob Herring

Yes, I was aware at least older powerpc DTs don't use 'cpu' for node names.

Quoted 8 lines
Quoted 1 line

Actually newer ones too, see below :)

Good, because that is required by the Open Firmware standard (the PowerPC binding, to be exact):

http://www.openbios.org/data/docs/ppc-2_1.ps

(see 5.1.4, "name").

Yes. I should say I only expect systems following ePAPR (3.7) or DT Spec will use 'cpu' node names. Those specs also require 'device_type' which is supposed to indicate what OF methods are available for a node which doesn't exist on FDT.

Rob

author maintainer
#9 lore raw

PATCH 2/21 of: Support matching cpu nodes with no 'reg' property

In reply to Rob Herring

For some single core ARM systems, the DTs can have a single cpu node without a reg property and #address-cells == 0. This case is valid and should match on cpu #0.

---
 drivers/of/base.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/of/base.c +2 -0
index 70609d5a2506..6389aeb2f48c 100644
@@ -327,6 +327,8 @@ static bool __of_find_n_match_cpu_property(struct device_node *cpun,
 
 	ac = of_n_addr_cells(cpun);
 	cell = of_get_property(cpun, prop_name, &prop_len);
+	if (!cell && !ac && arch_match_cpu_phys_id(cpu, 0))
+		return true;
 	if (!cell || !ac)
 		return false;
 	prop_len /= sizeof(*cell) * ac;
Signature · 1 line
2.17.1
author maintainer
#10 lore raw

PATCH 3/21 ARM: use for_each_of_cpu_node iterator

In reply to Rob Herring

Use the for_each_of_cpu_node iterator to iterate over cpu nodes. This has the side effect of defaulting to iterating using "cpu" node names in preference to the deprecated (for FDT) device_type == "cpu".

Cc Russell King <[email protected]>
Cc linux-arm-kernel at lists.infradead.org

---
Please ack and I will take via the DT tree. This is dependent on the first 2 patches.

 arch/arm/kernel/devtree.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
arch/arm/kernel/devtree.c +1 -4
index ecaa68dd1af5..13bcd3b867cb 100644
@@ -87,14 +87,11 @@ void __init arm_dt_init_cpu_maps(void)
 	if (!cpus)
 		return;
 
-	for_each_child_of_node(cpus, cpu) {
+	for_each_of_cpu_node(cpu) {
 		const __be32 *cell;
 		int prop_bytes;
 		u32 hwid;
 
-		if (of_node_cmp(cpu->type, "cpu"))
-			continue;
-
 		pr_debug(" * %pOF...\n", cpu);
 		/*
 		 * A device tree containing CPU nodes with missing "reg"

--
2.17.1

author maintainer
#11 lore raw

PATCH 4/21 ARM: topology: remove unneeded check for /cpus node

In reply to Rob Herring

Checking for "/cpus" node is not necessary as of_get_cpu_node() will fail later on anyways. The call to of_find_node_by_path() also leaks a reference. So just remove the check.

Cc Russell King <[email protected]>
Cc linux-arm-kernel at lists.infradead.org

---
Please ack and I will take via the DT tree. This is dependent on the first 2 patches.

 arch/arm/kernel/topology.c | 6 ------
 1 file changed, 6 deletions(-)
arch/arm/kernel/topology.c +0 -6
index 24ac3cab411d..60e375ce1ab2 100644
@@ -94,12 +94,6 @@ static void __init parse_dt_topology(void)
 	__cpu_capacity = kcalloc(nr_cpu_ids, sizeof(*__cpu_capacity),
 				 GFP_NOWAIT);
 
-	cn = of_find_node_by_path("/cpus");
-	if (!cn) {
-		pr_err("No CPU information found in DT\n");
-		return;
-	}
-
 	for_each_possible_cpu(cpu) {
 		const u32 *rate;
 		int len;

--
2.17.1

author maintainer
#12 lore raw

PATCH 5/21 ARM: shmobile: use for_each_of_cpu_node iterator

In reply to Rob Herring

Use the for_each_of_cpu_node iterator to iterate over cpu nodes. This has the side effect of defaulting to iterating using "cpu" node names in preference to the deprecated (for FDT) device_type == "cpu".

Cc Simon Horman <[email protected]>
Cc Magnus Damm <[email protected]>
Cc Russell King <[email protected]>
Cc linux-arm-kernel at lists.infradead.org
Cc linux-renesas-soc at vger.kernel.org

---
Please ack and I will take via the DT tree. This is dependent on the first 2 patches.

 arch/arm/mach-shmobile/pm-rcar-gen2.c |  8 ++------
 arch/arm/mach-shmobile/pm-rmobile.c   |  2 +-
 arch/arm/mach-shmobile/timer.c        | 10 ++--------
 3 files changed, 5 insertions(+), 15 deletions(-)
arch/arm/mach-shmobile/pm-rcar-gen2.c +2 -6
index 345af3ebcc3a..7efe95bd584f 100644
@@ -50,7 +50,7 @@ void __init rcar_gen2_pm_init(void)
 	void __iomem *p;
 	u32 bar;
 	static int once;
-	struct device_node *np, *cpus;
+	struct device_node *np;
 	bool has_a7 = false;
 	bool has_a15 = false;
 	struct resource res;
@@ -59,11 +59,7 @@ void __init rcar_gen2_pm_init(void)
 	if (once++)
 		return;
 
-	cpus = of_find_node_by_path("/cpus");
-	if (!cpus)
-		return;
-
-	for_each_child_of_node(cpus, np) {
+	for_each_of_cpu_node(np) {
 		if (of_device_is_compatible(np, "arm,cortex-a15"))
 			has_a15 = true;
 		else if (of_device_is_compatible(np, "arm,cortex-a7"))
arch/arm/mach-shmobile/pm-rmobile.c +1 -1
index e348bcfe389d..94fdeef11b81 100644
@@ -202,7 +202,7 @@ static void __init get_special_pds(void)
 	const struct of_device_id *id;
 
 	/* PM domains containing CPUs */
-	for_each_node_by_type(np, "cpu")
+	for_each_of_cpu_node(np)
 		add_special_pd(np, PD_CPU);
 
 	/* PM domain containing console */
arch/arm/mach-shmobile/timer.c +2 -8
index 828e8aea037e..e48b0939693f 100644
@@ -22,22 +22,16 @@
 
 void __init shmobile_init_delay(void)
 {
-	struct device_node *np, *cpus;
+	struct device_node *np;
 	u32 max_freq = 0;
 
-	cpus = of_find_node_by_path("/cpus");
-	if (!cpus)
-		return;
-
-	for_each_child_of_node(cpus, np) {
+	for_each_of_cpu_node(np) {
 		u32 freq;
 
 		if (!of_property_read_u32(np, "clock-frequency", &freq))
 			max_freq = max(max_freq, freq);
 	}
 
-	of_node_put(cpus);
-
 	if (!max_freq)
 		return;
 

--
2.17.1

Reviewed-by on v1 5/21
#13 lore raw

Re: [PATCH 05/21] ARM: shmobile: use for_each_of_cpu_node iterator

Quoted 10 lines · Rob Herring

Use the for_each_of_cpu_node iterator to iterate over cpu nodes. This has the side effect of defaulting to iterating using "cpu" node names in preference to the deprecated (for FDT) device_type == "cpu".

Cc Simon Horman <[email protected]>
Cc Magnus Damm <[email protected]>
Cc Russell King <[email protected]>
Cc linux-arm-kernel at lists.infradead.org
Cc linux-renesas-soc at vger.kernel.org

Gr{oetje,eeting}s,

Geert

Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
Reviewed-by on v1 5/21
#14 lore raw

Re: [PATCH 05/21] ARM: shmobile: use for_each_of_cpu_node iterator

In reply to Rob Herring
Quoted 10 lines · Rob Herring

Use the for_each_of_cpu_node iterator to iterate over cpu nodes. This has the side effect of defaulting to iterating using "cpu" node names in preference to the deprecated (for FDT) device_type == "cpu".

Cc Simon Horman <[email protected]>
Cc Magnus Damm <[email protected]>
Cc Russell King <[email protected]>
Cc linux-arm-kernel at lists.infradead.org
Cc linux-renesas-soc at vger.kernel.org
author maintainer
#15 lore raw

PATCH 6/21 arm64: use for_each_of_cpu_node iterator

In reply to Rob Herring

Use the for_each_of_cpu_node iterator to iterate over cpu nodes. This has the side effect of defaulting to iterating using "cpu" node names in preference to the deprecated (for FDT) device_type == "cpu".

Cc Catalin Marinas <[email protected]>
Cc Will Deacon <[email protected]>
Cc linux-arm-kernel at lists.infradead.org

---
Please ack and I will take via the DT tree. This is dependent on the first 2 patches.

 arch/arm64/kernel/smp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/kernel/smp.c +1 -1
index 25fcd22a4bb2..96b8f2f51ab2 100644
@@ -602,7 +602,7 @@ static void __init of_parse_and_init_cpus(void)
 {
 	struct device_node *dn;
 
-	for_each_node_by_type(dn, "cpu") {
+	for_each_of_cpu_node(dn) {
 		u64 hwid = of_get_cpu_mpidr(dn);
 
 		if (hwid == INVALID_HWID)

--
2.17.1

Acked-by on v1 6/21
#16 lore raw

Re: [PATCH 06/21] arm64: use for_each_of_cpu_node iterator

Quoted 11 lines · Rob Herring

Use the for_each_of_cpu_node iterator to iterate over cpu nodes. This has the side effect of defaulting to iterating using "cpu" node names in preference to the deprecated (for FDT) device_type == "cpu".

---
Please ack and I will take via the DT tree. This is dependent on the first 2 patches.

Will

author maintainer
#17 lore raw

PATCH 7/21 c6x: use for_each_of_cpu_node iterator

In reply to Rob Herring

Use the for_each_of_cpu_node iterator to iterate over cpu nodes. This has the side effect of defaulting to iterating using "cpu" node names in preference to the deprecated (for FDT) device_type == "cpu".

---
Please ack and I will take via the DT tree. This is dependent on the first 2 patches.

 arch/c6x/kernel/setup.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
arch/c6x/kernel/setup.c +3 -8
index 786e36e2f61d..2e97455ca0b7 100644
@@ -96,7 +96,7 @@ static void __init get_cpuinfo(void)
 	unsigned long core_khz;
 	u64 tmp;
 	struct cpuinfo_c6x *p;
-	struct device_node *node, *np;
+	struct device_node *node;
 
 	p = &per_cpu(cpu_data, smp_processor_id());
 
@@ -190,13 +190,8 @@ static void __init get_cpuinfo(void)
 
 	p->core_id = get_coreid();
 
-	node = of_find_node_by_name(NULL, "cpus");
-	if (node) {
-		for_each_child_of_node(node, np)
-			if (!strcmp("cpu", np->name))
-				++c6x_num_cores;
-		of_node_put(node);
-	}
+	for_each_of_cpu_node(node)
+		++c6x_num_cores;
 
 	node = of_find_node_by_name(NULL, "soc");
 	if (node) {

--
2.17.1

author maintainer
#18 lore raw

PATCH 8/21 microblaze: get cpu node with of_get_cpu_node

In reply to Rob Herring

"device_type" use is deprecated for FDT though it has continued to be used for nodes like cpu nodes. Use of_get_cpu_node() instead which works using node names by default. This will allow the eventually removal of cpu device_type properties.

Also, fix a leaked reference by adding a missing of_node_put.

---
Please ack and I will take via the DT tree. This is dependent on the first 2 patches.

 arch/microblaze/kernel/cpu/cpuinfo.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
arch/microblaze/kernel/cpu/cpuinfo.c +3 -1
index 96b3f26d16be..0c52aca87478 100644
@@ -89,7 +89,7 @@ static struct device_node *cpu;
 
 void __init setup_cpuinfo(void)
 {
-	cpu = (struct device_node *) of_find_node_by_type(NULL, "cpu");
+	cpu = of_get_cpu_node(0, NULL);
 	if (!cpu)
 		pr_err("You don't have cpu!!!\n");
 
@@ -117,6 +117,8 @@ void __init setup_cpuinfo(void)
 	if (cpuinfo.mmu_privins)
 		pr_warn("%s: Stream instructions enabled"
 			" - USERSPACE CAN LOCK THIS KERNEL!\n", __func__);
+
+	of_node_put(cpu);
 }
 
 void __init setup_cpuinfo_clk(void)

--
2.17.1

Tested-by on v1 8/21
#19 lore raw

Re: [PATCH 08/21] microblaze: get cpu node with of_get_cpu_node

Quoted 5 lines · Rob Herring

"device_type" use is deprecated for FDT though it has continued to be used for nodes like cpu nodes. Use of_get_cpu_node() instead which works using node names by default. This will allow the eventually removal of cpu device_type properties.

Quoted 7 lines

Also, fix a leaked reference by adding a missing of_node_put.

---
Please ack and I will take via the DT tree. This is dependent on the first 2 patches.

I have tested it and it is align with the spec and all dtses generated before 2015 will work without any issue.
In 2015 new device tree generator was introduced and it is not adding reg property to cpu node which is required by this change. This will be fixed but that means that all generated dtses from 2015 are affected.

That's why will be great if you can also change that pr_err message to mentioned to also check reg property to give users a chance to fix it properly. Error log below.

Anyway here is my

Thanks,
Michal

[    0.000000] Ramdisk addr 0x00000000,
[    0.000000] Compiled-in FDT at (ptrval)
[    0.000000] Linux version 4.19.0-rc2-00010-gf9a96b0ac503
(monstr@monstr-desktop2) (gcc version 4.9.2 (crosstool-NG 1.20.0)) #4
Mon Sep 10 16:31:14 CEST 2018
[    0.000000] setup_memory: max_mapnr: 0x40000
[    0.000000] setup_memory: min_low_pfn: 0x80000
[    0.000000] setup_memory: max_low_pfn: 0xb0000
[    0.000000] setup_memory: max_pfn: 0xc0000
[    0.000000] Zone ranges:
[    0.000000]   DMA      [mem 0x0000000080000000-0x00000000afffffff]
[    0.000000]   Normal   empty
[    0.000000]   HighMem  [mem 0x00000000b0000000-0x00000000bfffffff]
[    0.000000] Movable zone start for each node
[    0.000000] Early memory node ranges
[    0.000000]   node   0: [mem 0x0000000080000000-0x00000000bfffffff]
[    0.000000] Initmem setup node 0 [mem
0x0000000080000000-0x00000000bfffffff]
[    0.000000] earlycon: ns16550a0 at MMIO 0x44a01000 (options '')
[    0.000000] bootconsole [ns16550a0] enabled
[    0.000000] You don't have cpu!!!
[    0.000000] setup_cpuinfo: initialising
[    0.000000] setup_cpuinfo: Using full CPU PVR support
[    0.000000] ERROR: Microblaze BARREL, MSR, PCMP or DIV-different for
PVR and DTS
[    0.000000] ERROR: Microblaze HW_MUL-different for PVR and DTS
[    0.000000] wt_msr_noirq
[    0.000000] pcpu-alloc: s0 r0 d32768 u32768 alloc=1*32768
[    0.000000] pcpu-alloc: [0] 0
[    0.000000] Built 1 zonelists, mobility grouping on.  Total pages: 260608
[    0.000000] Kernel command line: console=ttyS0,115200 earlycon
[    0.000000] Dentry cache hash table entries: 131072 (order: 7, 524288
bytes)
[    0.000000] Inode-cache hash table entries: 65536 (order: 6, 262144
bytes)
[    0.000000] Memory: 1027496K/1048576K available (4270K kernel code,
153K rwdata, 1256K rodata, 4989K init, 561K bss, 21080K reserved, 0K
cma-reserved, 262144K highmem)
[    0.000000] Kernel virtual memory layout:
[    0.000000]   * 0xfffea000..0xfffff000  : fixmap
[    0.000000]   * 0xff800000..0xffc00000  : highmem PTEs
[    0.000000]   * 0xff7ff000..0xff800000  : early ioremap
[    0.000000]   * 0xf0000000..0xff7ff000  : vmalloc & ioremap
[    0.000000] NR_IRQS: 33
[    0.000000] irq-xilinx: /amba_pl/interrupt-controller@41200000:
num_irq=6, edge=0x0
[    0.000000] Oops: kernel access of bad area, sig: 11
[    0.000000] CPU: 0 PID: 0 Comm: swapper Not tainted
4.19.0-rc2-00010-gf9a96b0ac503 #4
[    0.000000]  Registers dump: mode=80571E90
[    0.000000]  r1=C028BD54, r2=C056FAB6, r3=00000000, r4=00000010
[    0.000000]  r5=00000000, r6=C0495348, r7=C0495350, r8=00000000
[    0.000000]  r9=C0571F44, r10=EF002400, r11=00000030, r12=00000000
[    0.000000]  r13=410C2FC0, r14=C0496688, r15=C02831F0, r16=00000000
[    0.000000]  r17=C02831EC, r18=FFFFFFFF, r19=C05BABE0, r20=BFFEC168
[    0.000000]  r21=BFFEC168, r22=EF7F9A80, r23=00000000, r24=00000000
[    0.000000]  r25=BFE6B84C, r26=80000000, r27=00000001, r28=90000040
[    0.000000]  r29=01000000, r30=00000380, r31=C05782E8, rPC=C02831EC
[    0.000000]  msr=000046A0, ear=0000000C, esr=00001A72, fsr=000065A0
[    0.000000] Kernel panic - not syncing: Attempted to kill the idle task!
[    0.000000] ---[ end Kernel panic - not syncing: Attempted to kill

the idle task! ]---

author maintainer
#20 lore raw

Re: [PATCH 08/21] microblaze: get cpu node with of_get_cpu_node

Quoted 15 lines · Michal Simek
Quoted 5 lines · Rob Herring

"device_type" use is deprecated for FDT though it has continued to be used for nodes like cpu nodes. Use of_get_cpu_node() instead which works using node names by default. This will allow the eventually removal of cpu device_type properties.

Quoted 7 lines

Also, fix a leaked reference by adding a missing of_node_put.

---
Please ack and I will take via the DT tree. This is dependent on the first 2 patches.

Quoted 6 lines

I have tested it and it is align with the spec and all dtses generated before 2015 will work without any issue.
In 2015 new device tree generator was introduced and it is not adding reg property to cpu node which is required by this change. This will be fixed but that means that all generated dtses from 2015 are affected.

Patch 2 was supposed to handle that case. However, it does expect that there should be an #address-cells equal to 0 in that case. Is that not a valid assumption?

Quoted 3 lines

That's why will be great if you can also change that pr_err message to mentioned to also check reg property to give users a chance to fix it properly. Error log below.

I don't think breaking users is good.

I could make this a find by path (/cpus/cpu) instead or just drop it for microblaze. It doesn't really affect my plans for removing device_node.type ptr.

Rob

Quoted 5 lines

Anyway here is my

Thanks,
Michal

#21 lore raw

Re: [PATCH 08/21] microblaze: get cpu node with of_get_cpu_node

Quoted 23 lines · Rob Herring
Quoted 15 lines · Michal Simek
Quoted 5 lines · Rob Herring

"device_type" use is deprecated for FDT though it has continued to be used for nodes like cpu nodes. Use of_get_cpu_node() instead which works using node names by default. This will allow the eventually removal of cpu device_type properties.

Quoted 7 lines

Also, fix a leaked reference by adding a missing of_node_put.

---
Please ack and I will take via the DT tree. This is dependent on the first 2 patches.

Quoted 6 lines

I have tested it and it is align with the spec and all dtses generated before 2015 will work without any issue.
In 2015 new device tree generator was introduced and it is not adding reg property to cpu node which is required by this change. This will be fixed but that means that all generated dtses from 2015 are affected.

Quoted 3 lines

Patch 2 was supposed to handle that case. However, it does expect that there should be an #address-cells equal to 0 in that case. Is that not a valid assumption?

as you can expect we have

#address-cells = <0x1>;
#cpus = <0x1>;
#size-cells = <0x0>;

cpu@0 {
	/* no reg property */
};

That missing reg property was even reported by dtc but none has fixed that. This will be fixed for xilinx releases.

Quoted 9 lines
Quoted 3 lines

That's why will be great if you can also change that pr_err message to mentioned to also check reg property to give users a chance to fix it properly. Error log below.

I don't think breaking users is good.

I could make this a find by path (/cpus/cpu) instead or just drop it for microblaze. It doesn't really affect my plans for removing device_node.type ptr.

If this is fine for you that will be the best solution.

Thanks,
Michal

author maintainer
#22 lore raw

PATCH 9/21 nios2: get cpu node with of_get_cpu_node

In reply to Rob Herring

"device_type" use is deprecated for FDT though it has continued to be used for nodes like cpu nodes. Use of_get_cpu_node() instead which works using node names by default. This will allow the eventually removal of cpu device_type properties.

Also, fix a leaked reference by adding a missing of_node_put.

---
Please ack and I will take via the DT tree. This is dependent on the first 2 patches.

 arch/nios2/kernel/cpuinfo.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
arch/nios2/kernel/cpuinfo.c +3 -1
index 93207718bb22..ccc1d2a15a0a 100644
@@ -47,7 +47,7 @@ void __init setup_cpuinfo(void)
 	const char *str;
 	int len;
 
-	cpu = of_find_node_by_type(NULL, "cpu");
+	cpu = of_get_cpu_node(0, NULL);
 	if (!cpu)
 		panic("%s: No CPU found in devicetree!\n", __func__);
 
@@ -120,6 +120,8 @@ void __init setup_cpuinfo(void)
 	cpuinfo.reset_addr = fcpu(cpu, "altr,reset-addr");
 	cpuinfo.exception_addr = fcpu(cpu, "altr,exception-addr");
 	cpuinfo.fast_tlb_miss_exc_addr = fcpu(cpu, "altr,fast-tlb-miss-addr");
+
+	of_node_put(cpu);
 }
 
 #ifdef CONFIG_PROC_FS

--
2.17.1

author maintainer
#23 lore raw

PATCH 10/21 openrisc: use for_each_of_cpu_node iterator

In reply to Rob Herring

Use the for_each_of_cpu_node iterator to iterate over cpu nodes. This has the side effect of defaulting to iterating using "cpu" node names in preference to the deprecated (for FDT) device_type == "cpu".

This also fixes a leaked reference for cpus node.

Cc Jonas Bonn <[email protected]>
Cc Stefan Kristiansson <[email protected]>
Cc Stafford Horne <[email protected]>

---
Please ack and I will take via the DT tree. This is dependent on the first 2 patches.

 arch/openrisc/kernel/setup.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
arch/openrisc/kernel/setup.c +1 -2
index 9d28ab14d139..e17fcd83120f 100644
@@ -158,9 +158,8 @@ static struct device_node *setup_find_cpu_node(int cpu)
 {
 	u32 hwid;
 	struct device_node *cpun;
-	struct device_node *cpus = of_find_node_by_path("/cpus");
 
-	for_each_available_child_of_node(cpus, cpun) {
+	for_each_of_cpu_node(cpun) {
 		if (of_property_read_u32(cpun, "reg", &hwid))
 			continue;
 		if (hwid == cpu)

--
2.17.1

maintainer Acked-by on v1 10/21
#24 lore raw

Re: [PATCH 10/21] openrisc: use for_each_of_cpu_node iterator

Quoted 23 lines · Rob Herring

Use the for_each_of_cpu_node iterator to iterate over cpu nodes. This has the side effect of defaulting to iterating using "cpu" node names in preference to the deprecated (for FDT) device_type == "cpu".

This also fixes a leaked reference for cpus node.

Cc Jonas Bonn <[email protected]>
Cc Stefan Kristiansson <[email protected]>
Cc Stafford Horne <[email protected]>

---
Please ack and I will take via the DT tree. This is dependent on the first 2 patches.

 arch/openrisc/kernel/setup.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
arch/openrisc/kernel/setup.c +0 -0
index 9d28ab14d139..e17fcd83120f 100644

arch/openrisc/kernel/setup.c static struct device_node *setup_find_cpu_node(int cpu) · line 165

Quoted 10 lines
arch/openrisc/kernel/setup.c +1 -2
@@ -158,9 +158,8 @@ static struct device_node *setup_find_cpu_node(int cpu)
 {
 	u32 hwid;
 	struct device_node *cpun;
-	struct device_node *cpus = of_find_node_by_path("/cpus");
 
-	for_each_available_child_of_node(cpus, cpun) {
+	for_each_of_cpu_node(cpun) {
 		if (of_property_read_u32(cpun, "reg", &hwid))
 			continue;
 		if (hwid == cpu)

This looks fine to me. Thanks Rob

author maintainer
#25 lore raw

PATCH 11/21 powerpc: use for_each_of_cpu_node iterator

In reply to Rob Herring

Use the for_each_of_cpu_node iterator to iterate over cpu nodes. This has the side effect of defaulting to iterating using "cpu" node names in preference to the deprecated (for FDT) device_type == "cpu".

Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Michael Ellerman <[email protected]>

---
Please ack and I will take via the DT tree. This is dependent on the first 2 patches.

 arch/powerpc/platforms/powermac/feature.c | 51 ++++++++---------------
 arch/powerpc/platforms/powermac/setup.c   | 15 +++----
 2 files changed, 26 insertions(+), 40 deletions(-)
arch/powerpc/platforms/powermac/feature.c +18 -33
index 4eb8cb38fc69..ed2f54b3f173 100644
@@ -1049,7 +1049,6 @@ core99_reset_cpu(struct device_node *node, long param, long value)
 	unsigned long flags;
 	struct macio_chip *macio;
 	struct device_node *np;
-	struct device_node *cpus;
 	const int dflt_reset_lines[] = {	KL_GPIO_RESET_CPU0,
 						KL_GPIO_RESET_CPU1,
 						KL_GPIO_RESET_CPU2,
@@ -1059,10 +1058,7 @@ core99_reset_cpu(struct device_node *node, long param, long value)
 	if (macio->type != macio_keylargo)
 		return -ENODEV;
 
-	cpus = of_find_node_by_path("/cpus");
-	if (cpus == NULL)
-		return -ENODEV;
-	for (np = cpus->child; np != NULL; np = np->sibling) {
+	for_each_of_cpu_node(np) {
 		const u32 *num = of_get_property(np, "reg", NULL);
 		const u32 *rst = of_get_property(np, "soft-reset", NULL);
 		if (num == NULL || rst == NULL)
@@ -1072,7 +1068,6 @@ core99_reset_cpu(struct device_node *node, long param, long value)
 			break;
 		}
 	}
-	of_node_put(cpus);
 	if (np == NULL || reset_io == 0)
 		reset_io = dflt_reset_lines[param];
 
@@ -1504,16 +1499,12 @@ static long g5_reset_cpu(struct device_node *node, long param, long value)
 	unsigned long flags;
 	struct macio_chip *macio;
 	struct device_node *np;
-	struct device_node *cpus;
 
 	macio = &macio_chips[0];
 	if (macio->type != macio_keylargo2 && macio->type != macio_shasta)
 		return -ENODEV;
 
-	cpus = of_find_node_by_path("/cpus");
-	if (cpus == NULL)
-		return -ENODEV;
-	for (np = cpus->child; np != NULL; np = np->sibling) {
+	for_each_of_cpu_node(np) {
 		const u32 *num = of_get_property(np, "reg", NULL);
 		const u32 *rst = of_get_property(np, "soft-reset", NULL);
 		if (num == NULL || rst == NULL)
@@ -1523,7 +1514,6 @@ static long g5_reset_cpu(struct device_node *node, long param, long value)
 			break;
 		}
 	}
-	of_node_put(cpus);
 	if (np == NULL || reset_io == 0)
 		return -ENODEV;
 
@@ -2515,31 +2505,26 @@ static int __init probe_motherboard(void)
 	 * supposed to be set when not supported, but I'm not very confident
 	 * that all Apple OF revs did it properly, I do it the paranoid way.
 	 */
-	while (uninorth_base && uninorth_rev > 3) {
-		struct device_node *cpus = of_find_node_by_path("/cpus");
+	if (uninorth_base && uninorth_rev > 3) {
 		struct device_node *np;
 
-		if (!cpus || !cpus->child) {
-			printk(KERN_WARNING "Can't find CPU(s) in device tree !\n");
-			of_node_put(cpus);
-			break;
-		}
-		np = cpus->child;
-		/* Nap mode not supported on SMP */
-		if (np->sibling) {
-			of_node_put(cpus);
-			break;
-		}
-		/* Nap mode not supported if flush-on-lock property is present */
-		if (of_get_property(np, "flush-on-lock", NULL)) {
-			of_node_put(cpus);
-			break;
+		for_each_of_cpu_node(np) {
+			int cpu_count = 1;
+
+			/* Nap mode not supported on SMP */
+			if (of_get_property(np, "flush-on-lock", NULL) ||
+			    (cpu_count > 1)) {
+				powersave_nap = 0;
+				of_node_put(np);
+				break;
+			}
+
+			cpu_count++;
+			powersave_nap = 1;
 		}
-		of_node_put(cpus);
-		powersave_nap = 1;
-		printk(KERN_DEBUG "Processor NAP mode on idle enabled.\n");
-		break;
 	}
+	if (powersave_nap)
+		printk(KERN_DEBUG "Processor NAP mode on idle enabled.\n");
 
 	/* On CPUs that support it (750FX), lowspeed by default during
 	 * NAP mode
arch/powerpc/platforms/powermac/setup.c +8 -7
index 3a529fcdae97..2f00e3daafb0 100644
@@ -243,10 +243,9 @@ static void __init l2cr_init(void)
 {
 	/* Checks "l2cr-value" property in the registry */
 	if (cpu_has_feature(CPU_FTR_L2CR)) {
-		struct device_node *np = of_find_node_by_name(NULL, "cpus");
-		if (!np)
-			np = of_find_node_by_type(NULL, "cpu");
-		if (np) {
+		struct device_node *np;
+
+		for_each_of_cpu_node(np) {
 			const unsigned int *l2cr =
 				of_get_property(np, "l2cr-value", NULL);
 			if (l2cr) {
@@ -256,6 +255,7 @@ static void __init l2cr_init(void)
 				_set_L2CR(ppc_override_l2cr_value);
 			}
 			of_node_put(np);
+			break;
 		}
 	}
 
@@ -279,8 +279,8 @@ static void __init pmac_setup_arch(void)
 	/* Set loops_per_jiffy to a half-way reasonable value,
 	   for use until calibrate_delay gets called. */
 	loops_per_jiffy = 50000000 / HZ;
-	cpu = of_find_node_by_type(NULL, "cpu");
-	if (cpu != NULL) {
+
+	for_each_of_cpu_node(cpu) {
 		fp = of_get_property(cpu, "clock-frequency", NULL);
 		if (fp != NULL) {
 			if (pvr >= 0x30 && pvr < 0x80)
@@ -292,8 +292,9 @@ static void __init pmac_setup_arch(void)
 			else
 				/* 601, 603, etc. */
 				loops_per_jiffy = *fp / (2 * HZ);
+			of_node_put(cpu);
+			break;
 		}
-		of_node_put(cpu);
 	}
 
 	/* See if newworld or oldworld */

--
2.17.1

author maintainer
#26 lore raw

PATCH 12/21 powerpc: 4xx: get cpu node with of_get_cpu_node

In reply to Rob Herring

"device_type" use is deprecated for FDT though it has continued to be used for nodes like cpu nodes. Use of_get_cpu_node() instead which works using node names by default. This will allow the eventually removal of cpu device_type properties.

Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Michael Ellerman <[email protected]>

---
Please ack and I will take via the DT tree. This is dependent on the first 2 patches.

 arch/powerpc/platforms/4xx/soc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/platforms/4xx/soc.c +1 -1
index 5e36508b2a70..1844bf502fcf 100644
@@ -200,7 +200,7 @@ void ppc4xx_reset_system(char *cmd)
 	u32 reset_type = DBCR0_RST_SYSTEM;
 	const u32 *prop;
 
-	np = of_find_node_by_type(NULL, "cpu");
+	np = of_get_cpu_node(0, NULL);
 	if (np) {
 		prop = of_get_property(np, "reset-type", NULL);
 

--
2.17.1

author maintainer
#27 lore raw

PATCH 13/21 powerpc: 8xx: get cpu node with of_get_cpu_node

In reply to Rob Herring

"device_type" use is deprecated for FDT though it has continued to be used for nodes like cpu nodes. Use of_get_cpu_node() instead which works using node names by default. This will allow the eventually removal of cpu device_type properties.

Also, fix a leaked reference and add a missing of_node_put.

Cc Vitaly Bordug <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Michael Ellerman <[email protected]>

---
Please ack and I will take via the DT tree. This is dependent on the first 2 patches.

 arch/powerpc/platforms/8xx/m8xx_setup.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
arch/powerpc/platforms/8xx/m8xx_setup.c +3 -2
index 027c42d8966c..f1c805c8adbc 100644
@@ -66,7 +66,7 @@ static int __init get_freq(char *name, unsigned long *val)
 	int found = 0;
 
 	/* The cpu node should have timebase and clock frequency properties */
-	cpu = of_find_node_by_type(NULL, "cpu");
+	cpu = of_get_cpu_node(0, NULL);
 
 	if (cpu) {
 		fp = of_get_property(cpu, name, NULL);
@@ -147,8 +147,9 @@ void __init mpc8xx_calibrate_decr(void)
 	 * we have to enable the timebase).  The decrementer interrupt
 	 * is wired into the vector table, nothing to do here for that.
 	 */
-	cpu = of_find_node_by_type(NULL, "cpu");
+	cpu = of_get_cpu_node(0, NULL);
 	virq= irq_of_parse_and_map(cpu, 0);
+	of_node_put(cpu);
 	irq = virq_to_hw(virq);
 
 	sys_tmr2 = immr_map(im_sit);

--
2.17.1

author maintainer
#28 lore raw

PATCH 14/21 riscv: use for_each_of_cpu_node iterator

In reply to Rob Herring

Use the for_each_of_cpu_node iterator to iterate over cpu nodes. This has the side effect of defaulting to iterating using "cpu" node names in preference to the deprecated (for FDT) device_type == "cpu".

---
Please ack and I will take via the DT tree. This is dependent on the first 2 patches.

 arch/riscv/kernel/smpboot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/riscv/kernel/smpboot.c +1 -1
index 56abab6a9812..3c59afe67951 100644
@@ -52,7 +52,7 @@ void __init setup_smp(void)
 	struct device_node *dn = NULL;
 	int hart, im_okay_therefore_i_am = 0;
 
-	while ((dn = of_find_node_by_type(dn, "cpu"))) {
+	for_each_of_cpu_node(dn) {
 		hart = riscv_of_processor_hart(dn);
 		if (hart >= 0) {
 			set_cpu_possible(hart, true);

--
2.17.1

#29 lore raw

Re: [PATCH 14/21] riscv: use for_each_of_cpu_node iterator

Quoted 11 lines · Rob Herring

Use the for_each_of_cpu_node iterator to iterate over cpu nodes. This has the side effect of defaulting to iterating using "cpu" node names in preference to the deprecated (for FDT) device_type == "cpu".

---
Please ack and I will take via the DT tree. This is dependent on the first 2 patches.

We have a few pending patches in this area that look like they might conflict. It might be worth to delay this one and apply it post -rc1 to avoid dependencies if that isn't a problem for you.

author maintainer
#30 lore raw

Re: [PATCH 14/21] riscv: use for_each_of_cpu_node iterator

Quoted 14 lines · Christoph Hellwig
Quoted 11 lines · Rob Herring

Use the for_each_of_cpu_node iterator to iterate over cpu nodes. This has the side effect of defaulting to iterating using "cpu" node names in preference to the deprecated (for FDT) device_type == "cpu".

---
Please ack and I will take via the DT tree. This is dependent on the first 2 patches.

Quoted 3 lines

We have a few pending patches in this area that look like they might conflict. It might be worth to delay this one and apply it post -rc1 to avoid dependencies if that isn't a problem for you.

Sure. That's fine.

Rob

Acked-by on v1 14/21
#31 lore raw

Re: [PATCH 14/21] riscv: use for_each_of_cpu_node iterator

In reply to Rob Herring
Quoted 20 lines · On Wed, 05 Sep 2018 12:37:31 PDT (-0700), [email protected] wrote:

Use the for_each_of_cpu_node iterator to iterate over cpu nodes. This has the side effect of defaulting to iterating using "cpu" node names in preference to the deprecated (for FDT) device_type == "cpu".

---
Please ack and I will take via the DT tree. This is dependent on the first 2 patches.

 arch/riscv/kernel/smpboot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/riscv/kernel/smpboot.c +0 -0
index 56abab6a9812..3c59afe67951 100644

arch/riscv/kernel/smpboot.c void __init setup_smp(void) · line 58

Quoted 8 lines
arch/riscv/kernel/smpboot.c +1 -1
@@ -52,7 +52,7 @@ void __init setup_smp(void)
 	struct device_node *dn = NULL;
 	int hart, im_okay_therefore_i_am = 0;
 
-	while ((dn = of_find_node_by_type(dn, "cpu"))) {
+	for_each_of_cpu_node(dn) {
 		hart = riscv_of_processor_hart(dn);
 		if (hart >= 0) {
 			set_cpu_possible(hart, true);

Thanks!

author maintainer
#32 lore raw

PATCH 15/21 SH: use for_each_of_cpu_node iterator

In reply to Rob Herring

Use the for_each_of_cpu_node iterator to iterate over cpu nodes. This has the side effect of defaulting to iterating using "cpu" node names in preference to the deprecated (for FDT) device_type == "cpu".

---
Please ack and I will take via the DT tree. This is dependent on the first 2 patches.

 arch/sh/boards/of-generic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/sh/boards/of-generic.c +1 -1
index 26789ad28193..cde370cad4ae 100644
@@ -64,7 +64,7 @@ static void sh_of_smp_probe(void)
 
 	init_cpu_possible(cpumask_of(0));
 
-	for_each_node_by_type(np, "cpu") {
+	for_each_of_cpu_node(np) {
 		const __be32 *cell = of_get_property(np, "reg", NULL);
 		u64 id = -1;
 		if (cell) id = of_read_number(cell, of_n_addr_cells(np));

--
2.17.1

author maintainer
#33 lore raw

PATCH 16/21 x86: DT: use for_each_of_cpu_node iterator

In reply to Rob Herring

Use the for_each_of_cpu_node iterator to iterate over cpu nodes. This has the side effect of defaulting to iterating using "cpu" node names in preference to the deprecated (for FDT) device_type == "cpu".

Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc "H. Peter Anvin" <[email protected]>

---
Please ack and I will take via the DT tree. This is dependent on the first 2 patches.

 arch/x86/kernel/devicetree.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/devicetree.c +1 -1
index f39f3a06c26f..7299dcbf8e85 100644
@@ -140,7 +140,7 @@ static void __init dtb_cpu_setup(void)
 	int ret;
 
 	version = GET_APIC_VERSION(apic_read(APIC_LVR));
-	for_each_node_by_type(dn, "cpu") {
+	for_each_of_cpu_node(dn) {
 		ret = of_property_read_u32(dn, "reg", &apic_id);
 		if (ret < 0) {
 			pr_warn("%pOF: missing local APIC ID\n", dn);

--
2.17.1

Reviewed-by on v1 16/21
#34 lore raw

Re: [PATCH 16/21] x86: DT: use for_each_of_cpu_node iterator

Quoted 9 lines · Rob Herring

Use the for_each_of_cpu_node iterator to iterate over cpu nodes. This has the side effect of defaulting to iterating using "cpu" node names in preference to the deprecated (for FDT) device_type == "cpu".

Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
author maintainer
#35 lore raw

PATCH 17/21 clk: mvebu: use for_each_of_cpu_node iterator

In reply to Rob Herring

Use the for_each_of_cpu_node iterator to iterate over cpu nodes. This has the side effect of defaulting to iterating using "cpu" node names in preference to the deprecated (for FDT) device_type == "cpu".

Cc Michael Turquette <[email protected]>
Cc Stephen Boyd <[email protected]>

---
Please ack and I will take via the DT tree. This is dependent on the first 2 patches.

 drivers/clk/mvebu/clk-cpu.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/mvebu/clk-cpu.c +2 -2
index 072aa38374ce..3045067448fb 100644
@@ -183,7 +183,7 @@ static void __init of_cpu_clk_setup(struct device_node *node)
 		pr_warn("%s: pmu-dfs base register not set, dynamic frequency scaling not available\n",
 			__func__);
 
-	for_each_node_by_type(dn, "cpu")
+	for_each_of_cpu_node(dn)
 		ncpus++;
 
 	cpuclk = kcalloc(ncpus, sizeof(*cpuclk), GFP_KERNEL);
@@ -194,7 +194,7 @@ static void __init of_cpu_clk_setup(struct device_node *node)
 	if (WARN_ON(!clks))
 		goto clks_out;
 
-	for_each_node_by_type(dn, "cpu") {
+	for_each_of_cpu_node(dn) {
 		struct clk_init_data init;
 		struct clk *clk;
 		char *clk_name = kzalloc(5, GFP_KERNEL);

--
2.17.1

maintainer Acked-by on v1 17/21
#36 lore raw

Re: [PATCH 17/21] clk: mvebu: use for_each_of_cpu_node iterator

Quoting Rob Herring (2018-09-05 12:37:34)

Quoted 10 lines

Use the for_each_of_cpu_node iterator to iterate over cpu nodes. This has the side effect of defaulting to iterating using "cpu" node names in preference to the deprecated (for FDT) device_type =3D=3D "cpu". =

Cc Michael Turquette <[email protected]>
Cc Stephen Boyd <[email protected]>

---

author maintainer
#37 lore raw

PATCH 18/21 edac: cpc925: use for_each_of_cpu_node iterator

In reply to Rob Herring

Use the for_each_of_cpu_node iterator to iterate over cpu nodes. This has the side effect of defaulting to iterating using "cpu" node names in preference to the deprecated (for FDT) device_type == "cpu".

Cc Borislav Petkov <[email protected]>
Cc Mauro Carvalho Chehab <[email protected]>

---
Please ack and I will take via the DT tree. This is dependent on the first 2 patches.

 drivers/edac/cpc925_edac.c | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)
drivers/edac/cpc925_edac.c +2 -18
index 2c98e020df05..3c0881ac9880 100644
@@ -593,8 +593,7 @@ static void cpc925_mc_check(struct mem_ctl_info *mci)
 /******************** CPU err device********************************/
 static u32 cpc925_cpu_mask_disabled(void)
 {
-	struct device_node *cpus;
-	struct device_node *cpunode = NULL;
+	struct device_node *cpunode;
 	static u32 mask = 0;
 
 	/* use cached value if available */
@@ -603,20 +602,8 @@ static u32 cpc925_cpu_mask_disabled(void)
 
 	mask = APIMASK_ADI0 | APIMASK_ADI1;
 
-	cpus = of_find_node_by_path("/cpus");
-	if (cpus == NULL) {
-		cpc925_printk(KERN_DEBUG, "No /cpus node !\n");
-		return 0;
-	}
-
-	while ((cpunode = of_get_next_child(cpus, cpunode)) != NULL) {
+	for_each_of_cpu_node(cpunode) {
 		const u32 *reg = of_get_property(cpunode, "reg", NULL);
-
-		if (strcmp(cpunode->type, "cpu")) {
-			cpc925_printk(KERN_ERR, "Not a cpu node in /cpus: %s\n", cpunode->name);
-			continue;
-		}
-
 		if (reg == NULL || *reg > 2) {
 			cpc925_printk(KERN_ERR, "Bad reg value at %pOF\n", cpunode);
 			continue;
@@ -633,9 +620,6 @@ static u32 cpc925_cpu_mask_disabled(void)
 				"Assuming PI id is equal to CPU MPIC id!\n");
 	}
 
-	of_node_put(cpunode);
-	of_node_put(cpus);
-
 	return mask;
 }
 

--
2.17.1

maintainer
#38 lore raw

Re: [PATCH 18/21] edac: cpc925: use for_each_of_cpu_node iterator

Quoted 11 lines · Rob Herring

Use the for_each_of_cpu_node iterator to iterate over cpu nodes. This has the side effect of defaulting to iterating using "cpu" node names in preference to the deprecated (for FDT) device_type == "cpu".

Cc Borislav Petkov <[email protected]>
Cc Mauro Carvalho Chehab <[email protected]>

---
Please ack and I will take via the DT tree. This is dependent on the first 2 patches.

Completely unknown territory for me so I'd trust your judgement. Staring at 1/21, the conversion looks ok except the removal of those prints that a cpu nodes are not present - I wonder if they even meant anything or were just there during driver development...

Quoted 18 lines
 drivers/edac/cpc925_edac.c | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)
drivers/edac/cpc925_edac.c +1 -2
index 2c98e020df05..3c0881ac9880 100644
@@ -593,8 +593,7 @@ static void cpc925_mc_check(struct mem_ctl_info *mci)
 /******************** CPU err device********************************/
 static u32 cpc925_cpu_mask_disabled(void)
 {
-	struct device_node *cpus;
-	struct device_node *cpunode = NULL;
+	struct device_node *cpunode;
 	static u32 mask = 0;
 
 	/* use cached value if available */

drivers/edac/cpc925_edac.c static u32 cpc925_cpu_mask_disabled(void) · line 608

Quoted 6 lines
drivers/edac/cpc925_edac.c +0 -3
@@ -603,20 +602,8 @@ static u32 cpc925_cpu_mask_disabled(void)
 
 	mask = APIMASK_ADI0 | APIMASK_ADI1;
 
-	cpus = of_find_node_by_path("/cpus");
-	if (cpus == NULL) {
-		cpc925_printk(KERN_DEBUG, "No /cpus node !\n");

This thing...

drivers/edac/cpc925_edac.c static u32 cpc925_cpu_mask_disabled(void) · line 616

Quoted 9 lines
drivers/edac/cpc925_edac.c +1 -7
-		return 0;
-	}
-
-	while ((cpunode = of_get_next_child(cpus, cpunode)) != NULL) {
+	for_each_of_cpu_node(cpunode) {
 		const u32 *reg = of_get_property(cpunode, "reg", NULL);
-
-		if (strcmp(cpunode->type, "cpu")) {
-			cpc925_printk(KERN_ERR, "Not a cpu node in /cpus: %s\n", cpunode->name);

... and this thing.

Thx.

Signature · 4 lines
Regards/Gruss,
    Boris.

Good mailing practices for 400: avoid top-posting and trim the reply.
author maintainer
#39 lore raw

Re: [PATCH 18/21] edac: cpc925: use for_each_of_cpu_node iterator

Quoted 14 lines · Borislav Petkov
Quoted 11 lines · Rob Herring

Use the for_each_of_cpu_node iterator to iterate over cpu nodes. This has the side effect of defaulting to iterating using "cpu" node names in preference to the deprecated (for FDT) device_type == "cpu".

Cc Borislav Petkov <[email protected]>
Cc Mauro Carvalho Chehab <[email protected]>

---
Please ack and I will take via the DT tree. This is dependent on the first 2 patches.

Quoted 4 lines

Completely unknown territory for me so I'd trust your judgement. Staring at 1/21, the conversion looks ok except the removal of those prints that a cpu nodes are not present - I wonder if they even meant anything or were just there during driver development...

I should have noted this. It's not the kernel's job to validate the DT and certainly not some driver's job to validate cpu nodes. It's bad enough that some random driver is parsing cpu nodes. If they are missing or are crap, you should get warnings or messages well before this point.

Rob

maintainer Acked-by
#40 lore raw

Re: [PATCH 18/21] edac: cpc925: use for_each_of_cpu_node iterator

Quoted 5 lines · Rob Herring

I should have noted this. It's not the kernel's job to validate the DT and certainly not some driver's job to validate cpu nodes. It's bad enough that some random driver is parsing cpu nodes. If they are missing or are crap, you should get warnings or messages well before this point.

That is useful info for the commit message, I'd say.

In any case:

Signature · 4 lines
Regards/Gruss,
    Boris.

Good mailing practices for 400: avoid top-posting and trim the reply.
author maintainer
#41 lore raw

PATCH 19/21 iommu: fsl_pamu: use for_each_of_cpu_node iterator

In reply to Rob Herring

Use the for_each_of_cpu_node iterator to iterate over cpu nodes. This has the side effect of defaulting to iterating using "cpu" node names in preference to the deprecated (for FDT) device_type == "cpu".

Cc Joerg Roedel <[email protected]>
Cc iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org

---
Please ack and I will take via the DT tree. This is dependent on the first 2 patches.

 drivers/iommu/fsl_pamu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/fsl_pamu.c +1 -1
index 8540625796a1..1b955aea44dd 100644
@@ -543,7 +543,7 @@ u32 get_stash_id(u32 stash_dest_hint, u32 vcpu)
 		return ~(u32)0;
 	}
 
-	for_each_node_by_type(node, "cpu") {
+	for_each_of_cpu_node(node) {
 		prop = of_get_property(node, "reg", &len);
 		for (i = 0; i < len / sizeof(u32); i++) {
 			if (be32_to_cpup(&prop[i]) == vcpu) {

--
2.17.1

author maintainer
#42 lore raw

PATCH 20/21 of: use for_each_of_cpu_node iterator

In reply to Rob Herring

Use the for_each_of_cpu_node iterator to iterate over cpu nodes. This has the side effect of defaulting to iterating using "cpu" node names in preference to the deprecated (for FDT) device_type == "cpu".

---
Please ack and I will take via the DT tree. This is dependent on the first 2 patches.

 drivers/of/base.c    |  2 +-
 drivers/of/of_numa.c | 15 ++-------------
 2 files changed, 3 insertions(+), 14 deletions(-)
drivers/of/base.c +1 -1
index 6389aeb2f48c..8285c07cab44 100644
@@ -389,7 +389,7 @@ struct device_node *of_get_cpu_node(int cpu, unsigned int *thread)
 {
 	struct device_node *cpun;
 
-	for_each_node_by_type(cpun, "cpu") {
+	for_each_of_cpu_node(cpun) {
 		if (arch_find_n_match_cpu_physical_id(cpun, cpu, thread))
 			return cpun;
 	}
drivers/of/of_numa.c +2 -13
index 27d9b4bba535..f165fe28f49d 100644
@@ -24,18 +24,9 @@ static void __init of_numa_parse_cpu_nodes(void)
 {
 	u32 nid;
 	int r;
-	struct device_node *cpus;
-	struct device_node *np = NULL;
-
-	cpus = of_find_node_by_path("/cpus");
-	if (!cpus)
-		return;
-
-	for_each_child_of_node(cpus, np) {
-		/* Skip things that are not CPUs */
-		if (of_node_cmp(np->type, "cpu") != 0)
-			continue;
+	struct device_node *np;
 
+	for_each_of_cpu_node(np) {
 		r = of_property_read_u32(np, "numa-node-id", &nid);
 		if (r)
 			continue;
@@ -46,8 +37,6 @@ static void __init of_numa_parse_cpu_nodes(void)
 		else
 			node_set(nid, numa_nodes_parsed);
 	}
-
-	of_node_put(cpus);
 }
 
 static int __init of_numa_parse_memory_nodes(void)

--
2.17.1

#43 lore raw

NXP P50XX/e5500 secondary CPUs not onlined with current mainline (was [PATCH 20/21] of: use for_each_of_cpu_node iterator)

Hi Rob,

This change is breaking some powerpc machines, ...

Quoted 20 lines · Rob Herring

Use the for_each_of_cpu_node iterator to iterate over cpu nodes. This has the side effect of defaulting to iterating using "cpu" node names in preference to the deprecated (for FDT) device_type == "cpu".

---
Please ack and I will take via the DT tree. This is dependent on the first 2 patches.

 drivers/of/base.c    |  2 +-
 drivers/of/of_numa.c | 15 ++-------------
 2 files changed, 3 insertions(+), 14 deletions(-)
drivers/of/base.c +0 -0
index 6389aeb2f48c..8285c07cab44 100644

drivers/of/base.c struct device_node *of_get_cpu_node(int cpu, unsigned int *thread) · line 395

Quoted 8 lines
drivers/of/base.c +1 -1
@@ -389,7 +389,7 @@ struct device_node *of_get_cpu_node(int cpu, unsigned int *thread)
 {
 	struct device_node *cpun;
 
-	for_each_node_by_type(cpun, "cpu") {
+	for_each_of_cpu_node(cpun) {
 		if (arch_find_n_match_cpu_physical_id(cpun, cpu, thread))
 			return cpun;
 	}

Previously we just looked for any node with a type of "cpu", but now we're using for_each_of_cpu_node(), which does:

	for (; next; next = next->sibling) {
		if (!(of_node_name_eq(next, "cpu") ||
		      (next->type && !of_node_cmp(next->type, "cpu"))))
			continue;

		if (!__of_device_is_available(next))
			continue;
                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

		if (of_node_get(next))
			break;
	}

ie. the available check is new.

On this machine the 2nd CPU is not marked as available:

  root@p5020ds:/proc/device-tree/cpus/PowerPC,e5500@1# lsprop status 
  status           "disabled"

This has the effect of preventing the SMP code from finding the 2nd CPU in order to bring it up (in smp_85xx_start_cpu()). And so only the boot CPU is onlined.

The device tree is built from a dts:

arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi

But we don't set the status in there, so presumably u-boot is changing the status during boot? (not a u-boot expert).

We could work around this in the platform code presumably, but I'm worried this might break other things as well. You didn't mention the addition of the available check in the change log so I wonder if it was deliberate or just seemed like a good idea?

cheers

author maintainer
#44 lore raw

Re: NXP P50XX/e5500 secondary CPUs not onlined with current mainline (was [PATCH 20/21] of: use for_each_of_cpu_node iterator)

Quoted 63 lines · Michael Ellerman

Hi Rob,

This change is breaking some powerpc machines, ...

Quoted 20 lines · Rob Herring

Use the for_each_of_cpu_node iterator to iterate over cpu nodes. This has the side effect of defaulting to iterating using "cpu" node names in preference to the deprecated (for FDT) device_type == "cpu".

---
Please ack and I will take via the DT tree. This is dependent on the first 2 patches.

 drivers/of/base.c    |  2 +-
 drivers/of/of_numa.c | 15 ++-------------
 2 files changed, 3 insertions(+), 14 deletions(-)
drivers/of/base.c +0 -0
index 6389aeb2f48c..8285c07cab44 100644

drivers/of/base.c struct device_node *of_get_cpu_node(int cpu, unsigned int *thread) · line 395

Quoted 8 lines
drivers/of/base.c +1 -1
@@ -389,7 +389,7 @@ struct device_node *of_get_cpu_node(int cpu, unsigned int *thread)
 {
      struct device_node *cpun;
 
-     for_each_node_by_type(cpun, "cpu") {
+     for_each_of_cpu_node(cpun) {
              if (arch_find_n_match_cpu_physical_id(cpun, cpu, thread))
                      return cpun;
      }

Previously we just looked for any node with a type of "cpu", but now we're using for_each_of_cpu_node(), which does:

        for (; next; next = next->sibling) {
                if (!(of_node_name_eq(next, "cpu") ||
                      (next->type && !of_node_cmp(next->type, "cpu"))))
                        continue;

                if (!__of_device_is_available(next))
                        continue;
                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

                if (of_node_get(next))
                        break;
        }

ie. the available check is new.

On this machine the 2nd CPU is not marked as available:

  root@p5020ds:/proc/device-tree/cpus/PowerPC,e5500@1# lsprop status
  status           "disabled"

This has the effect of preventing the SMP code from finding the 2nd CPU in order to bring it up (in smp_85xx_start_cpu()). And so only the boot CPU is onlined.

Quoted 6 lines

The device tree is built from a dts:

arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi

But we don't set the status in there, so presumably u-boot is changing the status during boot? (not a u-boot expert).

Ah, status for cpus is a bit different. For most nodes, it should be equivalent to the node not being present, but for cpus it means offline if disabled. Though ARM platforms have never used it in that way.

Quoted 4 lines

We could work around this in the platform code presumably, but I'm worried this might break other things as well. You didn't mention the addition of the available check in the change log so I wonder if it was deliberate or just seemed like a good idea?

Just seemed like a good idea...

I'll send a patch now dropping those 2 lines.

Rob

#45 lore raw

Re: NXP P50XX/e5500 secondary CPUs not onlined with current mainline (was [PATCH 20/21] of: use for_each_of_cpu_node iterator)

Quoted 63 lines · Rob Herring
Quoted 62 lines · Michael Ellerman
Quoted 20 lines · Rob Herring

Use the for_each_of_cpu_node iterator to iterate over cpu nodes. This has the side effect of defaulting to iterating using "cpu" node names in preference to the deprecated (for FDT) device_type == "cpu".

---
Please ack and I will take via the DT tree. This is dependent on the first 2 patches.

 drivers/of/base.c    |  2 +-
 drivers/of/of_numa.c | 15 ++-------------
 2 files changed, 3 insertions(+), 14 deletions(-)
drivers/of/base.c +0 -0
index 6389aeb2f48c..8285c07cab44 100644

drivers/of/base.c struct device_node *of_get_cpu_node(int cpu, unsigned int *thread) · line 395

Quoted 8 lines
drivers/of/base.c +1 -1
@@ -389,7 +389,7 @@ struct device_node *of_get_cpu_node(int cpu, unsigned int *thread)
 {
      struct device_node *cpun;
 
-     for_each_node_by_type(cpun, "cpu") {
+     for_each_of_cpu_node(cpun) {
              if (arch_find_n_match_cpu_physical_id(cpun, cpu, thread))
                      return cpun;
      }

Previously we just looked for any node with a type of "cpu", but now we're using for_each_of_cpu_node(), which does:

        for (; next; next = next->sibling) {
                if (!(of_node_name_eq(next, "cpu") ||
                      (next->type && !of_node_cmp(next->type, "cpu"))))
                        continue;

                if (!__of_device_is_available(next))
                        continue;
                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

                if (of_node_get(next))
                        break;
        }

ie. the available check is new.

On this machine the 2nd CPU is not marked as available:

  root@p5020ds:/proc/device-tree/cpus/PowerPC,e5500@1# lsprop status
  status           "disabled"

This has the effect of preventing the SMP code from finding the 2nd CPU in order to bring it up (in smp_85xx_start_cpu()). And so only the boot CPU is onlined.

The device tree is built from a dts:

arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi

Quoted 7 lines
Quoted 2 lines

But we don't set the status in there, so presumably u-boot is changing the status during boot? (not a u-boot expert).

Ah, status for cpus is a bit different. For most nodes, it should be equivalent to the node not being present, but for cpus it means offline if disabled. Though ARM platforms have never used it in that way.

Aha. We don't use it like that on server CPUs either, so perhaps it's just a u-boot thing.

Quoted 6 lines
Quoted 4 lines

We could work around this in the platform code presumably, but I'm worried this might break other things as well. You didn't mention the addition of the available check in the change log so I wonder if it was deliberate or just seemed like a good idea?

Just seemed like a good idea...

Yeah fair enough.

Quoted 1 line

I'll send a patch now dropping those 2 lines.

Awesome, thanks.

cheers

author maintainer
#46 lore raw

PATCH 21/21 fbdev: fsl-diu: get cpu node with of_get_cpu_node

In reply to Rob Herring

"device_type" use is deprecated for FDT though it has continued to be used for nodes like cpu nodes. Use of_get_cpu_node() instead which works using node names by default. This will allow the eventually removal of cpu device_type properties.

---
Please ack and I will take via the DT tree. This is dependent on the first 2 patches.

 drivers/video/fbdev/fsl-diu-fb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/fsl-diu-fb.c +1 -1
index bc9eb8afc313..332a56b6811f 100644
@@ -1925,7 +1925,7 @@ static int __init fsl_diu_init(void)
 	pr_info("Freescale Display Interface Unit (DIU) framebuffer driver\n");
 
 #ifdef CONFIG_NOT_COHERENT_CACHE
-	np = of_find_node_by_type(NULL, "cpu");
+	np = of_get_cpu_node(0, NULL);
 	if (!np) {
 		pr_err("fsl-diu-fb: can't find 'cpu' device node\n");
 		return -ENODEV;

--
2.17.1
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

maintainer Acked-by on v1 21/21
#47 lore raw

Re: [PATCH 21/21] fbdev: fsl-diu: get cpu node with of_get_cpu_node

drivers/video/fbdev/fsl-diu-fb.c static int __init fsl_diu_init(void) · line 1928

Quoted 3 lines · Rob Herring
  #ifdef CONFIG_NOT_COHERENT_CACHE
drivers/video/fbdev/fsl-diu-fb.c +1 -1
-	np = of_find_node_by_type(NULL, "cpu");
+	np = of_get_cpu_node(0, NULL);

This #ifdef means that it's only compiled on an MPC5121, which is a very dead platform. of_get_cpu_node() looks okay to me, but I'm going to have to assume that you know what you're doing.

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

A message that is not in the archive (sent off-list or not yet received): 20180905193738.19325-1-robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org

#49 lore raw

Hi Rob,

2018-09-05 21:37 GMT+02:00 Rob Herring <[email protected]>:

Quoted 10 lines

This series adds an iterator for cpu nodes and converts users over to use it or of_get_cpu_node in some cases. This allows us to remove the dependency on device_type property for cpu nodes though removing that from DTS files will have to wait for some time. In some cases, this makes the DT search more strict by only looking in /cpus child nodes rather than any node with the device_type == cpu. The iterator also honors the status property which is often forgotten.

I've only tested on ARM under QEMU and compiled powerpc.

Do you have this somewhere in your tree not to apply 21 patches by hand?

Thanks,
Michal

author maintainer
#50 lore raw
Quoted 13 lines · Michal Simek

Hi Rob,

2018-09-05 21:37 GMT+02:00 Rob Herring <[email protected]>:

Quoted 9 lines

This series adds an iterator for cpu nodes and converts users over to use it or of_get_cpu_node in some cases. This allows us to remove the dependency on device_type property for cpu nodes though removing that from DTS files will have to wait for some time. In some cases, this makes the DT search more strict by only looking in /cpus child nodes rather than any node with the device_type == cpu. The iterator also honors the status property which is often forgotten.

Quoted 5 lines
Quoted 1 line

I've only tested on ARM under QEMU and compiled powerpc.

Do you have this somewhere in your tree not to apply 21 patches by hand?

Yes, dt/cpu-type branch on my kernel.org tree.

Rob