add hiopt table for gpu undervolt

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

@@ -187,24 +187,42 @@ volatile CustomizeTable C = {
     //{ 1305600, {}, { 1374130, -13725, -859,    0,   4442, 576 } },
 },
 
-.marikoGpuDvfsTableUV = {
-    {   76800, {}, {   590000,       0,       0,       0,       0,       0 } }, 
-	{  153600, {}, {   590000,       0,       0,       0,       0,       0 } },
-	{  230400, {}, {   590000,       0,       0,       0,       0,       0 } },
-	{  307200, {}, {   590000,       0,       0,       0,       0,       0 } },
-	{  384000, {}, {   590000,       0,       0,       0,       0,       0 } },
-	{  460800, {}, {   795089,  -11096,    -163,     298,  -10421,     162 } },
-	{  537600, {}, {   795089,  -11096,    -163,     298,  -10421,     162 } },
-	{  614400, {}, {   820606,   -6285,    -452,     238,   -6182,      81 } },
-	{  691200, {}, {   846289,   -4565,    -552,     119,   -3958,      -2 } },
-	{  768000, {}, {   888720,   -5110,    -584,       0,   -2849,      39 } },
-	{  844800, {}, {   936634,   -6089,    -602,     -60,     -99,     -93 } },
-	{  921600, {}, {   982562,   -7373,    -614,    -179,    1797,     -13 } },
-	{  998400, {}, {  1090179,  -14125,    -497,    -179,    3518,       9 } },
-	{ 1075200, {}, {  1155798,  -13465,    -648,       0,    1077,      40 } },
-	{ 1152000, {}, {  1198568,  -10904,    -830,       0,    1469,     110 } },
-	{ 1228800, {}, {  1269988,  -12707,    -859,       0,    3722,     313 } },
-	{ 1267200, {}, {  1308155,  -13694,    -867,       0,    3681,     559 } },
+.marikoGpuDvfsTableSLT = {
+    {   76800, {}, {  590000,                                         } }, 
+	{  153600, {}, {  590000,                                         } },
+	{  230400, {}, {  590000,                                         } },
+	{  307200, {}, {  590000,                                         } },
+	{  384000, {}, {  590000,                                         } },
+	{  460800, {}, {  795089, -11096,   -163,    298,  -10421,    162 } },
+	{  537600, {}, {  795089, -11096,   -163,    298,  -10421,    162 } },
+	{  614400, {}, {  820606,  -6285,   -452,    238,   -6182,     81 } },
+	{  691200, {}, {  846289,  -4565,   -552,    119,   -3958,     -2 } },
+	{  768000, {}, {  888720,  -5110,   -584,      0,   -2849,     39 } },
+	{  844800, {}, {  936634,  -6089,   -602,    -60,     -99,    -93 } },
+	{  921600, {}, {  982562,  -7373,   -614,   -179,    1797,    -13 } },
+	{  998400, {}, { 1090179, -14125,   -497,   -179,    3518,      9 } },
+	{ 1075200, {}, { 1155798, -13465,   -648,      0,    1077,     40 } },
+	{ 1152000, {}, { 1198568, -10904,   -830,      0,    1469,    110 } },
+	{ 1228800, {}, { 1269988, -12707,   -859,      0,    3722,    313 } },
+	{ 1267200, {}, { 1308155, -13694,   -867,      0,    3681,    559 } },
+},
+.marikoGpuDvfsTableHiOPT = {
+    {   76800, {}, {  590000,                                     } }, 
+	{  153600, {}, {  590000,                                     } }, 
+	{  230400, {}, {  590000,                                     } }, 
+	{  307200, {}, {  590000,                                     } }, 
+	{  384000, {}, {  590000,                                     } }, 
+	{  460800, {}, {  590000,                                     } }, 
+	{  537600, {}, {  590000,                                     } }, 
+	{  614400, {}, {  590000,                                     } }, 
+	{  691200, {}, {  838712, -7304,  -552,  1785, -56250,   -450 } }, 
+	{  768000, {}, {  880210, -7955,  -584,     0, -42735,   8775 } }, 
+	{  844800, {}, {  926398, -8892,  -602,  -900,  -5760, -20925 } }, 
+	{  921600, {}, {  970060, -10108, -614, -2685,  22620,  -2925 } }, 
+	{  998400, {}, { 1065665, -16075, -497, -2685,  48195,   2025 } }, 
+	{ 1075200, {}, { 1132576, -16093, -648,     0,  16155,   9000 } }, 
+	{ 1152000, {}, { 1180029, -14534, -830,     0,  22035,  24750 } }, 
+	{ 1228800, {}, { 1248293, -16383, -859,     0,  55830,  70425 } },
 },
 
 .eristaMtcTable = const_cast<EristaMtcTable *>(&EristaMtcTablePlaceholder),

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

@@ -56,7 +56,8 @@ typedef struct CustomizeTable {
     CustomizeCpuDvfsTable marikoCpuDvfsTable;
     CustomizeGpuDvfsTable eristaGpuDvfsTable;
     CustomizeGpuDvfsTable marikoGpuDvfsTable;
-    CustomizeGpuDvfsTable marikoGpuDvfsTableUV;
+    CustomizeGpuDvfsTable marikoGpuDvfsTableSLT;
+    CustomizeGpuDvfsTable marikoGpuDvfsTableHiOPT;
     EristaMtcTable* eristaMtcTable;
     MarikoMtcTable* marikoMtcTable;
 } CustomizeTable;

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

@@ -210,7 +210,7 @@ Result CpuFreqCvbTable(u32* ptr) {
 template<bool isMariko>
 Result GpuFreqCvbTable(u32* ptr) {
     cvb_entry_t* default_table = isMariko ? (cvb_entry_t *)(&mariko::GpuCvbTableDefault) : (cvb_entry_t *)(&erista::GpuCvbTableDefault);
-    cvb_entry_t* customize_table = const_cast<cvb_entry_t *>(isMariko ? (C.marikoGpuUV ? C.marikoGpuDvfsTableUV : C.marikoGpuDvfsTable) : C.eristaGpuDvfsTable);
+    cvb_entry_t* customize_table = const_cast<cvb_entry_t *>(isMariko ? (C.marikoGpuUV ? (C.marikoGpuUV == 2 ? C.marikoGpuDvfsTableHiOPT : C.marikoGpuDvfsTableSLT) : C.marikoGpuDvfsTable) : C.eristaGpuDvfsTable);
 
     size_t default_entry_count = GetDvfsTableEntryCount(default_table);
     size_t default_table_size = default_entry_count * sizeof(cvb_entry_t);

Source/sys-clk-OC/sysmodule/src/file_utils.cpp

@@ -305,7 +305,20 @@ Result FileUtils::CustParser(const char* filepath, size_t filesize) {
         }
 
         cpu_dvfs_table = &table.marikoCpuDvfsTable;
-        gpu_dvfs_table = table.marikoGpuUV ? &table.marikoGpuDvfsTableUV : &table.marikoGpuDvfsTable;
+        switch (table.marikoGpuUV) {
+            case 0:
+                gpu_dvfs_table = table.marikoGpuDvfsTable;
+                break;
+            case 1:
+                gpu_dvfs_table = table.marikoGpuDvfsTableSLT;
+                break;
+            case 2:
+                gpu_dvfs_table = table.marikoGpuDvfsTableHiOPT;
+                break;
+            default:
+                gpu_dvfs_table = table.marikoGpuDvfsTable;
+                break;
+        }
     } else {
         if (table.eristaEmcMaxClock)
             Clocks::maxMemFreq = table.eristaEmcMaxClock * 1000;

Source/sys-clk-OC/sysmodule/src/file_utils.h

@@ -61,7 +61,8 @@ typedef struct CustTable {
     CustomizeCpuDvfsTable marikoCpuDvfsTable;
     CustomizeGpuDvfsTable eristaGpuDvfsTable;
     CustomizeGpuDvfsTable marikoGpuDvfsTable;
-    CustomizeGpuDvfsTable marikoGpuDvfsTableUV;
+    CustomizeGpuDvfsTable marikoGpuDvfsTableSLT;
+    CustomizeGpuDvfsTable marikoGpuDvfsTableHiOPT;
     void* eristaMtcTable;
     void* marikoMtcTable;
 } CustTable;

pages/dist/main.js

@@ -1 +1 @@
-var __awaiter=this&&this.__awaiter||function(e,t,i,s){return new(i||(i=Promise))((function(a,l){function r(e){try{o(s.next(e))}catch(e){l(e)}}function n(e){try{o(s.throw(e))}catch(e){l(e)}}function o(e){var t;e.done?a(e.value):(t=e.value,t instanceof i?t:new i((function(e){e(t)}))).then(r,n)}o((s=s.apply(e,t||[])).next())}))};const CUST_REV=4,CUST_REV_ADV=5;var CustPlatform;!function(e){e[e.Undefined=0]="Undefined",e[e.Erista=1]="Erista",e[e.Mariko=2]="Mariko",e[e.All=3]="All"}(CustPlatform||(CustPlatform={}));class CustEntry{constructor(e,t,i,s,a,l,r=[0,1e6],n=1,o=!0){this.id=e,this.name=t,this.platform=i,this.size=s,this.desc=a,this.defval=l,this.step=n,this.zeroable=o,this.min=r[0],this.max=r[1]}validate(){let e=new ErrorToolTip(this.id).clear();return Number.isNaN(this.value)||void 0===this.value?(e.setMsg("Invalid value: Not a number").show(),!1):!(!this.zeroable||0!=this.value)||(this.value<this.min||this.value>this.max?(e.setMsg(`Expected range: [${this.min}, ${this.max}], got ${this.value}.`).show(),!1):this.value%this.step==0||(e.setMsg(`${this.value} % ${this.step} ≠ 0`).show(),!1))}getInputElement(){return document.getElementById(this.id)}updateValueFromElement(){var e;this.value=Number(null===(e=this.getInputElement())||void 0===e?void 0:e.value)}isAvailableFor(e){return e===CustPlatform.Undefined||this.platform===e||this.platform===CustPlatform.All}createElement(){let e=this.getInputElement();if(!e){let t=document.createElement("div");t.classList.add("grid","cust-element"),e=document.createElement("input"),e.min=String(this.zeroable?0:this.min),e.max=String(this.max),e.id=this.id,e.type="number",e.step=String(this.step);let i=document.createElement("label");i.setAttribute("for",this.id),i.innerHTML=this.name,i.appendChild(e),t.appendChild(i);let s=document.createElement("blockquote");s.innerHTML="<ul>"+this.desc.map((e=>`<li>${e}</li>`)).join("")+"</ul>",s.setAttribute("for",this.id),t.appendChild(s),document.getElementById("config-list-basic").appendChild(t),new ErrorToolTip(this.id).addChangeListener()}e.value=String(this.value)}setElementValue(){this.getInputElement().value=String(this.value)}setElementDefaultValue(){this.getInputElement().value=String(this.defval)}removeElement(){let e=this.getInputElement();e&&e.parentElement.parentElement.remove()}showElement(){let e=this.getInputElement();e&&e.parentElement.parentElement.style.removeProperty("display")}hideElement(){let e=this.getInputElement();e&&e.parentElement.parentElement.style.setProperty("display","none")}}class AdvEntry extends CustEntry{createElement(){let e=this.getInputElement();if(!e){let t=document.createElement("div");t.classList.add("grid","cust-element"),e=document.createElement("input"),e.min=String(this.zeroable?0:this.min),e.max=String(this.max),e.id=this.id,e.type="number",e.step=String(this.step);let i=document.createElement("label");i.setAttribute("for",this.id),i.innerHTML=this.name,i.appendChild(e),t.appendChild(i);let s=document.createElement("blockquote");s.innerHTML="<ul>"+this.desc.map((e=>`<li>${e}</li>`)).join("")+"</ul>",s.setAttribute("for",this.id),t.appendChild(s),document.getElementById("config-list-advanced").appendChild(t),new ErrorToolTip(this.id).addChangeListener()}e.value=String(this.value)}}var CustTable=[new CustEntry("mtcConf","DRAM Timing",CustPlatform.Mariko,4,["<b>0</b>: AUTO_ADJ_MARIKO_SAFE: Auto adjust timings for LPDDR4 ≤3733 Mbps specs, 8Gb density. (Default)","<b>1</b>: AUTO_ADJ_MARIKO_4266: Auto adjust timings for LPDDR4X 4266 Mbps specs, 8Gb density.","<b>2</b>: NO_ADJ_ALL: No timing adjustment for both Erista and Mariko. Might achieve better performance on Mariko but lower maximum frequency is expected."],0,[0,2],1),new CustEntry("commonCpuBoostClock","Boost Clock in kHz",CustPlatform.All,4,["System default: 1785000","Boost clock will be applied when applications request higher CPU frequency for quicker loading.","This will be set regardless of whether sys-clk is enabled."],1785e3,[102e4,3e6],1,!1),new CustEntry("commonEmcMemVolt","EMC Vddq (Erista Only) & RAM Vdd2 Voltage in uV",CustPlatform.All,4,["Acceptable range: 1100000 ≤ x ≤ 1250000, and it should be divided evenly by 12500.","Erista Default (HOS): 1125000 (bootloader: 1100000)","Mariko Default: 1100000 (It will not work without sys-clk-OC)","Not enabled by default"],0,[11e5,125e4],12500),new CustEntry("eristaCpuMaxVolt","Erista CPU Max Voltage in mV",CustPlatform.Erista,4,["Acceptable range: 1100 ≤ x ≤ 1300","L4T Default: 1235"],1235,[1100,1300],1),new CustEntry("eristaEmcMaxClock","Erista RAM Max Clock in kHz",CustPlatform.Erista,4,["Values should be ≥ 1600000, and divided evenly by 3200.","<b>WARNING:</b> RAM overclock could be UNSTABLE if timing parameters are not suitable for your DRAM"],1862400,[16e5,24e5],3200),new CustEntry("marikoCpuMaxVolt","Mariko CPU Max Voltage in mV",CustPlatform.Mariko,4,["System default: 1120","Acceptable range: 1100 ≤ x ≤ 1300"],1235,[1100,1300],5),new CustEntry("marikoEmcMaLine truncated
+var __awaiter=this&&this.__awaiter||function(e,t,i,a){return new(i||(i=Promise))((function(s,l){function r(e){try{o(a.next(e))}catch(e){l(e)}}function n(e){try{o(a.throw(e))}catch(e){l(e)}}function o(e){var t;e.done?s(e.value):(t=e.value,t instanceof i?t:new i((function(e){e(t)}))).then(r,n)}o((a=a.apply(e,t||[])).next())}))};const CUST_REV=4,CUST_REV_ADV=5;var CustPlatform;!function(e){e[e.Undefined=0]="Undefined",e[e.Erista=1]="Erista",e[e.Mariko=2]="Mariko",e[e.All=3]="All"}(CustPlatform||(CustPlatform={}));class CustEntry{constructor(e,t,i,a,s,l,r=[0,1e6],n=1,o=!0){this.id=e,this.name=t,this.platform=i,this.size=a,this.desc=s,this.defval=l,this.step=n,this.zeroable=o,this.min=r[0],this.max=r[1]}validate(){let e=new ErrorToolTip(this.id).clear();return Number.isNaN(this.value)||void 0===this.value?(e.setMsg("Invalid value: Not a number").show(),!1):!(!this.zeroable||0!=this.value)||(this.value<this.min||this.value>this.max?(e.setMsg(`Expected range: [${this.min}, ${this.max}], got ${this.value}.`).show(),!1):this.value%this.step==0||(e.setMsg(`${this.value} % ${this.step} ≠ 0`).show(),!1))}getInputElement(){return document.getElementById(this.id)}updateValueFromElement(){var e;this.value=Number(null===(e=this.getInputElement())||void 0===e?void 0:e.value)}isAvailableFor(e){return e===CustPlatform.Undefined||this.platform===e||this.platform===CustPlatform.All}createElement(){let e=this.getInputElement();if(!e){let t=document.createElement("div");t.classList.add("grid","cust-element"),e=document.createElement("input"),e.min=String(this.zeroable?0:this.min),e.max=String(this.max),e.id=this.id,e.type="number",e.step=String(this.step);let i=document.createElement("label");i.setAttribute("for",this.id),i.innerHTML=this.name,i.appendChild(e),t.appendChild(i);let a=document.createElement("blockquote");a.innerHTML="<ul>"+this.desc.map((e=>`<li>${e}</li>`)).join("")+"</ul>",a.setAttribute("for",this.id),t.appendChild(a),document.getElementById("config-list-basic").appendChild(t),new ErrorToolTip(this.id).addChangeListener()}e.value=String(this.value)}setElementValue(){this.getInputElement().value=String(this.value)}setElementDefaultValue(){this.getInputElement().value=String(this.defval)}removeElement(){let e=this.getInputElement();e&&e.parentElement.parentElement.remove()}showElement(){let e=this.getInputElement();e&&e.parentElement.parentElement.style.removeProperty("display")}hideElement(){let e=this.getInputElement();e&&e.parentElement.parentElement.style.setProperty("display","none")}}class AdvEntry extends CustEntry{createElement(){let e=this.getInputElement();if(!e){let t=document.createElement("div");t.classList.add("grid","cust-element"),e=document.createElement("input"),e.min=String(this.zeroable?0:this.min),e.max=String(this.max),e.id=this.id,e.type="number",e.step=String(this.step);let i=document.createElement("label");i.setAttribute("for",this.id),i.innerHTML=this.name,i.appendChild(e),t.appendChild(i);let a=document.createElement("blockquote");a.innerHTML="<ul>"+this.desc.map((e=>`<li>${e}</li>`)).join("")+"</ul>",a.setAttribute("for",this.id),t.appendChild(a),document.getElementById("config-list-advanced").appendChild(t),new ErrorToolTip(this.id).addChangeListener()}e.value=String(this.value)}}var CustTable=[new CustEntry("mtcConf","DRAM Timing",CustPlatform.Mariko,4,["<b>0</b>: AUTO_ADJ_MARIKO_SAFE: Auto adjust timings for LPDDR4 ≤3733 Mbps specs, 8Gb density. (Default)","<b>1</b>: AUTO_ADJ_MARIKO_4266: Auto adjust timings for LPDDR4X 4266 Mbps specs, 8Gb density.","<b>2</b>: NO_ADJ_ALL: No timing adjustment for both Erista and Mariko. Might achieve better performance on Mariko but lower maximum frequency is expected."],0,[0,2],1),new CustEntry("commonCpuBoostClock","Boost Clock in kHz",CustPlatform.All,4,["System default: 1785000","Boost clock will be applied when applications request higher CPU frequency for quicker loading.","This will be set regardless of whether sys-clk is enabled."],1785e3,[102e4,3e6],1,!1),new CustEntry("commonEmcMemVolt","EMC Vddq (Erista Only) & RAM Vdd2 Voltage in uV",CustPlatform.All,4,["Acceptable range: 1100000 ≤ x ≤ 1250000, and it should be divided evenly by 12500.","Erista Default (HOS): 1125000 (bootloader: 1100000)","Mariko Default: 1100000 (It will not work without sys-clk-OC)","Not enabled by default"],0,[11e5,125e4],12500),new CustEntry("eristaCpuMaxVolt","Erista CPU Max Voltage in mV",CustPlatform.Erista,4,["Acceptable range: 1100 ≤ x ≤ 1300","L4T Default: 1235"],1235,[1100,1300],1),new CustEntry("eristaEmcMaxClock","Erista RAM Max Clock in kHz",CustPlatform.Erista,4,["Values should be ≥ 1600000, and divided evenly by 3200.","<b>WARNING:</b> RAM overclock could be UNSTABLE if timing parameters are not suitable for your DRAM"],1862400,[16e5,24e5],3200),new CustEntry("marikoCpuMaxVolt","Mariko CPU Max Voltage in mV",CustPlatform.Mariko,4,["System default: 1120","Acceptable range: 1100 ≤ x ≤ 1300"],1235,[1100,1300],5),new CustEntry("marikoEmcMaLine truncated

pages/src/main.ts

@@ -262,11 +262,13 @@ var AdvTable: Array<AdvEntry> = [
     CustPlatform.Mariko,
     4,
     ["Undervolt Mariko GPU",
-     "Might not work properly",
-     "Your GPU might not withstand undervolt",
-     "Can hang your console, or crash games"],
+     "Your GPU might not withstand undervolt and may not work properly",
+     "Can hang your console, or crash games",
+     "<b>0</b> : Default Table",
+     "<b>1</b> : SLT Table",
+     "<b>2</b> : HiOPT Table (If your speedo is not good, higher gpu freq will not work)"],
      0,
-     [0,1],
+     [0,2],
      1,
   ),
 ];