In order to prepare the introduction of the export symbols node
handling, add a export_symbols_name parameter in of_overlay_fdt_apply().
The export_symbols_name is the name of the export symbols subnode
available in the base node that will be used by the resolver to handle
export symbols resolution.
Having the name of the subnode in parameters instead of the subnode
itself avoid the use of an export symbol node that is not directly
related to the base node.
Signed-off-by: Herve Codina <herve.codina@xxxxxxxxxxx>
---
drivers/misc/lan966x_pci.c | 3 ++-
drivers/of/of_kunit_helpers.c | 2 +-
drivers/of/overlay.c | 7 ++++++-
drivers/of/unittest.c | 4 ++--
include/linux/of.h | 6 ++++--
5 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/drivers/misc/lan966x_pci.c b/drivers/misc/lan966x_pci.c
index 9c79b58137e5..f05cb040ec69 100644
--- a/drivers/misc/lan966x_pci.c
+++ b/drivers/misc/lan966x_pci.c
@@ -128,7 +128,8 @@ static int lan966x_pci_load_overlay(struct lan966x_pci *data)
u32 dtbo_size = __dtbo_lan966x_pci_end - __dtbo_lan966x_pci_begin;
void *dtbo_start = __dtbo_lan966x_pci_begin;
- return of_overlay_fdt_apply(dtbo_start, dtbo_size, &data->ovcs_id, dev_of_node(data->dev));
+ return of_overlay_fdt_apply(dtbo_start, dtbo_size, &data->ovcs_id,
+ dev_of_node(data->dev), NULL);
}
static void lan966x_pci_unload_overlay(struct lan966x_pci *data)
diff --git a/drivers/of/of_kunit_helpers.c b/drivers/of/of_kunit_helpers.c
index 7b3ed5a382aa..476b43474168 100644
--- a/drivers/of/of_kunit_helpers.c
+++ b/drivers/of/of_kunit_helpers.c
@@ -56,7 +56,7 @@ int of_overlay_fdt_apply_kunit(struct kunit *test, void *overlay_fdt,
return -ENOMEM;
ret = of_overlay_fdt_apply(overlay_fdt, overlay_fdt_size,
- ovcs_id, NULL);
+ ovcs_id, NULL, NULL);
if (ret)
return ret;
diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
index 28aa0a133eea..9bceeed45c9f 100644
--- a/drivers/of/overlay.c
+++ b/drivers/of/overlay.c
@@ -964,6 +964,10 @@ static int of_overlay_apply(struct overlay_changeset *ovcs,
* @overlay_fdt_size: number of bytes in @overlay_fdt
* @ret_ovcs_id: pointer for returning created changeset id
* @base: pointer for the target node to apply overlay
+ * @export_symbols_name:
+ * Name of the export symbol subnode of the @base node to
+ * provide extra symbols. Those extra symbols are used in
+ * the overlay symbols resolution.
*
* Creates and applies an overlay changeset.
*
@@ -979,7 +983,8 @@ static int of_overlay_apply(struct overlay_changeset *ovcs,
*/
int of_overlay_fdt_apply(const void *overlay_fdt, u32 overlay_fdt_size,
- int *ret_ovcs_id, const struct device_node *base)
+ int *ret_ovcs_id, const struct device_node *base,
+ const char *export_symbols_name)
{
void *new_fdt;
void *new_fdt_align;
diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c
index e76ac087ea98..f19e15f8b288 100644
--- a/drivers/of/unittest.c
+++ b/drivers/of/unittest.c
@@ -3737,7 +3737,7 @@ static int __init overlay_data_apply(const char *overlay_name, int *ovcs_id)
pr_err("no overlay data for %s\n", overlay_name);
ret = of_overlay_fdt_apply(info->dtbo_begin, size, &info->ovcs_id,
- NULL);
+ NULL, NULL);
if (ovcs_id)
*ovcs_id = info->ovcs_id;
if (ret < 0)
@@ -4077,7 +4077,7 @@ static int testdrv_probe(struct pci_dev *pdev, const struct pci_device_id *id)
}
size = info->dtbo_end - info->dtbo_begin;
- ret = of_overlay_fdt_apply(info->dtbo_begin, size, &ovcs_id, dn);
+ ret = of_overlay_fdt_apply(info->dtbo_begin, size, &ovcs_id, dn, NULL);
of_node_put(dn);
if (ret)
return ret;
diff --git a/include/linux/of.h b/include/linux/of.h
index f921786cb8ac..2ac09b0161fd 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -1747,7 +1747,8 @@ struct of_overlay_notify_data {
#ifdef CONFIG_OF_OVERLAY
int of_overlay_fdt_apply(const void *overlay_fdt, u32 overlay_fdt_size,
- int *ovcs_id, const struct device_node *target_base);
+ int *ovcs_id, const struct device_node *target_base,
+ const char *export_symbols_name);
int of_overlay_remove(int *ovcs_id);
int of_overlay_remove_all(void);
@@ -1757,7 +1758,8 @@ int of_overlay_notifier_unregister(struct notifier_block *nb);
#else
static inline int of_overlay_fdt_apply(const void *overlay_fdt, u32 overlay_fdt_size,
- int *ovcs_id, const struct device_node *target_base)
+ int *ovcs_id, const struct device_node *target_base,
+ const char *export_symbols_name)
{
return -ENOTSUPP;
}
--
2.47.0
