From 971465bc8b49dd84521d4eb4d7ae8078350ebd1d Mon Sep 17 00:00:00 2001 From: Ben Levinsky Date: Thu, 29 Jan 2026 12:51:23 -0800 Subject: [PATCH] examples: legacy_apps: xlnx: Remove xlnx_hw_to_bsp_irq() The Lopper-generated amd_platform_info.h already accounts for BSP. So remove the unneeded function xlnx_hw_to_bsp_irq() which tries to account for IRQ system number difference from baremetal (generic) and FreeRTOS BSPs. Signed-off-by: Ben Levinsky --- .../legacy_apps/machine/xlnx/zynqmp_r5/freertos/gic_init.c | 7 ------- .../legacy_apps/machine/xlnx/zynqmp_r5/generic/gic_init.c | 5 ----- .../legacy_apps/machine/xlnx/zynqmp_r5/platform_info.c | 6 ------ 3 files changed, 18 deletions(-) diff --git a/examples/legacy_apps/machine/xlnx/zynqmp_r5/freertos/gic_init.c b/examples/legacy_apps/machine/xlnx/zynqmp_r5/freertos/gic_init.c index c0f3b34..703c45d 100644 --- a/examples/legacy_apps/machine/xlnx/zynqmp_r5/freertos/gic_init.c +++ b/examples/legacy_apps/machine/xlnx/zynqmp_r5/freertos/gic_init.c @@ -17,13 +17,6 @@ #include "xparameters.h" #include "xscugic.h" -#define FREERTOS_BSP_IRQ_OFFSET 32 - -int xlnx_hw_to_bsp_irq(int sys_irq) -{ - return sys_irq - FREERTOS_BSP_IRQ_OFFSET; -} - /* Interrupt Controller setup */ int system_interrupt_register(int int_num, void (*intr_handler)(void *), void *data) diff --git a/examples/legacy_apps/machine/xlnx/zynqmp_r5/generic/gic_init.c b/examples/legacy_apps/machine/xlnx/zynqmp_r5/generic/gic_init.c index af7f34c..c669bc1 100644 --- a/examples/legacy_apps/machine/xlnx/zynqmp_r5/generic/gic_init.c +++ b/examples/legacy_apps/machine/xlnx/zynqmp_r5/generic/gic_init.c @@ -21,11 +21,6 @@ static XScuGic xInterruptController; -int xlnx_hw_to_bsp_irq(int sys_irq) -{ - return sys_irq; -} - int system_interrupt_register(int intr_num, void (*intr_handler)(void *), void *data) { diff --git a/examples/legacy_apps/machine/xlnx/zynqmp_r5/platform_info.c b/examples/legacy_apps/machine/xlnx/zynqmp_r5/platform_info.c index 560e345..efa9161 100644 --- a/examples/legacy_apps/machine/xlnx/zynqmp_r5/platform_info.c +++ b/examples/legacy_apps/machine/xlnx/zynqmp_r5/platform_info.c @@ -179,8 +179,6 @@ extern struct metal_irq_controller xlnx_irq_cntr; int system_interrupt_register(int int_num, void (*intr_handler)(void *), void *data); -int xlnx_hw_to_bsp_irq(int sys_irq); - /* RPMsg virtio shared buffer pool */ static struct rpmsg_virtio_shm_pool shpool; @@ -263,10 +261,6 @@ static int xlnx_machine_init(void) metal_dbg("kick device irq id = %d\n", (int)kick_device.irq_info); - /* convert from HW irq number to bsp specific irq */ - kick_device.irq_info = - (void *)xlnx_hw_to_bsp_irq((int)kick_device.irq_info); - ret = system_interrupt_register((int)kick_device.irq_info, xlnx_irq_isr, (void *)kick_device.irq_info);