diff --git a/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv_mariko.cpp b/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv_mariko.cpp index 130174a1..6895c0cd 100644 --- a/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv_mariko.cpp +++ b/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv_mariko.cpp @@ -839,32 +839,32 @@ namespace ams::ldr::hoc::pcv::mariko { { 1331200, { 650, 637, 637, }, }, { 1600000, { 675, 650, 637, }, }, { 1866000, { DVB(DvbVolt( 700, 675, 650)) }, }, + { 2000000, { DVB(DvbVolt( 712, 687, 662)) }, }, { 2133000, { DVB(DvbVolt( 725, 700, 675)) }, }, - { 2246000, { DVB(DvbVolt( 750, 725, 700)) }, }, + { 2200000, { DVB(DvbVolt( 737, 712, 687)) }, }, + { 2266000, { DVB(DvbVolt( 750, 725, 700)) }, }, + { 2333000, { DVB(DvbVolt( 762, 737, 712)) }, }, { 2400000, { DVB(DvbVolt( 775, 750, 725)) }, }, + { 2433000, { DVB(DvbVolt( 787, 762, 737)) }, }, { 2466000, { DVB(DvbVolt( 800, 775, 750)) }, }, - { 2533000, { DVB(DvbVolt( 810, 785, 760)) }, }, - { 2566000, { DVB(DvbVolt( 820, 795, 770)) }, }, - { 2600000, { DVB(DvbVolt( 830, 805, 780)) }, }, - { 2633000, { DVB(DvbVolt( 840, 815, 790)) }, }, + { 2533000, { DVB(DvbVolt( 812, 787, 762)) }, }, + { 2566000, { DVB(DvbVolt( 825, 800, 775)) }, }, + { 2600000, { DVB(DvbVolt( 837, 812, 787)) }, }, { 2666000, { DVB(DvbVolt( 850, 825, 800)) }, }, - { 2700000, { DVB(DvbVolt( 860, 835, 810)) }, }, - { 2733000, { DVB(DvbVolt( 870, 845, 820)) }, }, - { 2766000, { DVB(DvbVolt( 880, 855, 830)) }, }, - { 2800000, { DVB(DvbVolt( 895, 865, 840)) }, }, - { 2833000, { DVB(DvbVolt( 900, 875, 850)) }, }, - { 2866000, { DVB(DvbVolt( 910, 885, 860)) }, }, - { 2900000, { DVB(DvbVolt( 920, 895, 870)) }, }, - { 2933000, { DVB(DvbVolt( 950, 905, 880)) }, }, - { 2966000, { DVB(DvbVolt( 960, 915, 890)) }, }, - { 3000000, { DVB(DvbVolt( 970, 925, 900)) }, }, - { 3033000, { DVB(DvbVolt( 980, 940, 910)) }, }, - { 3066000, { DVB(DvbVolt(1000, 955, 920)) }, }, - { 3100000, { DVB(DvbVolt(1010, 990, 930)) }, }, - { 3133000, { DVB(DvbVolt(1025, 1005, 940)) }, }, - { 3166000, { DVB(DvbVolt(1035, 1015, 950)) }, }, - { 3200000, { DVB(DvbVolt(1050, 1025, 960)) }, }, - { ~0u, { }, }, + { 2700000, { DVB(DvbVolt( 875, 850, 825)) }, }, + { 2733000, { DVB(DvbVolt( 887, 862, 837)) }, }, + { 2766000, { DVB(DvbVolt( 912, 887, 862)) }, }, + { 2800000, { DVB(DvbVolt( 925, 900, 875)) }, }, + { 2833000, { DVB(DvbVolt( 937, 912, 887)) }, }, + { 2900000, { DVB(DvbVolt( 950, 925, 900)) }, }, + { 2933000, { DVB(DvbVolt( 962, 937, 912)) }, }, + { 3000000, { DVB(DvbVolt( 975, 950, 925)) }, }, + { 3033000, { DVB(DvbVolt( 987, 962, 937)) }, }, + { 3100000, { DVB(DvbVolt(1000, 975, 950)) }, }, + { 3133000, { DVB(DvbVolt(1025, 1000, 975)) }, }, + { 3166000, { DVB(DvbVolt(1037, 1012, 987)) }, }, + { 3200000, { DVB(DvbVolt(1050, 1025, 1000)) }, }, + { ~0u, { }, }, }; #undef DVB DvbEntry emcDvbTableOc[newEmcList.size()]; diff --git a/Source/hoc-clk/sysmodule/src/mgr/clock_manager.cpp b/Source/hoc-clk/sysmodule/src/mgr/clock_manager.cpp index 732502be..76292b2d 100644 --- a/Source/hoc-clk/sysmodule/src/mgr/clock_manager.cpp +++ b/Source/hoc-clk/sysmodule/src/mgr/clock_manager.cpp @@ -512,6 +512,8 @@ namespace clockManager { u32 threshold = (u32)config::GetConfigValue(HocClkConfigValue_AutoRamCpuRamOCThreshold) * 1000; if (ramHz >= threshold) { u32 cpuOverrideHz = (u32)config::GetConfigValue(HocClkConfigValue_AutoRamCpuCpuOCFreq) * 1000; + if (cpuOverrideHz <= gContext.freqs[HocClkModule_CPU]) + return; maxHz = GetMaxAllowedHz(HocClkModule_CPU, gContext.profile); nearestHz = GetNearestHz(HocClkModule_CPU, cpuOverrideHz, maxHz); fileUtils::LogLine( diff --git a/dist/atmosphere/contents/00FF0000636C6BFF/exefs.nsp b/dist/atmosphere/contents/00FF0000636C6BFF/exefs.nsp index ef1adb9d..66f9ff38 100644 Binary files a/dist/atmosphere/contents/00FF0000636C6BFF/exefs.nsp and b/dist/atmosphere/contents/00FF0000636C6BFF/exefs.nsp differ diff --git a/dist/atmosphere/kips/hoc.kip b/dist/atmosphere/kips/hoc.kip index 8f3fc012..1a810018 100644 Binary files a/dist/atmosphere/kips/hoc.kip and b/dist/atmosphere/kips/hoc.kip differ diff --git a/dist/switch/.overlays/Horizon-OC-Monitor.ovl b/dist/switch/.overlays/Horizon-OC-Monitor.ovl index a091cb59..2beae2a8 100644 Binary files a/dist/switch/.overlays/Horizon-OC-Monitor.ovl and b/dist/switch/.overlays/Horizon-OC-Monitor.ovl differ diff --git a/dist/switch/.overlays/horizon-oc-overlay.ovl b/dist/switch/.overlays/horizon-oc-overlay.ovl index a25ccd39..9e815aba 100644 Binary files a/dist/switch/.overlays/horizon-oc-overlay.ovl and b/dist/switch/.overlays/horizon-oc-overlay.ovl differ