| Message ID | 20230822051938.2852567-1-aniketmaurya@google.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | i3c: master: Fix SETDASA process | expand |
On Tue, 22 Aug 2023 05:19:38 +0000, Aniket wrote: > When a I3C DT node has a static_addr and an init_dyn_addr,the > init_dyn_addr is reserved in i3c_master_bus_init() and then > the static_addr is reserved in i3c_master_early_i3c_dev_add(). > But if the dynamic address is same as static then above > procedure would fail. > Add a check to pass i3c_bus_get_addr_slot_status() when static > and dynamic address are equal. > > [...] Applied, thanks! [1/1] i3c: master: Fix SETDASA process commit: c6a7550458922181bb922863d5f5feaf3c453fe5 Best regards,
diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c index 08aeb69a7800..87283e4a4607 100644 --- a/drivers/i3c/master.c +++ b/drivers/i3c/master.c @@ -1308,7 +1308,11 @@ static int i3c_master_get_i3c_addrs(struct i3c_dev_desc *dev) if (dev->info.static_addr) { status = i3c_bus_get_addr_slot_status(&master->bus, dev->info.static_addr); - if (status != I3C_ADDR_SLOT_FREE) + /* Since static address and assigned dynamic address can be + * equal, allow this case to pass. + */ + if (status != I3C_ADDR_SLOT_FREE && + dev->info.static_addr != dev->boardinfo->init_dyn_addr) return -EBUSY; i3c_bus_set_addr_slot_status(&master->bus,
When a I3C DT node has a static_addr and an init_dyn_addr,the init_dyn_addr is reserved in i3c_master_bus_init() and then the static_addr is reserved in i3c_master_early_i3c_dev_add(). But if the dynamic address is same as static then above procedure would fail. Add a check to pass i3c_bus_get_addr_slot_status() when static and dynamic address are equal. Signed-off-by: Aniket <aniketmaurya@google.com> --- drivers/i3c/master.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)