mirror of
https://github.com/CTCaer/hekate.git
synced 2024-11-23 02:16:41 +00:00
exo: Add support for exo2
This commit is contained in:
parent
c2160ae367
commit
3c6c92aa9c
1 changed files with 11 additions and 5 deletions
|
@ -645,6 +645,7 @@ int hos_launch(ini_sec_t *cfg)
|
||||||
{
|
{
|
||||||
u8 kb;
|
u8 kb;
|
||||||
launch_ctxt_t ctxt;
|
launch_ctxt_t ctxt;
|
||||||
|
bool exo_new = false;
|
||||||
tsec_ctxt_t tsec_ctxt;
|
tsec_ctxt_t tsec_ctxt;
|
||||||
volatile secmon_mailbox_t *secmon_mailbox;
|
volatile secmon_mailbox_t *secmon_mailbox;
|
||||||
|
|
||||||
|
@ -719,6 +720,11 @@ int hos_launch(ini_sec_t *cfg)
|
||||||
|
|
||||||
gfx_puts("Loaded config, pkg1 and keyblob\n");
|
gfx_puts("Loaded config, pkg1 and keyblob\n");
|
||||||
|
|
||||||
|
// Check if secmon is new exosphere.
|
||||||
|
if (ctxt.secmon)
|
||||||
|
exo_new = !memcmp((void *)((u8 *)ctxt.secmon + ctxt.secmon_size - 4), "LENY", 4);
|
||||||
|
h_cfg.aes_slots_new = exo_new;
|
||||||
|
|
||||||
// Generate keys.
|
// Generate keys.
|
||||||
if (!h_cfg.se_keygen_done)
|
if (!h_cfg.se_keygen_done)
|
||||||
{
|
{
|
||||||
|
@ -929,8 +935,8 @@ int hos_launch(ini_sec_t *cfg)
|
||||||
else if (kb == KB_FIRMWARE_VERSION_301)
|
else if (kb == KB_FIRMWARE_VERSION_301)
|
||||||
PMC(APBDEV_PMC_SECURE_SCRATCH32) = 0x104; // Warmboot 3.0.1/.2 PA address id.
|
PMC(APBDEV_PMC_SECURE_SCRATCH32) = 0x104; // Warmboot 3.0.1/.2 PA address id.
|
||||||
|
|
||||||
// Finalize per firmware key access.
|
// Finalize per firmware key access. Skip access control if new exosphere.
|
||||||
switch (kb)
|
switch (kb | (exo_new << 7))
|
||||||
{
|
{
|
||||||
case KB_FIRMWARE_VERSION_100_200:
|
case KB_FIRMWARE_VERSION_100_200:
|
||||||
case KB_FIRMWARE_VERSION_300:
|
case KB_FIRMWARE_VERSION_300:
|
||||||
|
@ -952,7 +958,7 @@ int hos_launch(ini_sec_t *cfg)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Clear BCT area for retail units and copy it over if dev unit.
|
// Clear BCT area for retail units and copy it over if dev unit.
|
||||||
if (kb <= KB_FIRMWARE_VERSION_500)
|
if (kb <= KB_FIRMWARE_VERSION_500 && !exo_new)
|
||||||
{
|
{
|
||||||
memset((void *)0x4003D000, 0, 0x3000);
|
memset((void *)0x4003D000, 0, 0x3000);
|
||||||
if ((fuse_read_odm(4) & 3) == 3)
|
if ((fuse_read_odm(4) & 3) == 3)
|
||||||
|
@ -979,7 +985,7 @@ int hos_launch(ini_sec_t *cfg)
|
||||||
mc_config_carveout();
|
mc_config_carveout();
|
||||||
|
|
||||||
// Lock SE before starting 'SecureMonitor' if < 6.2.0, otherwise lock bootrom and ipatches.
|
// Lock SE before starting 'SecureMonitor' if < 6.2.0, otherwise lock bootrom and ipatches.
|
||||||
_se_lock(kb <= KB_FIRMWARE_VERSION_600);
|
_se_lock(kb <= KB_FIRMWARE_VERSION_600 && !exo_new);
|
||||||
|
|
||||||
// Reset sysctr0 counters.
|
// Reset sysctr0 counters.
|
||||||
if (kb >= KB_FIRMWARE_VERSION_620)
|
if (kb >= KB_FIRMWARE_VERSION_620)
|
||||||
|
@ -989,7 +995,7 @@ int hos_launch(ini_sec_t *cfg)
|
||||||
//_pmc_scratch_lock(kb);
|
//_pmc_scratch_lock(kb);
|
||||||
|
|
||||||
// Set secmon mailbox address.
|
// Set secmon mailbox address.
|
||||||
if (kb >= KB_FIRMWARE_VERSION_700)
|
if (kb >= KB_FIRMWARE_VERSION_700 || exo_new)
|
||||||
secmon_mailbox = (secmon_mailbox_t *)SECMON7_MAILBOX_ADDR;
|
secmon_mailbox = (secmon_mailbox_t *)SECMON7_MAILBOX_ADDR;
|
||||||
else
|
else
|
||||||
secmon_mailbox = (secmon_mailbox_t *)SECMON_MAILBOX_ADDR;
|
secmon_mailbox = (secmon_mailbox_t *)SECMON_MAILBOX_ADDR;
|
||||||
|
|
Loading…
Reference in a new issue