admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

tools/power x86_energy_perf_policy: Simplify Android MSR probe

Browse Source 
no functional change

Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Len Brown
2025-11-25 11:47:04 -05:00
parent 2ff4b59f2e
commit 90a2fe2576
1 changed files with 11 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c
View File

@@ -95,7 +95,6 @@ unsigned int bdx_highest_ratio;
#define PATH_TO_CPU "/sys/devices/system/cpu/" #define PATH_TO_CPU "/sys/devices/system/cpu/"
#define SYSFS_PATH_MAX 255 #define SYSFS_PATH_MAX 255
/* keep Default as a linux path */
static int use_android_msr_path; static int use_android_msr_path;
/* /*
@@ -681,29 +680,6 @@ void err_on_hypervisor(void)
"not supported on this virtual machine"); "not supported on this virtual machine");
} }
static void probe_msr_path_format(void)
{
struct stat sb;
char test_path[32];
/* Test standard Linux path */
sprintf(test_path, "/dev/cpu/%d/msr", base_cpu);
if (stat(test_path, &sb) == 0) {
use_android_msr_path = 0;
return;
}
/* Test Android-style path */
sprintf(test_path, "/dev/msr%d", base_cpu);
if (stat(test_path, &sb) == 0) {
use_android_msr_path = 1;
return;
}
/* If neither exists, keep the default Linux format */
use_android_msr_path = 0;
}
int get_msr(int cpu, int offset, unsigned long long *msr) int get_msr(int cpu, int offset, unsigned long long *msr)
{ {
int retval; int retval;
@@ -1450,12 +1426,23 @@ void set_base_cpu(void)
err(-ENODEV, "No valid cpus found"); err(-ENODEV, "No valid cpus found");
} }
static void probe_android_msr_path(void)
{
struct stat sb;
char test_path[32];
sprintf(test_path, "/dev/msr%d", base_cpu);
if (stat(test_path, &sb) == 0)
use_android_msr_path = 1;
}
void probe_dev_msr(void) void probe_dev_msr(void)
{ {
struct stat sb; struct stat sb;
char pathname[32]; char pathname[32];
probe_android_msr_path();
sprintf(pathname, use_android_msr_path ? "/dev/msr%d" : "/dev/cpu/%d/msr", base_cpu); sprintf(pathname, use_android_msr_path ? "/dev/msr%d" : "/dev/cpu/%d/msr", base_cpu);
if (stat(pathname, &sb)) { if (stat(pathname, &sb)) {
if (system("/sbin/modprobe msr > /dev/null 2>&1")) { if (system("/sbin/modprobe msr > /dev/null 2>&1")) {
@@ -1582,9 +1569,6 @@ int main(int argc, char **argv)
{ {
set_base_cpu(); set_base_cpu();
/* probe MSR path */
probe_msr_path_format();
probe_dev_msr(); probe_dev_msr();
init_data_structures(); init_data_structures();