On Thu, Mar 31, 2016 at 11:18:25AM -0500, Rob Herring wrote:
> On Thu, Mar 31, 2016 at 12:29 AM, David Gibson
> <david@xxxxxxxxxxxxxxxxxxxxx> wrote:
> > On Wed, Mar 23, 2016 at 07:40:20PM -0500, Rob Herring wrote:
> >> Signed-off-by: Rob Herring <robh@xxxxxxxxxx>
> >
> > Minor nit: before doing these tests, we should probably add a check
> > which ensures that any bus bridge node *has* a #address-cells and
> > #size-cells value.
>
> I'll check, but I thought we already had that check because any bridge
> node has reg or ranges.
>
> >
> >> ---
> >> checks.c | 87 +++++++++++++++++++++++++++--
> >> tests/run_tests.sh | 4 ++
> >> tests/unit-addr-leading-0s.dts | 10 ++++
> >> tests/unit-addr-leading-0x.dts | 10 ++++
> >> tests/unit-addr-simple-bus-comma.dts | 18 ++++++
> >> tests/unit-addr-simple-bus-reg-mismatch.dts | 18 ++++++
> >> 6 files changed, 142 insertions(+), 5 deletions(-)
> >> create mode 100644 tests/unit-addr-leading-0s.dts
> >> create mode 100644 tests/unit-addr-leading-0x.dts
> >> create mode 100644 tests/unit-addr-simple-bus-comma.dts
> >> create mode 100644 tests/unit-addr-simple-bus-reg-mismatch.dts
> >>
> >> diff --git a/checks.c b/checks.c
> >> index 48e926e..82a7f38 100644
> >> --- a/checks.c
> >> +++ b/checks.c
> >> @@ -20,6 +20,11 @@
> >>
> >> #include "dtc.h"
> >>
> >> +#define node_addr_cells(n) \
> >> + (((n)->addr_cells == -1) ? 2 : (n)->addr_cells)
> >> +#define node_size_cells(n) \
> >> + (((n)->size_cells == -1) ? 1 : (n)->size_cells)
> >> +
> >> #ifdef TRACE_CHECKS
> >> #define TRACE(c, ...) \
> >> do { \
> >> @@ -578,12 +583,88 @@ static bool is_simple_bridge(struct node *node)
> >> return false;
> >> }
> >>
> >> +static void default_unit_addr(struct check *c, struct node *dt, struct node *node)
> >> +{
> >> + const char *unitname = get_unitname(node);
> >> +
> >> + if (strstr(unitname, "0x") == unitname) {
> >> + FAIL(c, "Node %s unit address should not have leading \"0x\"",
> >> + node->fullpath);
> >> + /* skip over 0x for next test */
> >> + unitname += 2;
> >> + }
> >> + if (unitname[0] == '0' && isxdigit(unitname[1]))
> >> + FAIL(c, "Node %s unit address should not have leading 0s",
> >> + node->fullpath);
> >
> > Explicitly checking various aspects of the format seems a bit weird to
> > me. Why not just generate the expected address from 'reg' and
> > strcmp()?
>
> Because for the default check, I'm only testing these aspects. I found
> some cases running this thru the kernel tree dts files that the full
> simple-bus check is too strict. For example, we want to warn on
> "@0x002,4", but not "@2,4" or "@2blah".
Ok. Thinking about it, I think this might work a bit better separated
(mostly) from the bus type stuff. Basically treat it as a "common
unit name problems" test, that will skip itself if a bus type is set
(which will allow more thorough testing of the unit name).
> >> +static void simple_bus_unit_addr(struct check *c, struct node *dt, struct node *node)
> >> +{
> >> + const char *unitname = get_unitname(node);
> >> + struct property *prop;
> >> + uint64_t unitaddr, regaddr = 0;
> >> + int n, addr_cells;
> >> + cell_t *cell;
> >> +
> >> + default_unit_addr(c, dt, node);
> >> +
> >> + n = strspn(unitname, DIGITS "abcedf");
> >> + if (n != strlen(unitname))
> >> + FAIL(c, "Node %s unit address should have only lower case hex digits",
> >> + node->fullpath);
> >> +
> >> + unitaddr = strtoll(unitname, NULL, 16);
> >> +
> >> + prop = get_property(node, "reg");
> >> + if (!prop) {
> >> + prop = get_property(node, "ranges");
> >> + if (!prop || !prop->val.len)
> >> + return;
> >> +
> >> + cell = (cell_t *)prop->val.val;
> >> + cell += node_addr_cells(node);
> >> + } else
> >> + cell = (cell_t *)prop->val.val;
> >> +
> >> + addr_cells = node_addr_cells(node->parent);
> >> + while (addr_cells--)
> >> + regaddr = (regaddr << 32) | fdt32_to_cpu(*cell++);
> >> +
> >> + if (regaddr != unitaddr)
> >> + FAIL(c, "Node %s unit address does not match reg address (%zx != %zx)",
> >> + node->fullpath, regaddr, unitaddr);
> >
> > Again, parsing the unit address and comparing back to reg seems
> > backwards to me.
>
> I agree here. And then I don't need simple-bus to inherit the default checks.
Yes, I think that makes sense.
> >> +}
> >> +
> >> struct bus_type simple_bus_type = {
> >> .expected_addr_cells = -1, /* For don't care */
> >> .expected_size_cells = -1,
> >> .is_type = is_simple_bridge,
> >> + .check_unit_addr = simple_bus_unit_addr,
> >> +};
> >> +
> >> +struct bus_type default_bus_type = {
> >> + .expected_addr_cells = -1, /* For don't care */
> >> + .expected_size_cells = -1,
> >> + .check_unit_addr = default_unit_addr,
> >> };
> >>
> >> +static void check_unit_address_format(struct check *c, struct node *dt,
> >> + struct node *node)
> >> +{
> >> + struct bus_type *bt;
> >> +
> >> + if (!node->parent)
> >> + return;
> >> +
> >> + bt = node->parent->bus_type;
> >> + if (!bt)
> >> + bt = &default_bus_type;
> >> +
> >> + if (bt->check_unit_addr)
> >> + bt->check_unit_addr(c, dt, node);
> >> +}
> >> +NODE_WARNING(unit_address_format, NULL);
> >
> > I'm not entirely convinced with the idea of the default unit address
> > checker. I'm more inclined towards only checking when we have a known
> > bus type, then trying to expand those known bus types as much as we can.
>
> We've been thru this. The default check is pretty minimal. If we could
> come up with determining bus types of I2C and SPI, then maybe. We
> could look at controller node names, but then if the node names are
> wrong, we'd need to detect that. With SPI the child nodes generally
> have SPI specific properties. With I2C, we don't have anything else to
> key off of.
Ok. As above, I think I'd be more comfortable with this check as a
"common mistakes" warning than a "default bus" checker.
It's a small distinction, but it's a question of being presented as
something with authoritative knowledge of what a unit address should
look like, versus something looking for specific common problems.
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
Attachment:
signature.asc
Description: PGP signature
