CPU (Linux): detect bios limited frequency and print it by default

To match neofetch's behavior

Fix #947
This commit is contained in:
李通洲
2024-05-20 18:33:47 +08:00
parent a8b734c877
commit 264b6794f3
3 changed files with 33 additions and 7 deletions
+1 -1
View File
@@ -22,12 +22,12 @@ typedef struct FFCPUResult
double frequencyBase; // GHz
double frequencyMax; // GHz
double frequencyMin; // GHz
double frequencyBiosLimit; // GHz
FFCPUCore coreTypes[16]; // number of P cores, E cores, etc.
double temperature;
} FFCPUResult;
const char* ffCPUDetectByCpuid(FFCPUResult* cpu);
const char* ffDetectCPU(const FFCPUOptions* options, FFCPUResult* cpu);
const char* ffCPUAppleCodeToName(uint32_t code);
+10 -1
View File
@@ -150,6 +150,14 @@ static bool detectFrequency(FFCPUResult* cpu)
else
cpu->frequencyBase = fbase;
}
uint32_t fbioslimit = getFrequency(&path, "/bios_limit", NULL, &buffer);
if (fbioslimit > 0)
{
if (cpu->frequencyBiosLimit == cpu->frequencyBiosLimit)
cpu->frequencyBiosLimit = cpu->frequencyBiosLimit > fbioslimit ? cpu->frequencyBiosLimit : fbioslimit;
else
cpu->frequencyBiosLimit = fbioslimit;
}
uint32_t fmax = getFrequency(&path, "/cpuinfo_max_freq", "/scaling_max_freq", &buffer);
if (fmax > 0)
{
@@ -167,7 +175,7 @@ static bool detectFrequency(FFCPUResult* cpu)
cpu->frequencyMin = fmin;
}
uint32_t freq = fbase <= 0 ? fmax : fbase; // seems base frequencies are more stable
uint32_t freq = fbase == 0 ? fmax : fbase; // seems base frequencies are more stable
uint32_t ifreq = 0;
while (cpu->coreTypes[ifreq].freq != freq && cpu->coreTypes[ifreq].freq > 0)
++ifreq;
@@ -180,6 +188,7 @@ static bool detectFrequency(FFCPUResult* cpu)
cpu->frequencyBase /= 1e6;
cpu->frequencyMax /= 1e6;
cpu->frequencyMin /= 1e6;
cpu->frequencyBiosLimit /= 1e6;
return true;
}