ben/hekate-emmc
1
0
Fork 0
forked from CTCaer/hekate
Code Issues Pull Requests Releases 1 Activity

minerva: do not reread mrr for channel b

Browse Source 
Just in case the mrr fifo is not empty.
This commit is contained in:
CTCaer 2024-02-16 16:34:30 +02:00
parent e96e74c72a
commit feb5b11f66
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
modules/hekate_libsys_minerva/sys_sdrammtc.c
View File

@ -1168,7 +1168,7 @@ static u32 _get_dram_temperature()
if (channel1_enabled) if (channel1_enabled)
{ {
_request_mmr_data(0x40040000, EMC_CHANNEL1); _request_mmr_data(0x40040000, EMC_CHANNEL1);
mr4_1 = EMC(EMC_MRR); mr4_1 = EMC(EMC_MRR) & 0xFFFF;
if (mr4_1 < 0xF001) if (mr4_1 < 0xF001)
mr4_1 &= 0x7; mr4_1 &= 0x7;
@ -1549,21 +1549,25 @@ static u32 _minerva_update_clock_tree_delay(emc_table_t *src_emc_entry, emc_tabl
if (upd_type_bits & 0x5400) if (upd_type_bits & 0x5400)
{ {
_request_mmr_data(0x80130000, channel1_enabled); // Dev0 MRR 19. _request_mmr_data(0x80130000, channel1_enabled); // Dev0 MRR 19.
temp_ch0_0 = (EMC(EMC_MRR) & 0xFF) << 8; u32 mrr = EMC(EMC_MRR);
temp_ch0_1 = EMC(EMC_MRR) & 0xFF00; temp_ch0_0 = (mrr & 0xFF) << 8;
temp_ch0_1 = mrr & 0xFF00;
if (channel1_enabled) if (channel1_enabled)
{ {
temp_ch1_0 = (EMC_CH1(EMC_MRR) & 0xFF) << 8; mrr = EMC_CH1(EMC_MRR);
temp_ch1_1 = EMC_CH1(EMC_MRR) & 0xFF00; temp_ch1_0 = (mrr & 0xFF) << 8;
temp_ch1_1 = mrr & 0xFF00;
} }
_request_mmr_data(0x80120000, channel1_enabled); // Dev0 MRR 18. _request_mmr_data(0x80120000, channel1_enabled); // Dev0 MRR 18.
temp_ch0_0 |= EMC(EMC_MRR) & 0xFF; mrr = EMC(EMC_MRR);
temp_ch0_1 |= (EMC(EMC_MRR) & 0xFF00) >> 8; temp_ch0_0 |= mrr & 0xFF;
temp_ch0_1 |= (mrr & 0xFF00) >> 8;
if (channel1_enabled) if (channel1_enabled)
{ {
temp_ch1_0 |= EMC_CH1(EMC_MRR) & 0xFF; mrr = EMC_CH1(EMC_MRR);
temp_ch1_1 |= (EMC_CH1(EMC_MRR) & 0xFF00) >> 8; temp_ch1_0 |= mrr & 0xFF;
temp_ch1_1 |= (mrr & 0xFF00) >> 8;
} }
} }
@ -1723,21 +1727,25 @@ calc_dev2:
if (update_type <= PERIODIC_TRAINING_UPDATE && upd_type_bits & 0x5400) if (update_type <= PERIODIC_TRAINING_UPDATE && upd_type_bits & 0x5400)
{ {
_request_mmr_data(0x40130000, channel1_enabled); // Dev1 MRR 19. _request_mmr_data(0x40130000, channel1_enabled); // Dev1 MRR 19.
temp_ch0_0 = (EMC(EMC_MRR) & 0xFF) << 8; u32 mrr = EMC(EMC_MRR);
temp_ch0_1 = EMC(EMC_MRR) & 0xFF00; temp_ch0_0 = (mrr& 0xFF) << 8;
temp_ch0_1 = mrr & 0xFF00;
if (channel1_enabled) if (channel1_enabled)
{ {
temp_ch1_0 = (EMC_CH1(EMC_MRR) & 0xFF) << 8; mrr = EMC_CH1(EMC_MRR);
temp_ch1_1 = EMC_CH1(EMC_MRR) & 0xFF00; temp_ch1_0 = (mrr & 0xFF) << 8;
temp_ch1_1 = mrr & 0xFF00;
} }
_request_mmr_data(0x40120000, channel1_enabled); // Dev1 MRR 18 _request_mmr_data(0x40120000, channel1_enabled); // Dev1 MRR 18
temp_ch0_0 |= EMC(EMC_MRR) & 0xFF; mrr = EMC(EMC_MRR);
temp_ch0_1 |= ((EMC(EMC_MRR) & 0xFF00) >> 8); temp_ch0_0 |= mrr & 0xFF;
temp_ch0_1 |= ((mrr & 0xFF00) >> 8);
if (channel1_enabled) if (channel1_enabled)
{ {
temp_ch1_0 |= EMC_CH1(EMC_MRR) & 0xFF; mrr = EMC_CH1(EMC_MRR);
temp_ch1_1 |= (EMC_CH1(EMC_MRR) & 0xFF00) >> 8; temp_ch1_0 |= mrr & 0xFF;
temp_ch1_1 |= (mrr & 0xFF00) >> 8;
} }
} }