On Fri, Aug 29, 2014 at 09:31:40AM +0200, Thierry Reding wrote:
> On Thu, Aug 28, 2014 at 06:10:55PM +0200, Arnd Bergmann wrote:
> > On Thursday 28 August 2014 17:31:17 Thierry Reding wrote:
> >
> > > void __init tegra_init_irq(void)
> > > {
> > > - int i;
> > > - void __iomem *distbase;
> > > + unsigned int max_ictlrs = ARRAY_SIZE(ictlr_regs), i;
> > > + const struct of_device_id *match;
> > > + struct device_node *np;
> > > + struct resource res;
> > > +
> > > + np = of_find_matching_node_and_match(NULL, ictlr_matches, &match);
> > > + if (np) {
> > > + const struct tegra_ictlr_soc *soc = match->data;
> > > +
> > > + for (i = 0; i < soc->num_ictlrs; i++) {
> > > + if (of_address_to_resource(np, i, &res) < 0)
> > > + break;
> > > +
> > > + ictlr_regs[i] = res;
> > > + }
> > > +
> > > + WARN(i != soc->num_ictlrs,
> > > + "Found %u interrupt controllers in DT; expected %u.\n",
> > > + i, soc->num_ictlrs);
> > > +
> > > + max_ictlrs = soc->num_ictlrs;
> > > + of_node_put(np);
> > > + } else {
> > > + /*
> > > + * If no matching device node was found, fall back to using
> > > + * the chip ID.
> > > + */
> > > +
> > > + /* Tegra30 and later have five interrupt controllers, ... */
> > > + max_ictlrs = ARRAY_SIZE(ictlr_regs);
> > > +
> > > + /* ..., but Tegra20 only has four. */
> > > + if (of_machine_is_compatible("nvidia,tegra20"))
> > > + max_ictlrs--;
> > > + }
> >
> > How about moving the entire file to drivers/irqchip and using the
> > IRQCHIP_DECLARE() helper for the DT case?
> >
> > For the fallback, you can have an entry into that file that just takes
> > the address and number, which you can call from platform code here.
>
> I think I did try that at some point, but there were issues that I don't
> remember. I'll give it another shot.
So I got pretty far with this and the system still boots. But for some
reason suspend/resume is now broken. The difference seems to be that
earlier the legacy interrupt controller would be registered first, and
the GIC second. When the legacy interrupt controller is initialized
after the GIC (which happens when I use IRQCHIP_DECLARE), then suspend
and resume won't work (for some yet unknown reason). Unfortunately the
of_irq_init() code is too clever, so I can't even work around it by
changing link order or device tree order.
I'll see if I can find out what causes this combination to malfunction
when initialized in the opposite order.
Thierry
Attachment:
pgpZgNuL6d08U.pgp
Description: PGP signature
