UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: Use of_get_cpu_hwid() 

Replace the open coded parsing of CPU nodes' 'reg' property with
of_get_cpu_hwid().

This change drops an error message for missing 'reg' property, but that
should not be necessary as the DT tools will ensure 'reg' is present.

Cc: Russell King <linux@armlinux.org.uk>
Signed-off-by: Rob Herring <robh@kernel.org>
Tested-by: Florian Fainelli <f.fainelli@gmail.com>
Link: https://lore.kernel.org/r/20211006164332.1981454-3-robh@kernel.org
This commit is contained in:
Rob Herring 2021-10-06 11:43:22 -05:00
parent 795e92ec5f
commit ca96bbe246
1 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arch/arm/kernel/devtree.c
View File

@ -84,33 +84,15 @@ void __init arm_dt_init_cpu_maps(void)
return; return;
for_each_of_cpu_node(cpu) { for_each_of_cpu_node(cpu) {
const __be32 *cell; u32 hwid = of_get_cpu_hwid(cpu, 0);
int prop_bytes;
u32 hwid;
pr_debug(" * %pOF...\n", cpu); pr_debug(" * %pOF...\n", cpu);
/*
* A device tree containing CPU nodes with missing "reg"
* properties is considered invalid to build the
* cpu_logical_map.
*/
cell = of_get_property(cpu, "reg", &prop_bytes);
if (!cell || prop_bytes < sizeof(*cell)) {
pr_debug(" * %pOF missing reg property\n", cpu);
of_node_put(cpu);
return;
}
/* /*
* Bits n:24 must be set to 0 in the DT since the reg property * Bits n:24 must be set to 0 in the DT since the reg property
* defines the MPIDR[23:0]. * defines the MPIDR[23:0].
*/ */
do { if (hwid & ~MPIDR_HWID_BITMASK) {
hwid = be32_to_cpu(*cell++);
prop_bytes -= sizeof(*cell);
} while (!hwid && prop_bytes > 0);
if (prop_bytes || (hwid & ~MPIDR_HWID_BITMASK)) {
of_node_put(cpu); of_node_put(cpu);
return; return;
} }