Re: [PATCH v3 5/8] driver core: platform: warn on bad fwnode assignment

From: Rafael J. Wysocki (Intel)

Date: Tue Nov 17 2026 - 10:24:58 EST


On Tue, Nov 17, 2026 at 11:13 AM Johan Hovold <johan@xxxxxxxxxx> wrote:
>
> Commit e6054f410c97 ("driver core: platform: amend the API contract for
> fwnode setters") added a warning to platform_device_set_fwnode() in case
> the current firmware node pointer points to a software node as that may
> prevent software_node_notify_remove() from being called.
>
> This is only an issue if the platform device has been registered however
> as software_node_notify() is only called for registered devices. A
> bigger issue is that a secondary firmware node assigned before the call
> may be silently lost (and leaked in case of software nodes) as these
> helpers do not use set_primary_fwnode().
>
> Amend the current software node check, which fails to trigger if the
> device also has a primary non-software node, with a warning in case the
> device already has a secondary firmware node assigned to catch any
> (hard-to-debug) issues due to a secondary node being assigned before the
> call.
>
> Note that this also avoids making claims about the device firmware node
> pointing to the primary firmware node, which is not the case when the
> device only has a secondary node.
>
> Fixes: e6054f410c97 ("driver core: platform: amend the API contract for fwnode setters")
> Cc: Bartosz Golaszewski <bartosz.golaszewski@xxxxxxxxxxxxxxxx>
> Signed-off-by: Johan Hovold <johan@xxxxxxxxxx>

LGTM

Acked-by: Rafael J. Wysocki (Intel) <rafael@xxxxxxxxxx>

> ---
> drivers/base/platform.c | 40 ++++++++++++++++++++++++----------------
> 1 file changed, 24 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/base/platform.c b/drivers/base/platform.c
> index e0b38dbd5acf..06ce980b57b1 100644
> --- a/drivers/base/platform.c
> +++ b/drivers/base/platform.c
> @@ -708,9 +708,10 @@ EXPORT_SYMBOL_GPL(platform_device_add_data);
> *
> * Assign an OF node to this platform device. Internally keep track of the
> * reference count. Devices created with platform_device_alloc() must use this
> - * function instead of assigning the node manually. This function must not be
> - * called for a platform device that already has a software node as its primary
> - * firmware node assigned.
> + * function instead of assigning the node manually.
> + *
> + * This function must not be called for a platform device that already has a
> + * software node or secondary firmware node assigned.
> */
> void platform_device_set_of_node(struct platform_device *pdev,
> struct device_node *np)
> @@ -726,21 +727,24 @@ EXPORT_SYMBOL_GPL(platform_device_set_of_node);
> *
> * Assign a firmware node to this platform device. Internally keep track of the
> * reference count. Devices created with platform_device_alloc() must use this
> - * function instead of assigning the node manually. This function must not be
> - * called for a platform device that already has a software node as its primary
> - * firmware node assigned.
> + * function instead of assigning the node manually.
> + *
> + * This function must not be called for a platform device that already has a
> + * software node or secondary firmware node assigned.
> */
> void platform_device_set_fwnode(struct platform_device *pdev,
> struct fwnode_handle *fwnode)
> {
> + struct fwnode_handle *old = pdev->dev.fwnode;
> +
> /*
> - * If we call this function for a platform device whose primary
> - * firmware node is a software node, we'll never end up calling the
> - * symmetric software_node_notify_remove(). There are no users for this
> - * right now in the tree so just disallow it.
> + * A secondary firmware node may be lost as set_primary_fwnode() is
> + * not used here, and software_node_notify_remove() is not called for
> + * a registered device with a software node, warn for now.
> */
> - WARN_ON(is_software_node(dev_fwnode(&pdev->dev)));
> - fwnode_handle_put(pdev->dev.fwnode);
> + WARN_ON(old && (old->secondary || is_software_node(old)));
> +
> + fwnode_handle_put(old);
> device_set_node(&pdev->dev, fwnode_handle_get(fwnode));
> }
> EXPORT_SYMBOL_GPL(platform_device_set_fwnode);
> @@ -751,15 +755,19 @@ EXPORT_SYMBOL_GPL(platform_device_set_fwnode);
> * @dev2: device whose OF node to reuse
> *
> * Reuses the OF node of another device in this platform device while
> - * internally keeping track of reference counting. This function must not be
> - * called for a platform device that already has a software node as its primary
> - * firmware node assigned.
> + * internally keeping track of reference counting.
> + *
> + * This function must not be called for a platform device that already has a
> + * software node or secondary firmware node assigned.
> */
> void platform_device_set_of_node_from_dev(struct platform_device *pdev,
> const struct device *dev2)
> {
> + struct fwnode_handle *old = pdev->dev.fwnode;
> +
> /* See platform_device_set_fwnode(). */
> - WARN_ON(is_software_node(dev_fwnode(&pdev->dev)));
> + WARN_ON(old && (old->secondary || is_software_node(old)));
> +
> device_set_of_node_from_dev(&pdev->dev, dev2);
> pdev->dev.fwnode = of_fwnode_handle(pdev->dev.of_node);
> }
> --
> 2.56.1
>
>