sept: update to support 8.1.0

sept/sept-secondary/src/key_derivation.c

@@ -29,7 +29,7 @@
 #undef u32
 
 
-void derive_keys(void) {
+void derive_keys(uint32_t version) {
     /* Clear mailbox. */
     volatile uint32_t *mailbox = (volatile uint32_t *)0x4003FF00;
     while (*mailbox != 0) {
@@ -37,7 +37,7 @@ void derive_keys(void) {
     }
 
     /* Set derivation id. */
-    *((volatile uint32_t *)0x4003E800) = 0x0;
+    *((volatile uint32_t *)0x4003E800) = version;
 
     /* Copy key derivation stub into IRAM high. */
     for (size_t i = 0; i < key_derivation_bin_size; i += sizeof(uint32_t)) {

sept/sept-secondary/src/key_derivation.h

@@ -21,7 +21,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-void derive_keys(void);
+void derive_keys(uint32_t version);
 void load_keys(const uint8_t *se_state);
 
 #endif

sept/sept-secondary/src/main.c

@@ -48,7 +48,7 @@ static void set_has_rebooted(bool rebooted) {
 }
 
 
-static void exfiltrate_keys_and_reboot_if_needed(void) {
+static void exfiltrate_keys_and_reboot_if_needed(uint32_t version) {
     volatile tegra_pmc_t *pmc = pmc_get_regs();
     uint8_t *enc_se_state = (uint8_t *)0x4003E000;
     uint8_t *dec_se_state = (uint8_t *)0x4003F000;
@@ -59,7 +59,7 @@ static void exfiltrate_keys_and_reboot_if_needed(void) {
         set_has_rebooted(true);
 
         /* Derive keys. */
-        derive_keys();
+        derive_keys(version);
 
         reboot_to_self();
     } else {
@@ -135,14 +135,14 @@ static void exit_callback(int rc) {
     relocate_and_chainload();
 }
 
-int main(void) {
+int sept_main(uint32_t version) {
     const char *stage2_path;
     stage2_args_t *stage2_args;
     uint32_t stage2_version = 0;
     ScreenLogLevel log_level = SCREEN_LOG_LEVEL_NONE;
 
     /* Extract keys from the security engine, which TSEC FW locked down. */
-    exfiltrate_keys_and_reboot_if_needed();
+    exfiltrate_keys_and_reboot_if_needed(version);
 
     /* Override the global logging level. */
     log_set_log_level(log_level);

sept/sept-secondary/src/start.s

@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
- 
+
 .macro CLEAR_GPR_REG_ITER
     mov r\@, #0
 .endm
@@ -26,13 +26,18 @@
 _start:
     /* Switch to system mode, mask all interrupts, clear all flags */
     msr cpsr_cxsf, #0xDF
+    b begin_relocation_loop
+    _version:
+    .word 0x00000000 /* Version. */
+    .word 0x00000000 /* Reserved. */
 
+    begin_relocation_loop:
     /* Relocate ourselves if necessary */
     ldr r2, =__start__
     adr r3, _start
     cmp r2, r3
     beq _relocation_loop_end
-    
+
     /* If we are relocating, we are not rebooting to ourselves. Note that. */
     ldr r0, =0x4003FFFC
     mov r1, #0x0
@@ -50,12 +55,12 @@ _start:
 
     ldr r12, =_second_relocation_start
     bx  r12
-        
+
     _second_relocation_start:
     ldr r4, =__bss_start__
     sub r4, r4, r2
     mov r1, #0x0
-    
+
     _second_relocation_loop:
         ldmia r3!, {r5-r12}
         stmia r2!, {r5-r12}
@@ -67,7 +72,7 @@ _start:
     bx  r12
 
     _relocation_loop_end:
-    
+
     /* Set the stack pointer */
     ldr  sp, =__stack_top__
     mov  fp, #0
@@ -78,7 +83,9 @@ _start:
     CLEAR_GPR_REG_ITER
     .endr
     ldr lr, =__program_exit
-    b   main
+    ldr r0, =_version
+    ldr r0, [r0]
+    b   sept_main
 
 /* No need to include this in normal programs: */
 .section .chainloader.text.start, "ax", %progbits