summaryrefslogtreecommitdiffstats
path: root/drivers/irqchip
diff options
context:
space:
mode:
authorBrian Norris <computersforpeace@gmail.com>2014-12-25 12:49:02 -0500
committerRalf Baechle <ralf@linux-mips.org>2015-04-01 11:21:36 -0400
commitc9ae71e0f78fb72eedd674c788415cdf1eb34195 (patch)
tree19954a1de85beb0b4cacff1e65a57a0532dc431a /drivers/irqchip
parent7e229fa07da10ee3dc3f88989b515293758c42eb (diff)
IRQCHIP: brcmstb-l2: don't clear wakeable interrupts at init time
Wakeable interrupts might be pending at boot/init time, because wakeup interrupts might have triggered a resume from S5. So don't clear such wakeups. This means that any driver which requests a wakeable interrupt bit should be prepared to handle an interrupt as soon as they call request_irq(). (This is technically already the correct development practice, but some drivers probably expect not to receive interrupts until they have performed some I/O.) Signed-off-by: Brian Norris <computersforpeace@gmail.com> Signed-off-by: Kevin Cernekee <cernekee@gmail.com> Cc: f.fainelli@gmail.com Cc: jaedon.shin@gmail.com Cc: abrestic@chromium.org Cc: tglx@linutronix.de Cc: jason@lakedaemon.net Cc: jogo@openwrt.org Cc: arnd@arndb.de Cc: computersforpeace@gmail.com Cc: linux-mips@linux-mips.org Cc: devicetree@vger.kernel.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/8840/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'drivers/irqchip')
-rw-r--r--drivers/irqchip/irq-brcmstb-l2.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/irqchip/irq-brcmstb-l2.c b/drivers/irqchip/irq-brcmstb-l2.c
index 313c2c64498a..d6bcc6be0777 100644
--- a/drivers/irqchip/irq-brcmstb-l2.c
+++ b/drivers/irqchip/irq-brcmstb-l2.c
@@ -136,7 +136,11 @@ int __init brcmstb_l2_intc_of_init(struct device_node *np,
136 136
137 /* Disable all interrupts by default */ 137 /* Disable all interrupts by default */
138 writel(0xffffffff, data->base + CPU_MASK_SET); 138 writel(0xffffffff, data->base + CPU_MASK_SET);
139 writel(0xffffffff, data->base + CPU_CLEAR); 139
140 /* Wakeup interrupts may be retained from S5 (cold boot) */
141 data->can_wake = of_property_read_bool(np, "brcm,irq-can-wake");
142 if (!data->can_wake)
143 writel(0xffffffff, data->base + CPU_CLEAR);
140 144
141 data->parent_irq = irq_of_parse_and_map(np, 0); 145 data->parent_irq = irq_of_parse_and_map(np, 0);
142 if (!data->parent_irq) { 146 if (!data->parent_irq) {
@@ -188,8 +192,7 @@ int __init brcmstb_l2_intc_of_init(struct device_node *np,
188 ct->chip.irq_suspend = brcmstb_l2_intc_suspend; 192 ct->chip.irq_suspend = brcmstb_l2_intc_suspend;
189 ct->chip.irq_resume = brcmstb_l2_intc_resume; 193 ct->chip.irq_resume = brcmstb_l2_intc_resume;
190 194
191 if (of_property_read_bool(np, "brcm,irq-can-wake")) { 195 if (data->can_wake) {
192 data->can_wake = true;
193 /* This IRQ chip can wake the system, set all child interrupts 196 /* This IRQ chip can wake the system, set all child interrupts
194 * in wake_enabled mask 197 * in wake_enabled mask
195 */ 198 */