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
diff --git a/spm/cactus/cactus_main.c b/spm/cactus/cactus_main.c
index 727ebcb..5ca206b 100644
--- a/spm/cactus/cactus_main.c
+++ b/spm/cactus/cactus_main.c
@@ -180,12 +180,6 @@
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 7dc1648..2345051 100644
--- a/spm/common/sp_helpers.c
+++ b/spm/common/sp_helpers.c
@@ -75,29 +75,6 @@
* 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 965f799..4f64a82 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 {