Fix lock clear in warmboot_main

2018-03-04 21:57:25 +01:00
parent 3e128a8b3e
commit 4c38be1560
3 changed files with 19 additions and 8 deletions
--- a/exosphere/src/warmboot_main.c
+++ b/exosphere/src/warmboot_main.c
@@ -56,12 +56,13 @@ void __attribute__((noreturn)) warmboot_main(void) {
            clkrst_disable(CARDEVICE_I2C1);
        }

+        clear_user_smc_in_progress();
+
        if (mkey_get_revision() >= MASTERKEY_REVISION_400_CURRENT) {
            setup_4x_mmio(); /* TODO */
        }
    }

-    clear_priv_smc_in_progress();
    setup_current_core_state();

    /* Update SCR_EL3 depending on value in Bootconfig. */