From 96a0cb29fa6bab4c2229cd30aa631ad5a44a8cc4 Mon Sep 17 00:00:00 2001 From: Rahul Batra Date: Wed, 5 Oct 2016 10:54:53 -0500 Subject: PPE Fixed Interval Timer handler bug fixes Added code to setup user-defined FIT handler Updated code, so by default FIT handler is _ppe42_default_irq_handler Change-Id: Ib2ed28360c9b15b509f3a1ac7bb34bc8f8a1be5c Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/30733 Tested-by: Jenkins Server Tested-by: PPE CI Reviewed-by: Douglas R. Gilbert Reviewed-by: YUE DU Reviewed-by: Gregory S. Still Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/30735 Reviewed-by: Hostboot Team Tested-by: FSP CI Jenkins Reviewed-by: Sachin Gupta --- src/import/chips/p9/procedures/ppe/pk/ppe42/pkppe42files.mk | 1 + src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_init.c | 7 +------ src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_irq.h | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/import/chips/p9/procedures/ppe/pk/ppe42/pkppe42files.mk b/src/import/chips/p9/procedures/ppe/pk/ppe42/pkppe42files.mk index 6f91a0df..3d3fe8c6 100644 --- a/src/import/chips/p9/procedures/ppe/pk/ppe42/pkppe42files.mk +++ b/src/import/chips/p9/procedures/ppe/pk/ppe42/pkppe42files.mk @@ -49,6 +49,7 @@ PPE42-C-SOURCES = ppe42_core.c \ ppe42_init.c \ ppe42_irq_core.c\ + ppe42_irq_init.c\ ppe42_gcc.c\ ppe42_scom.c\ eabi.c\ diff --git a/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_init.c b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_init.c index a22f4702..252567be 100644 --- a/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_init.c +++ b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_init.c @@ -57,6 +57,7 @@ __ppe42_system_setup() //NOTE: EXTERNAL_IRQS is the phantom interrupt assigned irq __ppe42_irq_handlers[irq].handler = __ppe42_phantom_irq_handler; +#endif /*STATIC_IRQ_TABLE*/ // Initialize special interrupt handlers __ppe42_fit_routine = __ppe42_default_irq_handler; @@ -65,12 +66,6 @@ __ppe42_system_setup() __ppe42_watchdog_routine = __ppe42_default_irq_handler; __ppe42_watchdog_arg = 0; - /* - __ppe42_debug_routine = __ppe42_default_irq_handler; - __ppe42_debug_arg = 0; - */ -#endif /*STATIC_IRQ_TABLE*/ - //Clear all status bits in the TSR mtspr(SPRN_TSR, TSR_ENW | TSR_WIS | TSR_DIS | TSR_FIS); diff --git a/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_irq.h b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_irq.h index c897984b..9b6f3f81 100644 --- a/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_irq.h +++ b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_irq.h @@ -106,7 +106,7 @@ PK_IRQ_HANDLER(__ppe42_phantom_irq_handler); int -ppe42_fit_setup(int tcr_fp, PkIrqHandler handler, void* arg); +ppe42_fit_setup(PkIrqHandler handler, void* arg); /// The address of the optional FIT interrupt handler -- cgit v1.2.1