Skip to content

[drivers] Fix OFW bus conflict and prevent duplicate device creation #11090

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lhxj wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −11
Open

[drivers] Fix OFW bus conflict and prevent duplicate device creation #11090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions components/drivers/core/platform_ofw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* Change Logs:
* Date Author Notes
* 2023-06-04 GuEe-GUI the first version
* 2025-12-25 lhxj fix OFW bus conflict and prevent duplicate device creation
*/

#include <rtthread.h>
Expand Down Expand Up @@ -223,16 +224,14 @@ rt_err_t rt_platform_ofw_request(struct rt_ofw_node *np)

if (dev)
{
/* Was create */
if (dev->drv)
{
/* Was probe OK */
err = RT_EOK;
}
else
{
err = rt_bus_reload_driver_device(dev->bus, dev);
}
/*
* Device was already created (np->dev != NULL).
* - If it's already probed (dev->drv != NULL), nothing to do.
* - If not yet probed (dev->drv == NULL), it belongs to its native bus
* (e.g. I2C/SPI) which will handle probing; platform bus should not reload
* or transfer it, to avoid cross-bus conflicts.
*/
err = RT_EOK;
}
else
{
Expand Down
4 changes: 4 additions & 0 deletions components/drivers/i2c/dev_i2c_bus.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* Change Logs:
* Date Author Notes
* 2022-12-06 GuEe-GUI first version
* 2025-12-25 lhxj mark OFW node as taken to prevent platform bus duplication
*/

#include <rtdevice.h>
Expand Down Expand Up @@ -63,6 +64,9 @@ void i2c_bus_scan_clients(struct rt_i2c_bus_device *bus)

rt_dm_dev_set_name(&client->parent, "%s", client->name);

/* Mark this OFW node as taken to prevent platform bus from creating duplicate device */
i2c_client_np->dev = &client->parent;

rt_i2c_device_register(client);

if (i2c_client_np != child_np)
Expand Down
6 changes: 5 additions & 1 deletion components/drivers/spi/dev_spi_bus.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* Change Logs:
* Date Author Notes
* 2022-12-06 GuEe-GUI first version
* 2025-12-25 lhxj mark OFW node as taken to prevent platform bus duplication; fix cppcheck warning
*/

#include "dev_spi_dm.h"
Expand Down Expand Up @@ -69,6 +70,9 @@ void spi_bus_scan_devices(struct rt_spi_bus *bus)
continue;
}

/* Mark this OFW node as taken to prevent platform bus from creating duplicate device */
spi_dev_np->dev = &spi_dev->parent;

rt_spi_device_register(spi_dev);
}
}
Expand Down Expand Up @@ -163,7 +167,7 @@ static rt_err_t spi_probe(rt_device_t dev)
rt_spidev_device_init(device, rt_dm_dev_get_name(&device->parent));
}

return err;
return RT_EOK;
}

static rt_err_t spi_remove(rt_device_t dev)
Expand Down