From a871f0be4957fda9ca2315db83db1c39a4a3a25f Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Thu, 1 Apr 2021 11:38:53 +0200 Subject: [PATCH] xtensa: cavs: fix irq_enable() argument irq_enable() should be called with the composite IRQ code as its argument, not just the Xtensa proper part of it. Signed-off-by: Guennadi Liakhovetski --- drivers/timer/cavs_timer.c | 2 +- soc/xtensa/intel_adsp/common/soc_mp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/timer/cavs_timer.c b/drivers/timer/cavs_timer.c index 28fb9962fd3..cd7b217ce5b 100644 --- a/drivers/timer/cavs_timer.c +++ b/drivers/timer/cavs_timer.c @@ -193,6 +193,6 @@ void smp_timer_init(void) + CAVS_ICTL_INT_CPU_OFFSET(arch_curr_cpu()->id) + 0x04, 22 + TIMER); - irq_enable(XTENSA_IRQ_NUMBER(TIMER_IRQ)); + irq_enable(TIMER_IRQ); } #endif diff --git a/soc/xtensa/intel_adsp/common/soc_mp.c b/soc/xtensa/intel_adsp/common/soc_mp.c index 710b1821e28..6a019e1ea83 100644 --- a/soc/xtensa/intel_adsp/common/soc_mp.c +++ b/soc/xtensa/intel_adsp/common/soc_mp.c @@ -149,7 +149,7 @@ void z_mp_entry(void) #ifdef CONFIG_IPM_CAVS_IDC /* Interrupt must be enabled while running on current core */ - irq_enable(XTENSA_IRQ_NUMBER(DT_IRQN(DT_INST(0, intel_cavs_idc)))); + irq_enable(DT_IRQN(DT_INST(0, intel_cavs_idc))); #endif /* CONFIG_IPM_CAVS_IDC */ start_rec.alive = 1;