From 632df0f00a43ca3833cc27a9c791fa9469e1377f Mon Sep 17 00:00:00 2001
From: Lightos1 <124387232+Lightos1@users.noreply.github.com>
Date: Fri, 5 Dec 2025 19:54:57 +0100
Subject: [PATCH] Add 3133 ram freq, todo: improve scaling

---
 .../loader/source/oc/mariko/calculate_timings.cpp         | 2 ++
 .../loader/source/oc/mariko/timing_tables.cpp             | 8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Source/Atmosphere/stratosphere/loader/source/oc/mariko/calculate_timings.cpp b/Source/Atmosphere/stratosphere/loader/source/oc/mariko/calculate_timings.cpp
index 5d79fe63..b1bc9456 100644
--- a/Source/Atmosphere/stratosphere/loader/source/oc/mariko/calculate_timings.cpp
+++ b/Source/Atmosphere/stratosphere/loader/source/oc/mariko/calculate_timings.cpp
@@ -141,6 +141,8 @@ namespace ams::ldr::oc::pcv::mariko {
 
     void CalculateQpop() {
         qpop = FLOOR(((C.marikoEmcMaxClock / 1000.0) - 2133 + 167) / 200.0) + 0x2D + C.mem_burst_read_latency;
+
+        if (C.marikoEmcMaxClock >= 3'133'000) qpop++;
     }
 
     void CalculatePdex2rw() {
diff --git a/Source/Atmosphere/stratosphere/loader/source/oc/mariko/timing_tables.cpp b/Source/Atmosphere/stratosphere/loader/source/oc/mariko/timing_tables.cpp
index cfe132a0..de54e965 100644
--- a/Source/Atmosphere/stratosphere/loader/source/oc/mariko/timing_tables.cpp
+++ b/Source/Atmosphere/stratosphere/loader/source/oc/mariko/timing_tables.cpp
@@ -42,7 +42,6 @@ namespace ams::ldr::oc::pcv::mariko {
         {2'933'000, 0, 0x2E, 0xC,  0},
         {2'966'000, 1,    0,   0,  0},
         {3'033'000, 0, 0x2F,   0,  0},
-        {3'100'000, 0,    0,   0,  0},
         {3'133'000, 1, 0x31, 0xD,  0},
     };
 
@@ -59,7 +58,7 @@ namespace ams::ldr::oc::pcv::mariko {
         {2'833'000, 0x12}, {2'866'000, 0x12}, {2'900'000, 0x12},
         {2'933'000, 0x10}, {2'966'000, 0x11}, {3'000'000, 0x11},
         {3'033'000, 0x10}, {3'066'000, 0x10}, {3'100'000, 0x10},
-        {3'133'000, 0x0F},
+        {3'133'000, 0x0F}
     };
 
     const u32 g_einput_patches_size = sizeof(g_einput_patches) / sizeof(g_einput_patches[0]);
@@ -242,8 +241,9 @@ namespace ams::ldr::oc::pcv::mariko {
         {2'900'000,  1},
         {2'933'000, -1},
         {2'966'000,  1},
-        {3'000'000,  1},
         {3'100'000,  1},
+        {3'166'000,  1},
+        {3'200'000,  1},
     };
 
     const u32 g_qrst_table_size = sizeof(g_qrst_patches) / sizeof(g_qrst_patches[0]);
@@ -273,6 +273,8 @@ namespace ams::ldr::oc::pcv::mariko {
         {3'033'000, -1},
         {3'066'000, -2},
         {3'100'000, -2},
+        {3'166'000, -1},
+        {3'200'000, -1},
     };
 
     const u32 g_qsafe_table_size = sizeof(g_qsafe_patches) / sizeof(g_qsafe_patches[0]);