| Message ID | 1590053542-389-1-git-send-email-pthombar@cadence.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | I3C SETDASA and DAA process fix | expand |
On Thu, 21 May 2020 11:32:22 +0200 Parshuram Thombare <pthombar@cadence.com> wrote: > Boardinfo was lost if I3C object for devices with boardinfo > available are not created or not added to the I3C device list > because of some failure e.g. SETDASA failed, retrieve info failed etc > This patch adds i3c_master_attach_boardinfo which scan boardinfo list > in the master object and 'attach' it to the I3C device object. > > Fixes: 3a379bbcea0a ("i3c: Add core I3C infrastructure") > Signed-off-by: Parshuram Thombare <pthombar@cadence.com> This patch looks good to me. I'll apply it just after the merge window. > --- > drivers/i3c/master.c | 19 +++++++++++++++++-- > 1 file changed, 17 insertions(+), 2 deletions(-) > > diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c > index 5f4bd52121fe..3d995f247cb7 100644 > --- a/drivers/i3c/master.c > +++ b/drivers/i3c/master.c > @@ -1776,6 +1776,21 @@ static void i3c_master_bus_cleanup(struct i3c_master_controller *master) > i3c_master_detach_free_devs(master); > } > > +static void i3c_master_attach_boardinfo(struct i3c_dev_desc *i3cdev) > +{ > + struct i3c_master_controller *master = i3cdev->common.master; > + struct i3c_dev_boardinfo *i3cboardinfo; > + > + list_for_each_entry(i3cboardinfo, &master->boardinfo.i3c, node) { > + if (i3cdev->info.pid != i3cboardinfo->pid) > + continue; > + > + i3cdev->boardinfo = i3cboardinfo; > + i3cdev->info.static_addr = i3cboardinfo->static_addr; > + return; > + } > +} > + > static struct i3c_dev_desc * > i3c_master_search_i3c_dev_duplicate(struct i3c_dev_desc *refdev) > { > @@ -1831,10 +1846,10 @@ int i3c_master_add_i3c_dev_locked(struct i3c_master_controller *master, > if (ret) > goto err_detach_dev; > > + i3c_master_attach_boardinfo(newdev); > + > olddev = i3c_master_search_i3c_dev_duplicate(newdev); > if (olddev) { > - newdev->boardinfo = olddev->boardinfo; > - newdev->info.static_addr = olddev->info.static_addr; > newdev->dev = olddev->dev; > if (newdev->dev) > newdev->dev->desc = newdev;
diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c index 5f4bd52121fe..3d995f247cb7 100644 --- a/drivers/i3c/master.c +++ b/drivers/i3c/master.c @@ -1776,6 +1776,21 @@ static void i3c_master_bus_cleanup(struct i3c_master_controller *master) i3c_master_detach_free_devs(master); } +static void i3c_master_attach_boardinfo(struct i3c_dev_desc *i3cdev) +{ + struct i3c_master_controller *master = i3cdev->common.master; + struct i3c_dev_boardinfo *i3cboardinfo; + + list_for_each_entry(i3cboardinfo, &master->boardinfo.i3c, node) { + if (i3cdev->info.pid != i3cboardinfo->pid) + continue; + + i3cdev->boardinfo = i3cboardinfo; + i3cdev->info.static_addr = i3cboardinfo->static_addr; + return; + } +} + static struct i3c_dev_desc * i3c_master_search_i3c_dev_duplicate(struct i3c_dev_desc *refdev) { @@ -1831,10 +1846,10 @@ int i3c_master_add_i3c_dev_locked(struct i3c_master_controller *master, if (ret) goto err_detach_dev; + i3c_master_attach_boardinfo(newdev); + olddev = i3c_master_search_i3c_dev_duplicate(newdev); if (olddev) { - newdev->boardinfo = olddev->boardinfo; - newdev->info.static_addr = olddev->info.static_addr; newdev->dev = olddev->dev; if (newdev->dev) newdev->dev->desc = newdev;
Boardinfo was lost if I3C object for devices with boardinfo available are not created or not added to the I3C device list because of some failure e.g. SETDASA failed, retrieve info failed etc This patch adds i3c_master_attach_boardinfo which scan boardinfo list in the master object and 'attach' it to the I3C device object. Fixes: 3a379bbcea0a ("i3c: Add core I3C infrastructure") Signed-off-by: Parshuram Thombare <pthombar@cadence.com> --- drivers/i3c/master.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)