Unverified Commit f9a619eb authored Nov 08, 2023 by Palmer Dabbelt

Merge patch series "Linux RISC-V AIA Preparatory Series"

These two  ended up in the AIA series, but they're really independent
improvements.

* b4-shazam-merge:
  of: property: Add fw_devlink support for msi-parent
  RISC-V: Don't fail in riscv_of_parent_hartid() for disabled HARTs

Link: https://lore.kernel.org/r/20231027154254.355853-1-apatel@ventanamicro.com


Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>

parents 05942f78 c5e4ce9d

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;
		}
		}

drivers/of/property.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1267,6 +1267,7 @@ DEFINE_SIMPLE_PROP(resets, "resets", "#reset-cells")
		DEFINE_SIMPLE_PROP(leds, "leds", NULL)
		DEFINE_SIMPLE_PROP(backlight, "backlight", NULL)
		DEFINE_SIMPLE_PROP(panel, "panel", NULL)
		DEFINE_SIMPLE_PROP(msi_parent, "msi-parent", "#msi-cells")
		DEFINE_SUFFIX_PROP(regulators, "-supply", NULL)
		DEFINE_SUFFIX_PROP(gpio, "-gpio", "#gpio-cells")

		@@ -1356,6 +1357,7 @@ static const struct supplier_bindings of_supplier_bindings[] = {
		{ .parse_prop = parse_leds, },
		{ .parse_prop = parse_backlight, },
		{ .parse_prop = parse_panel, },
		{ .parse_prop = parse_msi_parent, },
		{ .parse_prop = parse_gpio_compat, },
		{ .parse_prop = parse_interrupts, },
		{ .parse_prop = parse_regulators, },