nold/hekate
1
0
Fork 0
mirror of https://github.com/CTCaer/hekate synced 2024-12-22 03:11:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

mtc: Confine RAM OC completely inside minerva

Browse source 
Enabling OVERCLOCK_FREQ takes care of everything without the need of changing minerva caller.
This commit is contained in:
CTCaer 2021-01-03 14:37:39 +02:00
parent afb749560a
commit 8ce5d55eb8
1 changed files with 31 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
modules/hekate_libsys_minerva/sys_sdrammtc.c
View file

@ -28,6 +28,9 @@
#define EPRINTF(...) #define EPRINTF(...)
#define EPRINTFARGS(...) #define EPRINTFARGS(...)
#define MAX_FREQ_T210 1600000
//#define OVERCLOCK_FREQ 1862400
bool emc_2X_clk_src_is_pllmb; bool emc_2X_clk_src_is_pllmb;
bool fsp_for_src_freq; bool fsp_for_src_freq;
bool train_ram_patterns; bool train_ram_patterns;
@ -3751,14 +3754,17 @@ u32 _minerva_do_periodic_compensation(emc_table_t *mtc_table_entry)
u32 _minerva_set_rate(mtc_config_t *mtc_cfg) u32 _minerva_set_rate(mtc_config_t *mtc_cfg)
{ {
s32 src_emc_entry_idx = 0; u32 src_emc_entry_idx = 999;
s32 dst_emc_entry_idx = 999; u32 dst_emc_entry_idx = 999;
u32 selected_clk_src_emc; u32 selected_clk_src_emc;
u32 selected_emc_2x_clk_src; u32 selected_emc_2x_clk_src;
bool freq_changed = false; bool freq_changed = false;
emc_table_t *src_emc_entry; emc_table_t *src_emc_entry;
emc_table_t *dst_emc_entry; emc_table_t *dst_emc_entry;
if (mtc_cfg->table_entries > 900)
return 4;
for (u32 i = 0; i < mtc_cfg->table_entries; i++) for (u32 i = 0; i < mtc_cfg->table_entries; i++)
{ {
u32 table_entry_rate = mtc_cfg->mtc_table[i].rate_khz; u32 table_entry_rate = mtc_cfg->mtc_table[i].rate_khz;
@ -3768,6 +3774,12 @@ u32 _minerva_set_rate(mtc_config_t *mtc_cfg)
dst_emc_entry_idx = i; dst_emc_entry_idx = i;
} }
if (src_emc_entry_idx >= mtc_cfg->table_entries)
return 4;
if (dst_emc_entry_idx >= mtc_cfg->table_entries)
return 4;
src_emc_entry = (emc_table_t *)&mtc_cfg->mtc_table[src_emc_entry_idx]; src_emc_entry = (emc_table_t *)&mtc_cfg->mtc_table[src_emc_entry_idx];
dst_emc_entry = (emc_table_t *)&mtc_cfg->mtc_table[dst_emc_entry_idx]; dst_emc_entry = (emc_table_t *)&mtc_cfg->mtc_table[dst_emc_entry_idx];
@ -3776,9 +3788,6 @@ u32 _minerva_set_rate(mtc_config_t *mtc_cfg)
u32 src_clk_src_emc = src_emc_entry->clk_src_emc; u32 src_clk_src_emc = src_emc_entry->clk_src_emc;
u32 dst_clk_src_emc = dst_emc_entry->clk_src_emc; u32 dst_clk_src_emc = dst_emc_entry->clk_src_emc;
if (mtc_cfg->table_entries > 900)
return 4;
freq_changed = _check_freq_changed(dst_rate_khz, dst_clk_src_emc, src_rate_khz, src_clk_src_emc); freq_changed = _check_freq_changed(dst_rate_khz, dst_clk_src_emc, src_rate_khz, src_clk_src_emc);
EPRINTFARGS("Requested freq change from %d to %d.", src_rate_khz, dst_rate_khz); EPRINTFARGS("Requested freq change from %d to %d.", src_rate_khz, dst_rate_khz);
@ -3882,15 +3891,16 @@ void _minerva_init(mtc_config_t *mtc_cfg, void* bp)
return; return;
} }
// If this is set, it needs to be managed. Changing freq from OC to a lower #ifdef OVERCLOCK_FREQ
// must have the rate_from set to 2131200 and not 1600000 // Change max rate in table.
// bool overclock = true; mtc_cfg->mtc_table[mtc_cfg->table_entries - 1].rate_khz = OVERCLOCK_FREQ;
// if (overclock && mtc_cfg->rate_to == 1600000) // Change rates for OC RAM.
// { if (mtc_cfg->rate_from == MAX_FREQ_T210)
// mtc_cfg->rate_to = 2131200; mtc_cfg->rate_from = OVERCLOCK_FREQ;
// mtc_cfg->mtc_table[9].rate_khz = 2131200; if (mtc_cfg->rate_to == MAX_FREQ_T210)
// } mtc_cfg->rate_to = OVERCLOCK_FREQ;
#endif
switch (mtc_cfg->train_mode) switch (mtc_cfg->train_mode)
{ {
@ -3916,6 +3926,14 @@ void _minerva_init(mtc_config_t *mtc_cfg, void* bp)
break; break;
} }
#ifdef OVERCLOCK_FREQ
// Restore rates for OC RAM.
if (mtc_cfg->rate_from == OVERCLOCK_FREQ)
mtc_cfg->rate_from = MAX_FREQ_T210;
if (mtc_cfg->rate_to == OVERCLOCK_FREQ)
mtc_cfg->rate_to = MAX_FREQ_T210;
#endif
mtc_cfg->train_ram_patterns = train_ram_patterns; mtc_cfg->train_ram_patterns = train_ram_patterns;
mtc_cfg->fsp_for_src_freq = fsp_for_src_freq; mtc_cfg->fsp_for_src_freq = fsp_for_src_freq;
mtc_cfg->emc_2X_clk_src_is_pllmb = emc_2X_clk_src_is_pllmb; mtc_cfg->emc_2X_clk_src_is_pllmb = emc_2X_clk_src_is_pllmb;