Commit 754cf4b2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 

Pull i2c fixes from Wolfram Sang:

 - regression fixes for i801 and designware

 - better API and leak fix for releasing DMA safe buffers

 - better greppable strings for the bitbang algorithm

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: sh_mobile: fix leak when using DMA bounce buffer
  i2c: sh_mobile: define start_ch() void as it only returns 0 anyhow
  i2c: refactor function to release a DMA safe buffer
  i2c: algos: bit: make the error messages grepable
  i2c: designware: Re-init controllers with pm_disabled set on resume
  i2c: i801: Allow ACPI AML access I/O ports not reserved for SMBus
parents 4658aff6 cebc07d8

Documentation/i2c/DMA-considerations

+7 −3
Original line number Diff line number Diff line
@@ -50,10 +50,14 @@ bounce buffer. But you don't need to care about that detail, just use the 
returned buffer. If NULL is returned, the threshold was not met or a bounce

buffer could not be allocated. Fall back to PIO in that case.



In any case, a buffer obtained from above needs to be released. It ensures data

is copied back to the message and a potentially used bounce buffer is freed::

In any case, a buffer obtained from above needs to be released. Another helper

function ensures a potentially used bounce buffer is freed::



	i2c_release_dma_safe_msg_buf(msg, dma_buf);

	i2c_put_dma_safe_msg_buf(dma_buf, msg, xferred);



The last argument 'xferred' controls if the buffer is synced back to the

message or not. No syncing is needed in cases setting up DMA had an error and

there was no data transferred.



The bounce buffer handling from the core is generic and simple. It will always

allocate a new bounce buffer. If you want a more sophisticated handling (e.g.

drivers/i2c/algos/i2c-algo-bit.c

+31 −24
Original line number Diff line number Diff line
@@ -110,8 +110,8 @@ static int sclhi(struct i2c_algo_bit_data *adap) 
	}

#ifdef DEBUG

	if (jiffies != start && i2c_debug >= 3)

		pr_debug("i2c-algo-bit: needed %ld jiffies for SCL to go "

			 "high\n", jiffies - start);

		pr_debug("i2c-algo-bit: needed %ld jiffies for SCL to go high\n",

			 jiffies - start);

#endif



done:
@@ -171,8 +171,9 @@ static int i2c_outb(struct i2c_adapter *i2c_adap, unsigned char c) 
		setsda(adap, sb);

		udelay((adap->udelay + 1) / 2);

		if (sclhi(adap) < 0) { /* timed out */

			bit_dbg(1, &i2c_adap->dev, "i2c_outb: 0x%02x, "

				"timeout at bit #%d\n", (int)c, i);

			bit_dbg(1, &i2c_adap->dev,

				"i2c_outb: 0x%02x, timeout at bit #%d\n",

				(int)c, i);

			return -ETIMEDOUT;

		}

		/* FIXME do arbitration here:
@@ -185,8 +186,8 @@ static int i2c_outb(struct i2c_adapter *i2c_adap, unsigned char c) 
	}

	sdahi(adap);

	if (sclhi(adap) < 0) { /* timeout */

		bit_dbg(1, &i2c_adap->dev, "i2c_outb: 0x%02x, "

			"timeout at ack\n", (int)c);

		bit_dbg(1, &i2c_adap->dev,

			"i2c_outb: 0x%02x, timeout at ack\n", (int)c);

		return -ETIMEDOUT;

	}
@@ -215,8 +216,9 @@ static int i2c_inb(struct i2c_adapter *i2c_adap) 
	sdahi(adap);

	for (i = 0; i < 8; i++) {

		if (sclhi(adap) < 0) { /* timeout */

			bit_dbg(1, &i2c_adap->dev, "i2c_inb: timeout at bit "

				"#%d\n", 7 - i);

			bit_dbg(1, &i2c_adap->dev,

				"i2c_inb: timeout at bit #%d\n",

				7 - i);

			return -ETIMEDOUT;

		}

		indata *= 2;
@@ -265,8 +267,9 @@ static int test_bus(struct i2c_adapter *i2c_adap) 
		goto bailout;

	}

	if (!scl) {

		printk(KERN_WARNING "%s: SCL unexpected low "

		       "while pulling SDA low!\n", name);

		printk(KERN_WARNING

		       "%s: SCL unexpected low while pulling SDA low!\n",

		       name);

		goto bailout;

	}
@@ -278,8 +281,9 @@ static int test_bus(struct i2c_adapter *i2c_adap) 
		goto bailout;

	}

	if (!scl) {

		printk(KERN_WARNING "%s: SCL unexpected low "

		       "while pulling SDA high!\n", name);

		printk(KERN_WARNING

		       "%s: SCL unexpected low while pulling SDA high!\n",

		       name);

		goto bailout;

	}
@@ -291,8 +295,9 @@ static int test_bus(struct i2c_adapter *i2c_adap) 
		goto bailout;

	}

	if (!sda) {

		printk(KERN_WARNING "%s: SDA unexpected low "

		       "while pulling SCL low!\n", name);

		printk(KERN_WARNING

		       "%s: SDA unexpected low while pulling SCL low!\n",

		       name);

		goto bailout;

	}
@@ -304,8 +309,9 @@ static int test_bus(struct i2c_adapter *i2c_adap) 
		goto bailout;

	}

	if (!sda) {

		printk(KERN_WARNING "%s: SDA unexpected low "

		       "while pulling SCL high!\n", name);

		printk(KERN_WARNING

		       "%s: SDA unexpected low while pulling SCL high!\n",

		       name);

		goto bailout;

	}
@@ -352,8 +358,8 @@ static int try_address(struct i2c_adapter *i2c_adap, 
		i2c_start(adap);

	}

	if (i && ret)

		bit_dbg(1, &i2c_adap->dev, "Used %d tries to %s client at "

			"0x%02x: %s\n", i + 1,

		bit_dbg(1, &i2c_adap->dev,

			"Used %d tries to %s client at 0x%02x: %s\n", i + 1,

			addr & 1 ? "read from" : "write to", addr >> 1,

			ret == 1 ? "success" : "failed, timeout?");

	return ret;
@@ -442,8 +448,9 @@ static int readbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msg) 
			if (inval <= 0 || inval > I2C_SMBUS_BLOCK_MAX) {

				if (!(flags & I2C_M_NO_RD_ACK))

					acknak(i2c_adap, 0);

				dev_err(&i2c_adap->dev, "readbytes: invalid "

					"block length (%d)\n", inval);

				dev_err(&i2c_adap->dev,

					"readbytes: invalid block length (%d)\n",

					inval);

				return -EPROTO;

			}

			/* The original count value accounts for the extra
@@ -506,8 +513,8 @@ static int bit_doAddress(struct i2c_adapter *i2c_adap, struct i2c_msg *msg) 
			return -ENXIO;

		}

		if (flags & I2C_M_RD) {

			bit_dbg(3, &i2c_adap->dev, "emitting repeated "

				"start condition\n");

			bit_dbg(3, &i2c_adap->dev,

				"emitting repeated start condition\n");

			i2c_repstart(adap);

			/* okay, now switch into reading mode */

			addr |= 0x01;
@@ -564,8 +571,8 @@ static int bit_xfer(struct i2c_adapter *i2c_adap, 
			}

			ret = bit_doAddress(i2c_adap, pmsg);

			if ((ret != 0) && !nak_ok) {

				bit_dbg(1, &i2c_adap->dev, "NAK from "

					"device addr 0x%02x msg #%d\n",

				bit_dbg(1, &i2c_adap->dev,

					"NAK from device addr 0x%02x msg #%d\n",

					msgs[i].addr, i);

				goto bailout;

			}

drivers/i2c/busses/i2c-designware-master.c

+0 −1
Original line number Diff line number Diff line
@@ -708,7 +708,6 @@ int i2c_dw_probe(struct dw_i2c_dev *dev) 
	i2c_set_adapdata(adap, dev);



	if (dev->pm_disabled) {

		dev_pm_syscore_device(dev->dev, true);

		irq_flags = IRQF_NO_SUSPEND;

	} else {

		irq_flags = IRQF_SHARED | IRQF_COND_SUSPEND;

drivers/i2c/busses/i2c-designware-platdrv.c

+6 −1
Original line number Diff line number Diff line
@@ -434,6 +434,9 @@ static int dw_i2c_plat_suspend(struct device *dev) 
{

	struct dw_i2c_dev *i_dev = dev_get_drvdata(dev);



	if (i_dev->pm_disabled)

		return 0;



	i_dev->disable(i_dev);

	i2c_dw_prepare_clk(i_dev, false);
@@ -444,7 +447,9 @@ static int dw_i2c_plat_resume(struct device *dev) 
{

	struct dw_i2c_dev *i_dev = dev_get_drvdata(dev);



	if (!i_dev->pm_disabled)

		i2c_dw_prepare_clk(i_dev, true);



	i_dev->init(i_dev);



	return 0;

drivers/i2c/busses/i2c-i801.c

+8 −1
Original line number Diff line number Diff line
@@ -1415,6 +1415,13 @@ static void i801_add_tco(struct i801_priv *priv) 
}



#ifdef CONFIG_ACPI

static bool i801_acpi_is_smbus_ioport(const struct i801_priv *priv,

				      acpi_physical_address address)

{

	return address >= priv->smba &&

	       address <= pci_resource_end(priv->pci_dev, SMBBAR);

}



static acpi_status

i801_acpi_io_handler(u32 function, acpi_physical_address address, u32 bits,

		     u64 *value, void *handler_context, void *region_context)
@@ -1430,7 +1437,7 @@ i801_acpi_io_handler(u32 function, acpi_physical_address address, u32 bits, 
	 */

	mutex_lock(&priv->acpi_lock);



	if (!priv->acpi_reserved) {

	if (!priv->acpi_reserved && i801_acpi_is_smbus_ioport(priv, address)) {

		priv->acpi_reserved = true;



		dev_warn(&pdev->dev, "BIOS is accessing SMBus registers\n");

CRA Git | Maintained and supported by SUSTech CRA and CCSE