| Message ID | 1399645830-18669-1-git-send-email-boris.brezillon@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 09/05/2014 16:30, Boris BREZILLON : > sam9x5 SoCs have the following errata: > "RTC: Interrupt Mask Register cannot be used > Interrupt Mask Register read always returns 0." > > Hence we should not rely on what IMR claims about already masked IRQs > and just disable all IRQs. > > Signed-off-by: Boris BREZILLON <boris.brezillon@free-electrons.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > --- > Changes since v3: > - fix commit message and comment > Changes since v2: > - removed unused variable 'mask' > Changes since v1: > - use a macro to define IRQs bitmask > - read IMR register to ensure the write to IDR has been flushed > - quote atmel's datasheet errata in commit message > - comment the code to describe why we're not using IMR to disable > the interrupts > > arch/arm/mach-at91/sysirq_mask.c | 22 +++++++++++++--------- > 1 file changed, 13 insertions(+), 9 deletions(-) > > diff --git a/arch/arm/mach-at91/sysirq_mask.c b/arch/arm/mach-at91/sysirq_mask.c > index 2ba694f..f8bc351 100644 > --- a/arch/arm/mach-at91/sysirq_mask.c > +++ b/arch/arm/mach-at91/sysirq_mask.c > @@ -25,24 +25,28 @@ > > #include "generic.h" > > -#define AT91_RTC_IDR 0x24 /* Interrupt Disable Register */ > -#define AT91_RTC_IMR 0x28 /* Interrupt Mask Register */ > +#define AT91_RTC_IDR 0x24 /* Interrupt Disable Register */ > +#define AT91_RTC_IMR 0x28 /* Interrupt Mask Register */ > +#define AT91_RTC_IRQ_MASK 0x1f /* Available IRQs mask */ > > void __init at91_sysirq_mask_rtc(u32 rtc_base) > { > void __iomem *base; > - u32 mask; > > base = ioremap(rtc_base, 64); > if (!base) > return; > > - mask = readl_relaxed(base + AT91_RTC_IMR); > - if (mask) { > - pr_info("AT91: Disabling rtc irq\n"); > - writel_relaxed(mask, base + AT91_RTC_IDR); > - (void)readl_relaxed(base + AT91_RTC_IMR); /* flush */ > - } > + /* > + * sam9x5 SoCs have the following errata: > + * "RTC: Interrupt Mask Register cannot be used > + * Interrupt Mask Register read always returns 0." > + * > + * Hence we're not relying on IMR values to disable > + * interrupts. > + */ > + writel_relaxed(AT91_RTC_IRQ_MASK, base + AT91_RTC_IDR); > + (void)readl_relaxed(base + AT91_RTC_IMR); /* flush */ > > iounmap(base); > } >
diff --git a/arch/arm/mach-at91/sysirq_mask.c b/arch/arm/mach-at91/sysirq_mask.c index 2ba694f..f8bc351 100644 --- a/arch/arm/mach-at91/sysirq_mask.c +++ b/arch/arm/mach-at91/sysirq_mask.c @@ -25,24 +25,28 @@ #include "generic.h" -#define AT91_RTC_IDR 0x24 /* Interrupt Disable Register */ -#define AT91_RTC_IMR 0x28 /* Interrupt Mask Register */ +#define AT91_RTC_IDR 0x24 /* Interrupt Disable Register */ +#define AT91_RTC_IMR 0x28 /* Interrupt Mask Register */ +#define AT91_RTC_IRQ_MASK 0x1f /* Available IRQs mask */ void __init at91_sysirq_mask_rtc(u32 rtc_base) { void __iomem *base; - u32 mask; base = ioremap(rtc_base, 64); if (!base) return; - mask = readl_relaxed(base + AT91_RTC_IMR); - if (mask) { - pr_info("AT91: Disabling rtc irq\n"); - writel_relaxed(mask, base + AT91_RTC_IDR); - (void)readl_relaxed(base + AT91_RTC_IMR); /* flush */ - } + /* + * sam9x5 SoCs have the following errata: + * "RTC: Interrupt Mask Register cannot be used + * Interrupt Mask Register read always returns 0." + * + * Hence we're not relying on IMR values to disable + * interrupts. + */ + writel_relaxed(AT91_RTC_IRQ_MASK, base + AT91_RTC_IDR); + (void)readl_relaxed(base + AT91_RTC_IMR); /* flush */ iounmap(base); }
sam9x5 SoCs have the following errata: "RTC: Interrupt Mask Register cannot be used Interrupt Mask Register read always returns 0." Hence we should not rely on what IMR claims about already masked IRQs and just disable all IRQs. Signed-off-by: Boris BREZILLON <boris.brezillon@free-electrons.com> --- Changes since v3: - fix commit message and comment Changes since v2: - removed unused variable 'mask' Changes since v1: - use a macro to define IRQs bitmask - read IMR register to ensure the write to IDR has been flushed - quote atmel's datasheet errata in commit message - comment the code to describe why we're not using IMR to disable the interrupts arch/arm/mach-at91/sysirq_mask.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-)