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

pcv_erista and customize: Timing reduction and config.

Browse Source
This commit is contained in:
Lightos1
2025-10-22 22:15:00 +02:00
parent e253c026e4
commit a03b8ea0cf
3 changed files with 298 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,9 @@ namespace ams::ldr::oc {
volatile CustomizeTable C = { volatile CustomizeTable C = {
.hpMode = DISABLED, .mtcConf = AUTO_ADJ,
.hpMode = ENABLED,
.commonCpuBoostClock = 1785000, // Default boost clock .commonCpuBoostClock = 1785000, // Default boost clock
@@ -69,17 +71,17 @@ volatile CustomizeTable C = {
// Defaults - (3-3-2) 0-1-4-3-6 // Defaults - (3-3-2) 0-1-4-3-6
// Primary // Primary
.t1_tRCD = 3, .t1_tRCD = 0,
.t2_tRP = 3, .t2_tRP = 0,
.t3_tRAS = 2, .t3_tRAS = 0,
// Secondary // Secondary
.t4_tRRD = 0, .t4_tRRD = 0,
.t5_tRFC = 1, .t5_tRFC = 0,
.t6_tRTW = 4, .t6_tRTW = 0,
.t7_tWTR = 3, .t7_tWTR = 0,
.t8_tREFI= 6, .t8_tREFI= 0,
.mem_burst_latency = 0, // 0 - 1600l, 1 = 1866bl, 2 = 2133bl // .mem_burst_latency = 0, // 0 - 1600l, 1 = 1866bl, 2 = 2133bl /* TODO: Remove/fix. */
.marikoCpuVmin = 600, .marikoCpuVmin = 600,
@@ -222,7 +224,7 @@ volatile CustomizeTable C = {
{ 691200, { }, { 1149425, 8144, -940, 808, -21583, 226 } }, { 691200, { }, { 1149425, 8144, -940, 808, -21583, 226 } },
{ 768000, { }, { 1191317, 8144, -940, 808, -21583, 226 } }, { 768000, { }, { 1191317, 8144, -940, 808, -21583, 226 } },
{ 844800, { }, { 1233208, 8144, -940, 808, -21583, 226 } }, { 844800, { }, { 1233208, 8144, -940, 808, -21583, 226 } },
// { 921600, { }, { 1275100, 8144, -940, 808, -21583, 226 } }, { 921600, { }, { 1275100, 8144, -940, 808, -21583, 226 } },
// { 998400, { }, { 1316991, 8144, -940, 808, -21583, 226 } }, // { 998400, { }, { 1316991, 8144, -940, 808, -21583, 226 } },
// { 1075200, { }, { 1358882, 8144, -940, 808, -21583, 226 } }, // { 1075200, { }, { 1358882, 8144, -940, 808, -21583, 226 } },
@@ -258,7 +260,7 @@ volatile CustomizeTable C = {
{ 768000, { }, { 1023752, 8144, -940, 808, -21583, 226 } }, { 768000, { }, { 1023752, 8144, -940, 808, -21583, 226 } },
{ 844800, { }, { 1065643, 8144, -940, 808, -21583, 226 } }, { 844800, { }, { 1065643, 8144, -940, 808, -21583, 226 } },
{ 921600, { }, { 1107535, 8144, -940, 808, -21583, 226 } }, { 921600, { }, { 1107535, 8144, -940, 808, -21583, 226 } },
{ 998400, { }, { 1149426, 8144, -940, 808, -21583, 226 } }, // { 998400, { }, { 1149426, 8144, -940, 808, -21583, 226 } },
// { 1075200, { }, { 1275100, 8144, -940, 808, -21583, 226 } }, // { 1075200, { }, { 1275100, 8144, -940, 808, -21583, 226 } },
}, },
@@ -348,7 +350,7 @@ volatile CustomizeTable C = {
{ 998400, { }, { 1316991, 8144, -940, 808, -21583, 226 } }, // UNSAFE { 998400, { }, { 1316991, 8144, -940, 808, -21583, 226 } }, // UNSAFE
{ 1075200, { }, { 1358882, 8144, -940, 808, -21583, 226 } }, // UNSAFE { 1075200, { }, { 1358882, 8144, -940, 808, -21583, 226 } }, // UNSAFE
// { 1152000, { }, { 1400773, 8144, -940, 808, -21583, 226 } }, // DANGEROUS // { 1152000, { }, { 1400773, 8144, -940, 808, -21583, 226 } }, // DANGEROUS
// { 1228800, { }, { 1440773, 8144, -940, 808, -21583, 226 } }, // DANGEROUS // { 1228800, { }, { 1440773, 8144, -940, 808, -21583, 226 } }, // Cooler
}, },
.marikoGpuDvfsTableUv3UnsafeFreqs = { .marikoGpuDvfsTableUv3UnsafeFreqs = {

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

@@ -31,6 +31,7 @@
enum MtcConfig: u32 { enum MtcConfig: u32 {
AUTO_ADJ = 0, AUTO_ADJ = 0,
AUTO_ADJ_BL = 1,
}; };
using CustomizeCpuDvfsTable = pcv::cvb_entry_t[pcv::DvfsTableEntryLimit]; using CustomizeCpuDvfsTable = pcv::cvb_entry_t[pcv::DvfsTableEntryLimit];

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

@@ -164,8 +164,8 @@ namespace ams::ldr::oc::pcv::erista {
} }
/* This currently patches a lot of unwanted extra stuff that needs to be removed. */ /* This currently patches a lot of unwanted extra stuff that needs to be removed. */
/* Additionally all timings are hardcoded, meaning timing reductions don't work as of right now. */ /* Additionally, timing reductions have possible improvements. */
/* Finally: This only patches for 2133BL; 1866BL also needs to be done. */ /* Note: I don't even know if this patches 2133BL or 1866BL, but I assume 2133BL. */
void MemMtcTableAutoAdjustBaseLatency(EristaMtcTable *table) { void MemMtcTableAutoAdjustBaseLatency(EristaMtcTable *table) {
using namespace pcv::erista; using namespace pcv::erista;
#define WRITE_PARAM_ALL_REG(TABLE, PARAM, VALUE) \ #define WRITE_PARAM_ALL_REG(TABLE, PARAM, VALUE) \
@@ -174,42 +174,81 @@ namespace ams::ldr::oc::pcv::erista {
TABLE->shadow_regs_quse_train.PARAM = VALUE; \ TABLE->shadow_regs_quse_train.PARAM = VALUE; \
TABLE->shadow_regs_rdwr_train.PARAM = VALUE; TABLE->shadow_regs_rdwr_train.PARAM = VALUE;
WRITE_PARAM_ALL_REG(table, emc_cfg, 0xF3200000); /* TODO: HP mode. */ #define GET_CYCLE(PARAM) ((u32)((double)(PARAM) / tCK_avg))
WRITE_PARAM_ALL_REG(table, emc_rc, 0x00000060);
WRITE_PARAM_ALL_REG(table, emc_rfc, 0x00000120); /* This condition is insane but it's done in eos. */
WRITE_PARAM_ALL_REG(table, emc_ras, 0x00000044); /* Need to clean up at some point. */
WRITE_PARAM_ALL_REG(table, emc_rp, 0x0000001D); u32 rext;
WRITE_PARAM_ALL_REG(table, emc_r2w, 0x0000002A); u32 wext;
WRITE_PARAM_ALL_REG(table, emc_w2r, 0x00000021); if (C.eristaEmcMaxClock < 3200001) {
if (C.eristaEmcMaxClock < 2133001) {
rext = 26;
wext = 22;
} else {
rext = 28;
wext = 22;
if (2400000 < C.eristaEmcMaxClock) {
wext = 25;
}
}
} else {
rext = 30;
wext = 25;
}
u32 refresh_raw = 0xFFFF;
u32 trefbw = 0;
if (C.t8_tREFI != 6) {
refresh_raw = static_cast<u32>(std::floor(static_cast<double>(tREFpb_values[C.t8_tREFI]) / tCK_avg)) - 0x40;
refresh_raw = MIN(refresh_raw, static_cast<u32>(0xFFFF));
}
trefbw = refresh_raw + 0x40;
trefbw = MIN(trefbw, static_cast<u32>(0x3FFF));
if (C.hpMode) {
WRITE_PARAM_ALL_REG(table, emc_cfg, 0x13200000);
} else {
WRITE_PARAM_ALL_REG(table, emc_cfg, 0xF3200000);
}
WRITE_PARAM_ALL_REG(table, emc_rc, /*0x00000060*/ GET_CYCLE(tRC));
WRITE_PARAM_ALL_REG(table, emc_rfc, /*0x00000120*/ GET_CYCLE(tRFCab));
WRITE_PARAM_ALL_REG(table, emc_ras, /*0x00000044*/ GET_CYCLE(tRAS));
WRITE_PARAM_ALL_REG(table, emc_rp, /*0x0000001D*/ GET_CYCLE(tRPpb));
WRITE_PARAM_ALL_REG(table, emc_r2w, /*0x0000002A*/ tR2W);
WRITE_PARAM_ALL_REG(table, emc_w2r, /*0x00000021*/ tW2R);
WRITE_PARAM_ALL_REG(table, emc_r2p, 0x0000000C); WRITE_PARAM_ALL_REG(table, emc_r2p, 0x0000000C);
WRITE_PARAM_ALL_REG(table, emc_w2p, 0x0000002D); WRITE_PARAM_ALL_REG(table, emc_w2p, 0x0000002D);
WRITE_PARAM_ALL_REG(table, emc_rd_rcd, 0x0000001D); WRITE_PARAM_ALL_REG(table, emc_rd_rcd, /*0x0000001D*/ GET_CYCLE(tRCD));
WRITE_PARAM_ALL_REG(table, emc_wr_rcd, 0x0000001D); WRITE_PARAM_ALL_REG(table, emc_wr_rcd, /*0x0000001D*/ GET_CYCLE(tRCD));
WRITE_PARAM_ALL_REG(table, emc_rrd, 0x00000010); WRITE_PARAM_ALL_REG(table, emc_rrd, /*0x00000010*/ GET_CYCLE(tRRD));
WRITE_PARAM_ALL_REG(table, emc_rext, 0x00000017); WRITE_PARAM_ALL_REG(table, emc_rext, 0x00000017);
WRITE_PARAM_ALL_REG(table, emc_wdv, 0x0000000E); WRITE_PARAM_ALL_REG(table, emc_wdv, 0x0000000E);
WRITE_PARAM_ALL_REG(table, emc_quse, 0x00000024); WRITE_PARAM_ALL_REG(table, emc_quse, 0x00000024);
WRITE_PARAM_ALL_REG(table, emc_qrst, 0x0006000C); WRITE_PARAM_ALL_REG(table, emc_qrst, 0x0006000C);
WRITE_PARAM_ALL_REG(table, emc_qsafe, 0x00000034); WRITE_PARAM_ALL_REG(table, emc_qsafe, 0x00000034);
WRITE_PARAM_ALL_REG(table, emc_rdv, 0x0000003C); WRITE_PARAM_ALL_REG(table, emc_rdv, 0x0000003C);
WRITE_PARAM_ALL_REG(table, emc_refresh, 0x00001820); WRITE_PARAM_ALL_REG(table, emc_refresh, /*0x00001820*/ refresh_raw);
WRITE_PARAM_ALL_REG(table, emc_burst_refresh_num, 0x00000000); WRITE_PARAM_ALL_REG(table, emc_burst_refresh_num, 0x00000000);
WRITE_PARAM_ALL_REG(table, emc_pdex2wr, 0x00000010); WRITE_PARAM_ALL_REG(table, emc_pdex2wr, 0x00000010);
WRITE_PARAM_ALL_REG(table, emc_pdex2rd, 0x00000010); WRITE_PARAM_ALL_REG(table, emc_pdex2rd, 0x00000010);
WRITE_PARAM_ALL_REG(table, emc_pchg2pden, 0x00000003); WRITE_PARAM_ALL_REG(table, emc_pchg2pden, 0x00000003);
WRITE_PARAM_ALL_REG(table, emc_act2pden, 0x00000003); WRITE_PARAM_ALL_REG(table, emc_act2pden, 0x00000003);
WRITE_PARAM_ALL_REG(table, emc_ar2pden, 0x00000003); WRITE_PARAM_ALL_REG(table, emc_ar2pden, 0x00000003);
WRITE_PARAM_ALL_REG(table, emc_rw2pden, 0x00000038); WRITE_PARAM_ALL_REG(table, emc_rw2pden, /*0x00000038*/ GET_CYCLE(tRW2PDEN));
WRITE_PARAM_ALL_REG(table, emc_txsr, 0x0000012C); WRITE_PARAM_ALL_REG(table, emc_txsr, /*0x0000012C*/ MIN(GET_CYCLE(tXSR), (u32) 1022));
WRITE_PARAM_ALL_REG(table, emc_tcke, 0x0000000D); WRITE_PARAM_ALL_REG(table, emc_tcke, 0x0000000D);
WRITE_PARAM_ALL_REG(table, emc_tfaw, 0x00000040); WRITE_PARAM_ALL_REG(table, emc_tfaw, /*0x00000040*/ GET_CYCLE(tFAW));
WRITE_PARAM_ALL_REG(table, emc_trpab, 0x00000022); WRITE_PARAM_ALL_REG(table, emc_trpab, /*0x00000022*/ GET_CYCLE(tRPab));
WRITE_PARAM_ALL_REG(table, emc_tclkstable, 0x00000004); WRITE_PARAM_ALL_REG(table, emc_tclkstable, 0x00000004);
WRITE_PARAM_ALL_REG(table, emc_tclkstop, 0x00000014); WRITE_PARAM_ALL_REG(table, emc_tclkstop, 0x00000014);
WRITE_PARAM_ALL_REG(table, emc_trefbw, 0x00001860); WRITE_PARAM_ALL_REG(table, emc_trefbw, /* 0x00001860*/ trefbw);
WRITE_PARAM_ALL_REG(table, emc_tppd, 0x00000004); WRITE_PARAM_ALL_REG(table, emc_tppd, 0x00000004);
WRITE_PARAM_ALL_REG(table, emc_odt_write, 0x00000000); WRITE_PARAM_ALL_REG(table, emc_odt_write, 0x00000000);
WRITE_PARAM_ALL_REG(table, emc_pdex2mrr, 0x0000002E); WRITE_PARAM_ALL_REG(table, emc_pdex2mrr, /*0x0000002E*/ GET_CYCLE(pdex2mrr));
WRITE_PARAM_ALL_REG(table, emc_wext, 0x00000016); WRITE_PARAM_ALL_REG(table, emc_wext, 0x00000016);
WRITE_PARAM_ALL_REG(table, emc_rfc_slr, 0x00000000); WRITE_PARAM_ALL_REG(table, emc_rfc_slr, 0x00000000);
WRITE_PARAM_ALL_REG(table, emc_mrs_wait_cnt2, 0x01900017); WRITE_PARAM_ALL_REG(table, emc_mrs_wait_cnt2, 0x01900017);
@@ -252,9 +291,9 @@ namespace ams::ldr::oc::pcv::erista {
// WRITE_PARAM_ALL_REG(table, emc_tr_ctrl_1, 0x00000000); // WRITE_PARAM_ALL_REG(table, emc_tr_ctrl_1, 0x00000000);
WRITE_PARAM_ALL_REG(table, emc_tr_rdv, 0x0000003C); WRITE_PARAM_ALL_REG(table, emc_tr_rdv, 0x0000003C);
table->emc_sel_dpd_ctrl = 0x00040000; table->emc_sel_dpd_ctrl = 0x00040000;
WRITE_PARAM_ALL_REG(table, emc_pre_refresh_req_cnt, 0x00000608); WRITE_PARAM_ALL_REG(table, emc_pre_refresh_req_cnt, /*0x00000608*/ (u32) (refresh_raw / 4));
WRITE_PARAM_ALL_REG(table, emc_dyn_self_ref_control, 0x8000308C); WRITE_PARAM_ALL_REG(table, emc_dyn_self_ref_control, 0x8000308C);
WRITE_PARAM_ALL_REG(table, emc_txsrdll, 0x0000012C); WRITE_PARAM_ALL_REG(table, emc_txsrdll, /*0x0000012C*/ MIN(GET_CYCLE(tXSR), (u32) 1022));
WRITE_PARAM_ALL_REG(table, emc_tr_qpop, 0x0000002C); WRITE_PARAM_ALL_REG(table, emc_tr_qpop, 0x0000002C);
WRITE_PARAM_ALL_REG(table, emc_tr_rdv_mask, 0x0000003E); WRITE_PARAM_ALL_REG(table, emc_tr_rdv_mask, 0x0000003E);
WRITE_PARAM_ALL_REG(table, emc_tr_qsafe, 0x00000034); WRITE_PARAM_ALL_REG(table, emc_tr_qsafe, 0x00000034);
@@ -292,7 +331,7 @@ namespace ams::ldr::oc::pcv::erista {
table->emc_auto_cal_config7 = 0x00770000; table->emc_auto_cal_config7 = 0x00770000;
// WRITE_PARAM_ALL_REG(table, emc_refctrl2, 0x00000000); // WRITE_PARAM_ALL_REG(table, emc_refctrl2, 0x00000000);
WRITE_PARAM_ALL_REG(table, emc_fbio_cfg7, 0x00003BFF); WRITE_PARAM_ALL_REG(table, emc_fbio_cfg7, 0x00003BFF);
WRITE_PARAM_ALL_REG(table, emc_rfcpb, 0x00000090); WRITE_PARAM_ALL_REG(table, emc_rfcpb, /*0x00000090*/ GET_CYCLE(tRFCpb));
// WRITE_PARAM_ALL_REG(table, emc_dqs_brlshft_0, 0x00000000); /* brlshft may or may not be important, I don't think it matters but who knows. */ // WRITE_PARAM_ALL_REG(table, emc_dqs_brlshft_0, 0x00000000); /* brlshft may or may not be important, I don't think it matters but who knows. */
// WRITE_PARAM_ALL_REG(table, emc_dqs_brlshft_1, 0x00000000); // WRITE_PARAM_ALL_REG(table, emc_dqs_brlshft_1, 0x00000000);
table->emc_auto_cal_config4 = 0x00770000; table->emc_auto_cal_config4 = 0x00770000;
@@ -358,23 +397,58 @@ namespace ams::ldr::oc::pcv::erista {
WRITE_PARAM_ALL_REG(table, emc_training_ca_vref_ctrl, 0x00103200); WRITE_PARAM_ALL_REG(table, emc_training_ca_vref_ctrl, 0x00103200);
WRITE_PARAM_ALL_REG(table, emc_training_settle, 0x07070404); WRITE_PARAM_ALL_REG(table, emc_training_settle, 0x07070404);
// WRITE_PARAM_ALL_REG(table, emc_training_mpc, 0x00000000); // WRITE_PARAM_ALL_REG(table, emc_training_mpc, 0x00000000);
const u32 mc_tRCD = (int) ((double) (GET_CYCLE(tRCD) >> 2) - 2.0);
const u32 mc_tRPpb = (int) (((double) (GET_CYCLE(tRPpb) >> 2) - 1.0) + 2.0);
const u32 mc_tRC = (uint) ((double) (GET_CYCLE(tRC) >> 2) - 1.0);
const u32 mc_tR2W = (uint) (((double) ((uint)tR2W >> 2) - 1.0) + 2.0);
const u32 mc_tW2R = (uint) (((double) (tW2R >> 2) - 1.0) + 2.0);
const u32 mc_tRAS = MIN(GET_CYCLE(tRAS), (u32) 0x7F);
const u32 mc_tRRD = MIN(GET_CYCLE(tRRD), (u32) 31);
table->burst_mc_regs.mc_emem_arb_timing_ras = (int) ((double) (mc_tRAS >> 2) - 2.0);
table->burst_mc_regs.mc_emem_arb_timing_rcd = (int) ((double) (GET_CYCLE(tRCD) >> 2) - 2.0);
table->burst_mc_regs.mc_emem_arb_timing_rp = (int) (((double) (GET_CYCLE(tRPpb) >> 2) - 1.0) + 2.0);
table->burst_mc_regs.mc_emem_arb_timing_rc = (int) ((double) (GET_CYCLE(tRC) >> 2) - 1.0);
table->burst_mc_regs.mc_emem_arb_timing_faw = (int) ((double) (GET_CYCLE(tFAW) >> 2) - 1.0);
table->burst_mc_regs.mc_emem_arb_timing_rrd = (int) ((double) (mc_tRRD >> 2) - 1.0);
table->burst_mc_regs.mc_emem_arb_timing_r2w = (uint) (((double) ((uint) tR2W >> 2) - 1.0) + 2.0);
table->burst_mc_regs.mc_emem_arb_timing_w2r = (uint) (((double) (tW2R >> 2) - 1.0) + 2.0);
u32 mc_r2r = table->burst_mc_regs.mc_emem_arb_timing_r2r;
if (mc_r2r > 1) {
mc_r2r = (uint) (((double) (long) ((double) rext * 0.25) - 1.0) + 2.0);
table->burst_mc_regs.mc_emem_arb_timing_r2r = mc_r2r;
}
u32 mc_w2w = table->burst_mc_regs.mc_emem_arb_timing_w2w;
if (mc_w2w > 1) {
mc_w2w = (uint) (((double) (long) ((double) wext / 4.0) - 1.0) + 2.0);
table->burst_mc_regs.mc_emem_arb_timing_w2w = mc_w2w;
}
table->burst_mc_regs.mc_emem_arb_da_turns = ((mc_tW2R >> 1) << 0x18) | ((mc_tR2W >> 1) << 0x10) | ((mc_r2r >> 1) << 8) | ((mc_w2w >> 1));
table->burst_mc_regs.mc_emem_arb_da_covers = (((uint) (mc_tRCD + 3 + mc_tRPpb) >> 1 & 0xff) << 8) | (((uint) (mc_tRCD + 11 + mc_tRPpb) >> 1 & 0xff) << 0x10) | ((mc_tRC >> 1) & 0xff);
table->burst_mc_regs.mc_emem_arb_misc0 = (table->burst_mc_regs.mc_emem_arb_misc0 & 0xffe08000U) | ((mc_tRC + 1) & 0xff); /* Missing in l4t dump? TODO */
table->burst_mc_regs.mc_emem_arb_timing_rfcpb = GET_CYCLE(tRFCpb) >> 2;
table->burst_mc_regs.mc_emem_arb_cfg = 0x0000000c; table->burst_mc_regs.mc_emem_arb_cfg = 0x0000000c;
table->burst_mc_regs.mc_emem_arb_timing_rcd = 0x00000006; // table->burst_mc_regs.mc_emem_arb_timing_rcd = 0x00000006;
table->burst_mc_regs.mc_emem_arb_timing_rp = 0x00000007; // table->burst_mc_regs.mc_emem_arb_timing_rp = 0x00000007;
table->burst_mc_regs.mc_emem_arb_timing_rc = 0x00000018; // table->burst_mc_regs.mc_emem_arb_timing_rc = 0x00000018;
table->burst_mc_regs.mc_emem_arb_timing_ras = 0x0000000f; // table->burst_mc_regs.mc_emem_arb_timing_ras = 0x0000000f;
table->burst_mc_regs.mc_emem_arb_timing_faw = 0x0000000f; // table->burst_mc_regs.mc_emem_arb_timing_faw = 0x0000000f;
table->burst_mc_regs.mc_emem_arb_timing_rrd = 0x00000003; // table->burst_mc_regs.mc_emem_arb_timing_rrd = 0x00000003;
table->burst_mc_regs.mc_emem_arb_timing_rap2pre = 0x00000003; table->burst_mc_regs.mc_emem_arb_timing_rap2pre = 0x00000003;
table->burst_mc_regs.mc_emem_arb_timing_wap2pre = 0x0000000d; table->burst_mc_regs.mc_emem_arb_timing_wap2pre = 0x0000000d;
table->burst_mc_regs.mc_emem_arb_timing_r2r = 0x00000007; // table->burst_mc_regs.mc_emem_arb_timing_r2r = 0x00000007;
table->burst_mc_regs.mc_emem_arb_timing_w2w = 0x00000007; table->burst_mc_regs.mc_emem_arb_timing_w2w = 0x00000007;
table->burst_mc_regs.mc_emem_arb_timing_r2w = 0x0000000c; // table->burst_mc_regs.mc_emem_arb_timing_r2w = 0x0000000c;
table->burst_mc_regs.mc_emem_arb_timing_w2r = 0x0000000a; // table->burst_mc_regs.mc_emem_arb_timing_w2r = 0x0000000a;
table->burst_mc_regs.mc_emem_arb_da_turns = 0x05060303; // table->burst_mc_regs.mc_emem_arb_da_turns = 0x05060303;
table->burst_mc_regs.mc_emem_arb_da_covers = 0x000d080c; // table->burst_mc_regs.mc_emem_arb_da_covers = 0x000d080c;
table->burst_mc_regs.mc_emem_arb_ring1_throttle = 0x001f0000; table->burst_mc_regs.mc_emem_arb_ring1_throttle = 0x001f0000;
table->burst_mc_regs.mc_emem_arb_timing_rfcpb = 0x00000023; // table->burst_mc_regs.mc_emem_arb_timing_rfcpb = 0x00000023;
table->burst_mc_regs.mc_emem_arb_timing_ccdmw = 0x00000008; table->burst_mc_regs.mc_emem_arb_timing_ccdmw = 0x00000008;
table->burst_mc_regs.mc_emem_arb_refpb_hp_ctrl = 0x000a1020; table->burst_mc_regs.mc_emem_arb_refpb_hp_ctrl = 0x000a1020;
table->burst_mc_regs.mc_emem_arb_refpb_bank_ctrl = 0x80001028; table->burst_mc_regs.mc_emem_arb_refpb_bank_ctrl = 0x80001028;
@@ -417,7 +491,7 @@ namespace ams::ldr::oc::pcv::erista {
/* These timings are slightly off from eos, I am not sure why but I am going to figure it out at some point. */ /* These timings are slightly off from eos, I am not sure why but I am going to figure it out at some point. */
void MemMtcTableAutoAdjust(EristaMtcTable *table) { void MemMtcTableAutoAdjust(EristaMtcTable *table) {
if (C.mtcConf != AUTO_ADJ) if (C.mtcConf != AUTO_ADJ) /* Return even needed? */
return; return;
using namespace pcv::erista; using namespace pcv::erista;
@@ -499,7 +573,6 @@ namespace ams::ldr::oc::pcv::erista {
WRITE_PARAM_ALL_REG(table, emc_pdex2wr, GET_CYCLE(10.0)); 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_pdex2rd, GET_CYCLE(10.0));
/* I am very surprised if this is correct. */
WRITE_PARAM_ALL_REG(table, emc_pchg2pden, GET_CYCLE(1.75)); 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_ar2pden, GET_CYCLE(1.75));
WRITE_PARAM_ALL_REG(table, emc_pdex2cke, GET_CYCLE(1.75)); WRITE_PARAM_ALL_REG(table, emc_pdex2cke, GET_CYCLE(1.75));
@@ -511,7 +584,6 @@ namespace ams::ldr::oc::pcv::erista {
WRITE_PARAM_ALL_REG(table, emc_pre_refresh_req_cnt, (u32) (refresh_raw / 4)); WRITE_PARAM_ALL_REG(table, emc_pre_refresh_req_cnt, (u32) (refresh_raw / 4));
WRITE_PARAM_ALL_REG(table, emc_trefbw, trefbw); WRITE_PARAM_ALL_REG(table, emc_trefbw, trefbw);
/* MC. */
const u32 mc_tRCD = (int)((double)(GET_CYCLE(tRCD) >> 2) - 2.0); const u32 mc_tRCD = (int)((double)(GET_CYCLE(tRCD) >> 2) - 2.0);
const u32 mc_tRPpb = (int)(((double)(GET_CYCLE(tRPpb) >> 2) - 1.0) + 2.0); const u32 mc_tRPpb = (int)(((double)(GET_CYCLE(tRPpb) >> 2) - 1.0) + 2.0);
const u32 mc_tRC = (uint)((double)(GET_CYCLE(tRC) >> 2) - 1.0); const u32 mc_tRC = (uint)((double)(GET_CYCLE(tRC) >> 2) - 1.0);
@@ -520,15 +592,12 @@ namespace ams::ldr::oc::pcv::erista {
const u32 mc_tRAS = MIN(GET_CYCLE(tRAS), (u32) 0x7F); const u32 mc_tRAS = MIN(GET_CYCLE(tRAS), (u32) 0x7F);
const u32 mc_tRRD = MIN(GET_CYCLE(tRRD), (u32) 31); const u32 mc_tRRD = MIN(GET_CYCLE(tRRD), (u32) 31);
table->burst_mc_regs.mc_emem_arb_cfg = (int)(((double) C.eristaEmcMaxClock / 33300.0) * 0.25);
table->burst_mc_regs.mc_emem_arb_timing_ras = (int) ((double) (mc_tRAS >> 2) - 2.0); table->burst_mc_regs.mc_emem_arb_timing_ras = (int) ((double) (mc_tRAS >> 2) - 2.0);
table->burst_mc_regs.mc_emem_arb_timing_rcd = (int) ((double) (GET_CYCLE(tRCD) >> 2) - 2.0); table->burst_mc_regs.mc_emem_arb_timing_rcd = (int) ((double) (GET_CYCLE(tRCD) >> 2) - 2.0);
table->burst_mc_regs.mc_emem_arb_timing_rp = (int) (((double) (GET_CYCLE(tRPpb) >> 2) - 1.0) + 2.0); table->burst_mc_regs.mc_emem_arb_timing_rp = (int) (((double) (GET_CYCLE(tRPpb) >> 2) - 1.0) + 2.0);
table->burst_mc_regs.mc_emem_arb_timing_rc = (int) ((double) (GET_CYCLE(tRC) >> 2) - 1.0); table->burst_mc_regs.mc_emem_arb_timing_rc = (int) ((double) (GET_CYCLE(tRC) >> 2) - 1.0);
table->burst_mc_regs.mc_emem_arb_timing_faw = (int) ((double)(GET_CYCLE(tFAW) >> 2) - 1.0); table->burst_mc_regs.mc_emem_arb_timing_faw = (int) ((double)(GET_CYCLE(tFAW) >> 2) - 1.0);
table->burst_mc_regs.mc_emem_arb_timing_rrd = (int)((double)(mc_tRRD >> 2) - 1.0); table->burst_mc_regs.mc_emem_arb_timing_rrd = (int)((double)(mc_tRRD >> 2) - 1.0);
table->burst_mc_regs.mc_emem_arb_timing_rap2pre = 3;
table->burst_mc_regs.mc_emem_arb_timing_wap2pre = 11;
table->burst_mc_regs.mc_emem_arb_timing_r2w = (uint)(((double)((uint)tR2W >> 2) - 1.0) + 2.0); table->burst_mc_regs.mc_emem_arb_timing_r2w = (uint)(((double)((uint)tR2W >> 2) - 1.0) + 2.0);
table->burst_mc_regs.mc_emem_arb_timing_w2r = (uint)(((double)(tW2R >> 2) - 1.0) + 2.0); table->burst_mc_regs.mc_emem_arb_timing_w2r = (uint)(((double)(tW2R >> 2) - 1.0) + 2.0);
@@ -615,7 +684,6 @@ namespace ams::ldr::oc::pcv::erista {
WRITE_PARAM_ALL_REG(table, emc_cfg, 0x13200000); WRITE_PARAM_ALL_REG(table, emc_cfg, 0x13200000);
} }
/* This makes no sense but should match eos re. I will accept it and pray to the silicon gods. */
table->dram_timings.t_rp = tRFCpb; table->dram_timings.t_rp = tRFCpb;
table->dram_timings.t_rfc = tRFCab; table->dram_timings.t_rfc = tRFCab;
table->emc_cfg_2 = 0x11083d; table->emc_cfg_2 = 0x11083d;
@@ -643,18 +711,13 @@ namespace ams::ldr::oc::pcv::erista {
for (u32 i = khz_list_size - 1; i > 0; i--) for (u32 i = khz_list_size - 1; i > 0; i--)
std::memcpy(static_cast<void *>(table_list[i]), static_cast<void *>(table_list[i - 1]), sizeof(EristaMtcTable)); std::memcpy(static_cast<void *>(table_list[i]), static_cast<void *>(table_list[i - 1]), sizeof(EristaMtcTable));
/* Too lazy for proper settings atm, want to sleep. ¯\_(ツ)_/¯ */ if (C.mtcConf == AUTO_ADJ) {
if (0) MemMtcTableAutoAdjust(table_list[0]); MemMtcTableAutoAdjust(table_list[0]);
} else {
MemMtcTableAutoAdjustBaseLatency(table_list[0]); MemMtcTableAutoAdjustBaseLatency(table_list[0]);
}
PATCH_OFFSET(ptr, C.eristaEmcMaxClock); PATCH_OFFSET(ptr, C.eristaEmcMaxClock);
// Handle customize table replacement
// if (C.mtcConf == CUSTOMIZED_ALL) {
// MemMtcCustomizeTable(table_list[0], const_cast<EristaMtcTable *>(C.eristaMtcTable));
//}
R_SUCCEED(); R_SUCCEED();
} }