Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-23 13:36:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(qemu-sbsa): use fdt_read_uint32_default more

Browse source 
We have fdt_read_uint32_default() function which allows us to use less
temporary variables. Let make use of it where applicable.

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Change-Id: I6fc8a87d5aac427703fd3c8b689e153ed58fa8b7
This commit is contained in:
Marcin Juszkiewicz 2024-06-27 10:11:31 +02:00
parent badda892c9
commit adc63c99f1
1 changed files with 18 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
plat/qemu/qemu_sbsa/sbsa_sip_svc.c
View file

@ -89,10 +89,6 @@ uintptr_t sbsa_get_gicr(void);
static void read_cpu_topology_from_dt(void *dtb) static void read_cpu_topology_from_dt(void *dtb)
{ {
int node; int node;
uint32_t sockets = 0;
uint32_t clusters = 0;
uint32_t cores = 0;
uint32_t threads = 0;
/* /*
* QEMU gives us this DeviceTree node when we config: * QEMU gives us this DeviceTree node when we config:
@ -108,28 +104,16 @@ static void read_cpu_topology_from_dt(void *dtb)
node = fdt_path_offset(dtb, "/cpus/topology"); node = fdt_path_offset(dtb, "/cpus/topology");
if (node > 0) { if (node > 0) {
if (fdt_getprop(dtb, node, "sockets", NULL)) { dynamic_platform_info.cpu_topo.sockets =
fdt_read_uint32(dtb, node, "sockets", &sockets); fdt_read_uint32_default(dtb, node, "sockets", 0);
} dynamic_platform_info.cpu_topo.clusters =
fdt_read_uint32_default(dtb, node, "clusters", 0);
if (fdt_getprop(dtb, node, "clusters", NULL)) { dynamic_platform_info.cpu_topo.cores =
fdt_read_uint32(dtb, node, "clusters", &clusters); fdt_read_uint32_default(dtb, node, "cores", 0);
} dynamic_platform_info.cpu_topo.threads =
fdt_read_uint32_default(dtb, node, "threads", 0);
if (fdt_getprop(dtb, node, "cores", NULL)) {
fdt_read_uint32(dtb, node, "cores", &cores);
}
if (fdt_getprop(dtb, node, "threads", NULL)) {
fdt_read_uint32(dtb, node, "threads", &threads);
}
} }
dynamic_platform_info.cpu_topo.sockets = sockets;
dynamic_platform_info.cpu_topo.clusters = clusters;
dynamic_platform_info.cpu_topo.cores = cores;
dynamic_platform_info.cpu_topo.threads = threads;
INFO("Cpu topology: sockets: %d, clusters: %d, cores: %d, threads: %d\n", INFO("Cpu topology: sockets: %d, clusters: %d, cores: %d, threads: %d\n",
dynamic_platform_info.cpu_topo.sockets, dynamic_platform_info.cpu_topo.sockets,
dynamic_platform_info.cpu_topo.clusters, dynamic_platform_info.cpu_topo.clusters,
@ -142,7 +126,6 @@ void read_cpuinfo_from_dt(void *dtb)
int node; int node;
int prev; int prev;
int cpu = 0; int cpu = 0;
uint32_t nodeid = 0;
uintptr_t mpidr; uintptr_t mpidr;
/* /*
@ -184,14 +167,12 @@ void read_cpuinfo_from_dt(void *dtb)
panic(); panic();
} }
if (fdt_getprop(dtb, node, "numa-node-id", NULL)) {
fdt_read_uint32(dtb, node, "numa-node-id", &nodeid);
}
dynamic_platform_info.cpu[cpu].nodeid = nodeid;
dynamic_platform_info.cpu[cpu].mpidr = mpidr; dynamic_platform_info.cpu[cpu].mpidr = mpidr;
dynamic_platform_info.cpu[cpu].nodeid =
fdt_read_uint32_default(dtb, node, "numa-node-id", 0);
INFO("CPU %d: node-id: %d, mpidr: %ld\n", cpu, nodeid, mpidr); INFO("CPU %d: node-id: %d, mpidr: %ld\n", cpu,
dynamic_platform_info.cpu[cpu].nodeid, mpidr);
cpu++; cpu++;
@ -211,7 +192,6 @@ void read_meminfo_from_dt(void *dtb)
const char *type; const char *type;
int prev, node; int prev, node;
int len; int len;
uint32_t nodeid = 0;
uint32_t memnode = 0; uint32_t memnode = 0;
uint32_t higher_value, lower_value; uint32_t higher_value, lower_value;
uint64_t cur_base, cur_size; uint64_t cur_base, cur_size;
@ -240,11 +220,8 @@ void read_meminfo_from_dt(void *dtb)
type = fdt_getprop(dtb, node, "device_type", &len); type = fdt_getprop(dtb, node, "device_type", &len);
if (type && strncmp(type, "memory", len) == 0) { if (type && strncmp(type, "memory", len) == 0) {
if (fdt_getprop(dtb, node, "numa-node-id", NULL)) { dynamic_platform_info.memory[memnode].nodeid =
fdt_read_uint32(dtb, node, "numa-node-id", &nodeid); fdt_read_uint32_default(dtb, node, "numa-node-id", 0);
}
dynamic_platform_info.memory[memnode].nodeid = nodeid;
/* /*
* Get the 'reg' property of this node and * Get the 'reg' property of this node and
@ -342,10 +319,10 @@ void read_platform_version(void *dtb)
node = fdt_path_offset(dtb, "/"); node = fdt_path_offset(dtb, "/");
if (node >= 0) { if (node >= 0) {
platform_version_major = fdt32_ld(fdt_getprop(dtb, node, platform_version_major =
"machine-version-major", NULL)); fdt_read_uint32_default(dtb, node, "machine-version-major", 0);
platform_version_minor = fdt32_ld(fdt_getprop(dtb, node, platform_version_minor =
"machine-version-minor", NULL)); fdt_read_uint32_default(dtb, node, "machine-version-minor", 0);
} }
} }