diff options
Diffstat (limited to 'plat/xilinx')
| -rw-r--r-- | plat/xilinx/zynqmp/bl31_zynqmp_setup.c | 3 | ||||
| -rw-r--r-- | plat/xilinx/zynqmp/pm_service/pm_api_sys.c | 3 | ||||
| -rw-r--r-- | plat/xilinx/zynqmp/pm_service/pm_defs.h | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/plat/xilinx/zynqmp/bl31_zynqmp_setup.c b/plat/xilinx/zynqmp/bl31_zynqmp_setup.c index 36cf992e6..59f729850 100644 --- a/plat/xilinx/zynqmp/bl31_zynqmp_setup.c +++ b/plat/xilinx/zynqmp/bl31_zynqmp_setup.c @@ -215,7 +215,7 @@ static void prepare_dtb(void) void bl31_platform_setup(void) { #if (BL31_LIMIT < PLAT_DDR_LOWMEM_MAX) - prepare_dtb(); + prepare_dtb(); #endif /* Initialize the gic cpu and distributor interfaces */ @@ -246,7 +246,6 @@ void bl31_plat_arch_setup(void) plat_arm_interconnect_init(); plat_arm_interconnect_enter_coherency(); - const mmap_region_t bl_regions[] = { #if (BL31_LIMIT < PLAT_DDR_LOWMEM_MAX) MAP_REGION_FLAT(XILINX_OF_BOARD_DTB_ADDR, XILINX_OF_BOARD_DTB_MAX_SIZE, diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_sys.c b/plat/xilinx/zynqmp/pm_service/pm_api_sys.c index a17b6c550..63916b883 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_api_sys.c +++ b/plat/xilinx/zynqmp/pm_service/pm_api_sys.c @@ -1,5 +1,6 @@ /* * Copyright (c) 2013-2022, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2022-2023, Advanced Micro Devices Inc. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -786,7 +787,7 @@ static enum pm_ret_status feature_check_atf(uint32_t api_id, uint32_t *version, { switch (api_id) { case PM_QUERY_DATA: - *version = ATF_API_BASE_VERSION; + *version = TFA_API_QUERY_DATA_VERSION; bit_mask[0] = (uint32_t)(PM_QUERY_FEATURE_BITMASK); bit_mask[1] = (uint32_t)(PM_QUERY_FEATURE_BITMASK >> 32); return PM_RET_SUCCESS; diff --git a/plat/xilinx/zynqmp/pm_service/pm_defs.h b/plat/xilinx/zynqmp/pm_service/pm_defs.h index e335b9443..c33fb7107 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_defs.h +++ b/plat/xilinx/zynqmp/pm_service/pm_defs.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2013-2022, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2022-2023, Advanced Micro Devices Inc. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -31,6 +32,9 @@ #define FW_API_VERSION_2 (2U) /* Version of APIs implemented in ATF */ #define ATF_API_BASE_VERSION (1U) +/* Updating the QUERY_DATA API versioning as the bitmask functionality + * support is added in the v2.*/ +#define TFA_API_QUERY_DATA_VERSION (2U) /* Capabilities for RAM */ #define PM_CAP_ACCESS 0x1U |