Remove legacy hf_vm_get_count and hf_vcpu_get_count calls.
These are now covered by FFA_PARTITION_INFO_GET.
Change-Id: I1bfb0eff1b1eeaf1f2c0cfefcef3596fa771ed71
diff --git a/inc/hf/api.h b/inc/hf/api.h
index f9f8cca..6db4783 100644
--- a/inc/hf/api.h
+++ b/inc/hf/api.h
@@ -16,9 +16,6 @@
#include "vmapi/hf/ffa.h"
void api_init(struct mpool *ppool);
-ffa_vm_count_t api_vm_get_count(void);
-ffa_vcpu_count_t api_vcpu_get_count(ffa_vm_id_t vm_id,
- const struct vcpu *current);
void api_regs_state_saved(struct vcpu *vcpu);
int64_t api_mailbox_writable_get(const struct vcpu *current);
int64_t api_mailbox_waiter_get(ffa_vm_id_t vm_id, const struct vcpu *current);
diff --git a/inc/vmapi/hf/abi.h b/inc/vmapi/hf/abi.h
index 66f09fd..b537d1c 100644
--- a/inc/vmapi/hf/abi.h
+++ b/inc/vmapi/hf/abi.h
@@ -15,17 +15,15 @@
/* clang-format off */
/* TODO: Define constants below according to spec. */
-#define HF_VM_GET_COUNT 0xff01
-#define HF_VCPU_GET_COUNT 0xff02
-#define HF_MAILBOX_WRITABLE_GET 0xff03
-#define HF_MAILBOX_WAITER_GET 0xff04
-#define HF_INTERRUPT_ENABLE 0xff05
-#define HF_INTERRUPT_GET 0xff06
-#define HF_INTERRUPT_INJECT 0xff07
+#define HF_MAILBOX_WRITABLE_GET 0xff01
+#define HF_MAILBOX_WAITER_GET 0xff02
+#define HF_INTERRUPT_ENABLE 0xff03
+#define HF_INTERRUPT_GET 0xff04
+#define HF_INTERRUPT_INJECT 0xff05
/* Custom FF-A-like calls returned from FFA_RUN. */
-#define HF_FFA_RUN_WAIT_FOR_INTERRUPT 0xff09
-#define HF_FFA_RUN_WAKE_UP 0xff0a
+#define HF_FFA_RUN_WAIT_FOR_INTERRUPT 0xff06
+#define HF_FFA_RUN_WAKE_UP 0xff07
/* This matches what Trusty and its ATF module currently use. */
#define HF_DEBUG_LOG 0xbd000000
diff --git a/inc/vmapi/hf/call.h b/inc/vmapi/hf/call.h
index 8a29933..71f579f 100644
--- a/inc/vmapi/hf/call.h
+++ b/inc/vmapi/hf/call.h
@@ -61,22 +61,6 @@
}
/**
- * Returns the number of secondary VMs.
- */
-static inline ffa_vm_count_t hf_vm_get_count(void)
-{
- return hf_call(HF_VM_GET_COUNT, 0, 0, 0);
-}
-
-/**
- * Returns the number of vCPUs configured in the given secondary VM.
- */
-static inline ffa_vcpu_count_t hf_vcpu_get_count(ffa_vm_id_t vm_id)
-{
- return hf_call(HF_VCPU_GET_COUNT, vm_id, 0, 0);
-}
-
-/**
* Runs the given vCPU of the given VM.
*/
static inline struct ffa_value ffa_run(ffa_vm_id_t vm_id,