Received: by 2002:a05:6a10:eb17:0:0:0:0 with SMTP id hx23csp3858969pxb; Tue, 7 Sep 2021 09:03:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyKKrAIms0ss+l2A8+3lR+upjQQjyCqU64iRZmvaW/HYdvKnJ2imuJ0LDywnLg6nxOSJTic X-Received: by 2002:a17:906:9a4e:: with SMTP id aj14mr19288654ejc.84.1631030623108; Tue, 07 Sep 2021 09:03:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631030623; cv=none; d=google.com; s=arc-20160816; b=Xf9NWcsbW2LqslSWhCHI0oWWLzszRa/CmnqFakLcs6t8ZUFhUM5mW7MR3MBADmnF1Q dn4ZstDAk42D+h1Y2KecKFdbsvu7r6OOOl5y9wURzNYta5lN9WiN8jycksSxU3eN2nDn cH5EkgVeHQktM9DQeAwLSuCFldNW784HkvlU78EYG79FXegx/LpBBJzPMblL3bpkB0xA qRN8WKY7sAR4f7Dq5l+i1W1e4OabgBzVZ3+1cQaly6I5AfNq/DtXmIbY3lZhAS75Nph0 Qdy5IJe11yo/FVeVTPZeK50h7WX+L9Ft6AgZxbmAIXKgrzalTjSMqh3JEF6qdK6+fMGI sYzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=ePl94PVHL6QzIAzTUFNThDovefA2l3kvL4gueAZIQhA=; b=a/gog2L+QXPnhNWCNXUqSuT6GXoIl8VBFIXRYaHn9gM5zo+eUJo+k3EsvSWO8AlNud eW3mZtJ8mn5ieUt5saqfVIC1wK81z25nSe52JhIOa1RVQXrkVsLEi2Euyy3vmAhhKemt MA4F+HEc3IRToPG4sxVHcIad9svpMjpS95JEPCTPK4fKuERW4UFw9tE2l8N+ZDwYr/ZT PylX0gOkKTJrSwiNDFuaZH9gb96kgWOJBO73IoTdfO9mw9joIz7j/6PDybBeGiZgR226 ZLICcenlmQ44lHTnDFLEH9nokcftZzPCswUuaPumSdAeyFp4Kz4MYh1g7N4/F9JK+mvJ tGPA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m20si10985573edc.630.2021.09.07.09.03.17; Tue, 07 Sep 2021 09:03:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344952AbhIGPNJ (ORCPT + 99 others); Tue, 7 Sep 2021 11:13:09 -0400 Received: from mga18.intel.com ([134.134.136.126]:4526 "EHLO mga18.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232090AbhIGPNI (ORCPT ); Tue, 7 Sep 2021 11:13:08 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10099"; a="207339740" X-IronPort-AV: E=Sophos;i="5.85,274,1624345200"; d="scan'208";a="207339740" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Sep 2021 08:12:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,274,1624345200"; d="scan'208";a="469229470" Received: from chenyu-desktop.sh.intel.com ([10.239.158.176]) by orsmga007.jf.intel.com with ESMTP; 07 Sep 2021 08:11:58 -0700 From: Chen Yu To: linux-acpi@vger.kernel.org Cc: linux-kernel@vger.kernel.org, "Rafael J. Wysocki" , Len Brown , Dan Williams , Andy Shevchenko , Aubrey Li , Ashok Raj , Chen Yu , Ard Biesheuvel , linux-efi@vger.kernel.org Subject: [PATCH 2/5][RFC] efi: Introduce EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER and corresponding structures Date: Tue, 7 Sep 2021 23:17:45 +0800 Message-Id: <14bb2fa2c49934c627aec07077b96720d46b5202.1631025237.git.yu.c.chen@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Platform Firmware Runtime Update image starts with UEFI headers, and the headers are defined in UEFI specification, but some of them have not been defined in the kernel yet. For example, the header layout of a capsule file looks like this: EFI_CAPSULE_HEADER EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER EFI_FIRMWARE_IMAGE_AUTHENTICATION These structures would be used by the Platform Firmware Runtime Update driver to parse the format of capsule file to verify if the corresponding version number is valid. The EFI_CAPSULE_HEADER has been defined in the kernel, however the rest are not, thus introduce corresponding UEFI structures accordingly. The reason why efi_manage_capsule_header_t and efi_manage_capsule_image_header_t are packedi might be that: According to the uefi spec, [Figure 23-6 Firmware Management and Firmware Image Management headers] EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER is located at the lowest offset within the body of the capsule. And this structure is designed to be unaligned to save space, because in this way the adjacent drivers and binary payload elements could start on byte boundary with no padding. And the EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER is at the head of each payload, so packing this structure also makes room for more data. Signed-off-by: Chen Yu --- include/linux/efi.h | 50 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/include/linux/efi.h b/include/linux/efi.h index 6b5d36babfcc..19ff834e1388 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -148,6 +148,56 @@ typedef struct { u32 imagesize; } efi_capsule_header_t; +#pragma pack(1) + +/* EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER */ +typedef struct { + u32 ver; + u16 emb_drv_cnt; + u16 payload_cnt; + /* + * Variable array indicated by number of + * (emb_drv_cnt + payload_cnt) + */ + u64 offset_list[]; +} efi_manage_capsule_header_t; + +/* EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER */ +typedef struct { + u32 ver; + guid_t image_type_id; + u8 image_index; + u8 reserved_bytes[3]; + u32 image_size; + u32 vendor_code_size; + /* ver = 2. */ + u64 hw_ins; + /* ver = v3. */ + u64 capsule_support; +} efi_manage_capsule_image_header_t; + +#pragma pack() + +/* WIN_CERTIFICATE */ +typedef struct { + u32 len; + u16 rev; + u16 cert_type; +} win_cert_t; + +/* WIN_CERTIFICATE_UEFI_GUID */ +typedef struct { + win_cert_t hdr; + guid_t cert_type; + u8 cert_data[]; +} win_cert_uefi_guid_t; + +/* EFI_FIRMWARE_IMAGE_AUTHENTICATIO */ +typedef struct { + u64 mon_count; + win_cert_uefi_guid_t auth_info; +} efi_image_auth_t; + /* * EFI capsule flags */ -- 2.25.1