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

refactor(qemu-sbsa): create accessor functions for platform info

Browse source 
Creating accessor functions to access information held by struct
qemu_platform_info. That way the code that is relevant to fetching
information from the device tree can be taken out of sbsa_sip_svc.c and
placed in a file where other client can use the information it provides.

No change in functionality.

Change-Id: I989952ee6d15e1436549002dd7c7767c745ea297
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
This commit is contained in:
Mathieu Poirier 2024-09-27 15:39:19 -06:00
parent 6d59413b84
commit d564e08456
2 changed files with 72 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
plat/qemu/qemu_sbsa/include/sbsa_platform.h
View file

@ -44,5 +44,13 @@ struct qemu_platform_info {
}; };
void sbsa_platform_init(void); void sbsa_platform_init(void);
int sbsa_platform_version_major(void);
int sbsa_platform_version_minor(void);
uint32_t sbsa_platform_num_cpus(void);
uint32_t sbsa_platform_num_memnodes(void);
uint64_t sbsa_platform_gic_its_addr(void);
struct platform_cpu_data sbsa_platform_cpu_node(uint64_t index);
struct platform_memory_data sbsa_platform_memory_node(uint64_t index);
struct platform_cpu_topology sbsa_platform_cpu_topology(void);
#endif /* SBSA_PLATFORM_H */ #endif /* SBSA_PLATFORM_H */

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

@ -324,6 +324,46 @@ void sbsa_platform_init(void)
read_meminfo_from_dt(dtb); read_meminfo_from_dt(dtb);
} }
int sbsa_platform_version_major(void)
{
return platform_version_major;
}
int sbsa_platform_version_minor(void)
{
return platform_version_minor;
}
uint32_t sbsa_platform_num_cpus(void)
{
return dynamic_platform_info.num_cpus;
}
uint32_t sbsa_platform_num_memnodes(void)
{
return dynamic_platform_info.num_memnodes;
}
uint64_t sbsa_platform_gic_its_addr(void)
{
return gic_its_addr;
}
struct platform_cpu_data sbsa_platform_cpu_node(uint64_t index)
{
return dynamic_platform_info.cpu[index];
}
struct platform_memory_data sbsa_platform_memory_node(uint64_t index)
{
return dynamic_platform_info.memory[index];
}
struct platform_cpu_topology sbsa_platform_cpu_topology(void)
{
return dynamic_platform_info.cpu_topo;
}
/* /*
* This function is responsible for handling all SiP calls from the NS world * This function is responsible for handling all SiP calls from the NS world
*/ */
@ -349,49 +389,56 @@ uintptr_t sbsa_sip_smc_handler(uint32_t smc_fid,
switch (smc_fid) { switch (smc_fid) {
case SIP_SVC_VERSION: case SIP_SVC_VERSION:
INFO("Platform version requested\n"); INFO("Platform version requested\n");
SMC_RET3(handle, NULL, platform_version_major, platform_version_minor); SMC_RET3(handle, NULL, sbsa_platform_version_major(),
sbsa_platform_version_minor());
case SIP_SVC_GET_GIC: case SIP_SVC_GET_GIC:
SMC_RET3(handle, NULL, sbsa_get_gicd(), sbsa_get_gicr()); SMC_RET3(handle, NULL, sbsa_get_gicd(), sbsa_get_gicr());
case SIP_SVC_GET_GIC_ITS: case SIP_SVC_GET_GIC_ITS:
SMC_RET2(handle, NULL, gic_its_addr); SMC_RET2(handle, NULL, sbsa_platform_gic_its_addr());
case SIP_SVC_GET_CPU_COUNT: case SIP_SVC_GET_CPU_COUNT:
SMC_RET2(handle, NULL, dynamic_platform_info.num_cpus); SMC_RET2(handle, NULL, sbsa_platform_num_cpus());
case SIP_SVC_GET_CPU_NODE: case SIP_SVC_GET_CPU_NODE:
index = x1; index = x1;
if (index < PLATFORM_CORE_COUNT) { if (index < PLATFORM_CORE_COUNT) {
SMC_RET3(handle, NULL, struct platform_cpu_data data;
dynamic_platform_info.cpu[index].nodeid,
dynamic_platform_info.cpu[index].mpidr); data = sbsa_platform_cpu_node(index);
SMC_RET3(handle, NULL, data.nodeid, data.mpidr);
} else { } else {
SMC_RET1(handle, SMC_ARCH_CALL_INVAL_PARAM); SMC_RET1(handle, SMC_ARCH_CALL_INVAL_PARAM);
} }
case SIP_SVC_GET_CPU_TOPOLOGY: case SIP_SVC_GET_CPU_TOPOLOGY:
if (dynamic_platform_info.cpu_topo.cores > 0) { struct platform_cpu_topology topology;
SMC_RET5(handle, NULL,
dynamic_platform_info.cpu_topo.sockets, topology = sbsa_platform_cpu_topology();
dynamic_platform_info.cpu_topo.clusters,
dynamic_platform_info.cpu_topo.cores, if (topology.cores > 0) {
dynamic_platform_info.cpu_topo.threads); SMC_RET5(handle, NULL, topology.sockets,
topology.clusters, topology.cores,
topology.threads);
} else { } else {
/* we do not know topology so we report SMC as unknown */ /* we do not know topology so we report SMC as unknown */
SMC_RET1(handle, SMC_UNK); SMC_RET1(handle, SMC_UNK);
} }
case SIP_SVC_GET_MEMORY_NODE_COUNT: case SIP_SVC_GET_MEMORY_NODE_COUNT:
SMC_RET2(handle, NULL, dynamic_platform_info.num_memnodes); SMC_RET2(handle, NULL, sbsa_platform_num_memnodes());
case SIP_SVC_GET_MEMORY_NODE: case SIP_SVC_GET_MEMORY_NODE:
index = x1; index = x1;
if (index < PLAT_MAX_MEM_NODES) { if (index < PLAT_MAX_MEM_NODES) {
SMC_RET4(handle, NULL, struct platform_memory_data data;
dynamic_platform_info.memory[index].nodeid,
dynamic_platform_info.memory[index].addr_base, data = sbsa_platform_memory_node(index);
dynamic_platform_info.memory[index].addr_size);
SMC_RET4(handle, NULL, data.nodeid,
data.addr_base, data.addr_size);
} else { } else {
SMC_RET1(handle, SMC_ARCH_CALL_INVAL_PARAM); SMC_RET1(handle, SMC_ARCH_CALL_INVAL_PARAM);
} }