Commit 9c73accf authored Nov 23, 2023 by Anup Patel Committed by Zheng Zengkai Nov 23, 2023

RISC-V: Don't fail in riscv_of_parent_hartid() for disabled HARTs

stable inclusion
from stable-v6.6.2
commit 625046cd1d5fc4c21abf6ede0d30205ecff25d1d
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8IW7G

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=625046cd1d5fc4c21abf6ede0d30205ecff25d1d



--------------------------------

[ Upstream commit c4676f8dc1e12e68d6511f9ed89707fdad4c962c ]

The riscv_of_processor_hartid() used by riscv_of_parent_hartid() fails
for HARTs disabled in the DT. This results in the following warning
thrown by the RISC-V INTC driver for the E-core on SiFive boards:

[    0.000000] riscv-intc: unable to find hart id for /cpus/cpu@0/interrupt-controller

The riscv_of_parent_hartid() is only expected to read the hartid
from the DT so we directly call of_get_cpu_hwid() instead of calling
riscv_of_processor_hartid().

Fixes: ad635e72 ("riscv: cpu: Add 64bit hartid support on RV64")
Signed-off-by: Anup Patel <apatel@ventanamicro.com>
Reviewed-by: Atish Patra <atishp@rivosinc.com>
Link: https://lore.kernel.org/r/20231027154254.355853-2-apatel@ventanamicro.com


Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>

parent 19629c63

arch/riscv/kernel/cpu.c

+6 −5

Original line number	Diff line number	Diff line
		@@ -125,12 +125,13 @@ int __init riscv_early_of_processor_hartid(struct device_node *node, unsigned lo
		*/
		int riscv_of_parent_hartid(struct device_node node, unsigned long hartid)
		{
		int rc;

		for (; node; node = node->parent) {
		if (of_device_is_compatible(node, "riscv")) {
		rc = riscv_of_processor_hartid(node, hartid);
		if (!rc)
		*hartid = (unsigned long)of_get_cpu_hwid(node, 0);
		if (*hartid == ~0UL) {
		pr_warn("Found CPU without hart ID\n");
		return -ENODEV;
		}
		return 0;
		}
		}