ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/arm/sbsa-ref: add GIC node into DT 

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: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Marcin Juszkiewicz 2023-05-24 13:33:06 +02:00 committed by Peter Maydell
parent 5d6c687c9d
commit 0c08d4f310
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hw/arm/sbsa-ref.c
View File

@ -29,6 +29,7 @@
#include "exec/hwaddr.h" #include "exec/hwaddr.h"
#include "kvm_arm.h" #include "kvm_arm.h"
#include "hw/arm/boot.h" #include "hw/arm/boot.h"
#include "hw/arm/fdt.h"
#include "hw/arm/smmuv3.h" #include "hw/arm/smmuv3.h"
#include "hw/block/flash.h" #include "hw/block/flash.h"
#include "hw/boards.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); 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 * 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 * 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. * fw compatibility.
*/ */
qemu_fdt_setprop_cell(fdt, "/", "machine-version-major", 0); 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) { if (ms->numa_state->have_numa_distance) {
int size = nb_numa_nodes * nb_numa_nodes * 3 * sizeof(uint32_t); 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); g_free(nodename);
} }
sbsa_fdt_add_gic_node(sms);
} }
#define SBSA_FLASH_SECTOR_SIZE (256 * KiB) #define SBSA_FLASH_SECTOR_SIZE (256 * KiB)