linux-kernel - [PATCH] i2c: bcm2835: Set up the clock stretching timeout at boot.

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Wed,  1 Jun 2016 15:07:25 -0700
From:	Eric Anholt <eric@...olt.net>
To:	Wolfram Sang <wsa@...-dreams.de>
Cc:	linux-rpi-kernel@...ts.infradead.org,
	linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
	Stephen Warren <swarren@...dotorg.org>,
	Lee Jones <lee@...nel.org>, linux-i2c@...r.kernel.org,
	Eric Anholt <eric@...olt.net>
Subject: [PATCH] i2c: bcm2835: Set up the clock stretching timeout at boot.

The register at poweron contains 0x40, which at our typical 100khz bus
rate means .64ms instead of the desired 25ms.

Fixes many clock stretching timeouts when talking to the DSI panel's
bridge chip, and will hopefully fix talking to the FXL6408 GPIO
expander on the Pi3 as well.

Signed-off-by: Eric Anholt <eric@...olt.net>
---
 drivers/i2c/busses/i2c-bcm2835.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c
index 818b051d25e6..1348f224013d 100644
--- a/drivers/i2c/busses/i2c-bcm2835.c
+++ b/drivers/i2c/busses/i2c-bcm2835.c
@@ -28,6 +28,11 @@
 #define BCM2835_I2C_FIFO	0x10
 #define BCM2835_I2C_DIV		0x14
 #define BCM2835_I2C_DEL		0x18
+/*
+ * 16-bit field for the number of SCL cycles to wait after rising SCL
+ * before deciding the slave is not responding.  0 disables the
+ * timeout detection.
+ */
 #define BCM2835_I2C_CLKT	0x1c
 
 #define BCM2835_I2C_C_READ	BIT(0)
@@ -238,6 +243,7 @@ static int bcm2835_i2c_probe(struct platform_device *pdev)
 	u32 bus_clk_rate, divider;
 	int ret;
 	struct i2c_adapter *adap;
+	u32 clkt;
 
 	i2c_dev = devm_kzalloc(&pdev->dev, sizeof(*i2c_dev), GFP_KERNEL);
 	if (!i2c_dev)
@@ -280,6 +286,15 @@ static int bcm2835_i2c_probe(struct platform_device *pdev)
 	}
 	bcm2835_i2c_writel(i2c_dev, BCM2835_I2C_DIV, divider);
 
+	/*
+	 * SMBUS says "Devices participating in a transfer will
+	 * timeout when any clock low exceeds the value of
+	 * T_TIMEOUT,MIN of 25 ms."
+	 */
+	clkt = DIV_ROUND_UP(25 * bus_clk_rate, 1000);
+	clkt = min(clkt, 0xffffu);
+	bcm2835_i2c_writel(i2c_dev, BCM2835_I2C_CLKT, clkt);
+
 	irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
 	if (!irq) {
 		dev_err(&pdev->dev, "No IRQ resource\n");
-- 
2.8.0.rc3