OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

hv: cpu_state_tbl: fix multiple exits 

This patch fixes the MISRA-C violations in arch/x86/cpu_state_tbl.c
 * make the function have only one exit point

Tracked-On: #861
Signed-off-by: Shiqing Gao <shiqing.gao@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Shiqing Gao 2018-12-21 09:58:21 +08:00 committed by wenlingz
parent eb77e25ff9
commit ddd07b955b
1 changed files with 28 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
hypervisor/arch/x86/cpu_state_tbl.c
View File

@ -106,19 +106,18 @@ static int32_t get_state_tbl_idx(const char *cpuname)
{ {
int32_t i; int32_t i;
int32_t count = ARRAY_SIZE(cpu_state_tbl); int32_t count = ARRAY_SIZE(cpu_state_tbl);
int32_t ret = -1;
if (cpuname == NULL) { if (cpuname != NULL) {
return -1; for (i = 0; i < count; i++) {
} if (strcmp((cpu_state_tbl[i].model_name), cpuname) == 0) {
ret = i;
for (i = 0; i < count; i++) { break;
if (strcmp((cpu_state_tbl[i].model_name), }
cpuname) == 0) {
return i;
} }
} }
return -1; return ret;
} }
void load_cpu_state_data(void) void load_cpu_state_data(void)
@ -126,35 +125,33 @@ void load_cpu_state_data(void)
int32_t tbl_idx; int32_t tbl_idx;
const struct cpu_state_info *state_info; const struct cpu_state_info *state_info;
(void)memset(&boot_cpu_data.state_info, 0U, (void)memset(&boot_cpu_data.state_info, 0U, sizeof(struct cpu_state_info));
sizeof(struct cpu_state_info));
tbl_idx = get_state_tbl_idx(boot_cpu_data.model_name); tbl_idx = get_state_tbl_idx(boot_cpu_data.model_name);
if (tbl_idx < 0) {
/* The state table is not found. */
return;
}
state_info = &(cpu_state_tbl + tbl_idx)->state_info; if (tbl_idx >= 0) {
/* The state table is found. */
if ((state_info->px_cnt != 0U) && (state_info->px_data != NULL)) { state_info = &(cpu_state_tbl + tbl_idx)->state_info;
if (state_info->px_cnt > MAX_PSTATE) {
boot_cpu_data.state_info.px_cnt = MAX_PSTATE; if ((state_info->px_cnt != 0U) && (state_info->px_data != NULL)) {
} else { if (state_info->px_cnt > MAX_PSTATE) {
boot_cpu_data.state_info.px_cnt = state_info->px_cnt; boot_cpu_data.state_info.px_cnt = MAX_PSTATE;
} else {
boot_cpu_data.state_info.px_cnt = state_info->px_cnt;
}
boot_cpu_data.state_info.px_data = state_info->px_data;
} }
boot_cpu_data.state_info.px_data = state_info->px_data; if ((state_info->cx_cnt != 0U) && (state_info->cx_data != NULL)) {
} if (state_info->cx_cnt > MAX_CX_ENTRY) {
boot_cpu_data.state_info.cx_cnt = MAX_CX_ENTRY;
} else {
boot_cpu_data.state_info.cx_cnt = state_info->cx_cnt;
}
if ((state_info->cx_cnt != 0U) && (state_info->cx_data != NULL)) { boot_cpu_data.state_info.cx_data = state_info->cx_data;
if (state_info->cx_cnt > MAX_CX_ENTRY) {
boot_cpu_data.state_info.cx_cnt = MAX_CX_ENTRY;
} else {
boot_cpu_data.state_info.cx_cnt = state_info->cx_cnt;
} }
boot_cpu_data.state_info.cx_data = state_info->cx_data;
} }
} }