From patchwork Wed Sep 12 13:21:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 146563 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp4825523ljw; Wed, 12 Sep 2018 06:22:44 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYbI8uI7oz9Ki1ZHd9BofoIzKFw7RLZo4ShS+sDwJLfj0//8Ik/eiWe/jUfBj5VnQ3/tUF0 X-Received: by 2002:a62:444d:: with SMTP id r74-v6mr2347680pfa.96.1536758564662; Wed, 12 Sep 2018 06:22:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536758564; cv=none; d=google.com; s=arc-20160816; b=ZeGGNlgLwqI6XsWa/4BCIVJrL/NIntBzncTwy8QEo5lrJ5tDObK7uaepamXg0oymYS tFKE7YiwZrpjPw8XJ7GYQnMNWiL05HZ1r2V7/rPfsIyCQiDwpWrhlMElG4zmN2ecz01p WX5QXx7XRoTrasQknc+hcsEWEuAWzB1WF4ey3HcL0rHduHGZZkchSEt1/pXSBjQJVafU W6gHksRRUNp6kn2Y/29vUGIfRxN22Yshc5Kt16IuXhtC9xwIBYxv9Q/MspKuj5DEe34a m4gKltJIVihrlQRSt/1ov3lLuJeMLmcXLY8fuOJu3Jdo8gnfQMmtzd7t4ZCOoB9eRNtd T8QQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=fGqbvUnhp8sWaAdk/WlYc4Jen8Zq2TMwwdyNk3NLdvw=; b=JDqcnVEMJLaQGpToiU9b/hcxBwbLvqeSvm3CG0nVN4WCSAtzFg8kSoZ0FljMjaPzI4 MAONYzOZn8fJbYM+DPtUbITrjP4a4rtWbdjV1Pw0ULy3MqaDmaXiQX1spByLQWpkmae0 Y0BvQwOs7JBk5DiX5DBLDp404/fO08lJ/l4r36waTQlguodJFSIB7bRF3xrjaXor82t7 /UZaazZiyeGg/OvaV6wqJWhRTAu/9a8+zwBjqJPanI4wxj0aJMvJI3I+86SC+esG78Rp Sh4rAsZU1ZKr3BM0cPv7/QbEBawaY2ilR/0n+zbpGo3oKm+KqjGUsZgZ35/7DBZuDV4+ PK4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=LUfwVCEu; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id f3-v6si963322plo.109.2018.09.12.06.22.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Sep 2018 06:22:44 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=LUfwVCEu; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 09CBC2112A2BC; Wed, 12 Sep 2018 06:22:44 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c09::242; helo=mail-wm0-x242.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id A44612112A2B0 for ; Wed, 12 Sep 2018 06:22:42 -0700 (PDT) Received: by mail-wm0-x242.google.com with SMTP id q8-v6so2409392wmq.4 for ; Wed, 12 Sep 2018 06:22:42 -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=3/BVtfkcORKSeUT5LfxPSJO1t3YRhbeLzxUb+6ZOqtc=; b=LUfwVCEurhUOegZmoQBhjf+WF6F1tOdO1QQ0RIZmk3XL4HjUoybnPI7A2gKwN5IVb+ X6xvn5dTkDZTTrA771wmY7bDeI+ugoWocqm1h9vEAhftghicx/L/I3AIKTURx4xd0JK6 GrItXf5o//QbvcRhepm6A+5dkyromGRyap60o= 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=3/BVtfkcORKSeUT5LfxPSJO1t3YRhbeLzxUb+6ZOqtc=; b=iY/vVANEQczkIB+4R9rdmngl5W4Po0Xc8iy5YPMYNpl064WEFn6TK79aR/n1adq7B9 awVQ5pqMfm/shTBAEvh/EowOUmi3+6hGP+mS+RXOtPFlhxbuKLWev2D4UQUZhXO/jl/G wm3xgXZGxK5y4p9BLdGzpgs7Josmi3jmI9PHRimn3olugtdPWwLiL9HD5A+B72Ou7Wiw 8Fatz6+at5kfUu6emyLXMscXbhGnt76s4pEUFxwmsWt1fV4xONjnmu/pjs5H/2Eu8SMw PFhPQ0WO+oftB2WKyk3h9nFnPlqo56ipS+EQr5F5QruWSR5IGwQBV/0R5zFLOcqhyjd0 v+xw== X-Gm-Message-State: APzg51BaKKs2BWcx+iuoWcRcDLBBBRGODL1aY3vsGB5ZksfaO5BhHNAK BB3gbp3hnZG9yuEN13fAYMPewrb3BHrZhQ== X-Received: by 2002:a1c:a941:: with SMTP id s62-v6mr1578117wme.76.1536758560737; Wed, 12 Sep 2018 06:22:40 -0700 (PDT) Received: from mba13.kuq.prv ([2001:a62:605:90f4:1f3:d690:1764:36ca]) by smtp.gmail.com with ESMTPSA id e133-v6sm1985129wma.33.2018.09.12.06.22.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Sep 2018 06:22:39 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 12 Sep 2018 15:21:48 +0200 Message-Id: <20180912132151.4258-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180912132151.4258-1-ard.biesheuvel@linaro.org> References: <20180912132151.4258-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH 1/4] MdeModulePkg: introduce PE/COFF image emulator protocol X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ruiyu Ni , Zimmer Vincent , Eric Dong , Andrew Fish , agraf@suse.de, Brian Richardson , Michael D Kinney , Laszlo Ersek , Star Zeng MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Introduce a protocol that can be invoked by the image loading services to execute foreign architecture PE/COFF images via an emulator. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- MdeModulePkg/Include/Protocol/PeCoffImageEmulator.h | 51 ++++++++++++++++++++ MdeModulePkg/MdeModulePkg.dec | 4 ++ 2 files changed, 55 insertions(+) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/MdeModulePkg/Include/Protocol/PeCoffImageEmulator.h b/MdeModulePkg/Include/Protocol/PeCoffImageEmulator.h new file mode 100644 index 000000000000..3391e68557b9 --- /dev/null +++ b/MdeModulePkg/Include/Protocol/PeCoffImageEmulator.h @@ -0,0 +1,51 @@ +/** @file + Copyright (c) 2018, Linaro, Ltd. All rights reserved.
+ + This program and the accompanying materials + are licensed and made available under the terms and conditions of the BSD License + which accompanies this distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + +**/ + +#ifndef __PECOFF_IMAGE_EMULATOR_PROTOCOL_GUID_H__ +#define __PECOFF_IMAGE_EMULATOR_PROTOCOL_GUID_H__ + +#define EDKII_PECOFF_IMAGE_EMULATOR_PROTOCOL_GUID \ + { 0x96F46153, 0x97A7, 0x4793, { 0xAC, 0xC1, 0xFA, 0x19, 0xBF, 0x78, 0xEA, 0x97 } } + +typedef struct _EDKII_PECOFF_IMAGE_EMULATOR_PROTOCOL EDKII_PECOFF_IMAGE_EMULATOR_PROTOCOL; + +typedef +BOOLEAN +(EFIAPI *IS_PECOFF_IMAGE_SUPPORTED) ( + IN EDKII_PECOFF_IMAGE_EMULATOR_PROTOCOL *This, + IN UINT16 MachineType, + IN UINT16 ImageType + ); + +typedef +EFI_STATUS +(EFIAPI *REGISTER_PECOFF_IMAGE) ( + IN EDKII_PECOFF_IMAGE_EMULATOR_PROTOCOL *This, + IN EFI_PHYSICAL_ADDRESS ImageBase, + IN UINT64 ImageSize + ); + +typedef +EFI_STATUS +(EFIAPI *UNREGISTER_PECOFF_IMAGE) ( + IN EDKII_PECOFF_IMAGE_EMULATOR_PROTOCOL *This, + IN EFI_PHYSICAL_ADDRESS ImageBase + ); + +typedef struct _EDKII_PECOFF_IMAGE_EMULATOR_PROTOCOL { + IS_PECOFF_IMAGE_SUPPORTED IsImageSupported; + REGISTER_PECOFF_IMAGE RegisterImage; + UNREGISTER_PECOFF_IMAGE UnregisterImage; +} EDKII_PECOFF_IMAGE_EMULATOR_PROTOCOL; + +#endif diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec index 6a6d9660edc2..be307329f901 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec @@ -617,6 +617,10 @@ ## Include/Protocol/AtaAtapiPolicy.h gEdkiiAtaAtapiPolicyProtocolGuid = { 0xe59cd769, 0x5083, 0x4f26,{ 0x90, 0x94, 0x6c, 0x91, 0x9f, 0x91, 0x6c, 0x4e } } + + ## Include/Protocol/PeCoffImageEmulator.h + gEdkiiPeCoffImageEmulatorProtocolGuid = { 0x96f46153, 0x97a7, 0x4793, { 0xac, 0xc1, 0xfa, 0x19, 0xbf, 0x78, 0xea, 0x97 } } + # # [Error.gEfiMdeModulePkgTokenSpaceGuid] # 0x80000001 | Invalid value provided. From patchwork Wed Sep 12 13:21:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 146564 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp4825572ljw; Wed, 12 Sep 2018 06:22:48 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZlg//7xudLlyzqEaNv0Yob+z9vRCBYFuWHa/JmUDmGKX0vBQrKqSIgbI02QFbxsbn3NWaq X-Received: by 2002:a63:c20:: with SMTP id b32-v6mr2290602pgl.400.1536758568141; Wed, 12 Sep 2018 06:22:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536758568; cv=none; d=google.com; s=arc-20160816; b=fhKNwZBqQZKiRnsk+yNHdW4a9XXjEn5fMNdRcv3/qZ5S3hi9uP/Dq5QILEuU89S0VA fsH+J1fnZOKO2NR0WvNCrtKiNnL7Q+aqZeMs5xa/W7V4Cb95V2/ImFB35nS3rg8x8n7z Gnjj1GDUcrvfpQVnkgb0cZlpRhwqbRuf/VO5QKlDx7AbY79obrJr5Dvh9D34NmCppWOx +P3kPfWbxJnQSGg1s1tmnjiuHDPN3G2+IlzvkcqWCHUcO5u6+U8Ar2XtZFilD+mDCAcG Zy44kszS0gOHu+lygAWTkXt2PLv/dUFFvUp21VC5J+PqFlUiFRHJkbjbIk/iRoJre0BQ mW1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=yYs6wM5xqzrt4l27+cbFKD58jG06MR4T46rgO/BmENM=; b=nQYmIEAgxvQfhPR02SKmogO4ZXj76ugJlj1GtZzXK3r+eiyolgfZO05Z+F7EyD63tq DD5SgkFHnRzzBSfMf0sspSzPoEXot95Pr5YsZHr1LT+rvZrUTcNI1nAC5GZ5PzItbA+7 bDoIk12DONUYmZRjx+H9mEtvx/Pj9v2X8cXiZekfqQtozrVfSzpwKXRh0lX+7bYOWpeb 5DZzKZxLVSew04BV3/AvddtiKFRVGUn91o3RkRsXpXapCTgOw9ZSKnvtkrmNsJKypZpA 6ewwvV/Raetr5giSrI5X5tGsYHUTurvL2tG2EcVUgSeEB8GzR1VsQI9nqn6UhP5tTsJi i6Dw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=kXSdRPC3; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id m86-v6si1026237pfj.48.2018.09.12.06.22.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Sep 2018 06:22:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=kXSdRPC3; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 3C0352112B1C1; Wed, 12 Sep 2018 06:22:45 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::443; helo=mail-wr1-x443.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 5881421959CB2 for ; Wed, 12 Sep 2018 06:22:44 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id k5-v6so2018898wre.10 for ; Wed, 12 Sep 2018 06:22:44 -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=sSkJVwiMxbNQvmkjAopwLMycZ8Yvu67HZtuZip0AVDQ=; b=kXSdRPC3F7ATbtuySn83L+rqmCSd/CZ8+cJpeliZ3BKslXvCZK+MU3AIk4jHDX6q8p D1JrMT07C5yz+lxEhRKZvliTLk7l+7m/sR7IfokQ6Ya+RfidjhX0xCGmK5ylM8wL6kw0 tEgbp3ubeJPW7JenU8XUbwAdONkVwqU+C+i7w= 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=sSkJVwiMxbNQvmkjAopwLMycZ8Yvu67HZtuZip0AVDQ=; b=OWaFV/ZceoG37rdCvF/q/scwZuRfVUxB8VbEgVkkO4VisnIydIgmvA2djXfxegMCbP wLMD8vxzxcBrrQ3fRkNxrImkYdDc/8pPuwIPDJnTXQs1DeprX1sdyvKYldRnZJyR72G4 KEh/jvJLlAQDnIz+KB8MXjaeyLaDMwTGnopSFxcqvX3oo+mPCGqQwxXR8nFDIrTADBsi cwFRUMD9Xq9kPAp9P5k1023H7Y+cmOAs14EFN4CdNWd/OBtu3rAa5iAWCsXuUhfLuIE1 AU2dw+jf6fNdZ8IEuWwnDVB+whxSdmg1bXixGnmyRzqA66qVkLTnQ9oNyREoGrky6Ulr nWtg== X-Gm-Message-State: APzg51Bgv10ETda2zvmRTkDesqT5hXmW/tBdqLPQQJ5av1Zy7aqF7Ehm sAk6wiezi3x1IrbH4PfrZ+orJRG494gXfw== X-Received: by 2002:a5d:438d:: with SMTP id i13-v6mr1596231wrq.156.1536758562420; Wed, 12 Sep 2018 06:22:42 -0700 (PDT) Received: from mba13.kuq.prv ([2001:a62:605:90f4:1f3:d690:1764:36ca]) by smtp.gmail.com with ESMTPSA id e133-v6sm1985129wma.33.2018.09.12.06.22.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Sep 2018 06:22:41 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 12 Sep 2018 15:21:49 +0200 Message-Id: <20180912132151.4258-3-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180912132151.4258-1-ard.biesheuvel@linaro.org> References: <20180912132151.4258-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH 2/4] MdeModulePkg/DxeCore: invoke the emulator protocol for foreign images X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ruiyu Ni , Zimmer Vincent , Eric Dong , Andrew Fish , agraf@suse.de, Brian Richardson , Michael D Kinney , Laszlo Ersek , Star Zeng MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" When encountering PE/COFF images that cannot be supported natively, attempt to locate an instance of the PE/COFF image emulator protocol, and if it supports the image, proceed with loading it and register it with the emulator. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- MdeModulePkg/Core/Dxe/DxeMain.h | 3 ++ MdeModulePkg/Core/Dxe/DxeMain.inf | 1 + MdeModulePkg/Core/Dxe/Image/Image.c | 39 +++++++++++++++++--- 3 files changed, 37 insertions(+), 6 deletions(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/MdeModulePkg/Core/Dxe/DxeMain.h b/MdeModulePkg/Core/Dxe/DxeMain.h index 7ec82388a3f9..57b3861d9813 100644 --- a/MdeModulePkg/Core/Dxe/DxeMain.h +++ b/MdeModulePkg/Core/Dxe/DxeMain.h @@ -53,6 +53,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include #include +#include #include #include #include @@ -229,6 +230,8 @@ typedef struct { UINT16 Machine; /// EBC Protocol pointer EFI_EBC_PROTOCOL *Ebc; + /// PE/COFF Image Emulator Protocol pointer + EDKII_PECOFF_IMAGE_EMULATOR_PROTOCOL *Emu; /// Runtime image list EFI_RUNTIME_IMAGE_ENTRY *RuntimeData; /// Pointer to Loaded Image Device Path Protocol diff --git a/MdeModulePkg/Core/Dxe/DxeMain.inf b/MdeModulePkg/Core/Dxe/DxeMain.inf index 68fa0a01d9bd..d7591aa0da6d 100644 --- a/MdeModulePkg/Core/Dxe/DxeMain.inf +++ b/MdeModulePkg/Core/Dxe/DxeMain.inf @@ -180,6 +180,7 @@ gEfiVariableArchProtocolGuid ## CONSUMES gEfiCapsuleArchProtocolGuid ## CONSUMES gEfiWatchdogTimerArchProtocolGuid ## CONSUMES + gEdkiiPeCoffImageEmulatorProtocolGuid ## SOMETIMES_CONSUMES [FeaturePcd] gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport ## CONSUMES diff --git a/MdeModulePkg/Core/Dxe/Image/Image.c b/MdeModulePkg/Core/Dxe/Image/Image.c index eddca140ee1a..e2dd80790657 100644 --- a/MdeModulePkg/Core/Dxe/Image/Image.c +++ b/MdeModulePkg/Core/Dxe/Image/Image.c @@ -67,6 +67,7 @@ LOADED_IMAGE_PRIVATE_DATA mCorePrivateImage = { NULL, // JumpContext 0, // Machine NULL, // Ebc + NULL, // Emu NULL, // RuntimeData NULL // LoadedImageDevicePath }; @@ -476,12 +477,23 @@ CoreLoadPeImage ( if (!EFI_IMAGE_MACHINE_TYPE_SUPPORTED (Image->ImageContext.Machine)) { if (!EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED (Image->ImageContext.Machine)) { // - // The PE/COFF loader can support loading image types that can be executed. - // If we loaded an image type that we can not execute return EFI_UNSUPORTED. + // Locate the emulator protocol to check whether it supports this + // image. // - DEBUG ((EFI_D_ERROR, "Image type %s can't be loaded ", GetMachineTypeName(Image->ImageContext.Machine))); - DEBUG ((EFI_D_ERROR, "on %s UEFI system.\n", GetMachineTypeName(mDxeCoreImageMachineType))); - return EFI_UNSUPPORTED; + Status = CoreLocateProtocol (&gEdkiiPeCoffImageEmulatorProtocolGuid, + NULL, (VOID **)&Image->Emu); + if (EFI_ERROR (Status) || + !Image->Emu->IsImageSupported (Image->Emu, + Image->ImageContext.Machine, + Image->ImageContext.ImageType)) { + // + // The PE/COFF loader can support loading image types that can be executed. + // If we loaded an image type that we can not execute return EFI_UNSUPORTED. + // + DEBUG ((EFI_D_ERROR, "Image type %s can't be loaded ", GetMachineTypeName(Image->ImageContext.Machine))); + DEBUG ((EFI_D_ERROR, "on %s UEFI system.\n", GetMachineTypeName(mDxeCoreImageMachineType))); + return EFI_UNSUPPORTED; + } } } @@ -687,6 +699,14 @@ CoreLoadPeImage ( if (EFI_ERROR(Status)) { goto Done; } + } else if (Image->Emu != NULL) { + Status = Image->Emu->RegisterImage (Image->Emu, Image->ImageBasePage, + EFI_PAGES_TO_SIZE (Image->NumberOfPages)); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_LOAD | DEBUG_ERROR, + "CoreLoadPeImage: Failed to load register foreign image with emulator.\n")); + goto Done; + } } // @@ -874,6 +894,13 @@ CoreUnloadAndCloseImage ( Image->Ebc->UnloadImage (Image->Ebc, Image->Handle); } + if (Image->Emu != NULL) { + // + // If the PE/COFF Emulator protocol exists we must unregister the image. + // + Image->Emu->UnregisterImage (Image->Emu, Image->ImageBasePage); + } + // // Unload image, free Image->ImageContext->ModHandle // @@ -1599,7 +1626,7 @@ CoreStartImage ( // // The image to be started must have the machine type supported by DxeCore. // - if (!EFI_IMAGE_MACHINE_TYPE_SUPPORTED (Image->Machine)) { + if (!EFI_IMAGE_MACHINE_TYPE_SUPPORTED (Image->Machine) && Image->Emu == NULL) { // // Do not ASSERT here, because image might be loaded via EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED // But it can not be started. From patchwork Wed Sep 12 13:21:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 146565 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp4825635ljw; Wed, 12 Sep 2018 06:22:51 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYK4y2aiQvDoinBLs8hNBxNhLw2FIn91FDr9VE5gGBAGLIdVWpGLzMq7X33Y31EVQCixujB X-Received: by 2002:a17:902:2f43:: with SMTP id s61-v6mr2224916plb.176.1536758571506; Wed, 12 Sep 2018 06:22:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536758571; cv=none; d=google.com; s=arc-20160816; b=HVdGt4Z9sBl65lJ6CGrsmmbpa6LNysnWJfKGfYbGiPfeWj0cGfIInSE29U1E7MomzZ L25f3woUvPmFk0ry71AP4fcJWa1sVCaHcGyEOK6Y0IigRmuGcJNb2ELGqvQPZPzrSQTC TwDseuxobV9hPb2UXe0cJVM4GNlZPPFBI4eyAp8YFChylQ7o8ybn5QCAm/HPuhjQ2y5H 6oIiMkLPsQD7jRGGOhe0uwFrTuGPyCYkmEoxk5KiKgTZtf4a7k2BrWAnZrfLNONA1R52 HMswf9YdwVOmCOXPihImNYXUXMrvQs0NPZWe7Z8TBslYQPueXe4+0/LPicN/6Hk0/6vs XIZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=27Hs6IDH+gwfNqqOr8jB61woM8/DcBj4SHZ6ditBDa4=; b=p1PuCS3hMce1BfjGUi0P+1/IMVpgefDNxrXjU91h4D+GpfxdkpqAXvcLi2wx99pByT 4SRdfDlXtD6hJnK0oukbpI8BI7Ved7Aays30uZiUqqwPugdCtM1LQBIaJC3DTMQZUGf8 EkhtJg3+jtXH+aTehB+qPEhZVKDV1bCClT9+v5RZtLARB/lgAoGd5KfsrwJV1xFzxKAe v6vzg5iPW12Za56U57uqyC1eQEhlpin9yLgx3/7nRpmEGNtspm8LWxoaoemnnZNFd0g7 c7ryFAhbzhTEgPsxTWNqK559G3JtlsxIcbv5GxPfUub1Msxv1so12Pxg0WDqK3f280pK QvTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="WnP/BJkj"; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id p67-v6si975668pfg.295.2018.09.12.06.22.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Sep 2018 06:22:51 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="WnP/BJkj"; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 6FB4F2112B1C6; Wed, 12 Sep 2018 06:22:47 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::441; helo=mail-wr1-x441.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id AA91921959CB2 for ; Wed, 12 Sep 2018 06:22:45 -0700 (PDT) Received: by mail-wr1-x441.google.com with SMTP id 20-v6so2009040wrb.12 for ; Wed, 12 Sep 2018 06:22:45 -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=1mPsRwICitXpw5IpjTEB5Cg9062CZQWh0lcwt+o5jhY=; b=WnP/BJkjTmlv6w0Yq2VGUzvF5LWN2562YtC+4B94FXroEFBmb+caIG0ah+BqKaN+M2 mIxLFpxv2q1MGGk0g5iQaD2wbeboKCek5R26czchKPsBBU6NuBqeYHImQWBTofcdhL1J d+bwWNXdIlKeEhygSER/B25KZ0lCdpnWcCwfE= 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=1mPsRwICitXpw5IpjTEB5Cg9062CZQWh0lcwt+o5jhY=; b=h7TKM3XN0lTFjFIdlR7i4+0Am5HxLqeSCVxFNMnbdCJehZs8zrShgUWlndqriKzTzT jIMvbe1kha6Usvnq03T4LPm+oQ9BvyifmddI6VmPGBhWhvwlYj+buWqFi6GcA6MsAHMj jeKhREqYzoDcEZ+JUwd5ScZbbWF2xWdXjrQW5m2YBcYlgumByNkN9Mq7xHMNnqkwbiok XxPvOUBn1jGbF4kd1w+pLVj508a4PJv59ORRaLi0fxco6NeM6icykOzeHUezWeW9hn0E 6HLXSGDVk1VR1RGBKAmg0CgHkuafaKdrU/TN35HXpf/trU3fk3s14fkD1EzLNXJFjavG y+DQ== X-Gm-Message-State: APzg51CqvMzoidbkgmjbZZvLi3u0Q6sHU4lUrSUzaS9cqivjwEliob8z fBYciK3z1CN62xmv3WJEZR17DB/VDakIPg== X-Received: by 2002:a5d:69d1:: with SMTP id s17-v6mr1593915wrw.77.1536758563792; Wed, 12 Sep 2018 06:22:43 -0700 (PDT) Received: from mba13.kuq.prv ([2001:a62:605:90f4:1f3:d690:1764:36ca]) by smtp.gmail.com with ESMTPSA id e133-v6sm1985129wma.33.2018.09.12.06.22.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Sep 2018 06:22:43 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 12 Sep 2018 15:21:50 +0200 Message-Id: <20180912132151.4258-4-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180912132151.4258-1-ard.biesheuvel@linaro.org> References: <20180912132151.4258-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH 3/4] MdeModulePkg/PciBusDxe: invoke PE/COFF emulator for foreign option ROMs X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ruiyu Ni , Zimmer Vincent , Eric Dong , Andrew Fish , agraf@suse.de, Brian Richardson , Michael D Kinney , Laszlo Ersek , Star Zeng MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" When enumerating option ROM images, take into account whether an emulator exists that would allow dispatch of PE/COFF images built for foreign architectures. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h | 1 + MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf | 1 + MdeModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.c | 16 +++++++++++++++- 3 files changed, 17 insertions(+), 1 deletion(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h index 55eb3a5a8070..dc57d4876c0f 100644 --- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h +++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h @@ -33,6 +33,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include #include +#include #include #include diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf index a21dd2b5edf4..3d99ea0c1047 100644 --- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf +++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf @@ -97,6 +97,7 @@ gEfiLoadFile2ProtocolGuid ## SOMETIMES_PRODUCES gEdkiiIoMmuProtocolGuid ## SOMETIMES_CONSUMES gEfiLoadedImageDevicePathProtocolGuid ## CONSUMES + gEdkiiPeCoffImageEmulatorProtocolGuid ## SOMETIMES_CONSUMES [FeaturePcd] gEfiMdeModulePkgTokenSpaceGuid.PcdPciBusHotplugDeviceSupport ## CONSUMES diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.c index c2be85a906af..07236afd327d 100644 --- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.c +++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.c @@ -678,6 +678,7 @@ ProcessOpRomImage ( MEDIA_RELATIVE_OFFSET_RANGE_DEVICE_PATH EfiOpRomImageNode; VOID *Buffer; UINTN BufferSize; + EDKII_PECOFF_IMAGE_EMULATOR_PROTOCOL *PeCoffEmulator; Indicator = 0; @@ -693,6 +694,7 @@ ProcessOpRomImage ( } ASSERT (((EFI_PCI_EXPANSION_ROM_HEADER *) RomBarOffset)->Signature == PCI_EXPANSION_ROM_HEADER_SIGNATURE); + PeCoffEmulator = NULL; do { EfiRomHeader = (EFI_PCI_EXPANSION_ROM_HEADER *) RomBarOffset; if (EfiRomHeader->Signature != PCI_EXPANSION_ROM_HEADER_SIGNATURE) { @@ -716,7 +718,19 @@ ProcessOpRomImage ( // Skip the EFI PCI Option ROM image if its machine type is not supported // if (!EFI_IMAGE_MACHINE_TYPE_SUPPORTED (EfiRomHeader->EfiMachineType)) { - goto NextImage; + // + // Check whether we have a PE/COFF emulator that supports this image + // + if (PeCoffEmulator == NULL) { + gBS->LocateProtocol (&gEdkiiPeCoffImageEmulatorProtocolGuid, NULL, + (VOID **)&PeCoffEmulator); + } + if (PeCoffEmulator == NULL || + !PeCoffEmulator->IsImageSupported (PeCoffEmulator, + EfiRomHeader->EfiMachineType, + EfiRomHeader->EfiSubsystem)) { + goto NextImage; + } } // From patchwork Wed Sep 12 13:21:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 146566 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp4825719ljw; Wed, 12 Sep 2018 06:22:55 -0700 (PDT) X-Google-Smtp-Source: ANB0VdaW/wsuW7jxLcAq8CBLNHvOF3D4EcLCnEzvjUL6j34/ac5vCEBQLOG+vx+kXOSxcgVqq8x2 X-Received: by 2002:a62:50c3:: with SMTP id g64-v6mr2324004pfj.244.1536758575114; Wed, 12 Sep 2018 06:22:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536758575; cv=none; d=google.com; s=arc-20160816; b=zWBqddSPCkqXEoO1KXIRLghZYQSoOORxvdSrBD2TRxH83jnb5sQ0CB2Ii3nrVM6sMq WwhPVITEtqUNl8g3C/mJXdmp7E4grfyiKDWTjJTqPltg/ay8F4HtLFfL936N0yBwQAiq 063o4vvrd8ohZoe/vZXBItxMAylrzedMVBfbg3LdCqFNW8IX6usdR3rxAjY8xa0sn/XU 9xEOUTbbxY+6OQ+hoCpfvs+PnyTiIwE67n6BpBWuqI3VzJ5enOt1el1BM/fQTND2nS44 nAYkaXUe2KltjPUvbKlgZXcecfFHAWIfm2XmT4cfJuZi0c0Rk1Ulr9jkv7Mom0/Azpvd 4BnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=M6sTNkHs+AdCyWYHhTUM+ynCzqiTeJhxU5YRyy6IE4A=; b=G0KBK+qz45SozGbWip1DYGxMQ1CwHXmHuNcJucSZGCW/MRpn/okDmkz6KXqspqC1V8 gJROTHQ/F3AK94OIMzx9ChzDZBhX1fidB5PdGvW2jNsiXyABxnKUhpNZTtYjj1KtTmtm BhHXixJVDvsYo6h8luZkMnMMkGI6ogOgFuh8m9fdWUexjhwgP5/KKTrgGNU5UHP9K1zo ehAYZl5bDSlrxpEQqXkqRRqaK5Z0FnxfESi/zYqaVFORW6cjgYKv2XvNjDKfU+os2GI0 dNFsxIrM9OfD3N7qaKJ0HYFaFR0pUBf6OWyc8aMcYMs+af8t51QVQAGI/B6evEZYTToi +2Ow== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=JxYuvLcu; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id e27-v6si1191122pgn.253.2018.09.12.06.22.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Sep 2018 06:22:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=JxYuvLcu; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 9A9C821A00AE6; Wed, 12 Sep 2018 06:22:48 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c09::242; helo=mail-wm0-x242.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id A08C22112B1C4 for ; Wed, 12 Sep 2018 06:22:46 -0700 (PDT) Received: by mail-wm0-x242.google.com with SMTP id t25-v6so2387473wmi.3 for ; Wed, 12 Sep 2018 06:22:46 -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=S3nLKLfL07G6P4WtOTyogrPlvnV+9rWMIzQYOQ2BRu4=; b=JxYuvLcuQymVAv9A0xhgbyf/C75AD5XAczzjMvD/fFVA2ZWOjGx0TLRa+FmEMcUFsA DSIMzTshd84AC26Tf70mFZSrG+XIQyvO3NtO3yaPI0CsYXDNBBrKNZWjbZis6c7BSaT5 FTpnTfN6vSFnZbpaXyn+8MOvdPYwVcurvXH9c= 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=S3nLKLfL07G6P4WtOTyogrPlvnV+9rWMIzQYOQ2BRu4=; b=Xvprt5xudknmaF4e6/2UaLUs1l2KItuuk+VvUpsMv7PZI41WViwxijny1l4Bc7lWyE Z+HqXjI9UO5l1zCFMTFOZYCIK/Gfpx+ElgVuBiYWOg3ji91jZf/p2l1pkt8StxpotGbp 7IAg7HRvFBv0IW0ajra18RqEVNnVcDbt3DMYCREfgR50EMe3E+jod6Wlrz7hoAOTx/8f 7XLDC6UhnKp0EnSMJcQLPUVn+xBX65TzIZZ4JocEZhKROFm0hEs9I3wViHlvlw5OhYwW Hkd66scZQ4CQLeERSZzLBMwoa1b+Rk/T5guVdprrtBWHZwSpbznLRQo1RMN9KlEoNh83 tT/Q== X-Gm-Message-State: APzg51BNWZLCJtElw6LUETNSwczyDurSb5gnRuU66BQfw9EeX/nWCk+/ X+0N6Pfk71DfGNbOYR31juLJr5WQYWZTtg== X-Received: by 2002:a1c:148f:: with SMTP id 137-v6mr1589695wmu.61.1536758564972; Wed, 12 Sep 2018 06:22:44 -0700 (PDT) Received: from mba13.kuq.prv ([2001:a62:605:90f4:1f3:d690:1764:36ca]) by smtp.gmail.com with ESMTPSA id e133-v6sm1985129wma.33.2018.09.12.06.22.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Sep 2018 06:22:44 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 12 Sep 2018 15:21:51 +0200 Message-Id: <20180912132151.4258-5-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180912132151.4258-1-ard.biesheuvel@linaro.org> References: <20180912132151.4258-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH 4/4] MdeModulePkg/UefiBootManagerLib: allow foreign Driver#### images X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ruiyu Ni , Zimmer Vincent , Eric Dong , Andrew Fish , agraf@suse.de, Brian Richardson , Michael D Kinney , Laszlo Ersek , Star Zeng MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Allow PE/COFF images that must execute under emulation for Driver#### options, by relaxing the machine type check to include support for machine types that is provided by the emulator. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c | 26 +++++++++++++++++++- MdeModulePkg/Library/UefiBootManagerLib/InternalBm.h | 1 + MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf | 1 + 3 files changed, 27 insertions(+), 1 deletion(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c b/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c index 7bf96646c690..67e3dfd7e9e1 100644 --- a/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c +++ b/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c @@ -1185,6 +1185,29 @@ EfiBootManagerFreeLoadOptions ( return EFI_SUCCESS; } +STATIC +BOOLEAN +BmIsImageTypeSupported ( + IN UINT16 MachineType, + IN UINT16 SubSystem + ) +{ + EFI_STATUS Status; + EDKII_PECOFF_IMAGE_EMULATOR_PROTOCOL *Emu; + + if (EFI_IMAGE_MACHINE_TYPE_SUPPORTED (MachineType)) { + return TRUE; + } + + Status = gBS->LocateProtocol (&gEdkiiPeCoffImageEmulatorProtocolGuid, + NULL, (VOID **)&Emu); + if (EFI_ERROR (Status)) { + return FALSE; + } + + return Emu->IsImageSupported (Emu, MachineType, SubSystem); +} + /** Return whether the PE header of the load option is valid or not. @@ -1235,7 +1258,8 @@ BmIsLoadOptionPeHeaderValid ( OptionalHeader = (EFI_IMAGE_OPTIONAL_HEADER32 *) &PeHeader->Pe32.OptionalHeader; if ((OptionalHeader->Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC || OptionalHeader->Magic == EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC) && - EFI_IMAGE_MACHINE_TYPE_SUPPORTED (PeHeader->Pe32.FileHeader.Machine) + BmIsImageTypeSupported (PeHeader->Pe32.FileHeader.Machine, + OptionalHeader->Subsystem) ) { // // Check the Subsystem: diff --git a/MdeModulePkg/Library/UefiBootManagerLib/InternalBm.h b/MdeModulePkg/Library/UefiBootManagerLib/InternalBm.h index 978fbff966f6..5f64ef304b87 100644 --- a/MdeModulePkg/Library/UefiBootManagerLib/InternalBm.h +++ b/MdeModulePkg/Library/UefiBootManagerLib/InternalBm.h @@ -47,6 +47,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include #include +#include #include #include diff --git a/MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf b/MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf index 72c5ca1cd59e..09e2134acf8e 100644 --- a/MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf +++ b/MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf @@ -104,6 +104,7 @@ gEfiDevicePathProtocolGuid ## SOMETIMES_CONSUMES gEfiBootLogoProtocolGuid ## SOMETIMES_CONSUMES gEfiSimpleTextInputExProtocolGuid ## SOMETIMES_CONSUMES + gEdkiiPeCoffImageEmulatorProtocolGuid ## SOMETIMES_CONSUMES gEdkiiVariableLockProtocolGuid ## SOMETIMES_CONSUMES gEfiGraphicsOutputProtocolGuid ## SOMETIMES_CONSUMES gEfiUsbIoProtocolGuid ## SOMETIMES_CONSUMES