Commit 2618280d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull i2c fixes from Wolfram Sang:

 - error path fixes (qcom-geni)

 - polling mode fix (rk3x)

 - target mode state machine fix (aspeed)

* tag 'i2c-for-6.7-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: aspeed: Handle the coalesced stop conditions with the start conditions.
  i2c: rk3x: fix potential spinlock recursion on poll
  i2c: qcom-geni: fix missing clk_disable_unprepare() and geni_se_resources_off()
parents a9ca0330 b4cc1cbb

drivers/i2c/busses/i2c-aspeed.c

+32 −16
Original line number Diff line number Diff line
@@ -249,18 +249,46 @@ static u32 aspeed_i2c_slave_irq(struct aspeed_i2c_bus *bus, u32 irq_status) 
	if (!slave)

		return 0;



	command = readl(bus->base + ASPEED_I2C_CMD_REG);

	/*

	 * Handle stop conditions early, prior to SLAVE_MATCH. Some masters may drive

	 * transfers with low enough latency between the nak/stop phase of the current

	 * command and the start/address phase of the following command that the

	 * interrupts are coalesced by the time we process them.

	 */

	if (irq_status & ASPEED_I2CD_INTR_NORMAL_STOP) {

		irq_handled |= ASPEED_I2CD_INTR_NORMAL_STOP;

		bus->slave_state = ASPEED_I2C_SLAVE_STOP;

	}



	if (irq_status & ASPEED_I2CD_INTR_TX_NAK &&

	    bus->slave_state == ASPEED_I2C_SLAVE_READ_PROCESSED) {

		irq_handled |= ASPEED_I2CD_INTR_TX_NAK;

		bus->slave_state = ASPEED_I2C_SLAVE_STOP;

	}



	/* Propagate any stop conditions to the slave implementation. */

	if (bus->slave_state == ASPEED_I2C_SLAVE_STOP) {

		i2c_slave_event(slave, I2C_SLAVE_STOP, &value);

		bus->slave_state = ASPEED_I2C_SLAVE_INACTIVE;

	}



	/* Slave was requested, restart state machine. */

	/*

	 * Now that we've dealt with any potentially coalesced stop conditions,

	 * address any start conditions.

	 */

	if (irq_status & ASPEED_I2CD_INTR_SLAVE_MATCH) {

		irq_handled |= ASPEED_I2CD_INTR_SLAVE_MATCH;

		bus->slave_state = ASPEED_I2C_SLAVE_START;

	}



	/* Slave is not currently active, irq was for someone else. */

	/*

	 * If the slave has been stopped and not started then slave interrupt

	 * handling is complete.

	 */

	if (bus->slave_state == ASPEED_I2C_SLAVE_INACTIVE)

		return irq_handled;



	command = readl(bus->base + ASPEED_I2C_CMD_REG);

	dev_dbg(bus->dev, "slave irq status 0x%08x, cmd 0x%08x\n",

		irq_status, command);
@@ -279,17 +307,6 @@ static u32 aspeed_i2c_slave_irq(struct aspeed_i2c_bus *bus, u32 irq_status) 
		irq_handled |= ASPEED_I2CD_INTR_RX_DONE;

	}



	/* Slave was asked to stop. */

	if (irq_status & ASPEED_I2CD_INTR_NORMAL_STOP) {

		irq_handled |= ASPEED_I2CD_INTR_NORMAL_STOP;

		bus->slave_state = ASPEED_I2C_SLAVE_STOP;

	}

	if (irq_status & ASPEED_I2CD_INTR_TX_NAK &&

	    bus->slave_state == ASPEED_I2C_SLAVE_READ_PROCESSED) {

		irq_handled |= ASPEED_I2CD_INTR_TX_NAK;

		bus->slave_state = ASPEED_I2C_SLAVE_STOP;

	}



	switch (bus->slave_state) {

	case ASPEED_I2C_SLAVE_READ_REQUESTED:

		if (unlikely(irq_status & ASPEED_I2CD_INTR_TX_ACK))
@@ -324,8 +341,7 @@ static u32 aspeed_i2c_slave_irq(struct aspeed_i2c_bus *bus, u32 irq_status) 
		i2c_slave_event(slave, I2C_SLAVE_WRITE_RECEIVED, &value);

		break;

	case ASPEED_I2C_SLAVE_STOP:

		i2c_slave_event(slave, I2C_SLAVE_STOP, &value);

		bus->slave_state = ASPEED_I2C_SLAVE_INACTIVE;

		/* Stop event handling is done early. Unreachable. */

		break;

	case ASPEED_I2C_SLAVE_START:

		/* Slave was just started. Waiting for the next event. */;

drivers/i2c/busses/i2c-qcom-geni.c

+7 −1
Original line number Diff line number Diff line
@@ -858,6 +858,7 @@ static int geni_i2c_probe(struct platform_device *pdev) 
	ret = geni_se_resources_on(&gi2c->se);

	if (ret) {

		dev_err(dev, "Error turning on resources %d\n", ret);

		clk_disable_unprepare(gi2c->core_clk);

		return ret;

	}

	proto = geni_se_read_proto(&gi2c->se);
@@ -877,8 +878,11 @@ static int geni_i2c_probe(struct platform_device *pdev) 
		/* FIFO is disabled, so we can only use GPI DMA */

		gi2c->gpi_mode = true;

		ret = setup_gpi_dma(gi2c);

		if (ret)

		if (ret) {

			geni_se_resources_off(&gi2c->se);

			clk_disable_unprepare(gi2c->core_clk);

			return dev_err_probe(dev, ret, "Failed to setup GPI DMA mode\n");

		}



		dev_dbg(dev, "Using GPI DMA mode for I2C\n");

	} else {
@@ -891,6 +895,8 @@ static int geni_i2c_probe(struct platform_device *pdev) 


		if (!tx_depth) {

			dev_err(dev, "Invalid TX FIFO depth\n");

			geni_se_resources_off(&gi2c->se);

			clk_disable_unprepare(gi2c->core_clk);

			return -EINVAL;

		}

drivers/i2c/busses/i2c-rk3x.c

+11 −2
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ struct rk3x_i2c_soc_data { 
 * @clk: function clk for rk3399 or function & Bus clks for others

 * @pclk: Bus clk for rk3399

 * @clk_rate_nb: i2c clk rate change notify

 * @irq: irq number

 * @t: I2C known timing information

 * @lock: spinlock for the i2c bus

 * @wait: the waitqueue to wait for i2c transfer
@@ -200,6 +201,7 @@ struct rk3x_i2c { 
	struct clk *clk;

	struct clk *pclk;

	struct notifier_block clk_rate_nb;

	int irq;



	/* Settings */

	struct i2c_timings t;
@@ -1087,13 +1089,18 @@ static int rk3x_i2c_xfer_common(struct i2c_adapter *adap, 


		spin_unlock_irqrestore(&i2c->lock, flags);



		if (!polling) {

			rk3x_i2c_start(i2c);



		if (!polling) {

			timeout = wait_event_timeout(i2c->wait, !i2c->busy,

						     msecs_to_jiffies(WAIT_TIMEOUT));

		} else {

			disable_irq(i2c->irq);

			rk3x_i2c_start(i2c);



			timeout = rk3x_i2c_wait_xfer_poll(i2c);



			enable_irq(i2c->irq);

		}



		spin_lock_irqsave(&i2c->lock, flags);
@@ -1310,6 +1317,8 @@ static int rk3x_i2c_probe(struct platform_device *pdev) 
		return ret;

	}



	i2c->irq = irq;



	platform_set_drvdata(pdev, i2c);



	if (i2c->soc_data->calc_timings == rk3x_i2c_v0_calc_timings) {