| From 109b9ff86d974f9e2df01bcb9c937d6db0250863 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 9 Sep 2021 18:14:45 -0700 |
| Subject: of: property: Disable fw_devlink DT support for X86 |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Saravana Kannan <saravanak@google.com> |
| |
| [ Upstream commit 4a48b66b3f52aa1a8aaa8a8863891eed35769731 ] |
| |
| 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/3c1f2473-92ad-bfc4-258e-a5a08ad73dd0@web.de/ |
| |
| Fixes: ea718c699055 ("Revert "Revert "driver core: Set fw_devlink=on by default""") |
| Signed-off-by: Saravana Kannan <saravanak@google.com> |
| Cc: Andre Muller <andre.muller@web.de> |
| Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Tested-by: Andre MΓΌller <andre.muller@web.de> |
| Link: https://lore.kernel.org/r/20210910011446.3208894-1-saravanak@google.com |
| Signed-off-by: Rob Herring <robh@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/of/property.c | 3 +++ |
| 1 file changed, 3 insertions(+) |
| |
| diff --git a/drivers/of/property.c b/drivers/of/property.c |
| index 6c028632f425..0b9c2fb843e7 100644 |
| --- a/drivers/of/property.c |
| +++ b/drivers/of/property.c |
| @@ -1434,6 +1434,9 @@ static int of_fwnode_add_links(struct fwnode_handle *fwnode) |
| struct property *p; |
| struct device_node *con_np = to_of_node(fwnode); |
| |
| + if (IS_ENABLED(CONFIG_X86)) |
| + return 0; |
| + |
| if (!con_np) |
| return -EINVAL; |
| |
| -- |
| 2.33.0 |
| |