Unverified Commit c98f136a authored by Conor Dooley's avatar Conor Dooley Committed by Palmer Dabbelt
Browse files

RISC-V: try new extension properties in of_early_processor_hartid() 



To fully deprecate the kernel's use of "riscv,isa",
of_early_processor_hartid() needs to first try using the new properties,
before falling back to "riscv,isa".

Reviewed-by: default avatarAndrew Jones <ajones@ventanamicro.com>
Signed-off-by: default avatarConor Dooley <conor.dooley@microchip.com>
Link: https://lore.kernel.org/r/20230713-tablet-jimmy-987fea0eb2e1@wendy


Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent 90700a4f

arch/riscv/kernel/cpu.c

+28 −1
Original line number Original line Diff line number Diff line
@@ -61,8 +61,35 @@ int riscv_early_of_processor_hartid(struct device_node *node, unsigned long *har 
		return -ENODEV;

		return -ENODEV;

	}

	}





	if (of_property_read_string(node, "riscv,isa-base", &isa))

		goto old_interface;



	if (IS_ENABLED(CONFIG_32BIT) && strncasecmp(isa, "rv32i", 5)) {

		pr_warn("CPU with hartid=%lu does not support rv32i", *hart);

		return -ENODEV;

	}



	if (IS_ENABLED(CONFIG_64BIT) && strncasecmp(isa, "rv64i", 5)) {

		pr_warn("CPU with hartid=%lu does not support rv64i", *hart);

		return -ENODEV;

	}



	if (!of_property_present(node, "riscv,isa-extensions"))

		return -ENODEV;



	if (of_property_match_string(node, "riscv,isa-extensions", "i") < 0 ||

	    of_property_match_string(node, "riscv,isa-extensions", "m") < 0 ||

	    of_property_match_string(node, "riscv,isa-extensions", "a") < 0) {

		pr_warn("CPU with hartid=%lu does not support ima", *hart);

		return -ENODEV;

	}



	return 0;



old_interface:

	if (of_property_read_string(node, "riscv,isa", &isa)) {

	if (of_property_read_string(node, "riscv,isa", &isa)) {

		pr_warn("CPU with hartid=%lu has no \"riscv,isa\" property\n", *hart);

		pr_warn("CPU with hartid=%lu has no \"riscv,isa-base\" or \"riscv,isa\" property\n",

			*hart);

		return -ENODEV;

		return -ENODEV;

	}

	}