diff --git a/app/boards/acp_7_x_adsp.conf b/app/boards/acp_7_x_adsp.conf index 04c63271c9ac..9c4d3df561b7 100644 --- a/app/boards/acp_7_x_adsp.conf +++ b/app/boards/acp_7_x_adsp.conf @@ -5,8 +5,6 @@ CONFIG_DCACHE_LINE_SIZE=128 CONFIG_DYNAMIC_INTERRUPTS=y CONFIG_SHARED_INTERRUPTS=n CONFIG_ZEPHYR_LOG=y -CONFIG_LOG_MODE_DEFERRED=n -CONFIG_LOG_MODE_MINIMAL=y CONFIG_DMA=y CONFIG_DMA_DOMAIN=n CONFIG_ZEPHYR_NATIVE_DRIVERS=y @@ -55,3 +53,12 @@ CONFIG_CORE_COUNT=1 CONFIG_FORMAT_CONVERT_HIFI3=n CONFIG_PCM_CONVERTER_FORMAT_S24_4LE_MSB=y CONFIG_XTENSA_INTERRUPT_NONPREEMPTABLE=y +CONFIG_LOG_BACKEND_ACP=y +# Set INF log level: SOF log level configs must be set explicitly +CONFIG_LOG_DEFAULT_LEVEL=3 +CONFIG_LOG_MAX_LEVEL=3 +CONFIG_SOF_LOG_LEVEL_OFF=n +CONFIG_SOF_LOG_LEVEL_ERR=n +CONFIG_SOF_LOG_LEVEL_WRN=n +CONFIG_SOF_LOG_LEVEL_INF=y +CONFIG_SOF_LOG_LEVEL_DBG=n diff --git a/src/drivers/amd/acp_7_x/ipc.c b/src/drivers/amd/acp_7_x/ipc.c index 777ad3e08494..35f8f6b0bb08 100644 --- a/src/drivers/amd/acp_7_x/ipc.c +++ b/src/drivers/amd/acp_7_x/ipc.c @@ -42,8 +42,7 @@ LOG_MODULE_REGISTER(ipc_handler_file, LOG_LEVEL_DBG); #define HOST_TO_DSP_INTR 1 #define INTERRUPT_DISABLE 0 -#define IRQ_NUM_EXT_LEVEL3 3 -#define IRQ_EXT_IPC_LEVEL_3 3 +#define IRQ_EXT_IPC_LEVEL_5 5 /* This function triggers a host interrupt from ACP DSP */ void acp_dsp_to_host_intr_trig(void) @@ -123,11 +122,11 @@ int platform_ipc_init(struct ipc *ipc) /* schedule */ schedule_task_init_edf(&ipc->ipc_task, SOF_UUID(ipc_task_amd_uuid), &ipc_task_ops, ipc, 0, 0); - interrupt_disable(IRQ_EXT_IPC_LEVEL_3, ipc); - interrupt_unregister(IRQ_EXT_IPC_LEVEL_3, ipc); - interrupt_register(IRQ_EXT_IPC_LEVEL_3, amd_irq_handler, ipc); - /* Enabling software interuppts */ - interrupt_enable(IRQ_EXT_IPC_LEVEL_3, ipc); + interrupt_disable(IRQ_EXT_IPC_LEVEL_5, ipc); + interrupt_unregister(IRQ_EXT_IPC_LEVEL_5, ipc); + interrupt_register(IRQ_EXT_IPC_LEVEL_5, amd_irq_handler, ipc); + /* Enabling software interrupts */ + interrupt_enable(IRQ_EXT_IPC_LEVEL_5, ipc); return 0; } diff --git a/src/platform/amd/acp_7_x/include/platform/platform.h b/src/platform/amd/acp_7_x/include/platform/platform.h index 2a6b0147446d..a44ffab57c59 100644 --- a/src/platform/amd/acp_7_x/include/platform/platform.h +++ b/src/platform/amd/acp_7_x/include/platform/platform.h @@ -27,7 +27,7 @@ struct timer; #define PLATFORM_DEFAULT_CLOCK CLK_CPU(0) /* IPC Interrupt */ -#define PLATFORM_IPC_INTERRUPT IRQ_EXT_IPC_LEVEL_3 +#define PLATFORM_IPC_INTERRUPT 5 /* EXT_LEVEL5 */ #define PLATFORM_IPC_INTERRUPT_NAME NULL /* Host page size */