i3c: add addr and lvr to i2c_dev_desc structure

I need to store address and lvr value for I2C devices without static definition
in DT. This allows secondary master to transmit DEFSLVS command properly.

Main changes between v4 and v5:
- Change in defslvs to use addr and lvr from i2c_dev_desc structure
- Change in CDNS and DW drivers to use addr and lvr from i2c_dev_desc structure

Signed-off-by: Przemyslaw Gaj <pgaj@cadence.com>
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>

4 files changed, 15 insertions, 8 deletions

diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c
index 87d0f349dd37..a38fdf325d30 100644
--- a/drivers/i3c/master.c
+++ b/drivers/i3c/master.c
@@ -600,6 +600,8 @@ i3c_master_alloc_i2c_dev(struct i3c_master_controller *master,
 
         dev->common.master = master;
         dev->boardinfo = boardinfo;
+        dev->addr = boardinfo->base.addr;
+        dev->lvr = boardinfo->lvr;
 
         return dev;
 }
@@ -918,8 +920,8 @@ int i3c_master_defslvs_locked(struct i3c_master_controller *master)
 
         desc = defslvs->slaves;
         i3c_bus_for_each_i2cdev(bus, i2cdev) {
-                desc->lvr = i2cdev->boardinfo->lvr;
-                desc->static_addr = i2cdev->boardinfo->base.addr << 1;
+                desc->lvr = i2cdev->lvr;
+                desc->static_addr = i2cdev->addr << 1;
                 desc++;
         }
 
@@ -1586,8 +1588,8 @@ static void i3c_master_detach_free_devs(struct i3c_master_controller *master)
                                  common.node) {
                 i3c_master_detach_i2c_dev(i2cdev);
                 i3c_bus_set_addr_slot_status(&master->bus,
-                                        i2cdev->boardinfo->base.addr,
-                                        I3C_ADDR_SLOT_FREE);
+                                             i2cdev->addr,
+                                             I3C_ADDR_SLOT_FREE);
                 i3c_master_free_i2c_dev(i2cdev);
         }
 }
diff --git a/drivers/i3c/master/dw-i3c-master.c b/drivers/i3c/master/dw-i3c-master.c
index 09912d75c6d5..b0ff0e12d84c 100644
--- a/drivers/i3c/master/dw-i3c-master.c
+++ b/drivers/i3c/master/dw-i3c-master.c
@@ -1033,12 +1033,12 @@ static int dw_i3c_master_attach_i2c_dev(struct i2c_dev_desc *dev)
                 return -ENOMEM;
 
         data->index = pos;
-        master->addrs[pos] = dev->boardinfo->base.addr;
+        master->addrs[pos] = dev->addr;
         master->free_pos &= ~BIT(pos);
         i2c_dev_set_master_data(dev, data);
 
         writel(DEV_ADDR_TABLE_LEGACY_I2C_DEV |
-               DEV_ADDR_TABLE_STATIC_ADDR(dev->boardinfo->base.addr),
+               DEV_ADDR_TABLE_STATIC_ADDR(dev->addr),
                master->regs +
                DEV_ADDR_TABLE_LOC(master->datstartaddr, data->index));
 
diff --git a/drivers/i3c/master/i3c-master-cdns.c b/drivers/i3c/master/i3c-master-cdns.c
index c8adf1eb7e1e..10db0bf0655a 100644
--- a/drivers/i3c/master/i3c-master-cdns.c
+++ b/drivers/i3c/master/i3c-master-cdns.c
@@ -1003,9 +1003,9 @@ static int cdns_i3c_master_attach_i2c_dev(struct i2c_dev_desc *dev)
         master->free_rr_slots &= ~BIT(slot);
         i2c_dev_set_master_data(dev, data);
 
-        writel(prepare_rr0_dev_address(dev->boardinfo->base.addr),
+        writel(prepare_rr0_dev_address(dev->addr),
                master->regs + DEV_ID_RR0(data->id));
-        writel(dev->boardinfo->lvr, master->regs + DEV_ID_RR2(data->id));
+        writel(dev->lvr, master->regs + DEV_ID_RR2(data->id));
         writel(readl(master->regs + DEVS_CTRL) |
                DEVS_CTRL_DEV_ACTIVE(data->id),
                master->regs + DEVS_CTRL);
diff --git a/include/linux/i3c/master.h b/include/linux/i3c/master.h
index 1f08fa8d69d2..9cb39d901cd5 100644
--- a/include/linux/i3c/master.h
+++ b/include/linux/i3c/master.h
@@ -71,6 +71,9 @@ struct i2c_dev_boardinfo {
  * @common: common part of the I2C device descriptor
  * @boardinfo: pointer to the boardinfo attached to this I2C device
  * @dev: I2C device object registered to the I2C framework
+ * @addr: I2C device address
+ * @lvr: LVR (Legacy Virtual Register) needed by the I3C core to know about
+ *       the I2C device limitations
  *
  * Each I2C device connected on the bus will have an i2c_dev_desc.
  * This object is created by the core and later attached to the controller
@@ -84,6 +87,8 @@ struct i2c_dev_desc {
         struct i3c_i2c_dev_desc common;
         const struct i2c_dev_boardinfo *boardinfo;
         struct i2c_client *dev;
+        u16 addr;
+        u8 lvr;
 };
 
 /**