Skip to contentSkip to conversation

hw/arm/xilinx_zynq: Wire FIQ between CPU <> GIC

PATCH Applied Philippe Mathieu-Daudé 2 participants 2 messages Jan 30, 2024 – Feb 6, 2024 Arm/Zynq architecture

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hw/arm/xilinx_zynq: Wire FIQ between CPU <> GIC

Similarly to commits dadbb58f59..5ae79fe825 for other ARM boards, connect FIQ output of the GIC CPU interfaces to the CPU.

---
 hw/arm/xilinx_zynq.c | 2 ++
 1 file changed, 2 insertions(+)
hw/arm/xilinx_zynq.c +2 -0
index 66d0de139f..ffad058107 100644
@@ -246,6 +246,8 @@ static void zynq_init(MachineState *machine)
     sysbus_mmio_map(busdev, 0, MPCORE_PERIPHBASE);
     sysbus_connect_irq(busdev, 0,
                        qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_IRQ));
+    sysbus_connect_irq(busdev, 1,
+                       qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_FIQ));
 
     for (n = 0; n < 64; n++) {
         pic[n] = qdev_get_gpio_in(dev, n);
Signature · 1 line
2.41.0
#1 lore raw
Quoted 14 lines · Philippe Mathieu-Daudé

Similarly to commits dadbb58f59..5ae79fe825 for other ARM boards, connect FIQ output of the GIC CPU interfaces to the CPU.

---
 hw/arm/xilinx_zynq.c | 2 ++
 1 file changed, 2 insertions(+)
hw/arm/xilinx_zynq.c +0 -0
index 66d0de139f..ffad058107 100644

hw/arm/xilinx_zynq.c static void zynq_init(MachineState *machine)

Quoted 9 lines
hw/arm/xilinx_zynq.c +2 -1
@@ -246,6 +246,8 @@ static void zynq_init(MachineState *machine)
     sysbus_mmio_map(busdev, 0, MPCORE_PERIPHBASE);
     sysbus_connect_irq(busdev, 0,
                        qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_IRQ));
+    sysbus_connect_irq(busdev, 1,
+                       qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_FIQ));
 
     for (n = 0; n < 64; n++) {
         pic[n] = qdev_get_gpio_in(dev, n);
--

Applied to target-arm.next, thanks.

-- PMM