From: Joel Stanley <joel@jms.id.au>
To: devicetree-compiler@vger.kernel.org,
David Gibson <david@gibson.dropbear.id.au>
Cc: linux-kernel@vger.kernel.org,
Stephen Rothwell <sfr@canb.auug.org.au>,
Arnd Bergmann <arnd@arndb.de>
Subject: [PATCH v4 2/2] checks: Improve i2c reg property checking
Date: Mon, 22 Jun 2020 12:40:05 +0930 [thread overview]
Message-ID: <20200622031005.1890039-3-joel@jms.id.au> (raw)
In-Reply-To: <20200622031005.1890039-1-joel@jms.id.au>
The i2c bindings in the kernel tree describe support for 10 bit
addressing, which must be indicated with the I2C_TEN_BIT_ADDRESS flag.
When this is set the address can be up to 10 bits. When it is not set
the address is a maximum of 7 bits.
See Documentation/devicetree/bindings/i2c/i2c.txt.
Take into account this flag when checking the address is valid.
Signed-off-by: Joel Stanley <joel@jms.id.au>
---
v2: Mask reg when checking the 10-bit size
v3: Fix test
v4: Add U to define
---
checks.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/checks.c b/checks.c
index 69b0156c940c..b7955dbd71ca 100644
--- a/checks.c
+++ b/checks.c
@@ -1023,6 +1023,7 @@ static void check_i2c_bus_bridge(struct check *c, struct dt_info *dti, struct no
WARNING(i2c_bus_bridge, check_i2c_bus_bridge, NULL, &addr_size_cells);
#define I2C_OWN_SLAVE_ADDRESS (1U << 30)
+#define I2C_TEN_BIT_ADDRESS (1U << 31)
static void check_i2c_bus_reg(struct check *c, struct dt_info *dti, struct node *node)
{
@@ -1057,10 +1058,13 @@ static void check_i2c_bus_reg(struct check *c, struct dt_info *dti, struct node
reg = fdt32_to_cpu(*(cells++));
/* Ignore I2C_OWN_SLAVE_ADDRESS */
reg &= ~I2C_OWN_SLAVE_ADDRESS;
- if (reg > 0x3ff)
+
+ if ((reg & I2C_TEN_BIT_ADDRESS) && ((reg & ~I2C_TEN_BIT_ADDRESS) > 0x3ff))
FAIL_PROP(c, dti, node, prop, "I2C address must be less than 10-bits, got \"0x%x\"",
reg);
-
+ else if (reg > 0x7f)
+ FAIL_PROP(c, dti, node, prop, "I2C address must be less than 7-bits, got \"0x%x\". Set I2C_TEN_BIT_ADDRESS for 10 bit addresses or fix the property",
+ reg);
}
}
WARNING(i2c_bus_reg, check_i2c_bus_reg, NULL, ®_format, &i2c_bus_bridge);
--
2.27.0
prev parent reply other threads:[~2020-06-22 3:10 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-22 3:10 [PATCH v4 0/2] dtc: Improve checks for i2c reg properties Joel Stanley
[not found] ` <20200622031005.1890039-1-joel-U3u1mxZcP9KHXe+LvDLADg@public.gmane.org>
2020-06-22 3:10 ` [PATCH v4 1/2] checks: Remove warning for I2C_OWN_SLAVE_ADDRESS Joel Stanley
2020-06-22 7:53 ` [PATCH v4 0/2] dtc: Improve checks for i2c reg properties David Gibson
2020-06-22 3:10 ` Joel Stanley [this message]
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=20200622031005.1890039-3-joel@jms.id.au \
--to=joel@jms.id.au \
--cc=arnd@arndb.de \
--cc=david@gibson.dropbear.id.au \
--cc=devicetree-compiler@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).