From patchwork Wed Sep 13 22:05:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 813655 X-Patchwork-Delegate: agraf@suse.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="foB516/u"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xsx0y1h4nz9sxR for ; Thu, 14 Sep 2017 08:19:46 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id E4589C226F5; Wed, 13 Sep 2017 22:12:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 40E09C225FD; Wed, 13 Sep 2017 22:11:57 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 17966C2257F; Wed, 13 Sep 2017 22:06:49 +0000 (UTC) Received: from mail-qt0-f196.google.com (mail-qt0-f196.google.com [209.85.216.196]) by lists.denx.de (Postfix) with ESMTPS id 63472C2257F for ; Wed, 13 Sep 2017 22:06:45 +0000 (UTC) Received: by mail-qt0-f196.google.com with SMTP id t46so942220qtj.3 for ; Wed, 13 Sep 2017 15:06:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=agLKFCHofSoXSGDDqTTx4I8hvrEJSirlG3r1W1vdczo=; b=foB516/ulBHjib94ZrsVYqhzw3uZcuLZcZlSTWH6WP5fuzhMeTAFA3Q2EUpskGE40x bQ7PogzK5WQbF8L7omsf4Ocd62CJLHZbXaFIRvJaZcz7K+3Q3Iz8pDQmi40uxcfDJqhR OClMkakuH51TESRRd8L2aO39l8zVSH33+zVOQKQD5MIRilHEEFHrYOTN+E4kuqHy31Di NWNkzMvmFTCy3fNif2lv22nD0kgQk3omU9ljkHr5TjXIQD0Tsy49qxawYt09ZpYeTHT/ myOPwlaXCA7rJuZi8DoTpDKP5kEhzCUwn3GwaD0FP+RsmKlbpSA/Ctteilz1c2rdmOls Ioxg== 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=agLKFCHofSoXSGDDqTTx4I8hvrEJSirlG3r1W1vdczo=; b=LhZ+g8eszlbJ5eCbwlMwbWCgAilNWUoVn/oDJUGWg/5mV1ROc4JOo751xrCwvl1BU6 bm+Qz+8PzaS8XWdmsNxfsVAnzZ3yDN1P5/6CULIkTQ+jxUFv6qcEEeLSKy1B3z/1PaZL fw1MnocisExnUICNOer+sZy43xnmpnIBPT8sbo9DYKYTsyGHx7kutCUtUdXEmDVujq9C bnpg5jaOm/8zhuT041KyisHSE4mUhrbhhQkO2HMTcupgb0ueb0140/jCyHnt8WTIoG+s NJwhh2s2zOyqnsxGtfkpsAY1vQiKXegW7uXI+CCjBAiDV0BfYDZn5SLSUVEdoXkrhnET 76HA== X-Gm-Message-State: AHPjjUgfsofeHKCTucPczz5gHZax6d9TqlnKsttQbNx5ofdTJMwjL+8G V+CPjtHUVatKqdxDPYU= X-Google-Smtp-Source: AOwi7QDc56FegPvAG5DvC/nWPH3eye95MZJcR6fa7RishxT/BSiwdBqaTmQy8wRQ9/S2IKSKg4ftDw== X-Received: by 10.200.35.204 with SMTP id r12mr18317907qtr.95.1505340404103; Wed, 13 Sep 2017 15:06:44 -0700 (PDT) Received: from localhost ([2601:184:4780:aac0:25f8:dd96:a084:785a]) by smtp.gmail.com with ESMTPSA id r22sm10509933qtj.94.2017.09.13.15.06.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 13 Sep 2017 15:06:43 -0700 (PDT) From: Rob Clark To: U-Boot Mailing List Date: Wed, 13 Sep 2017 18:05:40 -0400 Message-Id: <20170913220546.19560-18-robdclark@gmail.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170913220546.19560-1-robdclark@gmail.com> References: <20170913220546.19560-1-robdclark@gmail.com> Cc: Heinrich Schuchardt Subject: [U-Boot] [PATCH v3 17/21] efi_loader: set loaded image code/data type properly X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" These should be set according to the image type. Shell.efi and SCT.efi use these fields to determine what sort of image they are loading. Signed-off-by: Rob Clark --- include/pe.h | 6 ++++++ lib/efi_loader/efi_image_loader.c | 22 ++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/include/pe.h b/include/pe.h index deb35a0ea4..4ef3e92efa 100644 --- a/include/pe.h +++ b/include/pe.h @@ -62,6 +62,12 @@ typedef struct _IMAGE_DATA_DIRECTORY { #define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16 +/* PE32+ Subsystem type for EFI images */ +#define IMAGE_SUBSYSTEM_EFI_APPLICATION 10 +#define IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER 11 +#define IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER 12 +#define IMAGE_SUBSYSTEM_SAL_RUNTIME_DRIVER 13 + typedef struct _IMAGE_OPTIONAL_HEADER64 { uint16_t Magic; /* 0x20b */ uint8_t MajorLinkerVersion; diff --git a/lib/efi_loader/efi_image_loader.c b/lib/efi_loader/efi_image_loader.c index 242e6a504b..af29cc4f04 100644 --- a/lib/efi_loader/efi_image_loader.c +++ b/lib/efi_loader/efi_image_loader.c @@ -94,6 +94,7 @@ void *efi_load_pe(void *efi, struct efi_loaded_image *loaded_image_info) unsigned long virt_size = 0; bool can_run_nt64 = true; bool can_run_nt32 = true; + uint16_t image_type; #if defined(CONFIG_ARM64) can_run_nt32 = false; @@ -139,6 +140,7 @@ void *efi_load_pe(void *efi, struct efi_loaded_image *loaded_image_info) entry = efi_reloc + opt->AddressOfEntryPoint; rel_size = opt->DataDirectory[rel_idx].Size; rel = efi_reloc + opt->DataDirectory[rel_idx].VirtualAddress; + image_type = opt->Subsystem; } else if (can_run_nt32 && (nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC)) { IMAGE_OPTIONAL_HEADER32 *opt = &nt->OptionalHeader; @@ -152,12 +154,32 @@ void *efi_load_pe(void *efi, struct efi_loaded_image *loaded_image_info) entry = efi_reloc + opt->AddressOfEntryPoint; rel_size = opt->DataDirectory[rel_idx].Size; rel = efi_reloc + opt->DataDirectory[rel_idx].VirtualAddress; + image_type = opt->Subsystem; } else { printf("%s: Invalid optional header magic %x\n", __func__, nt->OptionalHeader.Magic); return NULL; } + switch (image_type) { + case IMAGE_SUBSYSTEM_EFI_APPLICATION: + loaded_image_info->image_code_type = EFI_LOADER_CODE; + loaded_image_info->image_data_type = EFI_LOADER_DATA; + break; + case IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER: + loaded_image_info->image_code_type = EFI_BOOT_SERVICES_CODE; + loaded_image_info->image_data_type = EFI_BOOT_SERVICES_DATA; + break; + case IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER: + case IMAGE_SUBSYSTEM_SAL_RUNTIME_DRIVER: + loaded_image_info->image_code_type = EFI_RUNTIME_SERVICES_CODE; + loaded_image_info->image_data_type = EFI_RUNTIME_SERVICES_DATA; + break; + default: + printf("%s: invalid image type: %u\n", __func__, image_type); + break; + } + /* Load sections into RAM */ for (i = num_sections - 1; i >= 0; i--) { IMAGE_SECTION_HEADER *sec = §ions[i];