OmniNX/Horizon-OC
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loader: add gpu vmin and vmax patch

Browse Source
This commit is contained in:
souldbminersmwc
2025-09-29 20:00:50 -04:00
parent 6056b4a424
commit 50ad977e4a
24 changed files with 262 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Atmosphere/stratosphere/loader/source/oc/customize.cpp
View File

@@ -89,6 +89,7 @@ volatile CustomizeTable C = {
.marikoGpuUV = 0,
.eristaCpuUV = 0,
.eristaGpuUV = 0,
@@ -115,6 +116,7 @@ volatile CustomizeTable C = {
.mem_burst_latency = 2,
// NOTE: These tables should NOT BE USED and are only here as placeholders. Always try and find your own optimal tables.
// Ensure the voltages actually increase or stay the sameot
.marikoGpuVoltArray = {
610 /* 76 */,
@@ -132,7 +134,7 @@ volatile CustomizeTable C = {
675 /* 998 */,
710 /* 1075 */,
735 /* 1152 */,
785 /* 1228 */,
785 /* 1228 (Only safe if GPU Scheduling is on)*/,
0 /* 1267 (Disabled by default) */,
0 /* 1305 (Disabled by default) */,
0 /* 1344 (Disabled by default) */,
@@ -156,7 +158,7 @@ volatile CustomizeTable C = {
875 /* 691 */,
900 /* 768 */,
950 /* 844 */,
900 /* 921 */,
975 /* 921 */,
0 /* 998 (Disabled by default) */,
0 /* 1075 (Disabled by default) */,
},
@@ -164,6 +166,12 @@ volatile CustomizeTable C = {
.marikoCpuVmin = 600,
.eristaGpuVmin = 810,
.marikoGpuVmin = 610,
.marikoGpuVmax = 800,
/* Advanced Settings:
* - Erista CPU DVFS Table:
*/

5
Source/Atmosphere/stratosphere/loader/source/oc/customize.hpp
View File

@@ -86,7 +86,10 @@
u32 marikoCpuVmin;
u32 eristaGpuVmin;
u32 marikoGpuVmin;
u32 marikoGpuVmax;
CustomizeCpuDvfsTable eristaCpuDvfsTable;
CustomizeCpuDvfsTable marikoCpuDvfsTable;
CustomizeCpuDvfsTable marikoCpuDvfsTableSLT;

9
Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv.hpp
View File

@@ -48,12 +48,17 @@ namespace ams::ldr::oc::pcv
{1963500, {1675751, -38635, 27}, {1120000}},
{},
};
constexpr int gpuVmax = 750;
constexpr int gpuVmin = 610;
constexpr u16 CpuMinVolts[] = {800, 637, 620, 610};
constexpr u32 CpuClkOfficial = 1963'500;
constexpr u32 CpuVoltOfficial = 1120;
constexpr cvb_entry_t GpuCvbTableDefault[] = {
// GPUB01_NA_CVB_TABLE
{76800, {}, {
@@ -184,6 +189,10 @@ namespace ams::ldr::oc::pcv
{},
};
constexpr int gpuVmin = 810;
constexpr u32 CpuVoltOfficial = 1235;
constexpr u32 CpuVoltL4T = 1235'000;
constexpr u16 CpuMinVolts[] = {950, 850, 825, 810};

81
Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv_erista.cpp
View File

@@ -21,7 +21,33 @@
namespace ams::ldr::oc::pcv::erista
{
Result CpuFreqVdd(u32* ptr) {
dvfs_rail* entry = reinterpret_cast<dvfs_rail *>(reinterpret_cast<u8 *>(ptr) - offsetof(dvfs_rail, freq));
R_UNLESS(entry->id == 1, ldr::ResultInvalidCpuFreqVddEntry());
R_UNLESS(entry->min_mv == 250'000, ldr::ResultInvalidCpuFreqVddEntry());
R_UNLESS(entry->step_mv == 5000, ldr::ResultInvalidCpuFreqVddEntry());
R_UNLESS(entry->max_mv == 1525'000, ldr::ResultInvalidCpuFreqVddEntry());
if (C.eristaCpuUV) {
if(!C.enableEristaCpuUnsafeFreqs) {
PATCH_OFFSET(ptr, GetDvfsTableLastEntry(C.eristaCpuDvfsTable)->freq);
} else {
PATCH_OFFSET(ptr, GetDvfsTableLastEntry(C.eristaCpuDvfsTableUnsafeFreqs)->freq);
}
} else {
PATCH_OFFSET(ptr, GetDvfsTableLastEntry(C.eristaCpuDvfsTable)->freq);
}
R_SUCCEED();
}
Result GpuVmin(u32 *ptr)
{
if (!C.eristaGpuVmin)
R_SKIP();
PATCH_OFFSET(ptr, (int)C.eristaGpuVmin);
R_SUCCEED();
}
Result CpuVoltRange(u32 *ptr)
{
u32 min_volt_got = *(ptr - 1);
@@ -41,42 +67,37 @@
Result CpuVoltDfll(u32* ptr) {
cvb_cpu_dfll_data *entry = reinterpret_cast<cvb_cpu_dfll_data *>(ptr);
R_UNLESS(entry->tune0_low == 0x0000FFCF, ldr::ResultInvalidCpuVoltDfllEntry());
R_UNLESS(entry->tune0_high == 0x00000000, ldr::ResultInvalidCpuVoltDfllEntry());
R_UNLESS(entry->tune1_low == 0x012207FF, ldr::ResultInvalidCpuVoltDfllEntry());
R_UNLESS(entry->tune1_high == 0x03FFF7FF, ldr::ResultInvalidCpuVoltDfllEntry());
// R_UNLESS(entry->tune0_low == 0x0000FFCF, ldr::ResultInvalidCpuVoltDfllEntry());
// R_UNLESS(entry->tune0_high == 0x00000000, ldr::ResultInvalidCpuVoltDfllEntry());
// R_UNLESS(entry->tune1_low == 0x012207FF, ldr::ResultInvalidCpuVoltDfllEntry());
// R_UNLESS(entry->tune1_high == 0x03FFF7FF, ldr::ResultInvalidCpuVoltDfllEntry());
if(!C.eristaCpuUV) {
R_SKIP();
}
PATCH_OFFSET(&(entry->dvco_calibration_max), 0x1C);
PATCH_OFFSET(&(entry->tune1_high), 0x10);
PATCH_OFFSET(&(entry->tune_high_margin_millivolts), 0xc);
switch(C.eristaCpuUV) {
case 0:
break;
case 1:
PATCH_OFFSET(&(entry->tune0_low), 0x0000FF88); //process_id 0 // EOS UV2
PATCH_OFFSET(&(entry->tune0_high), 0x0000FFFF);
PATCH_OFFSET(&(entry->tune1_low), 0x021107FF);
PATCH_OFFSET(&(entry->tune1_high), 0x00000000);
PATCH_OFFSET(&(entry->tune0_low), 0x0000FFFF); //process_id 0 // EOS UV1
PATCH_OFFSET(&(entry->tune1_low), 0x027007FF);
break;
case 2:
PATCH_OFFSET(&(entry->tune0_low), 0x0000FF90); //process_id 1 // EOS Uv2
PATCH_OFFSET(&(entry->tune0_high), 0x0000FFFF);
PATCH_OFFSET(&(entry->tune1_low), 0x021107FF);
PATCH_OFFSET(&(entry->tune1_high), 0x00000000);
PATCH_OFFSET(&(entry->tune0_low), 0x0000EFFF); //process_id 1 // EOS Uv2
PATCH_OFFSET(&(entry->tune1_low), 0x027407FF);
break;
case 3:
PATCH_OFFSET(&(entry->tune0_low), 0x0000FF98); //process_id 0 // EOS UV3
PATCH_OFFSET(&(entry->tune0_high), 0x0000FFFF);
PATCH_OFFSET(&(entry->tune1_low), 0x021107FF);
PATCH_OFFSET(&(entry->tune1_high), 0x00000000);
PATCH_OFFSET(&(entry->tune0_low), 0x0000DFFF); //process_id 0 // EOS UV3
PATCH_OFFSET(&(entry->tune1_low), 0x027807FF);
break;
case 4:
PATCH_OFFSET(&(entry->tune0_low), 0x0000FFA0); //process_id 1 // EOS Uv4
PATCH_OFFSET(&(entry->tune0_high), 0x0000FFFF);
PATCH_OFFSET(&(entry->tune1_low), 0x021107FF);
PATCH_OFFSET(&(entry->tune1_high), 0x00000000);
PATCH_OFFSET(&(entry->tune0_low), 0x0000DFDF); //process_id 1 // EOS Uv4
PATCH_OFFSET(&(entry->tune1_low), 0x027A07FF);
break;
case 5:
PATCH_OFFSET(&(entry->tune0_low), 0x0000FFFF); // EOS UV6
PATCH_OFFSET(&(entry->tune0_high), 0x0000FFFF);
PATCH_OFFSET(&(entry->tune1_low), 0x021107FF);
PATCH_OFFSET(&(entry->tune1_high), 0x022217FF);
PATCH_OFFSET(&(entry->tune0_low), 0x0000CFDF); // EOS UV5
PATCH_OFFSET(&(entry->tune1_low), 0x037007FF);
break;
default:
break;
@@ -337,9 +358,10 @@
u32 GpuCvbDefaultMaxFreq = static_cast<u32>(GetDvfsTableLastEntry(GpuCvbTableDefault)->freq);
PatcherEntry<u32> patches[] = {
{ "CPU Freq Vdd", &CpuFreqVdd, 1, nullptr, CpuClkOSLimit },
{"CPU Freq Table", CpuFreqCvbTable<false>, 1, nullptr, CpuCvbDefaultMaxFreq},
{"CPU Volt Limit", &CpuVoltRange, 0, &CpuMaxVoltPatternFn},
{ "CPU Volt Dfll", &CpuVoltDfll, 1, nullptr, 0x0000FFCF },
{ "CPU Volt Limit", &CpuVoltRange, 13, nullptr, CpuVoltOfficial },
{ "CPU Volt Dfll", &CpuVoltDfll, 1, nullptr, 0xFFEAD0FF },
{"GPU Freq Table", GpuFreqCvbTable<false>, 1, nullptr, GpuCvbDefaultMaxFreq},
{"GPU Freq Asm", &GpuFreqMaxAsm, 2, &GpuMaxClockPatternFn},
{"GPU Freq PLL", &GpuFreqPllLimit, 1, nullptr, GpuClkPllLimit},
@@ -347,6 +369,7 @@
{"MEM Freq Max", &MemFreqMax, 0, nullptr, EmcClkOSLimit},
{"MEM Freq PLLM", &MemFreqPllmLimit, 2, nullptr, EmcClkPllmLimit},
{"MEM Volt", &MemVoltHandler, 2, nullptr, MemVoltHOS},
{"GPU Vmin", &GpuVmin, 0, nullptr, gpuVmin},
};
for (uintptr_t ptr = mapped_nso;

30
Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv_mariko.cpp
View File

@@ -21,6 +21,22 @@
namespace ams::ldr::oc::pcv::mariko {
Result GpuVmin(u32 *ptr)
{
if (!C.marikoGpuVmin)
R_SKIP();
PATCH_OFFSET(ptr, (int)C.marikoGpuVmin);
R_SUCCEED();
}
Result GpuVmax(u32 *ptr)
{
if (!C.marikoGpuVmax)
R_SKIP();
PATCH_OFFSET(ptr, (int)C.marikoGpuVmax);
R_SUCCEED();
}
Result CpuFreqVdd(u32* ptr) {
dvfs_rail* entry = reinterpret_cast<dvfs_rail *>(reinterpret_cast<u8 *>(ptr) - offsetof(dvfs_rail, freq));
@@ -78,31 +94,31 @@
case 0:
break;
case 1:
PATCH_OFFSET(&(entry->tune0_low), 0x0000FF88); //process_id 0 // EOS UV2
PATCH_OFFSET(&(entry->tune0_low), 0x0000FF88); //process_id 0 // EOS UV1
PATCH_OFFSET(&(entry->tune0_high), 0x0000FFFF);
PATCH_OFFSET(&(entry->tune1_low), 0x021107FF);
PATCH_OFFSET(&(entry->tune1_high), 0x00000000);
break;
case 2:
PATCH_OFFSET(&(entry->tune0_low), 0x0000FF90); //process_id 1 // EOS Uv2
PATCH_OFFSET(&(entry->tune0_low), 0x0000FF90); /// EOS Uv2
PATCH_OFFSET(&(entry->tune0_high), 0x0000FFFF);
PATCH_OFFSET(&(entry->tune1_low), 0x021107FF);
PATCH_OFFSET(&(entry->tune1_high), 0x00000000);
break;
case 3:
PATCH_OFFSET(&(entry->tune0_low), 0x0000FF98); //process_id 0 // EOS UV3
PATCH_OFFSET(&(entry->tune0_low), 0x0000FF98); // EOS UV3
PATCH_OFFSET(&(entry->tune0_high), 0x0000FFFF);
PATCH_OFFSET(&(entry->tune1_low), 0x021107FF);
PATCH_OFFSET(&(entry->tune1_high), 0x00000000);
break;
case 4:
PATCH_OFFSET(&(entry->tune0_low), 0x0000FFA0); //process_id 1 // EOS Uv4
PATCH_OFFSET(&(entry->tune0_low), 0x0000FFA0); // EOS Uv4
PATCH_OFFSET(&(entry->tune0_high), 0x0000FFFF);
PATCH_OFFSET(&(entry->tune1_low), 0x021107FF);
PATCH_OFFSET(&(entry->tune1_high), 0x00000000);
break;
case 5:
PATCH_OFFSET(&(entry->tune0_low), 0x0000FFFF); // EOS UV6
PATCH_OFFSET(&(entry->tune0_low), 0x0000FFFF); // EOS UV5
PATCH_OFFSET(&(entry->tune0_high), 0x0000FFFF);
PATCH_OFFSET(&(entry->tune1_low), 0x021107FF);
PATCH_OFFSET(&(entry->tune1_high), 0x022217FF);
@@ -647,7 +663,9 @@
{ "MEM Freq Max", &MemFreqMax, 0, nullptr, EmcClkOSLimit },
{ "MEM Freq PLLM", &MemFreqPllmLimit, 2, nullptr, EmcClkPllmLimit },
{ "MEM Vddq", &EmcVddqVolt, 2, nullptr, EmcVddqDefault },
{ "MEM Vdd2", &MemVoltHandler, 2, nullptr, MemVdd2Default }
{ "MEM Vdd2", &MemVoltHandler, 2, nullptr, MemVdd2Default },
{ "GPU Vmin", &GpuVmin, 0, nullptr, gpuVmin},
{ "GPU Vmax", &GpuVmax, 0, nullptr, gpuVmax},
};
for (uintptr_t ptr = mapped_nso;

BIN
Source/Configurator/src/__pycache__/gpu.cpython-313.pyc
View File

Binary file not shown.

BIN
Source/Configurator/src/__pycache__/kip.cpython-313.pyc
View File

Binary file not shown.

BIN
Source/Configurator/src/__pycache__/misc.cpython-313.pyc
View File

Binary file not shown.

BIN
Source/Configurator/src/__pycache__/ram.cpython-313.pyc
View File

Binary file not shown.

43
Source/Configurator/src/gpu.py
View File

@@ -65,6 +65,11 @@ def populate():
voltages_e = [0] + list(range(700, 1100 + 1, 5)) # 0 first for Disabled
processed_voltages_e = ["Disabled" if v == 0 else f"{v} mV" for v in voltages_e]
processed_voltages_default = ["Default" if v == 0 else f"{v} mV" for v in voltages]
voltages_vmin = [0] + list(range(480, 650 + 1, 5)) # 0 first for Disabled
processed_voltages_vmin = ["Disabled" if v == 0 else f"{v} mV" for v in voltages_vmin]
voltages_vmin_e = [0] + list(range(700, 850 + 1, 5)) # 0 first for Disabled
processed_voltages_vmin_e = ["Disabled" if v == 0 else f"{v} mV" for v in voltages_vmin_e]
freqs_khz = [
76800, 153600, 230400, 307200, 384000, 460800, 537600, 614400, 691200, 768000,
844800, 921600, 998400, 1075200, 1152000, 1228800, 1267200, 1305600, 1344000, 1382400, 1420800,
@@ -72,7 +77,7 @@ def populate():
]
freqs_khz_e = [
76800, 153600, 230400, 307200, 384000, 460800, 537600, 614400, 691200, 768000,
844800, 921600, 998400, 1075200, 1152000
844800, 921600, 998400, 1075200 #, 1152000, 1228800 # Disabled by default as these freqs can cause board damage
]
freqs_mhz = [
76.8, 153.6, 230.4, 307.2, 384.0, 460.8, 537.6, 614.4, 691.2, 768.0,
@@ -119,20 +124,28 @@ def populate():
small=True,
tag="volt_info"
)
# dpg.add_combo(
# items=processed_voltages,
# default_value="Disabled",
# label="Gpu vMin",
# callback=k.grab_kip_storage_values_no_mult,
# tag="g_vmin"
# )
# dpg.add_combo(
# items=processed_voltages,
# default_value="Disabled",
# label="Gpu vMax",
# callback=k.grab_kip_storage_values_no_mult,
# tag="g_vmax"
# )
dpg.add_combo(
items=processed_voltages_vmin_e,
default_value="Disabled",
label="Erista GPU vMin",
callback=k.grab_kip_storage_values_no_mult,
tag="eristaGpuVmin"
)
dpg.add_combo(
items=processed_voltages_vmin,
default_value="Disabled",
label="Mariko GPU vMin",
callback=k.grab_kip_storage_values_no_mult,
tag="marikoGpuVmin"
)
dpg.add_combo(
items=processed_voltages,
default_value="Disabled",
label="Mariko GPU vMax",
callback=k.grab_kip_storage_values_no_mult,
tag="marikoGpuVmax"
)
dpg.add_separator(label="Undervolt")

45
Source/Configurator/src/kip.py
View File

@@ -82,8 +82,13 @@ variables = [
("g_volt_e_921600", "u32"),
("g_volt_e_998400", "u32"),
("g_volt_e_1075200", "u32"),
("g_volt_e_1152000", "u32"),
# ("g_volt_e_1152000", "u32"),
# ("g_volt_e_1228800", "u32"),
("marikoCpuVmin", "u32"),
("eristaGpuVmin", "u32"),
("marikoGpuVmin", "u32"),
("marikoGpuVmax", "u32"),
]
fmt_map = {
@@ -141,11 +146,14 @@ def load_all_vars():
for e_freq in [
"76800", "153600", "230400", "307200", "384000", "460800", "537600",
"614400", "691200", "768000", "844800", "921600", "998400", "1075200",
"1152000"
"614400", "691200", "768000", "844800", "921600", "998400", "1075200"# ,
# "1152000", "1228800"
]:
c.load_entry_object(f"g_volt_e_{e_freq}", 3)
c.load_entry_object("marikoCpuVmin", 3)
c.load_entry_object("eristaGpuVmin", 3)
c.load_entry_object("marikoGpuVmin", 3)
c.load_entry_object("marikoGpuVmax", 3)
def freq_to_label(freq):
if freq > 1382400:
@@ -240,7 +248,7 @@ def write_kip():
if not d.autosave:
c.show_popup("Success", "KIP saved successfully!")
def read_kip(filename, debug=True):
def read_kip(filename):
MAGIC = b"CUST"
struct_fmt = make_struct_format(variables)
struct_size = struct.calcsize(struct_fmt)
@@ -254,21 +262,20 @@ def read_kip(filename, debug=True):
values = struct.unpack(struct_fmt, raw)
for (attr_name, _), val in zip(variables, values):
setattr(d, attr_name, val)
if debug:
print("=== debug KIP layout ===")
offset = 0
for (attr_name, t) in variables:
code = fmt_map[t]
align = 8 if code == "d" else 4
padding = (-offset) % align
if padding:
offset += padding
size = struct.calcsize(code)
raw_bytes = raw[offset:offset + size]
val = getattr(d, attr_name)
print(f"{attr_name:<20} | type={t:<6} | offset={offset:<4} | size={size:<2} | raw=0x{raw_bytes.hex()} | val={val}")
offset += size
print("========================")
print("=== value layout ===")
offset = 0
for (attr_name, t) in variables:
code = fmt_map[t]
align = 8 if code == "d" else 4
padding = (-offset) % align
if padding:
offset += padding
size = struct.calcsize(code)
raw_bytes = raw[offset:offset + size]
val = getattr(d, attr_name)
print(f"{attr_name:<20} | type={t:<6} | offset={offset:<4} | size={size:<2} | raw=0x{raw_bytes.hex()} | val={val}")
offset += size
print("========================")
dpg.set_value("gpu_sched", g.check_gpu_sched())
dpg.show_item("gpu_tab")
dpg.show_item("cpu_tab")

6
Source/Configurator/src/main.py
View File

@@ -90,7 +90,9 @@ with dpg.texture_registry(show=False):
with dpg.file_dialog(directory_selector=False, show=False, tag="file_dialog", width=500, height=300, modal=True, callback=k.store):
dpg.add_file_extension(".kip")
def refresh_drives():
setattr(ins, "drive_list", ins.get_drives())
dpg.configure_item("drive_select", items=ins.drive_list)
with dpg.window(label="Configurator", width=400, height=300,id="main_window"):
with dpg.tab_bar():
with dpg.tab(label="File"):
@@ -102,9 +104,11 @@ with dpg.window(label="Configurator", width=400, height=300,id="main_window"):
callback=lambda: webbrowser.open("https://github.com/souldbminersmwc/Horizon-OC")
)
dpg.add_separator(label="Installation")
dpg.add_button(label="Refresh Drive List", callback=refresh_drives)
dpg.add_combo(
items=ins.drive_list,
default_value="Select a drive!",
tag="drive_select",
callback=ins.check_atmosphere
)
dpg.add_checkbox(label="Autosave", default_value=false, callback=ins.autosave_toggle)

4
Source/Configurator/src/misc.py
View File

@@ -183,7 +183,7 @@ def set_psm_value(sender, app_data):
value = next((x["value"] for x in PSM_OPTIONS if x["name"] == app_data), None)
if value:
ini.set_ini_values(str(ini_path), "psm", {"current_psm_mA": value})
common.show_popup("Success", f"PSM set to {app_data}")
common.show_popup("Success", f"Charge Limit set to {app_data}")
def remove_tc_entries():
ini_path = get_ini_path()
@@ -337,7 +337,7 @@ def populate():
dpg.add_image("coolerhd", width=20, height=20)
def set_white_tiger_clocks(app_data):
# cooler aah clocks
# 1400mv emc max
# 1375mv cpu max
# 750mv vdd2 mariko max

2
Source/sys-clk/build.sh
View File

@@ -42,4 +42,4 @@ cp -vf "$ROOT_DIR/overlay/out/sys-clk-overlay.ovl" "$DIST_DIR/switch/.overlays/s
echo "*** assets ***"
mkdir -p "$DIST_DIR/config/sys-clk"
cp -vf "$ROOT_DIR/config.ini.template" "$DIST_DIR/config/sys-clk/config.ini.template"
cp -vf "$ROOT_DIR/README.md" "$DIST_DIR/README.md"
cp -vf "$ROOT_DIR/../../README.md" "$DIST_DIR/README.md"