Commit 1c410411 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull i3c updates from Alexandre Belloni:
 "There are now more fixes because as stated in my previous pull
  request, people now have access to actual hardware.

  Core:

   - handle IBI in the proper order

  Drivers:

   - cdns: fix status register access

   - mipi-i3c-hci: many fixes now that the driver has been actually
     tested

   - svc: many IBI fixes, correct compatible string, fix hot join corner
     cases"

* tag 'i3c/for-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux: (29 commits)
  i3c: master: handle IBIs in order they came
  i3c: master: mipi-i3c-hci: Fix a kernel panic for accessing DAT_data.
  i3c: master: svc: fix compatibility string mismatch with binding doc
  i3c: master: svc: fix random hot join failure since timeout error
  i3c: master: svc: fix SDA keep low when polling IBIWON timeout happen
  i3c: master: svc: fix check wrong status register in irq handler
  i3c: master: svc: fix ibi may not return mandatory data byte
  i3c: master: svc: fix wrong data return when IBI happen during start frame
  i3c: master: svc: fix race condition in ibi work thread
  i3c: Fix typo "Provisional ID" to "Provisioned ID"
  i3c: Fix potential refcount leak in i3c_master_register_new_i3c_devs
  i3c: mipi-i3c-hci: Resume controller after aborted transfer
  i3c: mipi-i3c-hci: Resume controller explicitly
  i3c: mipi-i3c-hci: Fix missing xfer->completion in hci_cmd_v1_daa()
  i3c: mipi-i3c-hci: Do not unmap region not mapped for transfer
  i3c: mipi-i3c-hci: Set number of SW enabled Ring Bundles earlier
  i3c: mipi-i3c-hci: Fix race between bus cleanup and interrupt
  i3c: mipi-i3c-hci: Set ring start request together with enable
  i3c: mipi-i3c-hci: Remove BUG() when Ring Abort request times out
  i3c: mipi-i3c-hci: Fix out of bounds access in hci_dma_irq_handler
  ...
parents b8cc56d0 9fd00df0

Documentation/ABI/testing/sysfs-bus-i3c

+2 −2
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ What: /sys/bus/i3c/devices/i3c-<bus-id>/pid 
KernelVersion:  5.0

Contact:	linux-i3c@vger.kernel.org

Description:

		PID stands for Provisional ID and is used to uniquely identify

		PID stands for Provisioned ID and is used to uniquely identify

		a device on a bus. This PID contains information about the

		vendor, the part and an instance ID so that several devices of

		the same type can be connected on the same bus.
@@ -123,7 +123,7 @@ What: /sys/bus/i3c/devices/i3c-<bus-id>/<bus-id>-<device-pid>/pid 
KernelVersion:  5.0

Contact:	linux-i3c@vger.kernel.org

Description:

		PID stands for Provisional ID and is used to uniquely identify

		PID stands for Provisioned ID and is used to uniquely identify

		a device on a bus. This PID contains information about the

		vendor, the part and an instance ID so that several devices of

		the same type can be connected on the same bus.

Documentation/devicetree/bindings/i3c/i3c.yaml

+2 −2
Original line number Diff line number Diff line
@@ -125,12 +125,12 @@ patternProperties: 
                minimum: 0

                maximum: 0x7f

              - description: |

                  First half of the Provisional ID (following the PID

                  First half of the Provisioned ID (following the PID

                  definition provided by the I3C specification).



                  Contains the manufacturer ID left-shifted by 1.

              - description: |

                  Second half of the Provisional ID (following the PID

                  Second half of the Provisioned ID (following the PID

                  definition provided by the I3C specification).



                  Contains the ORing of the part ID left-shifted by 16,

Documentation/driver-api/i3c/protocol.rst

+2 −2
Original line number Diff line number Diff line
@@ -71,8 +71,8 @@ During DAA, each I3C device reports 3 important things: 
  related capabilities

* DCR: Device Characteristic Register. This 8-bit register describes the

  functionalities provided by the device

* Provisional ID: A 48-bit unique identifier. On a given bus there should be no

  Provisional ID collision, otherwise the discovery mechanism may fail.

* Provisioned ID: A 48-bit unique identifier. On a given bus there should be no

  Provisioned ID collision, otherwise the discovery mechanism may fail.



I3C slave events

================

drivers/i3c/master.c

+21 −3
Original line number Diff line number Diff line
@@ -1556,9 +1556,11 @@ i3c_master_register_new_i3c_devs(struct i3c_master_controller *master) 
			desc->dev->dev.of_node = desc->boardinfo->of_node;



		ret = device_register(&desc->dev->dev);

		if (ret)

		if (ret) {

			dev_err(&master->dev,

				"Failed to add I3C device (err = %d)\n", ret);

			put_device(&desc->dev->dev);

		}

	}

}
@@ -2340,7 +2342,7 @@ static int i3c_master_i2c_adapter_init(struct i3c_master_controller *master) 
	adap->dev.parent = master->dev.parent;

	adap->owner = master->dev.parent->driver->owner;

	adap->algo = &i3c_master_i2c_algo;

	strncpy(adap->name, dev_name(master->dev.parent), sizeof(adap->name));

	strscpy(adap->name, dev_name(master->dev.parent), sizeof(adap->name));



	/* FIXME: Should we allow i3c masters to override these values? */

	adap->timeout = 1000;
@@ -2403,7 +2405,7 @@ static void i3c_master_unregister_i3c_devs(struct i3c_master_controller *master) 
void i3c_master_queue_ibi(struct i3c_dev_desc *dev, struct i3c_ibi_slot *slot)

{

	atomic_inc(&dev->ibi->pending_ibis);

	queue_work(dev->common.master->wq, &slot->work);

	queue_work(dev->ibi->wq, &slot->work);

}

EXPORT_SYMBOL_GPL(i3c_master_queue_ibi);
@@ -2660,6 +2662,10 @@ int i3c_master_register(struct i3c_master_controller *master, 
	device_initialize(&master->dev);

	dev_set_name(&master->dev, "i3c-%d", i3cbus->id);



	master->dev.dma_mask = parent->dma_mask;

	master->dev.coherent_dma_mask = parent->coherent_dma_mask;

	master->dev.dma_parms = parent->dma_parms;



	ret = of_populate_i3c_bus(master);

	if (ret)

		goto err_put_dev;
@@ -2848,6 +2854,12 @@ int i3c_dev_request_ibi_locked(struct i3c_dev_desc *dev, 
	if (!ibi)

		return -ENOMEM;



	ibi->wq = alloc_ordered_workqueue(dev_name(i3cdev_to_dev(dev->dev)), WQ_MEM_RECLAIM);

	if (!ibi->wq) {

		kfree(ibi);

		return -ENOMEM;

	}



	atomic_set(&ibi->pending_ibis, 0);

	init_completion(&ibi->all_ibis_handled);

	ibi->handler = req->handler;
@@ -2875,6 +2887,12 @@ void i3c_dev_free_ibi_locked(struct i3c_dev_desc *dev) 
		WARN_ON(i3c_dev_disable_ibi_locked(dev));



	master->ops->free_ibi(dev);



	if (dev->ibi->wq) {

		destroy_workqueue(dev->ibi->wq);

		dev->ibi->wq = NULL;

	}



	kfree(dev->ibi);

	dev->ibi = NULL;

}

drivers/i3c/master/dw-i3c-master.c

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ struct dw_i3c_xfer { 
	struct completion comp;

	int ret;

	unsigned int ncmds;

	struct dw_i3c_cmd cmds[];

	struct dw_i3c_cmd cmds[] __counted_by(ncmds);

};



struct dw_i3c_i2c_dev_data {