Board: Fix no sched override

Updated GPU overclocking notes for Erista and Mariko.

LICENSE

@@ -6,6 +6,8 @@
 
 - Although "sys-clk" uses permissive license, all modifications towards it in this repo ("hoc-clk") are licensed under GPL v2.
 
+- Status-Monitor is licensed under the GPLv2
+
                     GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
 

README.md

@@ -115,6 +115,9 @@ Refer to COMPILATION.md
 * 714
 * 612 → sleep mode
   
+**Notes:**
+1. On Erista, CPU in handheld is capped to 1581MHz
+
 ### GPU clocks
 * 1536 → absolute max clock on mariko. very dangerous
 * 1459
@@ -140,8 +143,10 @@ Refer to COMPILATION.md
 * 76 → boost mode
 
 **Notes:**
-1. GPU overclock is capped at 460MHz in handheld and capped at 768MHz if charging, unless you're using the official charger.
+1. GPU overclock is capped at 460MHz on erista in handheld
-2. Clocks higher than 768MHz need the official charger is plugged in.
+2. On Mariko, cap with No uv is 614MHz, with SLT it is 691MHz and with HiOPT it's 768MHz
+3. Clocks higher than 768MHz on erista need the official charger is plugged in.
+4. On Mariko, cap with No uv is 844MHz, with SLT it is 921MHz and with HiOPT it's 998MHz
 
 ---
 
@@ -160,5 +165,5 @@ Refer to COMPILATION.md
 * **b0rd2death** – Ultrahand sys-clk & Status Monitor fork
 * **MasaGratoR and ZachyCatGames** - General help
 * **MasaGratoR** - Status Monitor & Display Refresh Rate Driver
-* **Dom, Samybigio, Arcdelta, Miki, Happy, Flopsider, Winnerboi77, Blaise, Alvise, TDRR, agjeococh and Xenshen** - Testing
+* **Dom, Samybigio, Arcdelta, Miki, Happy, Flopsider, Winnerboi77, Blaise, Alvise, TDRR, agjeococh, frost, letum00 and Xenshen** - Testing
 * **Samybigio2011** - Italian translations

Source/Atmosphere/stratosphere/loader/source/oc/mtc_timing_value.hpp

@@ -30,8 +30,6 @@ namespace ams::ldr::hoc {
     #define PACK_U32(high, low) ((static_cast<u32>(high) << 16) | (static_cast<u32>(low) & 0xFFFF))
     #define PACK_U32_NIBBLE_HIGH_BYTE_LOW(high, low) ((static_cast<u32>(high & 0xF) << 28) | (static_cast<u32>(low) & 0xFF))
 
-
-
     /* Burst latency, not to be confused with base latency (tWRL). */
     const u32 BL = 16;
 
@@ -73,7 +71,7 @@ namespace ams::ldr::hoc {
         const std::array<u32,       8> tRP_values     = { 18, 17, 16, 15, 14, 13, 12, 11 };
         const std::array<u32,      10> tRAS_values    = { 42, 36, 34, 32, 30, 28, 26, 24, 22, 20 };
         const std::array<double,    8>  tRRD_values   = { 10.0, 7.5, 6.0, 5.0, 4.0, 3.0, 2.0, 1.0 };
-        const std::array<u32,      11>  tRFC_values   = { 140, 130, 120, 110, 100, 90, 80, 70, 60, 50, 40 };
+        const std::array<u32,       6>  tRFC_values   = { 90, 80, 70, 60, 50, 40 };
         const std::array<u32,      10>  tWTR_values   = { 10, 9, 8, 7, 6, 5, 4, 3, 2, 1 };
         const std::array<u32,       6>  tREFpb_values = { 3900, 5850, 7800, 11700, 15600, 99999 };
 
@@ -176,3 +174,4 @@ namespace ams::ldr::hoc {
 
 }
 
+

Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv.cpp

@@ -144,7 +144,7 @@ void SafetyCheck() {
         { C.marikoCpuBoostClock, 1020'000, 2703'000, true },
         { C.commonEmcMemVolt,                 912'500, 1350'000 }, // Official burst vmax for the RAMs is 1500mV
         { C.eristaCpuMaxVolt,                    1000,     1257 },
-        { GET_MAX_OF_ARR(erista::maxClocks), 1600'000, 2600'000 },
+        { GET_MAX_OF_ARR(erista::maxEmcClocks), 1600'000, 2600'000 },
         { C.marikoCpuMaxVolt,                    1000,     1235 },
         { C.marikoEmcMaxClock,               1600'000, 3500'000 },
         { C.marikoEmcVddqVolt,                250'000,  700'000 },

Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv.hpp

@@ -178,7 +178,7 @@ namespace ams::ldr::hoc::pcv {
     }
 
     namespace erista {
-        const u32 maxClocks[] = { C.eristaEmcMaxClock2, C.eristaEmcMaxClock1, C.eristaEmcMaxClock, };
+        static u32 maxEmcClocks[] = { C.eristaEmcMaxClock2, C.eristaEmcMaxClock1, C.eristaEmcMaxClock, };
         #define GET_MAX_OF_ARR(ARR) (*std::max_element(ARR, ARR + std::size(ARR)))
 
         constexpr cvb_entry_t CpuCvbTableDefault[] = {

Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv_erista.cpp

@@ -324,13 +324,13 @@ namespace ams::ldr::hoc::pcv::erista {
 
         table->burst_mc_regs.mc_emem_arb_misc0 = (table->burst_mc_regs.mc_emem_arb_misc0 & 0xFFE08000) | (table->burst_mc_regs.mc_emem_arb_timing_rc + 1);
 
-        u32 mpcorer_ptsa_rate = MAX(static_cast<u32>(227), (table->rate_khz / 1600000) * 208);
+        u32 mpcorer_ptsa_rate = MIN(static_cast<u32>(227), (table->rate_khz / 1600000) * 208);
         table->la_scale_regs.mc_mll_mpcorer_ptsa_rate = mpcorer_ptsa_rate;
 
-        u32 ftop_ptsa_rate = MAX(static_cast<u32>(31), (table->rate_khz / 1600000) * 24);
+        u32 ftop_ptsa_rate = MIN(static_cast<u32>(31), (table->rate_khz / 1600000) * 24);
         table->la_scale_regs.mc_ftop_ptsa_rate = ftop_ptsa_rate;
 
-        u32 grant_decrement = MAX(static_cast<u32>(6143), (table->rate_khz / 1600000) * 4611);
+        u32 grant_decrement = MIN(static_cast<u32>(6143), (table->rate_khz / 1600000) * 4611);
         table->la_scale_regs.mc_ptsa_grant_decrement = grant_decrement;
 
         constexpr u32 MaskHigh = 0xFF00FFFF;
@@ -370,7 +370,12 @@ namespace ams::ldr::hoc::pcv::erista {
     }
 
     Result MemFreqMtcTable(u32 *ptr) {
+        if (GET_MAX_OF_ARR(maxEmcClocks) <= EmcClkOSLimit) {
+            R_SKIP();
+        }
+
         u32 khz_list[] = {1600000, 1331200, 1065600, 800000, 665600, 408000, 204000, 102000, 68000, 40800};
+        std::sort(maxEmcClocks, maxEmcClocks + std::size(maxEmcClocks), std::greater<>());
         u32 khz_list_size = sizeof(khz_list) / sizeof(u32);
 
         // Generate list for mtc table pointers
@@ -382,32 +387,37 @@ namespace ams::ldr::hoc::pcv::erista {
             R_UNLESS(table_list[i]->rev == MTC_TABLE_REV, ldr::ResultInvalidMtcTable());
         }
 
-        if (GET_MAX_OF_ARR(maxClocks) <= EmcClkOSLimit) {
+        u32 additionalFreqs = 0;
-            R_SKIP();
+        for (u32 i = 0; i < std::size(maxEmcClocks); ++i) {
+            if (maxEmcClocks[i] > EmcClkOSLimit) {
+                ++additionalFreqs;
+            } else {
+                break;
+            }
         }
 
         // Make room for new mtc table, discarding useless 40.8, 68000 and 102000 MHz table
-        // 40800 overwritten by 68000, ..., 1331200 overwritten by 1600000, leaving table_list[0], table_list[1] and table_list[2] not overwritten
+        // 40800 overwritten by 204000, ..., 1331200 overwritten by 1600000, leaving table_list[0], table_list[1] and table_list[2] not overwritten
-        for (u32 i = khz_list_size - 1; i > 2; --i) {
+        for (u32 i = khz_list_size - 1; i > additionalFreqs - 1; --i) {
-            std::memcpy(static_cast<void *>(table_list[i]), static_cast<void *>(table_list[i - 3]), sizeof(EristaMtcTable));
+            std::memcpy(static_cast<void *>(table_list[i]), static_cast<void *>(table_list[i - additionalFreqs]), sizeof(EristaMtcTable));
         }
 
-        for (u32 i = 0; i < std::size(maxClocks); ++i) {
+        for (u32 i = 0; i < additionalFreqs; ++i) {
-            if (maxClocks[i] > EmcClkOSLimit) {
+            /* Since we're not scaling latency timings properly, copy over the 1600Mhz table to get the closest timings. */
-                table_list[i]->rate_khz = maxClocks[i];
+            std::memcpy(table_list[i], table_list[additionalFreqs], sizeof(EristaMtcTable));
-                MemMtcTableAutoAdjust(table_list[i]);
+            table_list[i]->rate_khz = maxEmcClocks[i];
-            }
+            MemMtcTableAutoAdjust(table_list[i]);
         }
 
         R_SUCCEED();
     }
 
     Result MemFreqMax(u32 *ptr) {
-        if (GET_MAX_OF_ARR(maxClocks) <= EmcClkOSLimit) {
+        if (GET_MAX_OF_ARR(maxEmcClocks) <= EmcClkOSLimit) {
             R_SKIP();
         }
 
-        PATCH_OFFSET(ptr, GET_MAX_OF_ARR(maxClocks));
+        PATCH_OFFSET(ptr, GET_MAX_OF_ARR(maxEmcClocks));
 
         R_SUCCEED();
     }
@@ -445,4 +455,5 @@ namespace ams::ldr::hoc::pcv::erista {
             }
         }
     }
+
 }

Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv_mariko.cpp

@@ -266,7 +266,6 @@ namespace ams::ldr::hoc::pcv::mariko {
                 break;
         }
 
-
         switch (C.marikoCpuUVHigh) {
             case 1:
                 PATCH_OFFSET(&(entry->tune1_high), 0);
@@ -575,14 +574,6 @@ namespace ams::ldr::hoc::pcv::mariko {
         table->emc_cfg_2 = 0x11083D;
     }
 
-        // WRITE_PARAM_ALL_REG(table, emc_pdex2wr, GET_CYCLE(10.0));
-        // WRITE_PARAM_ALL_REG(table, emc_pdex2rd, GET_CYCLE(10.0));
-        // WRITE_PARAM_ALL_REG(table, emc_pchg2pden, GET_CYCLE(1.75));
-        // WRITE_PARAM_ALL_REG(table, emc_ar2pden,   GET_CYCLE(1.75));
-        // WRITE_PARAM_ALL_REG(table, emc_pdex2cke,  GET_CYCLE(1.75));
-        // WRITE_PARAM_ALL_REG(table, emc_act2pden,  GET_CYCLE(14.0));
-        // WRITE_PARAM_ALL_REG(table, emc_cke2pden,  GET_CYCLE(5.0));
-
     void MemMtcPllmbDivisor(MarikoMtcTable *table) {
         constexpr u32 PllOscInKHz   = 38400;
         constexpr u32 PllOscHalfKHz = 19200;

Source/sys-clk/overlay/Makefile

@@ -39,7 +39,7 @@ include ${TOPDIR}/lib/libultrahand/ultrahand.mk
 # version control constants
 #---------------------------------------------------------------------------------
 #TARGET_VERSION	:= $(shell git describe --dirty --always --tags)
-APP_VERSION		:= 0.40
+APP_VERSION		:= 0.41
 TARGET_VERSION := $(APP_VERSION)
 
 #---------------------------------------------------------------------------------

Source/sys-clk/overlay/src/ui/gui/misc_gui.cpp

@@ -245,34 +245,6 @@ void MiscGui::listUI()
         return;
     }
 
-    ValueThresholds thresholdsDisabled(0, 0);
-    std::vector<NamedValue> noNamedValues = {};
-
-    this->listElement->addItem(new tsl::elm::CategoryHeader("Settings"));
-
-    addConfigToggle(HocClkConfigValue_OverwriteBoostMode, nullptr);
-    std::vector<NamedValue> gpuSchedValues = {
-        NamedValue("Do not override", GpuSchedulingMode_DoNotOverride),
-        NamedValue("Enabled", GpuSchedulingMode_Enabled, "96.5% limit"),
-        NamedValue("Disabled", GpuSchedulingMode_Disabled, "99.7% limit"),
-    };
-    tsl::elm::CustomDrawer* gpuSchedInfoText = new tsl::elm::CustomDrawer([](tsl::gfx::Renderer *renderer, s32 x, s32 y, s32 w, s32 h) {
-        renderer->drawString("\uE150 This option requires a reboot", false, x + 20, y + 30, 18, tsl::style::color::ColorText);
-        renderer->drawString("to take effect", false, x + 20, y + 50, 18, tsl::style::color::ColorText);
-    });
-    gpuSchedInfoText->setBoundaries(0, 0, tsl::cfg::FramebufferWidth, 70);
-    this->listElement->addItem(gpuSchedInfoText);
-    addConfigButton(
-        HorizonOCConfigValue_GPUScheduling,
-        "GPU Scheduling Override",
-        ValueRange(0, 0, 1, "", 0),
-        "GPU Scheduling Override",
-        &thresholdsDisabled,
-        {},
-        gpuSchedValues,
-        false
-    );
-
     this->listElement->addItem(new tsl::elm::CategoryHeader("Safety Settings"));
     addConfigToggle(HocClkConfigValue_UncappedClocks, nullptr);
     addConfigToggle(HocClkConfigValue_ThermalThrottle, nullptr);
@@ -315,8 +287,30 @@ void MiscGui::listUI()
         );
     #endif
 
+    ValueThresholds thresholdsDisabled(0, 0);
+    std::vector<NamedValue> noNamedValues = {};
+
+    this->listElement->addItem(new tsl::elm::CategoryHeader("CPU Settings"));
+    addConfigToggle(HocClkConfigValue_OverwriteBoostMode, nullptr);
+    std::vector<NamedValue> gpuSchedValues = {
+        NamedValue("Do not override", GpuSchedulingMode_DoNotOverride),
+        NamedValue("Enabled (Default)", GpuSchedulingMode_Enabled, "96.6% limit"),
+        NamedValue("Disabled", GpuSchedulingMode_Disabled, "99.7% limit"),
+    };
+
+    this->listElement->addItem(new tsl::elm::CategoryHeader("GPU Settings"));
+    addConfigButton(
+        HorizonOCConfigValue_GPUScheduling,
+        "GPU Scheduling Override",
+        ValueRange(0, 0, 1, "", 0),
+        "GPU Scheduling Override",
+        &thresholdsDisabled,
+        {},
+        gpuSchedValues,
+        false
+    );
+
     if (IsMariko()) {
-        this->listElement->addItem(new tsl::elm::CategoryHeader("DVFS"));
         std::vector<NamedValue> dvfsValues = {
             NamedValue("Disabled", DVFSMode_Disabled),
             NamedValue("PCV Hijack", DVFSMode_Hijack),
@@ -354,19 +348,6 @@ void MiscGui::listUI()
         addConfigButton(HorizonOCConfigValue_DVFSOffset, "GPU DVFS Offset", ValueRange(0, 12, 1, "", 0), "GPU DVFS Offset", &thresholdsDisabled, {}, dvfsOffset, false);
     }
 
-    this->listElement->addItem(new tsl::elm::CategoryHeader("Display"));
-
-    addConfigToggle(HorizonOCConfigValue_OverwriteRefreshRate, nullptr);
-    tsl::elm::CustomDrawer* warningText = new tsl::elm::CustomDrawer([](tsl::gfx::Renderer *renderer, s32 x, s32 y, s32 w, s32 h) {
-        renderer->drawString("\uE150 Enabling unsafe display", false, x + 20, y + 30, 18, tsl::style::color::ColorText);
-        renderer->drawString("refresh rates may cause stress", false, x + 20, y + 50, 18, tsl::style::color::ColorText);
-        renderer->drawString("or damage to your display! ", false, x + 20, y + 70, 18, tsl::style::color::ColorText);
-        renderer->drawString("Proceed at your own risk!", false, x + 20, y + 90, 18, tsl::style::color::ColorText);
-    });
-    warningText->setBoundaries(0, 0, tsl::cfg::FramebufferWidth, 110);
-    this->listElement->addItem(warningText);
-    addConfigToggle(HorizonOCConfigValue_EnableUnsafeDisplayFreqs, nullptr);
-
     this->listElement->addItem(new tsl::elm::CategoryHeader("KIP"));
 
     tsl::elm::ListItem* saveBtn = new tsl::elm::ListItem("Save KIP Settings");
@@ -413,6 +394,17 @@ void MiscGui::listUI()
     });
     this->listElement->addItem(gpuSubmenu);
 
+    this->listElement->addItem(new tsl::elm::CategoryHeader("Display"));
+    addConfigToggle(HorizonOCConfigValue_OverwriteRefreshRate, nullptr);
+    tsl::elm::CustomDrawer* warningText = new tsl::elm::CustomDrawer([](tsl::gfx::Renderer *renderer, s32 x, s32 y, s32 w, s32 h) {
+        renderer->drawString("\uE150 Enabling unsafe display", false, x + 20, y + 30, 18, tsl::style::color::ColorText);
+        renderer->drawString("refresh rates may cause stress", false, x + 20, y + 50, 18, tsl::style::color::ColorText);
+        renderer->drawString("or damage to your display! ", false, x + 20, y + 70, 18, tsl::style::color::ColorText);
+        renderer->drawString("Proceed at your own risk!", false, x + 20, y + 90, 18, tsl::style::color::ColorText);
+    });
+    warningText->setBoundaries(0, 0, tsl::cfg::FramebufferWidth, 110);
+    this->listElement->addItem(warningText);
+    addConfigToggle(HorizonOCConfigValue_EnableUnsafeDisplayFreqs, nullptr);
 
     #if IS_MINIMAL == 0
         // std::vector<NamedValue> chargerCurrents = {
@@ -815,8 +807,6 @@ protected:
         this->listElement->addItem(new tsl::elm::CategoryHeader("CPU Settings"));
         if(IsMariko()) {
             std::vector<NamedValue> ClkOptions = {
-                NamedValue("1785 MHz", 1785000),
-                NamedValue("1887 MHz", 1887000),
                 NamedValue("1963 MHz", 1963000),
                 NamedValue("2091 MHz", 2091000),
                 NamedValue("2193 MHz", 2193000),

Source/sys-clk/sysmodule/src/board.cpp

@@ -1167,16 +1167,7 @@ void Board::SetGpuSchedulingMode(GpuSchedulingMode mode, GpuSchedulingOverrideMe
     u32 temp;
     bool enabled = false;
     switch(mode) {
-        case GpuSchedulingMode_DoNotOverride:
+        case GpuSchedulingMode_DoNotOverride: break;
-            if (method == GpuSchedulingOverrideMethod_Ini) {
-                const char* ini_path = "sdmc:/atmosphere/config/system_settings.ini";
-                const char* section = "am.gpu";
-                const char* key = "gpu_scheduling_enabled";
-
-                // Remove the key from the INI
-                ini_puts(section, key, NULL, ini_path);
-            }
-            return;
         case GpuSchedulingMode_Disabled:
             if(method == GpuSchedulingOverrideMethod_NvService)
                 nvIoctl(fd2, NVSCHED_CTRL_DISABLE, &temp);

Source/sys-clk/sysmodule/src/clock_manager.cpp

@@ -740,8 +740,21 @@ void ClockManager::HandleCpuUv() {
 void ClockManager::DVFSReset() {
     if (Board::GetSocType() == SysClkSocType_Mariko && this->config->GetConfigValue(HorizonOCConfigValue_DVFSMode) == DVFSMode_Hijack) {
         Board::PcvHijackDvfs(0);
+
+        u32 targetHz = this->context->overrideFreqs[SysClkModule_GPU];
+        if (!targetHz) {
+            targetHz = this->config->GetAutoClockHz(this->context->applicationId, SysClkModule_GPU, this->context->profile, false);
+            if(!targetHz) {
+                targetHz = this->config->GetAutoClockHz(GLOBAL_PROFILE_ID, SysClkModule_GPU, this->context->profile, false);
+            }
+        }
+
         Board::SetHz(SysClkModule_GPU, ~0);
-        Board::ResetToStockGpu();
+        if(targetHz) {
+            Board::SetHz(SysClkModule_GPU, targetHz);
+        } else {
+            Board::ResetToStockGpu();
+        }
     }
 }
 
@@ -777,6 +790,10 @@ void ClockManager::SetClocks(bool isBoost) {
     std::uint32_t nearestHz = 0;
 
     if(isBoost && !this->config->GetConfigValue(HocClkConfigValue_OverwriteBoostMode)) {
+        u32 boostFreq = Board::GetHz(SysClkModule_CPU);
+        if (boostFreq / 1000000 > 1785) {
+            Board::SetHz(SysClkModule_CPU, boostFreq);
+        }
         return; // Return if we are't overwriting boost mode
     }