[PATCH v2 1/5] i3c: master: detach and free device if pre_assign_dyn_addr() fails

[Vitor Soares]

On pre_assing_dyn_addr() the devices that fail:
  i3c_master_setdasa_locked()
  i3c_master_reattach_i3c_dev()
  i3c_master_retrieve_dev_info()

are kept in memory and master->bus.devs list. This makes the i3c devices
without a dynamic address are sent on DEFSLVS CCC command. Fix this by
detaching and freeing the devices that fail on pre_assign_dyn_addr().

Signed-off-by: Vitor Soares <vitor.soa...@synopsys.com>
---
Changes in v2:
  - Move out detach/free the i3c_dev_desc from pre_assign_dyn_addr()
  - Convert i3c_master_pre_assign_dyn_addr() to return an int

 drivers/i3c/master.c | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c
index 5f4bd52..586e34f 100644
--- a/drivers/i3c/master.c
+++ b/drivers/i3c/master.c
@@ -1426,19 +1426,19 @@ static void i3c_master_detach_i2c_dev(struct 
i2c_dev_desc *dev)
                master->ops->detach_i2c_dev(dev);
 }
 
-static void i3c_master_pre_assign_dyn_addr(struct i3c_dev_desc *dev)
+static int i3c_master_pre_assign_dyn_addr(struct i3c_dev_desc *dev)
 {
        struct i3c_master_controller *master = i3c_dev_get_master(dev);
        int ret;
 
        if (!dev->boardinfo || !dev->boardinfo->init_dyn_addr ||
            !dev->boardinfo->static_addr)
-               return;
+               return 0;
 
        ret = i3c_master_setdasa_locked(master, dev->info.static_addr,
                                        dev->boardinfo->init_dyn_addr);
        if (ret)
-               return;
+               return ret;
 
        dev->info.dyn_addr = dev->boardinfo->init_dyn_addr;
        ret = i3c_master_reattach_i3c_dev(dev, 0);
@@ -1449,10 +1449,12 @@ static void i3c_master_pre_assign_dyn_addr(struct 
i3c_dev_desc *dev)
        if (ret)
                goto err_rstdaa;
 
-       return;
+       return 0;
 
 err_rstdaa:
        i3c_master_rstdaa_locked(master, dev->boardinfo->init_dyn_addr);
+
+       return ret;
 }
 
 static void
@@ -1647,7 +1649,7 @@ static int i3c_master_bus_init(struct 
i3c_master_controller *master)
        enum i3c_addr_slot_status status;
        struct i2c_dev_boardinfo *i2cboardinfo;
        struct i3c_dev_boardinfo *i3cboardinfo;
-       struct i3c_dev_desc *i3cdev;
+       struct i3c_dev_desc *i3cdev, *i3ctmp;
        struct i2c_dev_desc *i2cdev;
        int ret;
 
@@ -1746,8 +1748,14 @@ static int i3c_master_bus_init(struct 
i3c_master_controller *master)
         * Pre-assign dynamic address and retrieve device information if
         * needed.
         */
-       i3c_bus_for_each_i3cdev(&master->bus, i3cdev)
-               i3c_master_pre_assign_dyn_addr(i3cdev);
+       list_for_each_entry_safe(i3cdev, i3ctmp, &master->bus.devs.i3c,
+                                common.node) {
+               ret = i3c_master_pre_assign_dyn_addr(i3cdev);
+               if (ret) {
+                       i3c_master_detach_i3c_dev(i3cdev);
+                       i3c_master_free_i3c_dev(i3cdev);
+               }
+       }
 
        ret = i3c_master_do_daa(master);
        if (ret)
-- 
2.7.4