powerpc/eeh-powernv: Fix unbalanced IRQ warning

apopple · mpe · commit b8d65e9662b1 · 2015-07-30T19:01:32.000+10:00
pnv_eeh_next_error() re-enables the eeh opal event interrupt but it
gets called from a loop if there are more outstanding events to
process, resulting in a warning due to enabling an already enabled
interrupt. Instead the interrupt should only be re-enabled once the
last outstanding event has been processed.

Tested-by: Daniel Axtens &lt;dja@axtens.net&gt;
Reported-by: Daniel Axtens &lt;dja@axtens.net&gt;
Signed-off-by: Alistair Popple &lt;alistair@popple.id.au&gt;
Acked-by: Gavin Shan &lt;gwshan@linux.vnet.ibm.com&gt;
Signed-off-by: Michael Ellerman &lt;mpe@ellerman.id.au&gt;
diff --git a/arch/powerpc/platforms/powernv/eeh-powernv.c b/arch/powerpc/platforms/powernv/eeh-powernv.c
@@ -1478,7 +1478,7 @@ static int pnv_eeh_next_error(struct eeh_pe **pe)
 	}
 
 	/* Unmask the event */
-	if (eeh_enabled())
+	if (ret == EEH_NEXT_ERR_NONE && eeh_enabled())
 		enable_irq(eeh_event_irq);
 
 	return ret;

Original file line number	Diff line number	Diff line change
`@@ -1478,7 +1478,7 @@ static int pnv_eeh_next_error(struct eeh_pe **pe)`
`1478`	`1478`	`}`
`1479`	`1479`
`1480`	`1480`	`/* Unmask the event */`
`1481`		`- if (eeh_enabled())`
	`1481`	`+ if (ret == EEH_NEXT_ERR_NONE && eeh_enabled())`
`1482`	`1482`	`enable_irq(eeh_event_irq);`
`1483`	`1483`
`1484`	`1484`	`return ret;`