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

Debug: Add one hypercall to quary hardware info

Browse Source 
acrntrace/log kernel modules will use this hypercall to fetch
pcpu num of hardware platform. Then, initialize driver accordingly.

Tracked-On: #1775;#1776
Signed-off-by: Kaige Fu <kaige.fu@intel.com>
Reviewed-by: Yan, Like <like.yan@intel.com>
This commit is contained in:
Kaige Fu 2018-12-06 16:13:35 +00:00 committed by wenlingz
parent 81a9de6067
commit 1e3358fd92
2 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
hypervisor/debug/hypercall.c
View File

@ -122,6 +122,34 @@ static int32_t hcall_setup_hv_npk_log(struct acrn_vm *vm, uint64_t param)
return 0; return 0;
} }
/**
* @brief Get hardware related info
*
* @param vm Pointer to vm data structure
* @param param Guest physical address pointing to struct acrn_hw_info
*
* @pre vm shall point to VM0
* @pre param shall be a valid physical address
*
* @retval 0 on success
* @retval -1 in case of error
*/
static int32_t hcall_get_hw_info(struct acrn_vm *vm, uint64_t param)
{
int32_t ret = 0;
struct acrn_hw_info hw_info;
(void)memset((void *)&hw_info, 0U, sizeof(hw_info));
hw_info.cpu_num = phys_cpu_num;
ret = copy_to_gpa(vm, &hw_info, param, sizeof(hw_info));
if (ret != 0) {
pr_err("%s: Unable to copy param to vm", __func__);
}
return ret;
}
/** /**
* @brief Setup hypervisor debug infrastructure, such as share buffer, NPK log and profiling. * @brief Setup hypervisor debug infrastructure, such as share buffer, NPK log and profiling.
* *
@ -151,6 +179,10 @@ int32_t hcall_debug(struct acrn_vm *vm, uint64_t param1, uint64_t param2, uint64
ret = hcall_profiling_ops(vm, param1, param2); ret = hcall_profiling_ops(vm, param1, param2);
break; break;
case HC_GET_HW_INFO:
ret = hcall_get_hw_info(vm, param1);
break;
default: default:
pr_err("op %d: Invalid hypercall\n", hypcall_id); pr_err("op %d: Invalid hypercall\n", hypcall_id);
ret = -EPERM; ret = -EPERM;

9
hypervisor/include/public/acrn_hv_defs.h
View File

@ -69,6 +69,7 @@
#define HC_SETUP_SBUF BASE_HC_ID(HC_ID, HC_ID_DBG_BASE + 0x00UL) #define HC_SETUP_SBUF BASE_HC_ID(HC_ID, HC_ID_DBG_BASE + 0x00UL)
#define HC_SETUP_HV_NPK_LOG BASE_HC_ID(HC_ID, HC_ID_DBG_BASE + 0x01UL) #define HC_SETUP_HV_NPK_LOG BASE_HC_ID(HC_ID, HC_ID_DBG_BASE + 0x01UL)
#define HC_PROFILING_OPS BASE_HC_ID(HC_ID, HC_ID_DBG_BASE + 0x02UL) #define HC_PROFILING_OPS BASE_HC_ID(HC_ID, HC_ID_DBG_BASE + 0x02UL)
#define HC_GET_HW_INFO BASE_HC_ID(HC_ID, HC_ID_DBG_BASE + 0x03UL)
/* Trusty */ /* Trusty */
#define HC_ID_TRUSTY_BASE 0x70UL #define HC_ID_TRUSTY_BASE 0x70UL
@ -209,6 +210,14 @@ struct hv_npk_log_param {
uint64_t mmio_addr; uint64_t mmio_addr;
} __aligned(8); } __aligned(8);
/**
* the parameter for HC_GET_HW_INFO hypercall
*/
struct acrn_hw_info {
uint16_t cpu_num; /* Physical CPU number */
uint16_t reserved[3];
} __aligned(8);
/** /**
* Gpa to hpa translation parameter, used for HC_VM_GPA2HPA hypercall * Gpa to hpa translation parameter, used for HC_VM_GPA2HPA hypercall
*/ */