Merge tag 'i3c/for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux

Pull i3c updates from Boris Brezillon: "Core changes: - Export i3c_device_match_id() so driver can get per-device data - Add addr and lvr fields to i2c_dev_desc so we can attach I2C devices that are not described in the DT - Add a missing of_node_put() - Fix a memory leak - Use dev_to_i3cmaster() instead of open-coding it Driver changes: - Use for_each_set_bit() in the Cadence driver" * tag 'i3c/for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux: i3c: master: Use dev_to_i3cmaster() i3c: master: fix a memory leak bug i3c: add addr and lvr to i2c_dev_desc structure i3c: master: cdns: Use for_each_set_bit() i3c: master: Add of_node_put() before return i3c: move i3c_device_match_id to device.c and export it

Linus Torvalds committed 7 years ago

Commit 31dda852 parents aa62325 6030f426 files · +90 −73Browse files

Unified · Split

6 files

drivers/i3c/device.c +53 −0
drivers/i3c/master.c +14 −53
drivers/i3c/master/dw-i3c-master.c +2 −2
drivers/i3c/master/i3c-master-cdns.c +12 −18
include/linux/i3c/device.h +4 −0
include/linux/i3c/master.h +5 −0

drivers/i3c/device.c+53−0

@@ -200,6 +200,59 @@ struct i3c_device dev_to_i3cdev(struct device dev) · 199 unmodified lines
200	}	200	}
201	EXPORT_SYMBOL_GPL(dev_to_i3cdev);	201	EXPORT_SYMBOL_GPL(dev_to_i3cdev);
202		202
		203	/**
		204	* i3c_device_match_id() - Returns the i3c_device_id entry matching @i3cdev
		205	* @i3cdev: I3C device
		206	* @id_table: I3C device match table
		207	*
		208	* Return: a pointer to an i3c_device_id object or NULL if there's no match.
		209	*/
		210	const struct i3c_device_id *
		211	i3c_device_match_id(struct i3c_device *i3cdev,
		212	const struct i3c_device_id *id_table)
		213	{
		214	struct i3c_device_info devinfo;
		215	const struct i3c_device_id *id;
		216
		217	i3c_device_get_info(i3cdev, &devinfo);
		218
		219	/*
		220	* The lower 32bits of the provisional ID is just filled with a random
		221	* value, try to match using DCR info.
		222	*/
		223	if (!I3C_PID_RND_LOWER_32BITS(devinfo.pid)) {
		224	u16 manuf = I3C_PID_MANUF_ID(devinfo.pid);
		225	u16 part = I3C_PID_PART_ID(devinfo.pid);
		226	u16 ext_info = I3C_PID_EXTRA_INFO(devinfo.pid);
		227
		228	/* First try to match by manufacturer/part ID. */
		229	for (id = id_table; id->match_flags != 0; id++) {
		230	if ((id->match_flags & I3C_MATCH_MANUF_AND_PART) !=
		231	I3C_MATCH_MANUF_AND_PART)
		232	continue;
		233
		234	if (manuf != id->manuf_id \|\| part != id->part_id)
		235	continue;
		236
		237	if ((id->match_flags & I3C_MATCH_EXTRA_INFO) &&
		238	ext_info != id->extra_info)
		239	continue;
		240
		241	return id;
		242	}
		243	}
		244
		245	/* Fallback to DCR match. */
		246	for (id = id_table; id->match_flags != 0; id++) {
		247	if ((id->match_flags & I3C_MATCH_DCR) &&
		248	id->dcr == devinfo.dcr)
		249	return id;
		250	}
		251
		252	return NULL;
		253	}
		254	EXPORT_SYMBOL_GPL(i3c_device_match_id);
		255
203	/**	256	/**
204	* i3c_driver_register_with_owner() - register an I3C device driver	257	* i3c_driver_register_with_owner() - register an I3C device driver
205	*	258	*

drivers/i3c/master.c+14−53

 	if (dev->type == &i3c_device_type)
 		return dev_to_i3cdev(dev)->desc;
-	master = container_of(dev, struct i3c_master_controller, dev);
+	master = dev_to_i3cmaster(dev);
 	return master->this;
 }
 	.uevent = i3c_device_uevent,
 };
-static const struct i3c_device_id *
-i3c_device_match_id(struct i3c_device *i3cdev,
-		    const struct i3c_device_id *id_table)
-{
-	struct i3c_device_info devinfo;
-	const struct i3c_device_id *id;
-	i3c_device_get_info(i3cdev, &devinfo);
-	/*
-	 * The lower 32bits of the provisional ID is just filled with a random
-	 * value, try to match using DCR info.
-	 */
-	if (!I3C_PID_RND_LOWER_32BITS(devinfo.pid)) {
-		u16 manuf = I3C_PID_MANUF_ID(devinfo.pid);
-		u16 part = I3C_PID_PART_ID(devinfo.pid);
-		u16 ext_info = I3C_PID_EXTRA_INFO(devinfo.pid);
-		/* First try to match by manufacturer/part ID. */
-		for (id = id_table; id->match_flags != 0; id++) {
-			if ((id->match_flags & I3C_MATCH_MANUF_AND_PART) !=
-			    I3C_MATCH_MANUF_AND_PART)
-				continue;
-			if (manuf != id->manuf_id || part != id->part_id)
-				continue;
-			if ((id->match_flags & I3C_MATCH_EXTRA_INFO) &&
-			    ext_info != id->extra_info)
-				continue;
-			return id;
-		}
-	}
-	/* Fallback to DCR match. */
-	for (id = id_table; id->match_flags != 0; id++) {
-		if ((id->match_flags & I3C_MATCH_DCR) &&
-		    id->dcr == devinfo.dcr)
-			return id;
-	}
-	return NULL;
-}
 static int i3c_device_match(struct device *dev, struct device_driver *drv)
 {
 	struct i3c_device *i3cdev;
 	dev->common.master = master;
 	dev->boardinfo = boardinfo;
+	dev->addr = boardinfo->base.addr;
+	dev->lvr = boardinfo->lvr;
 	return dev;
 }
 	desc = defslvs->slaves;
 	i3c_bus_for_each_i2cdev(bus, i2cdev) {
-		desc->lvr = i2cdev->boardinfo->lvr;
+		desc->lvr = i2cdev->lvr;
-		desc->static_addr = i2cdev->boardinfo->base.addr << 1;
+		desc->static_addr = i2cdev->addr << 1;
 		desc++;
 	}
 	if (ret)
 		goto out;
-	if (dest.payload.len != sizeof(*mwl))
+	if (dest.payload.len != sizeof(*mwl)) {
-		return -EIO;
+		ret = -EIO;
+		goto out;
+	}
 	info->max_write_len = be16_to_cpu(mwl->len);
 				 common.node) {
 		i3c_master_detach_i2c_dev(i2cdev);
 		i3c_bus_set_addr_slot_status(&master->bus,
-					i2cdev->boardinfo->base.addr,
+					     i2cdev->addr,
-					I3C_ADDR_SLOT_FREE);
+					     I3C_ADDR_SLOT_FREE);
 		i3c_master_free_i2c_dev(i2cdev);
 	}
 }
 	for_each_available_child_of_node(i3cbus_np, node) {
 		ret = of_i3c_master_add_dev(master, node);
-		if (ret)
+		if (ret) {
+			of_node_put(node);
 			return ret;
+		}
 	}
 	/*

drivers/i3c/master/dw-i3c-master.c+2−2

@@ -1033,12 +1033,12 @@ static int dw_i3c_master_attach_i2c_dev(struct i2c_dev_desc *dev) · 1032 unmodified lines
1033	return -ENOMEM;	1033	return -ENOMEM;
1034		1034
1035	data->index = pos;	1035	data->index = pos;
1036	master->addrs[pos] = dev->boardinfo->base.addr;	1036	master->addrs[pos] = dev->addr;
1037	master->free_pos &= ~BIT(pos);	1037	master->free_pos &= ~BIT(pos);
1038	i2c_dev_set_master_data(dev, data);	1038	i2c_dev_set_master_data(dev, data);
1039		1039
1040	writel(DEV_ADDR_TABLE_LEGACY_I2C_DEV \|	1040	writel(DEV_ADDR_TABLE_LEGACY_I2C_DEV \|
1041	DEV_ADDR_TABLE_STATIC_ADDR(dev->boardinfo->base.addr),	1041	DEV_ADDR_TABLE_STATIC_ADDR(dev->addr),
1042	master->regs +	1042	master->regs +
1043	DEV_ADDR_TABLE_LOC(master->datstartaddr, data->index));	1043	DEV_ADDR_TABLE_LOC(master->datstartaddr, data->index));
1044		1044

drivers/i3c/master/i3c-master-cdns.c+12−18

 static int cdns_i3c_master_get_rr_slot(struct cdns_i3c_master *master,
 				       u8 dyn_addr)
 {
-	u32 activedevs, rr;
+	unsigned long activedevs;
+	u32 rr;
 	int i;
 	if (!dyn_addr) {
 		return ffs(master->free_rr_slots) - 1;
 	}
-	activedevs = readl(master->regs + DEVS_CTRL) &
+	activedevs = readl(master->regs + DEVS_CTRL) & DEVS_CTRL_DEVS_ACTIVE_MASK;
-		     DEVS_CTRL_DEVS_ACTIVE_MASK;
+	activedevs &= ~BIT(0);
-	for (i = 1; i <= master->maxdevs; i++) {
-		if (!(BIT(i) & activedevs))
-			continue;
+	for_each_set_bit(i, &activedevs, master->maxdevs + 1) {
 		rr = readl(master->regs + DEV_ID_RR0(i));
 		if (!(rr & DEV_ID_RR0_IS_I3C) ||
 		    DEV_ID_RR0_GET_DEV_ADDR(rr) != dyn_addr)
 	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);
 static int cdns_i3c_master_do_daa(struct i3c_master_controller *m)
 {
 	struct cdns_i3c_master *master = to_cdns_i3c_master(m);
-	u32 olddevs, newdevs;
+	unsigned long olddevs, newdevs;
 	int ret, slot;
 	u8 addrs[MAX_DEVS] = { };
 	u8 last_addr = 0;
 	olddevs = readl(master->regs + DEVS_CTRL) & DEVS_CTRL_DEVS_ACTIVE_MASK;
+	olddevs |= BIT(0);
 	/* Prepare RR slots before launching DAA. */
-	for (slot = 1; slot <= master->maxdevs; slot++) {
+	for_each_clear_bit(slot, &olddevs, master->maxdevs + 1) {
-		if (olddevs & BIT(slot))
-			continue;
 		ret = i3c_master_get_free_addr(m, last_addr + 1);
 		if (ret < 0)
 			return -ENOSPC;
 	 * Clear all retaining registers filled during DAA. We already
 	 * have the addressed assigned to them in the addrs array.
 	 */
-	for (slot = 1; slot <= master->maxdevs; slot++) {
+	for_each_set_bit(slot, &newdevs, master->maxdevs + 1)
-		if (newdevs & BIT(slot))
+		i3c_master_add_i3c_dev_locked(m, addrs[slot]);
-			i3c_master_add_i3c_dev_locked(m, addrs[slot]);
-	}
 	/*
 	 * Clear slots that ended up not being used. Can be caused by I3C

include/linux/i3c/device.h+4−0

 struct device *i3cdev_to_dev(struct i3c_device *i3cdev);
 struct i3c_device *dev_to_i3cdev(struct device *dev);
+const struct i3c_device_id *
+i3c_device_match_id(struct i3c_device *i3cdev,
+		    const struct i3c_device_id *id_table);
 static inline void i3cdev_set_drvdata(struct i3c_device *i3cdev,
 				      void *data)
 {

include/linux/i3c/master.h+5−0

  * @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
 	struct i3c_i2c_dev_desc common;
 	const struct i2c_dev_boardinfo *boardinfo;
 	struct i2c_client *dev;
+	u16 addr;
+	u8 lvr;
 };
 /**

Merge tag 'i3c/for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code