From 5698c5b3db083b70645ebd288a6957fe590a1d53 Mon Sep 17 00:00:00 2001 From: Yatharth Kochar Date: Thu, 29 Oct 2015 12:47:02 +0000 Subject: Remove `RUN_IMAGE` usage as opcode passed to next EL. The primary usage of `RUN_IMAGE` SMC function id, used by BL2 is to make a request to BL1 to execute BL31. But BL2 also uses it as opcode to check if it is allowed to execute which is not the intended usage of `RUN_IMAGE` SMC. This patch removes the usage of `RUN_IMAGE` as opcode passed to next EL to check if it is allowed to execute. Change-Id: I6aebe0415ade3f43401a4c8a323457f032673657 --- bl2/aarch64/bl2_entrypoint.S | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) (limited to 'bl2/aarch64/bl2_entrypoint.S') diff --git a/bl2/aarch64/bl2_entrypoint.S b/bl2/aarch64/bl2_entrypoint.S index 1d2622974..75eb02a9d 100644 --- a/bl2/aarch64/bl2_entrypoint.S +++ b/bl2/aarch64/bl2_entrypoint.S @@ -39,13 +39,12 @@ func bl2_entrypoint /*--------------------------------------------- - * Store the extents of the tzram available to - * BL2 for future use. Use the opcode param to - * allow implement other functions if needed. + * Save from x1 the extents of the tzram + * available to BL2 for future use. + * x0 is not currently used. * --------------------------------------------- - */ - mov x20, x0 - mov x21, x1 + */ + mov x20, x1 /* --------------------------------------------- * Set the exception vector to something sane. @@ -73,14 +72,6 @@ func bl2_entrypoint msr sctlr_el1, x0 isb - /* --------------------------------------------- - * Check the opcodes out of paranoia. - * --------------------------------------------- - */ - mov x0, #RUN_IMAGE - cmp x0, x20 - b.ne _panic - /* --------------------------------------------- * Invalidate the RW memory used by the BL2 * image. This includes the data and NOBITS @@ -126,7 +117,7 @@ func bl2_entrypoint * specific early arch. setup e.g. mmu setup * --------------------------------------------- */ - mov x0, x21 + mov x0, x20 bl bl2_early_platform_setup bl bl2_plat_arch_setup -- cgit v1.2.3