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

hos: change order of deinits and update for newer exo

Browse source
This commit is contained in:
CTCaer 2022-01-20 13:49:29 +02:00
parent 6ac9d79282
commit b18b5076b3
1 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
bootloader/hos/hos.c
View file

@ -183,7 +183,7 @@ static void _se_lock(bool lock_se)
void _sysctr0_reset() void _sysctr0_reset()
{ {
SYSCTR0(SYSCTR0_CNTCR) = 0; //SYSCTR0(SYSCTR0_CNTCR) = 0; // Needs secure access.
SYSCTR0(SYSCTR0_COUNTERID0) = 0; SYSCTR0(SYSCTR0_COUNTERID0) = 0;
SYSCTR0(SYSCTR0_COUNTERID1) = 0; SYSCTR0(SYSCTR0_COUNTERID1) = 0;
SYSCTR0(SYSCTR0_COUNTERID2) = 0; SYSCTR0(SYSCTR0_COUNTERID2) = 0;
@ -1152,8 +1152,8 @@ int hos_launch(ini_sec_t *cfg)
secmon_mailbox = (secmon_mailbox_t *)(SECMON_MAILBOX_ADDR + SECMON_STATE_OFFSET); secmon_mailbox = (secmon_mailbox_t *)(SECMON_MAILBOX_ADDR + SECMON_STATE_OFFSET);
} }
// Start from DRAM ready signal and reset outgoing value. // Start directly from PKG2 ready signal and reset outgoing value.
secmon_mailbox->in = PKG1_STATE_DRAM_READY; secmon_mailbox->in = pkg1_state_pkg2_ready;
secmon_mailbox->out = SECMON_STATE_NOT_READY; secmon_mailbox->out = SECMON_STATE_NOT_READY;
// Disable display. This must be executed before secmon to provide support for all fw versions. // Disable display. This must be executed before secmon to provide support for all fw versions.
@ -1166,16 +1166,13 @@ int hos_launch(ini_sec_t *cfg)
CLOCK(CLK_RST_CONTROLLER_RST_DEV_L_SET) = BIT(CLK_L_USBD); CLOCK(CLK_RST_CONTROLLER_RST_DEV_L_SET) = BIT(CLK_L_USBD);
CLOCK(CLK_RST_CONTROLLER_RST_DEV_H_SET) = BIT(CLK_H_AHBDMA) | BIT(CLK_H_APBDMA) | BIT(CLK_H_USB2); CLOCK(CLK_RST_CONTROLLER_RST_DEV_H_SET) = BIT(CLK_H_AHBDMA) | BIT(CLK_H_APBDMA) | BIT(CLK_H_USB2);
// Flush cache and disable MMU.
bpmp_mmu_disable();
bpmp_clk_rate_set(BPMP_CLK_NORMAL);
// Scale down RAM OC if enabled. // Scale down RAM OC if enabled.
if (ctxt.stock) if (ctxt.stock)
minerva_prep_boot_freq(); minerva_prep_boot_freq();
// emuMMC: Some cards (Sandisk U1), do not like a fast power cycle. Wait min 100ms. // Flush cache and disable MMU.
sdmmc_storage_init_wait_sd(); bpmp_mmu_disable();
bpmp_clk_rate_set(BPMP_CLK_NORMAL);
// Launch secmon. // Launch secmon.
if (smmu_is_used()) if (smmu_is_used())
@ -1183,13 +1180,6 @@ int hos_launch(ini_sec_t *cfg)
else else
ccplex_boot_cpu0(secmon_base); ccplex_boot_cpu0(secmon_base);
// Wait for secmon to get ready.
while (!secmon_mailbox->out)
;
// Signal pkg2 ready and continue boot.
secmon_mailbox->in = pkg1_state_pkg2_ready;
// Halt ourselves in waitevent state and resume if there's JTAG activity. // Halt ourselves in waitevent state and resume if there's JTAG activity.
while (true) while (true)
bpmp_halt(); bpmp_halt();