Files
arm-trusted-firmware/fdts/fvp-base-gicv5.dtsi
T
Boyan Karatotev 8c37540524 fix(fvp): pass an interrupt-names property for the timer when using GICv5
The DT bindings expect the architectural timer's interrupts in the
following order:
interrupts:
  minItems: 1
  items:
    - description: secure timer irq
    - description: non-secure timer irq
    - description: virtual timer irq
    - description: hypervisor timer irq
    - description: hypervisor virtual timer irq

However, in GICv5 the NS frame does not have access to a secure timer
and one is not passed. Override the interrupt names Instead of passing a
dummy value.

Change-Id: Ib33dd44ee17bfc63b4e21a44205c81ad4c81bfda
Reported-by: Andrew Turner <andrew.turner4@arm.com>
Signed-off-by: Boyan Karatotev <boyan.karatotev@arm.com>
2025-08-19 09:47:10 +01:00

163 lines
4.9 KiB
Devicetree

/*
* Copyright (c) 2025, Arm Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#include <dt-bindings/interrupt-controller/arm-gicv5.h>
/* TODO: rtsm_ve-motherboard.dtsi definitons */
/ {
gic: interrupt-controller {
compatible = "arm,gic-v5";
#interrupt-cells = <3>;
interrupt-controller;
#address-cells = <2>;
#size-cells = <2>;
ranges;
interrupts = <GIC_PPI 25 IRQ_TYPE_LEVEL_HIGH>;
irs0: irs@2f1a0000 {
compatible = "arm,gic-v5-irs";
reg = <0x0 0x2f1a0000 0x0 0x10000>; /* NS IRS_CONFIG_FRAME */
reg-names = "ns-config";
#address-cells = <2>;
#size-cells = <2>;
ranges;
cpus = <&CPU0
&CPU1
&CPU2
&CPU3
&CPU4
&CPU5
&CPU6
&CPU7>;
arm,iaffids = /bits/ 16 <0 1 2 3 4 5 6 7>;
its@2f120000 {
compatible = "arm,gic-v5-its";
reg = <0x0 0x2f120000 0x0 0x10000>; /* NS ITS_CONFIG_FRAME */
reg-names = "ns-config";
#address-cells = <2>;
#size-cells = <2>;
ranges;
its0: msi-controller@2f130000 {
reg = <0x0 0x2f130000 0x0 0x10000>; /* ITS_TRANSLATE_FRAME */
reg-names = "ns-translate";
#msi-cells = <1>;
msi-controller;
};
};
};
};
iwb0: interrupt-controller@2f000000 {
compatible = "arm,gic-v5-iwb";
reg = <0x0 0x2f000000 0x0 0x10000>;
#address-cells = <0>;
interrupt-controller;
#interrupt-cells = <2>;
msi-parent = <&its0 64>;
};
timer {
interrupts = <GIC_PPI 30 IRQ_TYPE_LEVEL_HIGH>,
<GIC_PPI 27 IRQ_TYPE_LEVEL_HIGH>,
<GIC_PPI 26 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "phys", "virt", "hyp-phys";
};
timer@2a810000 {
frame@2a830000 {
/* Formerly GIC_LPI 58, now wire 26 as SPI. */
interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
};
};
pmu {
interrupts = <GIC_PPI 23 IRQ_TYPE_LEVEL_HIGH>;
};
/*
* Previously these were mapped to SPIs 32-74. We now explicitly describe
* the wires on the IWB to which the interrupts are connected. All of the
* below are signalled as SPIs.
*/
bus@8000000 {
interrupt-map = <0 0 0 &gic 0 0 GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
<0 0 1 &gic 0 0 GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
<0 0 2 &gic 0 0 GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
<0 0 3 &gic 0 0 GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
<0 0 4 &gic 0 0 GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,
<0 0 5 &gic 0 0 GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>,
<0 0 6 &gic 0 0 GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,
<0 0 7 &gic 0 0 GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,
<0 0 8 &gic 0 0 GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
<0 0 9 &gic 0 0 GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
<0 0 10 &gic 0 0 GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>,
<0 0 11 &gic 0 0 GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>,
<0 0 12 &gic 0 0 GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
<0 0 13 &gic 0 0 GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>,
<0 0 14 &gic 0 0 GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>,
<0 0 15 &gic 0 0 GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>,
<0 0 16 &gic 0 0 GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>,
<0 0 17 &gic 0 0 GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>,
<0 0 18 &gic 0 0 GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
<0 0 19 &gic 0 0 GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>,
<0 0 20 &gic 0 0 GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>,
<0 0 21 &gic 0 0 GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>,
<0 0 22 &gic 0 0 GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>,
<0 0 23 &gic 0 0 GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>,
<0 0 24 &gic 0 0 GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>,
<0 0 25 &gic 0 0 GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>,
<0 0 26 &gic 0 0 GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>,
<0 0 27 &gic 0 0 GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>,
<0 0 28 &gic 0 0 GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>,
<0 0 29 &gic 0 0 GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>,
<0 0 30 &gic 0 0 GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>,
<0 0 31 &gic 0 0 GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>,
<0 0 32 &gic 0 0 GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>,
<0 0 33 &gic 0 0 GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>,
<0 0 34 &gic 0 0 GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>,
<0 0 35 &gic 0 0 GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>,
<0 0 36 &gic 0 0 GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>,
<0 0 37 &gic 0 0 GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>,
<0 0 38 &gic 0 0 GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>,
<0 0 39 &gic 0 0 GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>,
<0 0 40 &gic 0 0 GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>,
<0 0 41 &gic 0 0 GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>,
<0 0 42 &iwb0 42 IRQ_TYPE_LEVEL_HIGH>,
<0 0 46 &iwb0 46 IRQ_TYPE_LEVEL_HIGH>;
};
#if (ENABLE_RME == 1)
pci: pci@40000000 {
interrupt-map = <0 0 0 1 &gic 0 GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH>,
<0 0 0 2 &gic 0 GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH>,
<0 0 0 3 &gic 0 GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH>,
<0 0 0 4 &gic 0 GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH>;
msi-map = <0x0 &its0 0x0 0x10000>;
};
smmu: iommu@2b400000 {
interrupts = <GIC_SPI 106 IRQ_TYPE_EDGE_RISING>,
<GIC_SPI 111 IRQ_TYPE_EDGE_RISING>,
<GIC_SPI 107 IRQ_TYPE_EDGE_RISING>,
<GIC_SPI 109 IRQ_TYPE_EDGE_RISING>;
msi-parent = <&its0 0x10000>;
};
#endif /* ENABLE_RME */
};