diff options
| author | Joanna Farley <joanna.farley@arm.com> | 2023-02-16 12:25:17 +0100 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2023-02-16 12:25:17 +0100 |
| commit | 0069933a68d15c93b8a14ac0fd11d36ff3e96e92 (patch) | |
| tree | 9da2180c36639a56ef5b738c60f18f63524068e0 /plat/xilinx | |
| parent | 97936d895b41bc7691edcbd5c24890764356e01c (diff) | |
| parent | aaf5ce77fb22f54a8ca7bc8d3be6172dacbfc0c1 (diff) | |
| download | arm-trusted-firmware-0069933a68d15c93b8a14ac0fd11d36ff3e96e92.tar.gz | |
Merge "feat(zynqmp): bump up version of query_data API" into integration
Diffstat (limited to 'plat/xilinx')
| -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 |
2 files changed, 6 insertions, 1 deletions
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 |