aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoanna Farley <joanna.farley@arm.com>2022-11-25 16:24:53 +0100
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2022-11-25 16:24:53 +0100
commit896c0daf3eb78b32d6628a96d888da5e2e63f39b (patch)
treecc2313df642f01f6e4eb30d01a8d82a47eb32177
parent53f63eb0ff7376ea884831428c1a13e7f01c4076 (diff)
parentcd73d62b0e0920ca4e6c4fea7ab65bcbd63e07de (diff)
downloadtrusted-firmware-a-896c0daf3eb78b32d6628a96d888da5e2e63f39b.tar.gz
Merge "fix(versal): initialize the variable with value 0 in pm code" into integration
-rw-r--r--plat/xilinx/versal/pm_service/pm_client.c4
-rw-r--r--plat/xilinx/versal/pm_service/pm_svc_main.c2
2 files changed, 2 insertions, 4 deletions
diff --git a/plat/xilinx/versal/pm_service/pm_client.c b/plat/xilinx/versal/pm_service/pm_client.c
index ce5e53384a..54f4eb285b 100644
--- a/plat/xilinx/versal/pm_service/pm_client.c
+++ b/plat/xilinx/versal/pm_service/pm_client.c
@@ -120,11 +120,9 @@ static void pm_client_set_wakeup_sources(uint32_t node_id)
{
uint32_t reg_num;
uint32_t device_id;
- uint8_t pm_wakeup_nodes_set[XPM_NODEIDX_DEV_MAX];
+ uint8_t pm_wakeup_nodes_set[XPM_NODEIDX_DEV_MAX] = { 0U };
uintptr_t isenabler1 = PLAT_VERSAL_GICD_BASE + GICD_ISENABLER + 4;
- zeromem(&pm_wakeup_nodes_set, (u_register_t)sizeof(pm_wakeup_nodes_set));
-
for (reg_num = 0U; reg_num < NUM_GICD_ISENABLER; reg_num++) {
uint32_t base_irq = reg_num << ISENABLER_SHIFT;
uint32_t reg = mmio_read_32(isenabler1 + (reg_num << 2));
diff --git a/plat/xilinx/versal/pm_service/pm_svc_main.c b/plat/xilinx/versal/pm_service/pm_svc_main.c
index 9eb426a374..c90f9e1c34 100644
--- a/plat/xilinx/versal/pm_service/pm_svc_main.c
+++ b/plat/xilinx/versal/pm_service/pm_svc_main.c
@@ -160,7 +160,7 @@ static uintptr_t eemi_for_compatibility(uint32_t api_id, uint32_t *pm_arg,
case PM_IOCTL:
{
- uint32_t value;
+ uint32_t value = 0U;
ret = pm_api_ioctl(pm_arg[0], pm_arg[1], pm_arg[2],
pm_arg[3], pm_arg[4],