2014-05-14 12:33 GMT-07:00 Arnd Bergmann <arnd@xxxxxxxx>: > On Wednesday 14 May 2014 12:10:46 Florian Fainelli wrote: >> This patch adds support for the Broadcom GISB arbiter bus timeout/error >> handler. GISB is a proprietary bus used by Broadcom Set Top Box >> System-on-a-chip devices (BCM7xxx) which allows multiple masters and >> clients to be interfaced with each other. >> >> The bus arbiter offers support for generating two interrupts towards the >> host CPU, thus allowing us to "catch" clock gated masters, or masters >> being volontarily blocked for powersaving purposes, or do general system >> troubleshooting. >> >> We also register a hook with the ARM fault exception handling to allow >> printing a more informative message than "imprecise external abort at >> 0x00000000" for instance. >> >> Signed-off-by: Florian Fainelli <f.fainelli@xxxxxxxxx> > > Looks pretty good to me. Cool, thanks!, BTW, which tree should we attempt to get this merged into? > >> +static int brcmstb_gisb_arb_decode_addr(struct brcmstb_gisb_arb_device *gdev, >> + const char *reason) >> +{ >> + u32 cap_status; >> + unsigned long arb_addr; >> + u32 master; >> + const char *m_name; >> + char m_fmt[11]; >> + >> + cap_status = ioread32(gdev->base + ARB_ERR_CAP_STATUS); >> + >> + /* Invalid captured address, bail out */ >> + if (!(cap_status & ARB_ERR_CAP_STATUS_VALID)) >> + return 1; >> + >> + /* Read the address and master */ >> + arb_addr = ioread32(gdev->base + ARB_ERR_CAP_ADDR) & 0xffffffff; >> +#ifdef CONFIG_PHYS_ADDR_T_64BIT >> + arb_addr |= (u64)ioread32(gdev->base + ARB_ERR_CAP_HI_ADDR) << 32; >> +#endif > > Can you use 'if (IS_ENABLED(CONFIG_PHYS_ADDR_T_64BIT))' here, or does that > cause a warning? No warning is issued, I will use that instead. Thanks! > >> +static int brcmstb_bus_error_handler(unsigned long addr, unsigned int fsr, >> + struct pt_regs *regs) >> +{ >> + int ret = 0; >> + struct brcmstb_gisb_arb_device *gdev; >> + >> + /* iterate over each GISB arb registered handlers */ >> + list_for_each_entry(gdev, &brcmstb_gisb_arb_device_list, next) >> + ret |= brcmstb_gisb_arb_decode_addr(gdev, "bus error"); >> + /* >> + * If it was an imprecise abort, then we need to correct the >> + * return address to be _after_ the instruction. >> + */ >> + if (fsr & (1 << 10)) >> + regs->ARM_pc += 4; >> + >> + return ret; >> +} > > This will cause the normal abort handler to trigger if the GISB > arbiter doesn't know what happened, right? That's right, one of the very first things that the GISB arbiter checks is whether the faulting error is valid or not, if it is not, it bails out and so we keep on processing the other exception handlers. -- Florian -- To unsubscribe from this list: send the line "unsubscribe linux-doc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html