Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp799744pxb; Wed, 27 Oct 2021 12:38:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyyoHzSym6y64Fau4ynJFGSkU6+OtJoLI7vXA/GMxh16dlJsLFqwHCEfD6TNAaoW4bZjf9K X-Received: by 2002:a63:3716:: with SMTP id e22mr17515219pga.75.1635363515664; Wed, 27 Oct 2021 12:38:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635363515; cv=none; d=google.com; s=arc-20160816; b=G/lLCwvGpN3HcrSNFuBszfJ5/k41d37xHRtGNedl4oV0/gcvRKhJernu9YhiuJWBgO hGlNgVavdvK8DoDuWVyOwZWTreLwYohjXRz2gWUzqbp3MKAmLDlrCdjOMFvJ3p3JUzxg CmlBGlrNm7A/uXIPhjMJRYf+kY67qFyrxhjDO9speiXAV3CJv34nu3/AIIKnSDkkkP5F sHs5I2KJJHoJ9MSG2/O7nkIo1wvRVj6/fVFNEt7/G0t9pgOKCBlhjHevfouIMQRCW0fG luNqENzobz7Hyd6Zpjt30Twh3ml9PbxffcKOamcXbd9R6rCheXgjUPCqDS8zpUNMaunZ 6smg== 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=/CGdYF/LdStFuPHs39Lbseg2cyxCY+3oTaFuyn8Wvxo=; b=KxKV5D47H5KdAZyF+bYPpjk8m9KuL798ED8UC83+P3q3W8oDiiV7shS9rbkUc8kRLO yC2tqWz+lU++RlvLWuIuaZAtng2ZzoSy8YgEARuxb3ZH1vZXi0gJZDB+pjptXmKbQTAN Jk+jI/yN0UuExrXqpcJQljTLaHqTyqa3rBFaHzOnQzYV4LZrh+tBWDDRJSy5yJKpUBfY /Qk/UAaxUQ/Slt0t9pzA9sdgjo/Bl2h4Zm4qKfqyS7Mpbxd8PLtmKq3hCusnvh3UNjR8 wX51hTysS5MVXIyvALJWrYlrbVneY/+xkSWoPzAqNL8FZgyqSAHdUojJMgyhHMRAuPot FFgw== 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 1si1002646pgq.205.2021.10.27.12.38.21; Wed, 27 Oct 2021 12:38:35 -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 S240317AbhJ0HKk (ORCPT + 99 others); Wed, 27 Oct 2021 03:10:40 -0400 Received: from mga03.intel.com ([134.134.136.65]:2286 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240291AbhJ0HKi (ORCPT ); Wed, 27 Oct 2021 03:10:38 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10149"; a="230039154" X-IronPort-AV: E=Sophos;i="5.87,186,1631602800"; d="scan'208";a="230039154" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Oct 2021 00:08:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,186,1631602800"; d="scan'208";a="635605540" Received: from chenyu-desktop.sh.intel.com ([10.239.158.186]) by fmsmga001.fm.intel.com with ESMTP; 27 Oct 2021 00:08:09 -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, linux-efi@vger.kernel.org Subject: [PATCH v7 1/4] efi: Introduce EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER and corresponding structures Date: Wed, 27 Oct 2021 15:07:24 +0800 Message-Id: <4898b5784e79b89bb25ce91384427b5ca3547b8f.1635317102.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. And 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 --- 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..f4acdb52cdfb 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; + 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; + 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