github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-22 21:47:22 +00:00
Code Issues Projects Releases Wiki Activity

hv:refine coding style for trusty_hypercallc.

Browse Source 
remove some redundant code

Tracked-On: #861
Signed-off-by: Yonghua Huang <yonghua.huang@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Yonghua Huang 2019-02-03 18:01:43 +08:00 committed by wenlingz
parent 229fbdd81d
commit c855b78230
1 changed files with 25 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
hypervisor/common/trusty_hypercall.c
View File

@ -26,22 +26,10 @@
int32_t hcall_world_switch(struct acrn_vcpu *vcpu)
{
int32_t next_world_id = !(vcpu->arch.cur_context);
int32_t ret;
int32_t ret = -EPERM;
if (next_world_id >= NR_WORLD) {
dev_dbg(ACRN_DBG_TRUSTY_HYCALL,
"%s world_id %d exceed max number of Worlds\n",
__func__, next_world_id);
ret = -EINVAL;
} else if (vcpu->vm->sworld_control.flag.supported == 0UL) {
dev_dbg(ACRN_DBG_TRUSTY_HYCALL,
"Secure World is not supported!\n");
ret = -EPERM;
} else if (vcpu->vm->sworld_control.flag.active == 0UL) {
dev_dbg(ACRN_DBG_TRUSTY_HYCALL,
"Trusty is not initialized!\n");
ret = -EPERM;
} else {
if ((vcpu->vm->sworld_control.flag.supported != 0UL) && (next_world_id < NR_WORLD)
&& (vcpu->vm->sworld_control.flag.active != 0UL)) {
switch_world(vcpu, next_world_id);
ret = 0;
}
@ -64,30 +52,24 @@ int32_t hcall_world_switch(struct acrn_vcpu *vcpu)
*/
int32_t hcall_initialize_trusty(struct acrn_vcpu *vcpu, uint64_t param)
{
int32_t ret = 0;
int32_t ret = -EFAULT;
struct trusty_boot_param boot_param;
if (vcpu->vm->sworld_control.flag.supported == 0UL) {
pr_err("Secure World is not supported!\n");
ret = -EPERM;
} else if (vcpu->vm->sworld_control.flag.active != 0UL) {
pr_err("Trusty already initialized!\n");
ret = -EPERM;
} else if (vcpu->arch.cur_context != NORMAL_WORLD) {
pr_err("%s, must initialize Trusty from Normal World!\n", __func__);
ret = -EPERM;
} else {
(void)memset(&boot_param, 0U, sizeof(boot_param));
if (copy_from_gpa(vcpu->vm, &boot_param, param, sizeof(boot_param)) != 0) {
pr_err("%s: Unable to copy trusty_boot_param\n", __func__);
ret = -EFAULT;
} else if (!initialize_trusty(vcpu, &boot_param)) {
ret = -ENODEV;
} else {
vcpu->vm->sworld_control.flag.active = 1UL;
}
}
if ((vcpu->vm->sworld_control.flag.supported != 0UL)
&& (vcpu->vm->sworld_control.flag.active == 0UL)
&& (vcpu->arch.cur_context == NORMAL_WORLD)) {
(void)memset(&boot_param, 0U, sizeof(boot_param));
if (copy_from_gpa(vcpu->vm, &boot_param, param, sizeof(boot_param)) == 0) {
if (initialize_trusty(vcpu, &boot_param)) {
vcpu->vm->sworld_control.flag.active = 1UL;
ret = 0;
}
}
} else {
ret = -EPERM;
pr_err("%s, context mismatch when initialize trusty.\n", __func__);
}
return ret;
}
@ -101,28 +83,24 @@ int32_t hcall_initialize_trusty(struct acrn_vcpu *vcpu, uint64_t param)
int32_t hcall_save_restore_sworld_ctx(struct acrn_vcpu *vcpu)
{
struct acrn_vm *vm = vcpu->vm;
int32_t ret = 0;
int32_t ret = -EINVAL;
if (vm->sworld_control.flag.supported == 0UL) {
dev_dbg(ACRN_DBG_TRUSTY_HYCALL,
"Secure World is not supported!\n");
ret = -EPERM;
} else if (!is_vcpu_bsp(vcpu)) {
/* Currently, Secure World is only running on vCPU0 */
dev_dbg(ACRN_DBG_TRUSTY_HYCALL,
"This hypercall is only allowed from vcpu0!");
ret = -EPERM;
} else {
if (is_vcpu_bsp(vcpu) && (vm->sworld_control.flag.supported != 0UL)) {
if (vm->sworld_control.flag.active != 0UL) {
save_sworld_context(vcpu);
vm->sworld_control.flag.ctx_saved = 1UL;
ret = 0;
} else {
if (vm->sworld_control.flag.ctx_saved != 0UL) {
restore_sworld_context(vcpu);
vm->sworld_control.flag.ctx_saved = 0UL;
vm->sworld_control.flag.active = 1UL;
ret = 0;
}
}
} else {
ret = -EPERM;
pr_err("%s, states mismatch when save restore sworld context.\n", __func__);
}
return ret;