From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.groups.io with SMTP id smtpd.web08.16061.1621237301428512606 for ; Mon, 17 May 2021 00:41:41 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=kTz1VYUb; spf=pass (domain: linaro.org, ip: 209.85.221.45, mailfrom: etienne.carriere@linaro.org) Received: by mail-wr1-f45.google.com with SMTP id n2so5339867wrm.0 for ; Mon, 17 May 2021 00:41:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QX/nN6cPY3qD+G+9mG9Zns+PsCCRDBVvq3/ySnJkodg=; b=kTz1VYUbHeu3xzoaybjsJNdIqZXUUn+96HZMP2l7Hp39QjKheg1GCP98zdYrYCMBUo iD5MexoDAAoxJ/lkjN0YPbFhIVKgCoR6qJQm4kTCCkjRCEkSIKWjWZiV5j9p3Nc8PbNj tZuX5wGZuH9Jud9ov5tqh8j+HPo8Xstk98dxWImfbksMCSQgHZXNbZBOdnGDRaaJsaxe 7haYDEvUZtI89U7TKZN3MTCFPVzoTYX8AUG1F+G5HORbXostMyZNwafTAIWxEZMbZHfg 2PdgtFgWNaDU352HSaBPt/A+ujTNI0bYbaIi6jGX8oQC1U/cn7OcPGK5YnF8k7L+GpmQ upiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=QX/nN6cPY3qD+G+9mG9Zns+PsCCRDBVvq3/ySnJkodg=; b=PuQA9zNKgQT5vkO6KENmICzqAsfACQslBH/7owactEUt+BdHUej6w0WQ4SI00NzxvG keq0z0Y54jHAEhhsWLCuvM/itfcEdxCXfQbN+eF/54ePqU9jhXErLV2g0fQNRj187TTU xBeRT1jxzhoP22kEyMOiHM3JsdDX5pJmxItAbJkW5edoT6FzwKW70Gwy+xSjV1CH0Bu0 +77hovHxjR6nUdYtBSSmw+QekjGfrWNjh6oDjQXPmUnwkcBK4YdZkU48a5DKGEDfPKW4 QuXF2jHtnGiVuO/y+SianWRiRS1Hegbw93Y2CTV49xh4tDesf1hJr+UP6eCNHmPPzksQ d97A== X-Gm-Message-State: AOAM530bQiVJ7YSxqcVIsOqWyPZT0OHPW0TyXjCUAYONwc04pS+2jun+ OOzdZ9FJMGqUQN/FyLYIHj+FRAyq8AVDw9aT X-Google-Smtp-Source: ABdhPJwj+s3GRDIlnbKDF/gcyBtQgIISyvY3w+X1KrmZQ0AIxSf1wp7UQrINIhSzYxPCBzo3r/filQ== X-Received: by 2002:adf:f751:: with SMTP id z17mr71262156wrp.175.1621237299757; Mon, 17 May 2021 00:41:39 -0700 (PDT) Return-Path: Received: from lmecxl0524.lme.st.com (2a01cb058b850800452ff0effb46d5f4.ipv6.abo.wanadoo.fr. [2a01:cb05:8b85:800:452f:f0ef:fb46:d5f4]) by smtp.gmail.com with ESMTPSA id f20sm15522258wmh.41.2021.05.17.00.41.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 00:41:39 -0700 (PDT) From: "Etienne Carriere" To: devel@edk2.groups.io Cc: Achin Gupta , Ard Biesheuvel , Jiewen Yao , Leif Lindholm , Sami Mujawar , Sughosh Ganu , Etienne Carriere , Bob Feng , Liming Gao Subject: [PATCH v3 3/5] GenFv: Arm: support images entered in Thumb mode Date: Mon, 17 May 2021 09:40:52 +0200 Message-Id: <20210517074054.30281-3-etienne.carriere@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210517074054.30281-1-etienne.carriere@linaro.org> References: <20210517074054.30281-1-etienne.carriere@linaro.org> Change GenFv for Arm architecture to generate a specific jump instruction as image entry instruction, when the target entry label is assembled with Thumb instruction set. This is possible since SecCoreEntryAddress value fetched from the PE32 has its LSBit set when the entry instruction executes in Thumb mode. Cc: Bob Feng Cc: Liming Gao Cc: Achin Gupta Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Sughosh Ganu Signed-off-by: Etienne Carriere --- Changes since v2: - Fix missing parentheses in expression. Changes since v1: - Fix typos in commit log and inline comments - Change if() test operand to be an explicit boolean --- BaseTools/Source/C/GenFv/GenFvInternalLib.c | 38 +++++++++++++++----- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/BaseTools/Source/C/GenFv/GenFvInternalLib.c b/BaseTools/Source/C/GenFv/GenFvInternalLib.c index 6e296b8ad6..6cf9c84e73 100644 --- a/BaseTools/Source/C/GenFv/GenFvInternalLib.c +++ b/BaseTools/Source/C/GenFv/GenFvInternalLib.c @@ -34,9 +34,27 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include "FvLib.h" #include "PeCoffLib.h" -#define ARMT_UNCONDITIONAL_JUMP_INSTRUCTION 0xEB000000 #define ARM64_UNCONDITIONAL_JUMP_INSTRUCTION 0x14000000 +/* + * Arm instruction to jump to Fv entry instruction in Arm or Thumb mode. + * From ARM Arch Ref Manual versions b/c/d, section A8.8.25 BL, BLX (immediate) + * BLX (encoding A2) branches to offset in Thumb instruction set mode. + * BL (encoding A1) branches to offset in Arm instruction set mode. + */ +#define ARM_JUMP_OFFSET_MAX 0xffffff +#define ARM_JUMP_TO_ARM(Offset) (0xeb000000 | ((Offset - 8) >> 2)) + +#define _ARM_JUMP_TO_THUMB(Imm32) (0xfa000000 | \ + (((Imm32) & (1 << 1)) << (24 - 1)) | \ + (((Imm32) >> 2) & 0x7fffff)) +#define ARM_JUMP_TO_THUMB(Offset) _ARM_JUMP_TO_THUMB((Offset) - 8) + +/* + * Arm instruction to retrun from exception (MOVS PC, LR) + */ +#define ARM_RETURN_FROM_EXCEPTION 0xE1B0F07E + BOOLEAN mArm = FALSE; BOOLEAN mRiscV = FALSE; STATIC UINT32 MaxFfsAlignment = 0; @@ -2203,23 +2221,25 @@ Returns: // if we found an SEC core entry point then generate a branch instruction // to it and populate a debugger SWI entry as well if (UpdateVectorSec) { + UINT32 EntryOffset; VerboseMsg("UpdateArmResetVectorIfNeeded updating ARM SEC vector"); - // B SecEntryPoint - signed_immed_24 part +/-32MB offset - // on ARM, the PC is always 8 ahead, so we're not really jumping from the base address, but from base address + 8 - ResetVector[0] = (INT32)(SecCoreEntryAddress - FvInfo->BaseAddress - 8) >> 2; + EntryOffset = (INT32)(SecCoreEntryAddress - FvInfo->BaseAddress); - if (ResetVector[0] > 0x00FFFFFF) { - Error(NULL, 0, 3000, "Invalid", "SEC Entry point must be within 32MB of the start of the FV"); + if (EntryOffset > ARM_JUMP_OFFSET_MAX) { + Error(NULL, 0, 3000, "Invalid", "SEC Entry point offset above 1MB of the start of the FV"); return EFI_ABORTED; } - // Add opcode for an unconditional branch with no link. i.e.: " B SecEntryPoint" - ResetVector[0] |= ARMT_UNCONDITIONAL_JUMP_INSTRUCTION; + if ((SecCoreEntryAddress & 1) != 0) { + ResetVector[0] = ARM_JUMP_TO_THUMB(EntryOffset); + } else { + ResetVector[0] = ARM_JUMP_TO_ARM(EntryOffset); + } // SWI handler movs pc,lr. Just in case a debugger uses SWI - ResetVector[2] = 0xE1B0F07E; + ResetVector[2] = ARM_RETURN_FROM_EXCEPTION; // Place holder to support a common interrupt handler from ROM. // Currently not supported. For this to be used the reset vector would not be in this FV -- 2.17.1