aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Deprez <olivier.deprez@arm.com>2020-09-15 10:20:19 +0200
committerManish Pandey <manish.pandey2@arm.com>2020-09-22 14:24:25 +0000
commit05a577e0a28d6ac68b6505c62162e160fc960668 (patch)
tree1fb685bae3c1849dc64146e938c486ec736c9c8d
parentb43e2c8ed33a3e5aff46ce8fccd0e776da2c09af (diff)
downloadtf-a-tests-05a577e0a28d6ac68b6505c62162e160fc960668.tar.gz
cactus: remove deprecated hypervisor calls
Hafnium provided VM get count and vcpu get count hypervisor calls which are now deprecated [1]. The preference is to use FFA_PARTITION_INFO_GET discovery ABI. [1] https://git.trustedfirmware.org/hafnium/hafnium.git/ commit/?id=ae3840dbc9372fd407893f32a5d624828c8933ae Signed-off-by: Olivier Deprez <olivier.deprez@arm.com> Change-Id: Idad95a0804a05d845dc45c2a0f0463f0120d4815
-rw-r--r--spm/cactus/cactus_main.c6
-rw-r--r--spm/common/sp_helpers.c23
-rw-r--r--spm/common/sp_helpers.h2
3 files changed, 0 insertions, 31 deletions
diff --git a/spm/cactus/cactus_main.c b/spm/cactus/cactus_main.c
index 727ebcb78..5ca206b08 100644
--- a/spm/cactus/cactus_main.c
+++ b/spm/cactus/cactus_main.c
@@ -180,12 +180,6 @@ void __dead2 cactus_main(void)
NOTICE("Booting Primary Cactus Secure Partition\n%s\n%s\n",
build_message, version_string);
-
- /* Get number of VMs */
- NOTICE("VM count: %u\n", spm_vm_get_count());
-
- /* Get virtual CPU count for current VM */
- NOTICE("vCPU count: %u\n", spm_vcpu_get_count(ffa_id));
} else {
set_putc_impl(HVC_CALL_AS_STDOUT);
diff --git a/spm/common/sp_helpers.c b/spm/common/sp_helpers.c
index 7dc164847..234505199 100644
--- a/spm/common/sp_helpers.c
+++ b/spm/common/sp_helpers.c
@@ -75,29 +75,6 @@ void sp_sleep(uint32_t ms)
* Hypervisor Calls Wrappers
******************************************************************************/
-ffa_vcpu_count_t spm_vcpu_get_count(ffa_vm_id_t vm_id)
-{
- hvc_args args = {
- .fid = SPM_VCPU_GET_COUNT,
- .arg1 = vm_id
- };
-
- hvc_ret_values ret = tftf_hvc(&args);
-
- return ret.ret0;
-}
-
-ffa_vm_count_t spm_vm_get_count(void)
-{
- hvc_args args = {
- .fid = SPM_VM_GET_COUNT
- };
-
- hvc_ret_values ret = tftf_hvc(&args);
-
- return ret.ret0;
-}
-
void spm_debug_log(char c)
{
hvc_args args = {
diff --git a/spm/common/sp_helpers.h b/spm/common/sp_helpers.h
index 965f79903..4f64a8279 100644
--- a/spm/common/sp_helpers.h
+++ b/spm/common/sp_helpers.h
@@ -13,8 +13,6 @@
#define SPM_VM_ID_FIRST SP_ID(1)
-#define SPM_VM_GET_COUNT (0xFF01)
-#define SPM_VCPU_GET_COUNT (0xFF02)
#define SPM_DEBUG_LOG (0xBD000000)
typedef struct {