From: Silvan Wicki <linux_wi-ADq4ffItWIY@public.gmane.org>
To: wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org
Cc: swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org,
linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-rpi-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
linux_wi-ADq4ffItWIY@public.gmane.org
Subject: [PATCH v4] i2c: busses: i2c-bcm2835: limits cdiv to allowed values
Date: Sat, 6 Jun 2015 20:18:46 +0200 [thread overview]
Message-ID: <1433614726-1737-1-git-send-email-linux_wi@tinag.ch> (raw)
Adds: make sure bits 16-31 of DIV register are always 0
Adds: assume minimal divider of 2 if divider resulted in 0
(bcm2835 sets divider to 32768 if cdiv is set to 0)
See page 33/34 of BCM2835-ARM-Peripherals.pdf for the DIV register.
https://www.raspberrypi.org/wp-content/uploads/2012/02/BCM2835-ARM-Peripherals.pdf
Signed-off-by: Silvan Wicki <linux_wi-ADq4ffItWIY@public.gmane.org>
---
drivers/i2c/busses/i2c-bcm2835.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c
index c9336a3..7a5b96d 100644
--- a/drivers/i2c/busses/i2c-bcm2835.c
+++ b/drivers/i2c/busses/i2c-bcm2835.c
@@ -50,6 +50,9 @@
#define BCM2835_I2C_S_CLKT BIT(9)
#define BCM2835_I2C_S_LEN BIT(10) /* Fake bit for SW error reporting */
+#define BCM2835_I2C_CDIV_MIN 0x0002
+#define BCM2835_I2C_CDIV_MAX 0xFFFE
+
#define BCM2835_I2C_TIMEOUT (msecs_to_jiffies(1000))
struct bcm2835_i2c_dev {
@@ -252,12 +255,28 @@ static int bcm2835_i2c_probe(struct platform_device *pdev)
divider = DIV_ROUND_UP(clk_get_rate(i2c_dev->clk), bus_clk_rate);
/*
+ * A divider of 0 results in extremely high bus_clk_rate values
+ * such as bus_clk_rate >= 4044967297 with core_clock = 250MHz.
+ * In such a case assume the minimal possible divider, since
+ * bcm2835 chip sets divisor internally to 32768 if cdiv is 0.
+ */
+ if (divider < BCM2835_I2C_CDIV_MIN) {
+ dev_warn(&pdev->dev,
+ "Clock too fast, falling back to max clock speed\n");
+ divider = BCM2835_I2C_CDIV_MIN;
+ }
+ /*
* Per the datasheet, the register is always interpreted as an even
* number, by rounding down. In other words, the LSB is ignored. So,
* if the LSB is set, increment the divider to avoid any issue.
*/
if (divider & 1)
divider++;
+ if (divider > BCM2835_I2C_CDIV_MAX) {
+ dev_warn(&pdev->dev,
+ "Clock too slow, falling back to min clock speed\n");
+ divider = BCM2835_I2C_CDIV_MAX;
+ }
bcm2835_i2c_writel(i2c_dev, BCM2835_I2C_DIV, divider);
irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
--
2.1.4
next reply other threads:[~2015-06-06 18:18 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-06 18:18 Silvan Wicki [this message]
[not found] ` <1433614726-1737-1-git-send-email-linux_wi-ADq4ffItWIY@public.gmane.org>
2015-06-06 21:55 ` [PATCH v4] i2c: busses: i2c-bcm2835: limits cdiv to allowed values Wolfram Sang
2015-06-09 1:48 ` Stephen Warren
[not found] ` <557645E9.4040700-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2015-06-17 10:14 ` Silvan Wicki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1433614726-1737-1-git-send-email-linux_wi@tinag.ch \
--to=linux_wi-adq4ffitwiy@public.gmane.org \
--cc=linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-rpi-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org \
--cc=wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).