diff mbox series

[1/5] hw/phb4: Make error interrupt handler compile

Message ID 20200121072838.2771-1-oohall@gmail.com
State Accepted
Headers show
Series [1/5] hw/phb4: Make error interrupt handler compile | expand

Checks

Context Check Description
snowpatch_ozlabs/snowpatch_job_snowpatch-skiboot-dco success Signed-off-by present
snowpatch_ozlabs/snowpatch_job_snowpatch-skiboot success Test snowpatch/job/snowpatch-skiboot on branch master
snowpatch_ozlabs/apply_patch success Successfully applied on branch master (d75e82dbfbb9443efeb3f9a5921ac23605aab469)

Commit Message

Oliver O'Halloran Jan. 21, 2020, 7:28 a.m. UTC
When phb4.c was copied from phb3.c the error interrupts were disabled by
default and apparently never re-enabled. Remove the #if 0 block and call
phb4_set_err_pending() rather than the phb3 version.

Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
---
 hw/phb4.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Oliver O'Halloran June 5, 2020, 7:04 a.m. UTC | #1
On Tue, Jan 21, 2020 at 6:28 PM Oliver O'Halloran <oohall@gmail.com> wrote:
>
> When phb4.c was copied from phb3.c the error interrupts were disabled by
> default and apparently never re-enabled. Remove the #if 0 block and call
> phb4_set_err_pending() rather than the phb3 version.
>
> Signed-off-by: Oliver O'Halloran <oohall@gmail.com>

Series merged as of 4357838d554592a46f6c24fd0fae7fc74c16f9ac
diff mbox series

Patch

diff --git a/hw/phb4.c b/hw/phb4.c
index ed7f4e5c4756..0b7bf778a50e 100644
--- a/hw/phb4.c
+++ b/hw/phb4.c
@@ -5585,7 +5585,6 @@  static void phb4_err_interrupt(struct irq_source *is, uint32_t isn)
 
 	PHBDBG(p, "Got interrupt 0x%08x\n", isn);
 
-#if 0
 	/* Update pending event */
 	opal_update_pending_evt(OPAL_EVENT_PCI_ERROR,
 				OPAL_EVENT_PCI_ERROR);
@@ -5598,8 +5597,7 @@  static void phb4_err_interrupt(struct irq_source *is, uint32_t isn)
 	 * Mark the PHB has pending error so that the OS
 	 * can handle it at late point.
 	 */
-	phb3_set_err_pending(p, true);
-#endif
+	phb4_set_err_pending(p, true);
 }
 
 static uint64_t phb4_lsi_attributes(struct irq_source *is __unused,