From ddc89c9f49f68a465ff4f754775b2d24df5829e2 Mon Sep 17 00:00:00 2001 From: CTCaer Date: Mon, 22 Jun 2020 12:04:49 +0300 Subject: [PATCH] hos: Reduce size of pkg1 id array --- bootloader/hos/hos.c | 4 +-- bootloader/hos/pkg1.c | 78 ++++++++++++++++++++++++------------------ bootloader/hos/pkg1.h | 2 -- nyx/nyx_gui/hos/pkg1.c | 75 +++++++++++++++++++++++----------------- nyx/nyx_gui/hos/pkg1.h | 1 - 5 files changed, 91 insertions(+), 69 deletions(-) diff --git a/bootloader/hos/hos.c b/bootloader/hos/hos.c index 442cb9f..1b30edd 100644 --- a/bootloader/hos/hos.c +++ b/bootloader/hos/hos.c @@ -792,7 +792,7 @@ int hos_launch(ini_sec_t *cfg) *(vu32 *)(ctxt.pkg1_id->warmboot_base + warmboot_patchset[i].off) = warmboot_patchset[i].val; } // Set warmboot address in PMC if required. - if (ctxt.pkg1_id->set_warmboot) + if (kb <= KB_FIRMWARE_VERSION_301) PMC(APBDEV_PMC_SCRATCH1) = warmboot_base; // Replace 'SecureMonitor' if requested. @@ -997,7 +997,7 @@ int hos_launch(ini_sec_t *cfg) sdmmc_storage_end(&emmc_storage); // Finalize MC carveout. - if (kb <= KB_FIRMWARE_VERSION_301) + if (kb <= KB_FIRMWARE_VERSION_301 && !exo_new) mc_config_carveout(); // Lock SE before starting 'SecureMonitor' if < 6.2.0, otherwise lock bootrom and ipatches. diff --git a/bootloader/hos/pkg1.c b/bootloader/hos/pkg1.c index e827718..1db36cb 100644 --- a/bootloader/hos/pkg1.c +++ b/bootloader/hos/pkg1.c @@ -19,15 +19,20 @@ #include +#include "hos.h" #include "pkg1.h" #include #include #include #include +#define PK11_SECTION_WB 0 +#define PK11_SECTION_LD 1 +#define PK11_SECTION_SM 2 + #define _NOPv7() 0xE320F000 -#define SM_100_ADR 0x4002B020 +#define SM_100_ADR 0x4002B020 // Original: 0x40014020. PATCHSET_DEF(_secmon_1_patchset, // Patch the relocator to be able to run from SM_100_ADR. { 0x1E0, _ADRP(0, 0x7C013000 - _PAGEOFF(SM_100_ADR)) }, @@ -99,37 +104,32 @@ PATCHSET_DEF(_warmboot_4_patchset, { 0x558, _NOPv7() } // Segment id check. ); - /* * package1.1 header: * package1.1 layout: - * 1.0: {sm, ldr, wb} { 2, 1, 0 } - * 2.0: {wb, ldr, sm} { 0, 1, 2 } - * 3.0: {wb, ldr, sm} { 0, 1, 2 } - * 3.1: {wb, ldr, sm} { 0, 1, 2 } - * 4.0: {ldr, sm, wb} { 1, 2, 0 } - * 5.0: {ldr, sm, wb} { 1, 2, 0 } - * 6.0: {ldr, sm, wb} { 1, 2, 0 } - * 6.2: {ldr, sm, wb} { 1, 2, 0 } - * 7.0: {ldr, sm, wb} { 1, 2, 0 } + * 1.0: {sm, ldr, wb} { 2, 1, 0 } + * 2.0: {wb, ldr, sm} { 0, 1, 2 } + * 3.0: {wb, ldr, sm} { 0, 1, 2 } + * 3.1: {wb, ldr, sm} { 0, 1, 2 } + * 4.0+: {ldr, sm, wb} { 1, 2, 0 } */ static const pkg1_id_t _pkg1_ids[] = { - { "20161121183008", 0, 0x1900, 0x3FE0, { 2, 1, 0 }, SM_100_ADR, 0x8000D000, true, _secmon_1_patchset, _warmboot_1_patchset }, //1.0.0 (Patched relocator) - { "20170210155124", 0, 0x1900, 0x3FE0, { 0, 1, 2 }, 0x4002D000, 0x8000D000, true, _secmon_2_patchset, _warmboot_2_patchset }, //2.0.0 - 2.3.0 - { "20170519101410", 1, 0x1A00, 0x3FE0, { 0, 1, 2 }, 0x4002D000, 0x8000D000, true, _secmon_3_patchset, _warmboot_3_patchset }, //3.0.0 - { "20170710161758", 2, 0x1A00, 0x3FE0, { 0, 1, 2 }, 0x4002D000, 0x8000D000, true, _secmon_3_patchset, _warmboot_3_patchset }, //3.0.1 - 3.0.2 - { "20170921172629", 3, 0x1800, 0x3FE0, { 1, 2, 0 }, 0x4002B000, 0x4003B000, false, _secmon_4_patchset, _warmboot_4_patchset }, //4.0.0 - 4.1.0 - { "20180220163747", 4, 0x1900, 0x3FE0, { 1, 2, 0 }, 0x4002B000, 0x4003B000, false, _secmon_5_patchset, _warmboot_4_patchset }, //5.0.0 - 5.1.0 - { "20180802162753", 5, 0x1900, 0x3FE0, { 1, 2, 0 }, 0x4002B000, 0x4003D800, false, _secmon_6_patchset, _warmboot_4_patchset }, //6.0.0 - 6.1.0 - { "20181107105733", 6, 0x0E00, 0x6FE0, { 1, 2, 0 }, 0x4002B000, 0x4003D800, false, _secmon_620_patchset, _warmboot_4_patchset }, //6.2.0 - { "20181218175730", 7, 0x0F00, 0x6FE0, { 1, 2, 0 }, 0x40030000, 0x4003E000, false, NULL, NULL }, //7.0.0 - { "20190208150037", 7, 0x0F00, 0x6FE0, { 1, 2, 0 }, 0x40030000, 0x4003E000, false, NULL, NULL }, //7.0.1 - { "20190314172056", 7, 0x0E00, 0x6FE0, { 1, 2, 0 }, 0x40030000, 0x4003E000, false, NULL, NULL }, //8.0.0 - 8.0.1 - { "20190531152432", 8, 0x0E00, 0x6FE0, { 1, 2, 0 }, 0x40030000, 0x4003E000, false, NULL, NULL }, //8.1.0 - { "20190809135709", 9, 0x0E00, 0x6FE0, { 1, 2, 0 }, 0x40030000, 0x4003E000, false, NULL, NULL }, //9.0.0 - 9.0.1 - { "20191021113848", 10, 0x0E00, 0x6FE0, { 1, 2, 0 }, 0x40030000, 0x4003E000, false, NULL, NULL }, //9.1.0 - { "20200303104606", 10, 0x0E00, 0x6FE0, { 1, 2, 0 }, 0x40030000, 0x4003E000, false, NULL, NULL }, //10.0.0 + { "20161121183008", 0, 0x1900, 0x3FE0, SM_100_ADR, 0x8000D000, _secmon_1_patchset, _warmboot_1_patchset }, //1.0.0 (Patched relocator) + { "20170210155124", 0, 0x1900, 0x3FE0, 0x4002D000, 0x8000D000, _secmon_2_patchset, _warmboot_2_patchset }, //2.0.0 - 2.3.0 + { "20170519101410", 1, 0x1A00, 0x3FE0, 0x4002D000, 0x8000D000, _secmon_3_patchset, _warmboot_3_patchset }, //3.0.0 + { "20170710161758", 2, 0x1A00, 0x3FE0, 0x4002D000, 0x8000D000, _secmon_3_patchset, _warmboot_3_patchset }, //3.0.1 - 3.0.2 + { "20170921172629", 3, 0x1800, 0x3FE0, 0x4002B000, 0x4003B000, _secmon_4_patchset, _warmboot_4_patchset }, //4.0.0 - 4.1.0 + { "20180220163747", 4, 0x1900, 0x3FE0, 0x4002B000, 0x4003B000, _secmon_5_patchset, _warmboot_4_patchset }, //5.0.0 - 5.1.0 + { "20180802162753", 5, 0x1900, 0x3FE0, 0x4002B000, 0x4003D800, _secmon_6_patchset, _warmboot_4_patchset }, //6.0.0 - 6.1.0 + { "20181107105733", 6, 0x0E00, 0x6FE0, 0x4002B000, 0x4003D800, _secmon_620_patchset, _warmboot_4_patchset }, //6.2.0 + { "20181218175730", 7, 0x0F00, 0x6FE0, 0x40030000, 0x4003E000, NULL, NULL }, //7.0.0 + { "20190208150037", 7, 0x0F00, 0x6FE0, 0x40030000, 0x4003E000, NULL, NULL }, //7.0.1 + { "20190314172056", 7, 0x0E00, 0x6FE0, 0x40030000, 0x4003E000, NULL, NULL }, //8.0.0 - 8.0.1 + { "20190531152432", 8, 0x0E00, 0x6FE0, 0x40030000, 0x4003E000, NULL, NULL }, //8.1.0 + { "20190809135709", 9, 0x0E00, 0x6FE0, 0x40030000, 0x4003E000, NULL, NULL }, //9.0.0 - 9.0.1 + { "20191021113848", 10, 0x0E00, 0x6FE0, 0x40030000, 0x4003E000, NULL, NULL }, //9.1.0 + { "20200303104606", 10, 0x0E00, 0x6FE0, 0x40030000, 0x4003E000, NULL, NULL }, //10.0.0 { NULL } //End. }; @@ -161,20 +161,32 @@ void pkg1_decrypt(const pkg1_id_t *id, u8 *pkg1) void pkg1_unpack(void *warmboot_dst, void *secmon_dst, void *ldr_dst, const pkg1_id_t *id, u8 *pkg1) { + u8 *sec_map; + u8 sec_map_100[3] = { PK11_SECTION_SM, PK11_SECTION_LD, PK11_SECTION_WB }; + u8 sec_map_2xx[3] = { PK11_SECTION_WB, PK11_SECTION_LD, PK11_SECTION_SM }; + u8 sec_map_4xx[3] = { PK11_SECTION_LD, PK11_SECTION_SM, PK11_SECTION_WB }; + pk11_hdr_t *hdr = (pk11_hdr_t *)(pkg1 + id->pkg11_off + 0x20); u32 sec_size[3] = { hdr->wb_size, hdr->ldr_size, hdr->sm_size }; //u32 sec_off[3] = { hdr->wb_off, hdr->ldr_off, hdr->sm_off }; + if (id->kb == KB_FIRMWARE_VERSION_100_200 && !strcmp(id->id, "20161121183008")) + sec_map = sec_map_100; + else if (id->kb >= KB_FIRMWARE_VERSION_100_200 && id->kb <= KB_FIRMWARE_VERSION_301) + sec_map = sec_map_2xx; + else + sec_map = sec_map_4xx; + u8 *pdata = (u8 *)hdr + sizeof(pk11_hdr_t); for (u32 i = 0; i < 3; i++) { - if (id->sec_map[i] == 0 && warmboot_dst) - memcpy(warmboot_dst, pdata, sec_size[id->sec_map[i]]); - else if (id->sec_map[i] == 1 && ldr_dst) - memcpy(ldr_dst, pdata, sec_size[id->sec_map[i]]); - else if (id->sec_map[i] == 2 && secmon_dst) - memcpy(secmon_dst, pdata, sec_size[id->sec_map[i]]); - pdata += sec_size[id->sec_map[i]]; + if (sec_map[i] == PK11_SECTION_WB && warmboot_dst) + memcpy(warmboot_dst, pdata, sec_size[sec_map[i]]); + else if (sec_map[i] == PK11_SECTION_LD && ldr_dst) + memcpy(ldr_dst, pdata, sec_size[sec_map[i]]); + else if (sec_map[i] == PK11_SECTION_SM && secmon_dst) + memcpy(secmon_dst, pdata, sec_size[sec_map[i]]); + pdata += sec_size[sec_map[i]]; } } diff --git a/bootloader/hos/pkg1.h b/bootloader/hos/pkg1.h index ac5bac0..1c7ec4b 100644 --- a/bootloader/hos/pkg1.h +++ b/bootloader/hos/pkg1.h @@ -37,10 +37,8 @@ typedef struct _pkg1_id_t u32 kb; u32 tsec_off; u32 pkg11_off; - u32 sec_map[3]; u32 secmon_base; u32 warmboot_base; - bool set_warmboot; patch_t *secmon_patchset; patch_t *warmboot_patchset; } pkg1_id_t; diff --git a/nyx/nyx_gui/hos/pkg1.c b/nyx/nyx_gui/hos/pkg1.c index f841797..fcd0ebb 100644 --- a/nyx/nyx_gui/hos/pkg1.c +++ b/nyx/nyx_gui/hos/pkg1.c @@ -19,42 +19,43 @@ #include +#include "hos.h" #include "pkg1.h" #include #include #include #include +#define PK11_SECTION_WB 0 +#define PK11_SECTION_LD 1 +#define PK11_SECTION_SM 2 + /* * package1.1 header: * package1.1 layout: - * 1.0: {sm, ldr, wb} { 2, 1, 0 } - * 2.0: {wb, ldr, sm} { 0, 1, 2 } - * 3.0: {wb, ldr, sm} { 0, 1, 2 } - * 3.1: {wb, ldr, sm} { 0, 1, 2 } - * 4.0: {ldr, sm, wb} { 1, 2, 0 } - * 5.0: {ldr, sm, wb} { 1, 2, 0 } - * 6.0: {ldr, sm, wb} { 1, 2, 0 } - * 6.2: {ldr, sm, wb} { 1, 2, 0 } - * 7.0: {ldr, sm, wb} { 1, 2, 0 } + * 1.0: {sm, ldr, wb} { 2, 1, 0 } + * 2.0: {wb, ldr, sm} { 0, 1, 2 } + * 3.0: {wb, ldr, sm} { 0, 1, 2 } + * 3.1: {wb, ldr, sm} { 0, 1, 2 } + * 4.0+: {ldr, sm, wb} { 1, 2, 0 } */ static const pkg1_id_t _pkg1_ids[] = { - { "20161121183008", 0, 0x1900, 0x3FE0, { 2, 1, 0 }, 0x40014020, 0x8000D000 }, //1.0.0 - { "20170210155124", 0, 0x1900, 0x3FE0, { 0, 1, 2 }, 0x4002D000, 0x8000D000 }, //2.0.0 - 2.3.0 - { "20170519101410", 1, 0x1A00, 0x3FE0, { 0, 1, 2 }, 0x4002D000, 0x8000D000 }, //3.0.0 - { "20170710161758", 2, 0x1A00, 0x3FE0, { 0, 1, 2 }, 0x4002D000, 0x8000D000 }, //3.0.1 - 3.0.2 - { "20170921172629", 3, 0x1800, 0x3FE0, { 1, 2, 0 }, 0x4002B000, 0x4003B000 }, //4.0.0 - 4.1.0 - { "20180220163747", 4, 0x1900, 0x3FE0, { 1, 2, 0 }, 0x4002B000, 0x4003B000 }, //5.0.0 - 5.1.0 - { "20180802162753", 5, 0x1900, 0x3FE0, { 1, 2, 0 }, 0x4002B000, 0x4003D800 }, //6.0.0 - 6.1.0 - { "20181107105733", 6, 0x0E00, 0x6FE0, { 1, 2, 0 }, 0x4002B000, 0x4003D800 }, //6.2.0 - { "20181218175730", 7, 0x0F00, 0x6FE0, { 1, 2, 0 }, 0x40030000, 0x4003E000 }, //7.0.0 - { "20190208150037", 7, 0x0F00, 0x6FE0, { 1, 2, 0 }, 0x40030000, 0x4003E000 }, //7.0.1 - { "20190314172056", 7, 0x0E00, 0x6FE0, { 1, 2, 0 }, 0x40030000, 0x4003E000 }, //8.0.0 - 8.0.1 - { "20190531152432", 8, 0x0E00, 0x6FE0, { 1, 2, 0 }, 0x40030000, 0x4003E000 }, //8.1.0 - { "20190809135709", 9, 0x0E00, 0x6FE0, { 1, 2, 0 }, 0x40030000, 0x4003E000 }, //9.0.0 - 9.0.1 - { "20191021113848", 10, 0x0E00, 0x6FE0, { 1, 2, 0 }, 0x40030000, 0x4003E000 }, //9.1.0 - { "20200303104606", 10, 0x0E00, 0x6FE0, { 1, 2, 0 }, 0x40030000, 0x4003E000 }, //10.0.0 + { "20161121183008", 0, 0x1900, 0x3FE0, 0x40014020, 0x8000D000 }, //1.0.0 + { "20170210155124", 0, 0x1900, 0x3FE0, 0x4002D000, 0x8000D000 }, //2.0.0 - 2.3.0 + { "20170519101410", 1, 0x1A00, 0x3FE0, 0x4002D000, 0x8000D000 }, //3.0.0 + { "20170710161758", 2, 0x1A00, 0x3FE0, 0x4002D000, 0x8000D000 }, //3.0.1 - 3.0.2 + { "20170921172629", 3, 0x1800, 0x3FE0, 0x4002B000, 0x4003B000 }, //4.0.0 - 4.1.0 + { "20180220163747", 4, 0x1900, 0x3FE0, 0x4002B000, 0x4003B000 }, //5.0.0 - 5.1.0 + { "20180802162753", 5, 0x1900, 0x3FE0, 0x4002B000, 0x4003D800 }, //6.0.0 - 6.1.0 + { "20181107105733", 6, 0x0E00, 0x6FE0, 0x4002B000, 0x4003D800 }, //6.2.0 + { "20181218175730", 7, 0x0F00, 0x6FE0, 0x40030000, 0x4003E000 }, //7.0.0 + { "20190208150037", 7, 0x0F00, 0x6FE0, 0x40030000, 0x4003E000 }, //7.0.1 + { "20190314172056", 7, 0x0E00, 0x6FE0, 0x40030000, 0x4003E000 }, //8.0.0 - 8.0.1 + { "20190531152432", 8, 0x0E00, 0x6FE0, 0x40030000, 0x4003E000 }, //8.1.0 + { "20190809135709", 9, 0x0E00, 0x6FE0, 0x40030000, 0x4003E000 }, //9.0.0 - 9.0.1 + { "20191021113848", 10, 0x0E00, 0x6FE0, 0x40030000, 0x4003E000 }, //9.1.0 + { "20200303104606", 10, 0x0E00, 0x6FE0, 0x40030000, 0x4003E000 }, //10.0.0 { NULL } //End. }; @@ -82,20 +83,32 @@ void pkg1_decrypt(const pkg1_id_t *id, u8 *pkg1) void pkg1_unpack(void *warmboot_dst, void *secmon_dst, void *ldr_dst, const pkg1_id_t *id, u8 *pkg1) { + u8 *sec_map; + u8 sec_map_100[3] = { PK11_SECTION_SM, PK11_SECTION_LD, PK11_SECTION_WB }; + u8 sec_map_2xx[3] = { PK11_SECTION_WB, PK11_SECTION_LD, PK11_SECTION_SM }; + u8 sec_map_4xx[3] = { PK11_SECTION_LD, PK11_SECTION_SM, PK11_SECTION_WB }; + pk11_hdr_t *hdr = (pk11_hdr_t *)(pkg1 + id->pkg11_off + 0x20); u32 sec_size[3] = { hdr->wb_size, hdr->ldr_size, hdr->sm_size }; //u32 sec_off[3] = { hdr->wb_off, hdr->ldr_off, hdr->sm_off }; + if (id->kb == KB_FIRMWARE_VERSION_100_200 && !strcmp(id->id, "20161121183008")) + sec_map = sec_map_100; + else if (id->kb >= KB_FIRMWARE_VERSION_100_200 && id->kb <= KB_FIRMWARE_VERSION_301) + sec_map = sec_map_2xx; + else + sec_map = sec_map_4xx; + u8 *pdata = (u8 *)hdr + sizeof(pk11_hdr_t); for (u32 i = 0; i < 3; i++) { - if (id->sec_map[i] == 0 && warmboot_dst) - memcpy(warmboot_dst, pdata, sec_size[id->sec_map[i]]); - else if (id->sec_map[i] == 1 && ldr_dst) - memcpy(ldr_dst, pdata, sec_size[id->sec_map[i]]); - else if (id->sec_map[i] == 2 && secmon_dst) - memcpy(secmon_dst, pdata, sec_size[id->sec_map[i]]); - pdata += sec_size[id->sec_map[i]]; + if (sec_map[i] == PK11_SECTION_WB && warmboot_dst) + memcpy(warmboot_dst, pdata, sec_size[sec_map[i]]); + else if (sec_map[i] == PK11_SECTION_LD && ldr_dst) + memcpy(ldr_dst, pdata, sec_size[sec_map[i]]); + else if (sec_map[i] == PK11_SECTION_SM && secmon_dst) + memcpy(secmon_dst, pdata, sec_size[sec_map[i]]); + pdata += sec_size[sec_map[i]]; } } diff --git a/nyx/nyx_gui/hos/pkg1.h b/nyx/nyx_gui/hos/pkg1.h index d55024e..5622ebe 100644 --- a/nyx/nyx_gui/hos/pkg1.h +++ b/nyx/nyx_gui/hos/pkg1.h @@ -25,7 +25,6 @@ typedef struct _pkg1_id_t u32 kb; u32 tsec_off; u32 pkg11_off; - u32 sec_map[3]; u32 secmon_base; u32 warmboot_base; } pkg1_id_t;