On Sun, Oct 10, 2021 at 11:58 PM David Gibson
<david@xxxxxxxxxxxxxxxxxxxxx> wrote:
>
> On Tue, Sep 28, 2021 at 04:23:33PM -0500, Rob Herring wrote:
> > Add a check for parsing 'interrupt-map' properties. The check primarily
> > tests parsing 'interrupt-map' properties which depends on and the parent
> > interrupt controller (or another map) node.
> >
> > Note that this does not require '#address-cells' in the interrupt-map
> > parent, but treats missing '#address-cells' as 0 which is how the Linux
> > kernel parses it. There's numerous cases that expect this behavior.
> >
> > Cc: Andre Przywara <andre.przywara@xxxxxxx>
> > Signed-off-by: Rob Herring <robh@xxxxxxxxxx>
> > ---
> > checks.c | 88 ++++++++++++++++++++++++++++++
> > tests/bad-interrupt-map-mask.dts | 20 +++++++
> > tests/bad-interrupt-map-parent.dts | 17 ++++++
> > tests/bad-interrupt-map.dts | 19 +++++++
> > tests/run_tests.sh | 3 +
> > 5 files changed, 147 insertions(+)
> > create mode 100644 tests/bad-interrupt-map-mask.dts
> > create mode 100644 tests/bad-interrupt-map-parent.dts
> > create mode 100644 tests/bad-interrupt-map.dts
> >
> > diff --git a/checks.c b/checks.c
> > index fb3fc9cda4b1..d4e7facd7f37 100644
> > --- a/checks.c
> > +++ b/checks.c
> > @@ -1589,6 +1589,93 @@ static void check_interrupt_provider(struct check *c,
> > }
> > WARNING(interrupt_provider, check_interrupt_provider, NULL);
> >
> > +static void check_interrupt_map(struct check *c,
> > + struct dt_info *dti,
> > + struct node *node)
> > +{
> > + struct node *root = dti->dt;
> > + struct property *prop, *irq_map_prop;
> > + size_t cellsize, cell, map_cells;
> > +
> > + irq_map_prop = get_property(node, "interrupt-map");
> > + if (!irq_map_prop)
> > + return;
> > +
> > + prop = get_property(node, "#interrupt-cells");
> > + if (!prop)
> > + /* Already checked in check_interrupt_provider */
>
> If you add check_interrupt_provider as a dependency, then you can omit
> this check. Of course, check_interrupt_provider itself should
> probably have a dependency on the check that ensures than
> len(#interrupt-cells) == 4.
Okay.
> > + return;
> > + cellsize = propval_cell(prop);
> > +
> > + prop = get_property(node, "#address-cells");
> > + if (!prop) {
> > + FAIL(c, dti, node,
> > + "Missing '#address-cells' in interrupt-map provider");
> > + return;
> > + }
> > + cellsize += propval_cell(prop);
> > +
> > + prop = get_property(node, "interrupt-map-mask");
> > + if (prop && (prop->val.len != (cellsize * sizeof(cell_t))))
> > + FAIL_PROP(c, dti, node, prop,
> > + "property size (%d) is invalid, expected %zu",
> > + prop->val.len, cellsize * sizeof(cell_t));
> > +
> > + if (!is_multiple_of(irq_map_prop->val.len, sizeof(cell_t))) {
> > + FAIL_PROP(c, dti, node, irq_map_prop,
> > + "property size (%d) is invalid, expected multiple of %zu",
> > + irq_map_prop->val.len, sizeof(cell_t));
> > + return;
> > + }
> > +
> > + map_cells = irq_map_prop->val.len / sizeof(cell_t);
> > + for (cell = 0; cell < map_cells; ) {
> > + struct node *provider_node;
> > + struct property *cellprop;
> > + int phandle;
> > + size_t parent_cellsize;
> > +
> > + if ((cell + cellsize) >= map_cells) {
> > + FAIL_PROP(c, dti, node, irq_map_prop,
> > + "property size (%d) too small, expected > %zu",
> > + irq_map_prop->val.len, (cell + cellsize) * sizeof(cell_t));
> > + break;
> > + }
> > +
> > + phandle = propval_cell_n(irq_map_prop, cell + cellsize);
> > +
> > + if ((phandle == 0) || (phandle == -1)) {
> > + FAIL_PROP(c, dti, node, irq_map_prop,
> > + "Cell %zu is not a phandle(%d)",
> > + cell + cellsize, phandle);
> > + break;
> > + }
> > + provider_node = get_node_by_phandle(root, phandle);
> > + if (!provider_node) {
> > + FAIL_PROP(c, dti, node, irq_map_prop,
> > + "Could not get phandle node for (cell %zu)",
> > + cell);
> > + break;
> > + }
> > +
> > + cellprop = get_property(provider_node, "#interrupt-cells");
> > + if (cellprop) {
> > + parent_cellsize = propval_cell(cellprop);
> > + } else {
> > + FAIL(c, dti, node, "Missing property '#interrupt-cells' in node %s or bad phandle (referred from interrupt-map[%zu])",
> > + provider_node->fullpath, cell);
> > + break;
> > + }
> > +
> > + cellprop = get_property(provider_node, "#address-cells");
> > + if (cellprop)
> > + parent_cellsize += propval_cell(cellprop);
> > +
> > + cell += cellsize + 1 + parent_cellsize;
> > + }
> > +}
> > +WARNING(interrupt_map, check_interrupt_map, NULL, &phandle_references);
> > +
> > static void check_interrupts_property(struct check *c,
> > struct dt_info *dti,
> > struct node *node)
> > @@ -1887,6 +1974,7 @@ static struct check *check_table[] = {
> > &gpios_property,
> > &interrupts_property,
> > &interrupt_provider,
> > + &interrupt_map,
> >
> > &alias_paths,
> >
> > diff --git a/tests/bad-interrupt-map-mask.dts b/tests/bad-interrupt-map-mask.dts
> > new file mode 100644
> > index 000000000000..10eaffd62310
> > --- /dev/null
> > +++ b/tests/bad-interrupt-map-mask.dts
> > @@ -0,0 +1,20 @@
> > +/dts-v1/;
> > +
> > +/ {
> > + interrupt-parent = <&intc>;
> > + intc: interrupt-controller {
> > + #interrupt-cells = <3>;
> > + interrupt-controller;
> > + };
> > +
> > + node {
> > + #address-cells = <0>;
> > + #interrupt-cells = <1>;
> > + interrupt-map = <1 &intc 1 2 3>;
> > + interrupt-map-mask = <0 0>;
> > +
> > + child {
> > + interrupts = <1>;
> > + };
> > + };
> > +};
> > diff --git a/tests/bad-interrupt-map-parent.dts b/tests/bad-interrupt-map-parent.dts
> > new file mode 100644
> > index 000000000000..fe88ce2fe76f
> > --- /dev/null
> > +++ b/tests/bad-interrupt-map-parent.dts
> > @@ -0,0 +1,17 @@
> > +/dts-v1/;
> > +
> > +/ {
> > + interrupt-parent = <&intc>;
> > + intc: interrupt-controller {
> > + };
> > +
> > + node {
> > + #address-cells = <0>;
> > + #interrupt-cells = <1>;
> > + interrupt-map = <1 &intc 1 2 3>;
>
> If you just want to verify the check on the bad parent, shouldn't you
> have an interrupt-map-mask here?
No, a missing interrupt-map-mask is not an error. Only the wrong
number of cells is an error. It's treated as all 1s mask if not
present. So, in interest of having a minimal test, I omitted it.
Rob
