Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit e3d794d5 authored by Johan Hovold's avatar Johan Hovold Committed by Palmer Dabbelt
Browse files

riscv: treat cpu devicetree nodes without status as enabled 



Follow the Linux convention and treat devicetree nodes without a status
property as enabled rather than disabled, while also allowing "ok" as a
shorthand for "okay".

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Reviewed-by: default avatarPaul Walmsley <paul.walmsley@sifive.com>
Signed-off-by: default avatarPalmer Dabbelt <palmer@sifive.com>
parent 149820c6

arch/riscv/kernel/cpu.c

+3 −7
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
 */

int riscv_of_processor_hartid(struct device_node *node)

{

	const char *isa, *status;

	const char *isa;

	u32 hart;



	if (!of_device_is_compatible(node, "riscv")) {
@@ -39,12 +39,8 @@ int riscv_of_processor_hartid(struct device_node *node) 
		return -ENODEV;

	}



	if (of_property_read_string(node, "status", &status)) {

		pr_warn("CPU with hartid=%d has no \"status\" property\n", hart);

		return -ENODEV;

	}

	if (strcmp(status, "okay")) {

		pr_info("CPU with hartid=%d has a non-okay status of \"%s\"\n", hart, status);

	if (!of_device_is_available(node)) {

		pr_info("CPU with hartid=%d is not available\n", hart);

		return -ENODEV;

	}