drivers/irqchip: xtensa: add warning to irq_retrigger

jcmvbkbc · jcmvbkbc · commit bb6652363be0 · 2019-01-26T02:02:14.000-08:00
XEA2 and MX PIC can only retrigger software interrupts. Issue a warning
if an interrupt of any other type is retriggered.

Signed-off-by: Max Filippov &lt;jcmvbkbc@gmail.com&gt;
diff --git a/drivers/irqchip/irq-xtensa-mx.c b/drivers/irqchip/irq-xtensa-mx.c
@@ -113,7 +113,11 @@ static void xtensa_mx_irq_ack(struct irq_data *d)
 
 static int xtensa_mx_irq_retrigger(struct irq_data *d)
 {
-	xtensa_set_sr(1 << d->hwirq, intset);
+	unsigned int mask = 1u << d->hwirq;
+
+	if (WARN_ON(mask & ~XCHAL_INTTYPE_MASK_SOFTWARE))
+		return 0;
+	xtensa_set_sr(mask, intset);
 	return 1;
 }
 
diff --git a/drivers/irqchip/irq-xtensa-pic.c b/drivers/irqchip/irq-xtensa-pic.c
@@ -70,7 +70,11 @@ static void xtensa_irq_ack(struct irq_data *d)
 
 static int xtensa_irq_retrigger(struct irq_data *d)
 {
-	xtensa_set_sr(1 << d->hwirq, intset);
+	unsigned int mask = 1u << d->hwirq;
+
+	if (WARN_ON(mask & ~XCHAL_INTTYPE_MASK_SOFTWARE))
+		return 0;
+	xtensa_set_sr(mask, intset);
 	return 1;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,11 @@ static void xtensa_mx_irq_ack(struct irq_data *d)`
`113`	`113`
`114`	`114`	`static int xtensa_mx_irq_retrigger(struct irq_data *d)`
`115`	`115`	`{`
`116`		`- xtensa_set_sr(1 << d->hwirq, intset);`
	`116`	`+ unsigned int mask = 1u << d->hwirq;`
	`117`	`+`
	`118`	`+ if (WARN_ON(mask & ~XCHAL_INTTYPE_MASK_SOFTWARE))`
	`119`	`+ return 0;`
	`120`	`+ xtensa_set_sr(mask, intset);`
`117`	`121`	`return 1;`
`118`	`122`	`}`
`119`	`123`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,11 @@ static void xtensa_irq_ack(struct irq_data *d)`
`70`	`70`
`71`	`71`	`static int xtensa_irq_retrigger(struct irq_data *d)`
`72`	`72`	`{`
`73`		`- xtensa_set_sr(1 << d->hwirq, intset);`
	`73`	`+ unsigned int mask = 1u << d->hwirq;`
	`74`	`+`
	`75`	`+ if (WARN_ON(mask & ~XCHAL_INTTYPE_MASK_SOFTWARE))`
	`76`	`+ return 0;`
	`77`	`+ xtensa_set_sr(mask, intset);`
`74`	`78`	`return 1;`
`75`	`79`	`}`
`76`	`80`