Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp568672pxb; Wed, 3 Nov 2021 08:46:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz2zXXwwSMYSsbZBjxLY2MlRRHul8U2JAWS3nFrcdp8UZoq+kM1J54uE+hQqMdECkV+gQb0 X-Received: by 2002:a05:6402:1289:: with SMTP id w9mr57058729edv.268.1635954397244; Wed, 03 Nov 2021 08:46:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635954397; cv=none; d=google.com; s=arc-20160816; b=TM0+Dceg/tQQLy7bVofi2rmMQ3FcRQ4F+ylZ/zdO31P+CupZvySXHNneRNqIENdAPx eyCY7xXGcr8ZJ4mGe0gCVZFPuI5pNvRLtYl1fkbM/1pqAvCm5VDK4KJT2LEIiBx+I50t w2pTfDI/Is+ctTd1LK6lHoAkSNCVWxQnN1Sb3ozdqwZPt6GHeemmd9iTgmcssOt1zvOv fskZVLv1Ph6vTVFgS1/RBYF7q/tdB8dfQuP2w2zI/6gn5/7EKGMIPvCH8TctBaX1kpV9 tU6Syfyj0Yvl3sYBvCRAJl/q/t3QTkbkgsIphYUVxt6ffjz+jY70BRI2jxN17LA6Stp4 tfog== 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=gfhepiPknFHfweCfHY4Q3oI3PReHChFcKJOUTbKYDcU=; b=pl/LHCZln+Am0HoFWK7KuTE6yH/9ehwoczMYSHsF/wKPc7NsX22YlAlrqUamIm1tJJ feaSNKPJt5lMg4T6dTriT4+fqwV71cFv8lkEFnPJ087LOT0Mr1d721+++8wZC+ka7vr9 PTZtKIVZXbuOhZ7mlrHEkiocPDSKRx3cgPkSaZ+hBy6MKPr/7Udxaushy9htpbOnUz4h foc+rzmnG7I77U5PzzhqtQ/e4u/V6bmhj6RrtDdWgI7+qSE4ZSbW4OTgYPgIpSVDKNtW r1L6RIxtxTis068QEg8LOLLFvJLBYQRnjdFWez9j/waNcTX5JbKVLiEFPbqUynr002u9 Hz1g== 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 fy33si3033236ejc.697.2021.11.03.08.46.12; Wed, 03 Nov 2021 08:46:37 -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 S231577AbhKCPqh (ORCPT + 99 others); Wed, 3 Nov 2021 11:46:37 -0400 Received: from mga06.intel.com ([134.134.136.31]:20743 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229587AbhKCPqg (ORCPT ); Wed, 3 Nov 2021 11:46:36 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10157"; a="292363207" X-IronPort-AV: E=Sophos;i="5.87,206,1631602800"; d="scan'208";a="292363207" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Nov 2021 08:44:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,206,1631602800"; d="scan'208";a="449861147" Received: from chenyu-desktop.sh.intel.com ([10.239.158.186]) by orsmga006.jf.intel.com with ESMTP; 03 Nov 2021 08:43:56 -0700 From: Chen Yu To: linux-acpi@vger.kernel.org Cc: Greg Kroah-Hartman , "Rafael J. Wysocki" , Ard Biesheuvel , Len Brown , Ashok Raj , Andy Shevchenko , Mike Rapoport , Aubrey Li , Chen Yu , linux-kernel@vger.kernel.org Subject: [PATCH v8 1/4] efi: Introduce EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER and corresponding structures Date: Wed, 3 Nov 2021 23:43:14 +0800 Message-Id: <68d1c452bbf7f742793cb39ebb66f6b4ba6a3fb3.1635953446.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. Besides, EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER and EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER are required to be packed in the uefi specification. Ard has pointed out that, the __packed attribute does indicate to the compiler that the entire thing can appear misaligned in memory. So if one follows the other in the capsule header, the __packed attribute may be appropriate to ensure that the second one is not accessed using misaligned loads and stores. Signed-off-by: Chen Yu --- v8: Use efi_guid_t instead of guid_t. (Andy Shevchenko) v7: Use __packed instead of pragma pack(1). (Greg Kroah-Hartman, Ard Biesheuve) v6: No change since v5. v5: No change since v4. v4: Revise the commit log to make it more clear. (Rafael J. Wysocki) --- include/linux/efi.h | 46 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/include/linux/efi.h b/include/linux/efi.h index 6b5d36babfcc..1ec73c5ab6c9 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -148,6 +148,52 @@ typedef struct { u32 imagesize; } efi_capsule_header_t; +/* EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER */ +struct efi_manage_capsule_header { + u32 ver; + u16 emb_drv_cnt; + u16 payload_cnt; + /* + * Variable array indicated by number of + * (emb_drv_cnt + payload_cnt) + */ + u64 offset_list[]; +} __packed; + +/* EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER */ +struct efi_manage_capsule_image_header { + u32 ver; + efi_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; +} __packed; + +/* WIN_CERTIFICATE */ +struct win_cert { + u32 len; + u16 rev; + u16 cert_type; +}; + +/* WIN_CERTIFICATE_UEFI_GUID */ +struct win_cert_uefi_guid { + struct win_cert hdr; + efi_guid_t cert_type; + u8 cert_data[]; +}; + +/* EFI_FIRMWARE_IMAGE_AUTHENTICATIO */ +struct efi_image_auth { + u64 mon_count; + struct win_cert_uefi_guid auth_info; +}; + /* * EFI capsule flags */ -- 2.25.1