Skip to content

Commit 4a48b66

Browse files
Saravana Kannanrobherring
authored andcommitted
of: property: Disable fw_devlink DT support for X86
Andre reported fw_devlink=on breaking OLPC XO-1.5 [1]. OLPC XO-1.5 is an X86 system that uses a mix of ACPI and OF to populate devices. The root cause seems to be ISA devices not setting their fwnode field. But trying to figure out how to fix that doesn't seem worth the trouble because the OLPC devicetree is very sparse/limited and fw_devlink only adds the links causing this issue. Considering that there aren't many users of OF in an X86 system, simply fw_devlink DT support for X86. [1] - https://lore.kernel.org/lkml/[email protected]/ Fixes: ea718c6 ("Revert "Revert "driver core: Set fw_devlink=on by default""") Signed-off-by: Saravana Kannan <[email protected]> Cc: Andre Muller <[email protected]> Acked-by: Greg Kroah-Hartman <[email protected]> Tested-by: Andre Müller <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Rob Herring <[email protected]>
1 parent bf9f243 commit 4a48b66

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

drivers/of/property.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1444,6 +1444,9 @@ static int of_fwnode_add_links(struct fwnode_handle *fwnode)
14441444
struct property *p;
14451445
struct device_node *con_np = to_of_node(fwnode);
14461446

1447+
if (IS_ENABLED(CONFIG_X86))
1448+
return 0;
1449+
14471450
if (!con_np)
14481451
return -EINVAL;
14491452

0 commit comments

Comments
 (0)