dvfs: fix bugs and edge cases with cpu dvfs

This commit is contained in:
souldbminersmwc committed 2026-10-05 17:45:36 -04:00
1 parent 79ee323cbe
commit b144c8d633
6 files changed
+63 -16

No files matched your search

+39 -2
View File
@@ -51,7 +51,8 @@
#include "../mapping/mem_map.hpp" #include "../mapping/mem_map.hpp"
#include "../soc/dram_mrr.hpp" #include "../soc/dram_mrr.hpp"
#include "../i2c/max77620_wdt.hpp" #include "../i2c/max77620_wdt.hpp"
#include "../mgr/clock_manager.hpp"
#include "../file/config.hpp"
namespace board { namespace board {
u64 clkVirtAddr, dsiVirtAddr, apbVirtAddr, fuseVirtAddr; u64 clkVirtAddr, dsiVirtAddr, apbVirtAddr, fuseVirtAddr;
@@ -95,15 +96,45 @@ namespace board {
u32 flags; u32 flags;
rc = pscPmModuleGetRequest(&s_pscModule, &state, &flags); rc = pscPmModuleGetRequest(&s_pscModule, &state, &flags);
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
if (state == PscPmState_Awake) { if (state == PscPmState_ReadyAwaken) {
i2c::wdt::ResetWdtEnableState(); i2c::wdt::ResetWdtEnableState();
i2c::wdt::Pet(); i2c::wdt::Pet();
if(board::GetSocType() == HocClkSocType_Mariko &&
file::config::GetConfigValue(HocClkConfigValue_CPUDVFSMode) == CPUDVFSMode_Modify) {
s32 cpuDvfsOffset = file::config::GetConfigValue(HocClkConfigValue_CPUDVFSOffset);
cpuDvfsOffset = std::max(cpuDvfsOffset, -80);
u32 cpuVmin = GetMinimumCpuVmin(mgr::GetNearestOverrideHz(HocClkModule_MEM) / 1000000, GetCpuSpeedoBracket());
if (cpuVmin) {
cpuVmin += cpuDvfsOffset;
}
ApplyCpuMinVolt(cpuVmin, true);
}
file::utils::LogLine("[brd]: Ready to awaken");
s_isAwake = true; s_isAwake = true;
} else if (state == PscPmState_ReadySleep) { } else if (state == PscPmState_ReadySleep) {
i2c::wdt::Disarm(); i2c::wdt::Disarm();
ResetToStockMem();
ResetToStockCpu();
ApplyCpuMinVolt(0, true);
file::utils::LogLine("[brd]: Ready to sleep");
s_isAwake = false; s_isAwake = false;
} else if (state == PscPmState_ReadyShutdown) { } else if (state == PscPmState_ReadyShutdown) {
i2c::wdt::Disarm(); i2c::wdt::Disarm();
ResetToStockMem();
ResetToStockCpu();
ApplyCpuMinVolt(0, true);
file::utils::LogLine("[brd]: Ready to shutdown");
s_isAwake = false; s_isAwake = false;
} }
@@ -254,6 +285,8 @@ namespace board {
rc = threadStart(&s_pscThread); rc = threadStart(&s_pscThread);
ASSERT_RESULT_OK(rc, "threadStart"); ASSERT_RESULT_OK(rc, "threadStart");
s_isAwake = true;
} }
void Exit() { void Exit() {
@@ -345,4 +378,8 @@ namespace board {
return cpuSpeedoBracket; return cpuSpeedoBracket;
} }
bool IsAwake() {
return s_isAwake;
}
} // namespace board } // namespace board
+1 -1
View File
@@ -61,5 +61,5 @@ namespace board {
bool IsDram8GB(); bool IsDram8GB();
void SetDisplayRefreshDockedState(bool docked); void SetDisplayRefreshDockedState(bool docked);
FuseData *GetFuseData(); FuseData *GetFuseData();
bool IsAwake();
} // namespace board } // namespace board
@@ -640,7 +640,7 @@ namespace board {
return mv <= PmicVmin ? 0 : (mv - PmicVmin) / PmicStep; return mv <= PmicVmin ? 0 : (mv - PmicVmin) / PmicStep;
} }
u32 GetLutVolt(u32 code) { [[maybe_unused]] u32 GetLutVolt(u32 code) {
return code * PmicStep + PmicVmin; return code * PmicStep + PmicVmin;
} }
@@ -652,14 +652,17 @@ namespace board {
VolatileCopyDwords(cpuVoltData.table, cpuVoltData.lut, LutSize); VolatileCopyDwords(cpuVoltData.table, cpuVoltData.lut, LutSize);
} }
/* todo debug edge cases of this. */ /* TODO: Dynamically get this from the PCV LUT */
void UnstuckFreqWar() { void UnstuckFreqWar() {
constexpr u32 KNOWN_GOOD_WAR_FREQUENCY = 1'785'000'000;
u32 hz = board::GetHz(HocClkModule_CPU); u32 hz = board::GetHz(HocClkModule_CPU);
board::SetHz(HocClkModule_CPU, ~0); board::SetHz(HocClkModule_CPU, KNOWN_GOOD_WAR_FREQUENCY);
svcSleepThread(5'000'000);
board::SetHz(HocClkModule_CPU, hz); board::SetHz(HocClkModule_CPU, hz);
} }
void RestoreCpuLut() { void RestoreCpuLut() {
cpuVoltData.lastVmin = 0;
VolatileCopyDwords(cpuVoltData.lut, cpuVoltData.table, LutSize); VolatileCopyDwords(cpuVoltData.lut, cpuVoltData.table, LutSize);
UnstuckFreqWar(); UnstuckFreqWar();
} }
@@ -762,16 +765,22 @@ namespace board {
return baseVolt; return baseVolt;
} }
void ApplyCpuMinVolt(u32 vmin) { void ApplyCpuMinVolt(u32 vmin, bool force) {
if (!cpuVoltData.initialized || vmin == cpuVoltData.lastVmin) { if(!force) {
return; if (!cpuVoltData.initialized || (vmin == cpuVoltData.lastVmin)) {
return;
}
} }
file::utils::LogLine("[dvfs]: %setting cpu vmin to %dmV", force ? "Forcefully s" : "S", vmin);
if (vmin == 0) { if (vmin == 0) {
RestoreCpuLut(); RestoreCpuLut();
file::utils::LogLine("[dvfs]: Restored LUT");
return; return;
} }
u32 tmpLut[LutSize]; u32 tmpLut[LutSize];
std::memcpy(tmpLut, cpuVoltData.table, sizeof(tmpLut)); std::memcpy(tmpLut, cpuVoltData.table, sizeof(tmpLut));
@@ -780,6 +789,7 @@ namespace board {
const u32 floored = FloorLutTable(tmpLut, minCode); const u32 floored = FloorLutTable(tmpLut, minCode);
if (floored == 0) { if (floored == 0) {
RestoreCpuLut(); RestoreCpuLut();
file::utils::LogLine("[dvfs]: Floored, restored LUT");
return; return;
} }
@@ -794,9 +804,7 @@ namespace board {
VolatileCopyDwords(cpuVoltData.lut, tmpLut, LutSize); VolatileCopyDwords(cpuVoltData.lut, tmpLut, LutSize);
if (vmin < cpuVoltData.lastVmin) { UnstuckFreqWar();
UnstuckFreqWar();
}
cpuVoltData.lastVmin = vmin; cpuVoltData.lastVmin = vmin;
} }
@@ -61,7 +61,7 @@ namespace board {
u32 GetMinimumGpuVmin(u32 freqMhz, u32 bracket); u32 GetMinimumGpuVmin(u32 freqMhz, u32 bracket);
void InitializeCpuLut(); void InitializeCpuLut();
void ApplyCpuMinVolt(u32 vmin); void ApplyCpuMinVolt(u32 vmin, bool force);
u32 GetMinimumCpuVmin(u32 freqMhz, u32 bracket); u32 GetMinimumCpuVmin(u32 freqMhz, u32 bracket);
} // namespace board } // namespace board
@@ -468,7 +468,7 @@ namespace mgr {
cpuVmin += cpuDvfsOffset; cpuVmin += cpuDvfsOffset;
} }
board::ApplyCpuMinVolt(cpuVmin); board::ApplyCpuMinVolt(cpuVmin, false);
} }
} }
@@ -484,7 +484,7 @@ namespace mgr {
} }
if (IsCpuDvfsEnabled()) { if (IsCpuDvfsEnabled()) {
board::ApplyCpuMinVolt(0); board::ApplyCpuMinVolt(0, false);
} }
} }
@@ -684,7 +684,7 @@ namespace mgr {
} }
if (IsCpuDvfsEnabled()) { if (IsCpuDvfsEnabled()) {
board::ApplyCpuMinVolt(0); board::ApplyCpuMinVolt(0, false);
} }
WaitForNextTick(); WaitForNextTick();
} }
@@ -66,6 +66,8 @@ namespace mgr {
void ApplyGpuFreqVoltRequest(u32 voltage, u32 hz); void ApplyGpuFreqVoltRequest(u32 voltage, u32 hz);
u32 GetNearestOverrideHz(HocClkModule module);
void Tick(); void Tick();
void WaitForNextTick(); void WaitForNextTick();
} // namespace mgr } // namespace mgr