i3c: support dynamically added i2c devices

I2C devices can be added to the system dynamically through several
sources other than static board info including device tree overlays and
sysfs i2c new_device.

Add an I2C bus notifier to attach the clients at runtime if they were
not defined in the board info.  For DT devices find the LVR in the reg
property, for user-space new_device additions we synthesize a
conservative setting of no spike filters and fast mode only.

Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Jamie Iles <quic_jiles@quicinc.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lore.kernel.org/r/20220117174816.1963463-3-quic_jiles@quicinc.com

diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c
index 9a09109da8cc63b3989a38e13c79730d2b5c3c9a..6cacbca8cdd0cc56841a3a2420d4ffec1fd50b7f 100644 (file)
--- a/drivers/i3c/master.c
+++ b/drivers/i3c/master.c
@@ -2167,11 +2167,122 @@ static u32 i3c_master_i2c_funcs(struct i2c_adapter *adapter)
        return I2C_FUNC_SMBUS_EMUL | I2C_FUNC_I2C;
 }
 
+static u8 i3c_master_i2c_get_lvr(struct i2c_client *client)
+{
+       /* Fall back to no spike filters and FM bus mode. */
+       u8 lvr = I3C_LVR_I2C_INDEX(2) | I3C_LVR_I2C_FM_MODE;
+
+       if (client->dev.of_node) {
+               u32 reg[3];
+
+               if (!of_property_read_u32_array(client->dev.of_node, "reg",
+                                               reg, ARRAY_SIZE(reg)))
+                       lvr = reg[2];
+       }
+
+       return lvr;
+}
+
+static int i3c_master_i2c_attach(struct i2c_adapter *adap, struct i2c_client *client)
+{
+       struct i3c_master_controller *master = i2c_adapter_to_i3c_master(adap);
+       enum i3c_addr_slot_status status;
+       struct i2c_dev_desc *i2cdev;
+       int ret;
+
+       /* Already added by board info? */
+       if (i3c_master_find_i2c_dev_by_addr(master, client->addr))
+               return 0;
+
+       status = i3c_bus_get_addr_slot_status(&master->bus, client->addr);
+       if (status != I3C_ADDR_SLOT_FREE)
+               return -EBUSY;
+
+       i3c_bus_set_addr_slot_status(&master->bus, client->addr,
+                                    I3C_ADDR_SLOT_I2C_DEV);
+
+       i2cdev = i3c_master_alloc_i2c_dev(master, client->addr,
+                                         i3c_master_i2c_get_lvr(client));
+       if (IS_ERR(i2cdev)) {
+               ret = PTR_ERR(i2cdev);
+               goto out_clear_status;
+       }
+
+       ret = i3c_master_attach_i2c_dev(master, i2cdev);
+       if (ret)
+               goto out_free_dev;
+
+       return 0;
+
+out_free_dev:
+       i3c_master_free_i2c_dev(i2cdev);
+out_clear_status:
+       i3c_bus_set_addr_slot_status(&master->bus, client->addr,
+                                    I3C_ADDR_SLOT_FREE);
+
+       return ret;
+}
+
+static int i3c_master_i2c_detach(struct i2c_adapter *adap, struct i2c_client *client)
+{
+       struct i3c_master_controller *master = i2c_adapter_to_i3c_master(adap);
+       struct i2c_dev_desc *dev;
+
+       dev = i3c_master_find_i2c_dev_by_addr(master, client->addr);
+       if (!dev)
+               return -ENODEV;
+
+       i3c_master_detach_i2c_dev(dev);
+       i3c_bus_set_addr_slot_status(&master->bus, dev->addr,
+                                    I3C_ADDR_SLOT_FREE);
+       i3c_master_free_i2c_dev(dev);
+
+       return 0;
+}
+
 static const struct i2c_algorithm i3c_master_i2c_algo = {
        .master_xfer = i3c_master_i2c_adapter_xfer,
        .functionality = i3c_master_i2c_funcs,
 };
 
+static int i3c_i2c_notifier_call(struct notifier_block *nb, unsigned long action,
+                                void *data)
+{
+       struct i2c_adapter *adap;
+       struct i2c_client *client;
+       struct device *dev = data;
+       struct i3c_master_controller *master;
+       int ret;
+
+       if (dev->type != &i2c_client_type)
+               return 0;
+
+       client = to_i2c_client(dev);
+       adap = client->adapter;
+
+       if (adap->algo != &i3c_master_i2c_algo)
+               return 0;
+
+       master = i2c_adapter_to_i3c_master(adap);
+
+       i3c_bus_maintenance_lock(&master->bus);
+       switch (action) {
+       case BUS_NOTIFY_ADD_DEVICE:
+               ret = i3c_master_i2c_attach(adap, client);
+               break;
+       case BUS_NOTIFY_DEL_DEVICE:
+               ret = i3c_master_i2c_detach(adap, client);
+               break;
+       }
+       i3c_bus_maintenance_unlock(&master->bus);
+
+       return ret;
+}
+
+static struct notifier_block i2cdev_notifier = {
+       .notifier_call = i3c_i2c_notifier_call,
+};
+
 static int i3c_master_i2c_adapter_init(struct i3c_master_controller *master)
 {
        struct i2c_adapter *adap = i3c_master_to_i2c_adapter(master);
@@ -2699,12 +2810,27 @@ void i3c_dev_free_ibi_locked(struct i3c_dev_desc *dev)
 
 static int __init i3c_init(void)
 {
-       return bus_register(&i3c_bus_type);
+       int res = bus_register_notifier(&i2c_bus_type, &i2cdev_notifier);
+
+       if (res)
+               return res;
+
+       res = bus_register(&i3c_bus_type);
+       if (res)
+               goto out_unreg_notifier;
+
+       return 0;
+
+out_unreg_notifier:
+       bus_unregister_notifier(&i2c_bus_type, &i2cdev_notifier);
+
+       return res;
 }
 subsys_initcall(i3c_init);
 
 static void __exit i3c_exit(void)
 {
+       bus_unregister_notifier(&i2c_bus_type, &i2cdev_notifier);
        idr_destroy(&i3c_bus_idr);
        bus_unregister(&i3c_bus_type);
 }