diff options
Diffstat (limited to 'platform/linux-generic/arch/x86/odp_sysinfo_parse.c')
| -rw-r--r-- | platform/linux-generic/arch/x86/odp_sysinfo_parse.c | 99 |
1 files changed, 72 insertions, 27 deletions
diff --git a/platform/linux-generic/arch/x86/odp_sysinfo_parse.c b/platform/linux-generic/arch/x86/odp_sysinfo_parse.c index d77165a41..0a5aedfcc 100644 --- a/platform/linux-generic/arch/x86/odp_sysinfo_parse.c +++ b/platform/linux-generic/arch/x86/odp_sysinfo_parse.c @@ -1,45 +1,93 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2016-2018 Linaro Limited + * Copyright (c) 2023 Nokia */ -#include <odp_internal.h> -#include <arch/x86/cpu_flags.h> +#include <odp_sysinfo_internal.h> +#include <odp_string_internal.h> +#include "cpu_flags.h" #include <string.h> -int cpuinfo_parser(FILE *file, system_info_t *sysinfo) +int _odp_cpuinfo_parser(FILE *file, system_info_t *sysinfo) { char str[1024]; - char *pos; + char *pos, *pos_end; double ghz = 0.0; + double mhz = 0.0; uint64_t hz; int id = 0; + bool freq_set = false; + + sysinfo->cpu_arch = ODP_CPU_ARCH_X86; + sysinfo->cpu_isa_sw.x86 = ODP_CPU_ARCH_X86_UNKNOWN; + sysinfo->cpu_isa_hw.x86 = ODP_CPU_ARCH_X86_UNKNOWN; + + #if defined __x86_64 || defined __x86_64__ + sysinfo->cpu_isa_sw.x86 = ODP_CPU_ARCH_X86_64; + #elif defined __i686 || defined __i686__ + sysinfo->cpu_isa_sw.x86 = ODP_CPU_ARCH_X86_I686; + #endif strcpy(sysinfo->cpu_arch_str, "x86"); - while (fgets(str, sizeof(str), file) != NULL && id < MAX_CPU_NUMBER) { + while (fgets(str, sizeof(str), file) != NULL && id < CONFIG_NUM_CPU_IDS) { + if (strstr(str, "flags") && strstr(str, "constant_tsc")) { + sysinfo->cpu_constant_tsc = 1; + continue; + } + pos = strstr(str, "model name"); if (pos) { - pos = strchr(str, ':'); - strncpy(sysinfo->model_str[id], pos + 2, - sizeof(sysinfo->model_str[id]) - 1); - - pos = strchr(sysinfo->model_str[id], '@'); - if (pos) { - *(pos - 1) = '\0'; - if (sscanf(pos, "@ %lfGHz", &ghz) == 1) { - hz = (uint64_t)(ghz * 1000000000.0); - sysinfo->cpu_hz_max[id] = hz; - } + freq_set = false; + + /* Copy model name between : and @ characters */ + pos = strchr(str, ':'); + pos_end = strchr(str, '@'); + if (pos == NULL) + continue; + + if (pos_end != NULL) + *(pos_end - 1) = '\0'; + + _odp_strcpy(sysinfo->model_str[id], pos + 2, + MODEL_STR_SIZE); + + if (sysinfo->cpu_hz_max[id]) { + freq_set = true; + id++; + continue; + } + + /* max frequency needs to be set */ + if (pos_end != NULL && + sscanf(pos_end, "@ %lfGHz", &ghz) == 1) { + hz = (uint64_t)(ghz * 1000000000.0); + sysinfo->cpu_hz_max[id++] = hz; + freq_set = true; + } + } else if (!freq_set && + strstr(str, "bogomips") != NULL) { + pos = strchr(str, ':'); + if (pos == NULL) + continue; + + if (sscanf(pos + 2, "%lf", &mhz) == 1) { + /* On typical x86 BogoMIPS is freq * 2 */ + hz = (uint64_t)(mhz * 1000000.0 / 2); + sysinfo->cpu_hz_max[id++] = hz; + freq_set = true; } - id++; } } return 0; } -uint64_t odp_cpu_hz_current(int id) +void _odp_sys_info_print_arch(void) +{ + _odp_cpu_flags_print_all(); +} + +uint64_t odp_cpu_arch_hz_current(int id) { char str[1024]; FILE *file; @@ -48,6 +96,8 @@ uint64_t odp_cpu_hz_current(int id) double mhz = 0.0; file = fopen("/proc/cpuinfo", "rt"); + if (!file) + return 0; /* find the correct processor instance */ while (fgets(str, sizeof(str), file) != NULL) { @@ -74,8 +124,3 @@ uint64_t odp_cpu_hz_current(int id) return 0; } - -void sys_info_print_arch(void) -{ - cpu_flags_print_all(); -} |