| Message ID | 20230517105303.453161-1-marcin.juszkiewicz@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2] hw/arm/sbsa-ref: add GIC node into DT | expand |
On 2023-05-17 11:53, Marcin Juszkiewicz wrote: > Let add GIC information into DeviceTree as part of SBSA-REF versioning. > > Trusted Firmware will read it and provide to next firmware level. > > Bumps platform version to 0.1 one so we can check is node is present. > > Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> Reviewed-by: Leif Lindholm <quic_llindhol@quicinc.com> > --- > hw/arm/sbsa-ref.c | 19 ++++++++++++++++++- > 1 file changed, 18 insertions(+), 1 deletion(-) > > diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c > index 792371fdce..9204e8605f 100644 > --- a/hw/arm/sbsa-ref.c > +++ b/hw/arm/sbsa-ref.c > @@ -29,6 +29,7 @@ > #include "exec/hwaddr.h" > #include "kvm_arm.h" > #include "hw/arm/boot.h" > +#include "hw/arm/fdt.h" > #include "hw/arm/smmuv3.h" > #include "hw/block/flash.h" > #include "hw/boards.h" > @@ -168,6 +169,20 @@ static uint64_t sbsa_ref_cpu_mp_affinity(SBSAMachineState *sms, int idx) > return arm_cpu_mp_affinity(idx, clustersz); > } > > +static void sbsa_fdt_add_gic_node(SBSAMachineState *sms) > +{ > + char *nodename; > + > + nodename = g_strdup_printf("/intc"); > + qemu_fdt_add_subnode(sms->fdt, nodename); > + qemu_fdt_setprop_sized_cells(sms->fdt, nodename, "reg", > + 2, sbsa_ref_memmap[SBSA_GIC_DIST].base, > + 2, sbsa_ref_memmap[SBSA_GIC_DIST].size, > + 2, sbsa_ref_memmap[SBSA_GIC_REDIST].base, > + 2, sbsa_ref_memmap[SBSA_GIC_REDIST].size); > + > + g_free(nodename); > +} > /* > * Firmware on this machine only uses ACPI table to load OS, these limited > * device tree nodes are just to let firmware know the info which varies from > @@ -204,7 +219,7 @@ static void create_fdt(SBSAMachineState *sms) > * fw compatibility. > */ > qemu_fdt_setprop_cell(fdt, "/", "machine-version-major", 0); > - qemu_fdt_setprop_cell(fdt, "/", "machine-version-minor", 0); > + qemu_fdt_setprop_cell(fdt, "/", "machine-version-minor", 1); > > if (ms->numa_state->have_numa_distance) { > int size = nb_numa_nodes * nb_numa_nodes * 3 * sizeof(uint32_t); > @@ -260,6 +275,8 @@ static void create_fdt(SBSAMachineState *sms) > > g_free(nodename); > } > + > + sbsa_fdt_add_gic_node(sms); > } > > #define SBSA_FLASH_SECTOR_SIZE (256 * KiB)
On Wed, 17 May 2023 at 11:53, Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> wrote: > > Let add GIC information into DeviceTree as part of SBSA-REF versioning. > > Trusted Firmware will read it and provide to next firmware level. > > Bumps platform version to 0.1 one so we can check is node is present. > > Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> Are we documenting anywhere what the format/requirements/versions of this board-to-firmware interface are ? thanks -- PMM
diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index 792371fdce..9204e8605f 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -29,6 +29,7 @@ #include "exec/hwaddr.h" #include "kvm_arm.h" #include "hw/arm/boot.h" +#include "hw/arm/fdt.h" #include "hw/arm/smmuv3.h" #include "hw/block/flash.h" #include "hw/boards.h" @@ -168,6 +169,20 @@ static uint64_t sbsa_ref_cpu_mp_affinity(SBSAMachineState *sms, int idx) return arm_cpu_mp_affinity(idx, clustersz); } +static void sbsa_fdt_add_gic_node(SBSAMachineState *sms) +{ + char *nodename; + + nodename = g_strdup_printf("/intc"); + qemu_fdt_add_subnode(sms->fdt, nodename); + qemu_fdt_setprop_sized_cells(sms->fdt, nodename, "reg", + 2, sbsa_ref_memmap[SBSA_GIC_DIST].base, + 2, sbsa_ref_memmap[SBSA_GIC_DIST].size, + 2, sbsa_ref_memmap[SBSA_GIC_REDIST].base, + 2, sbsa_ref_memmap[SBSA_GIC_REDIST].size); + + g_free(nodename); +} /* * Firmware on this machine only uses ACPI table to load OS, these limited * device tree nodes are just to let firmware know the info which varies from @@ -204,7 +219,7 @@ static void create_fdt(SBSAMachineState *sms) * fw compatibility. */ qemu_fdt_setprop_cell(fdt, "/", "machine-version-major", 0); - qemu_fdt_setprop_cell(fdt, "/", "machine-version-minor", 0); + qemu_fdt_setprop_cell(fdt, "/", "machine-version-minor", 1); if (ms->numa_state->have_numa_distance) { int size = nb_numa_nodes * nb_numa_nodes * 3 * sizeof(uint32_t); @@ -260,6 +275,8 @@ static void create_fdt(SBSAMachineState *sms) g_free(nodename); } + + sbsa_fdt_add_gic_node(sms); } #define SBSA_FLASH_SECTOR_SIZE (256 * KiB)
Let add GIC information into DeviceTree as part of SBSA-REF versioning. Trusted Firmware will read it and provide to next firmware level. Bumps platform version to 0.1 one so we can check is node is present. Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> --- hw/arm/sbsa-ref.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)