From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=66.187.233.73; helo=mx1.redhat.com; envelope-from=lersek@redhat.com; receiver=edk2-devel@lists.01.org Received: from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id DCEC8203B85B8 for ; Thu, 17 May 2018 01:10:51 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 32243BB401; Thu, 17 May 2018 08:10:51 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-28.rdu2.redhat.com [10.10.120.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id DADB72166BAD; Thu, 17 May 2018 08:10:49 +0000 (UTC) To: marcandre.lureau@redhat.com, edk2-devel@lists.01.org Cc: qemu-devel@nongnu.org, javierm@redhat.com, pjones@redhat.com, jiewen.yao@intel.com References: <20180515123007.10164-1-marcandre.lureau@redhat.com> <20180515123007.10164-3-marcandre.lureau@redhat.com> From: Laszlo Ersek Message-ID: <48283244-9534-24b8-263f-47d5fa9ff675@redhat.com> Date: Thu, 17 May 2018 10:10:48 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <20180515123007.10164-3-marcandre.lureau@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Thu, 17 May 2018 08:10:51 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Thu, 17 May 2018 08:10:51 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'lersek@redhat.com' RCPT:'' Subject: Re: [PATCH 2/4] ovmf: add QemuTpm.h header X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 08:10:52 -0000 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit On 05/15/18 14:30, marcandre.lureau@redhat.com wrote: > From: Marc-André Lureau > > Add some common macros and type definitions corresponding to the QEMU > TPM interface. > > Signed-off-by: Marc-André Lureau > --- > OvmfPkg/Include/IndustryStandard/QemuTpm.h | 67 ++++++++++++++++++++++ > 1 file changed, 67 insertions(+) > create mode 100644 OvmfPkg/Include/IndustryStandard/QemuTpm.h > > diff --git a/OvmfPkg/Include/IndustryStandard/QemuTpm.h b/OvmfPkg/Include/IndustryStandard/QemuTpm.h > new file mode 100644 > index 000000000000..054cf79374b5 > --- /dev/null > +++ b/OvmfPkg/Include/IndustryStandard/QemuTpm.h > @@ -0,0 +1,67 @@ > +/** @file > + Macro and type definitions corresponding to the QEMU TPM interface. > + > + Refer to "docs/specs/tpm.txt" in the QEMU source directory. > + > + Copyright (C) 2018, Red Hat, Inc. > + Copyright (c) 2018, IBM Corporation. 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 __QEMU_TPM_H__ > +#define __QEMU_TPM_H__ > + > +#include > + > +/* whether function is blocked by BIOS settings; bits 0, 1, 2 */ > +#define QEMU_TPM_PPI_FUNC_NOT_IMPLEMENTED (0 << 0) > +#define QEMU_TPM_PPI_FUNC_BIOS_ONLY (1 << 0) > +#define QEMU_TPM_PPI_FUNC_BLOCKED (2 << 0) > +#define QEMU_TPM_PPI_FUNC_ALLOWED_USR_REQ (3 << 0) > +#define QEMU_TPM_PPI_FUNC_ALLOWED_USR_NOT_REQ (4 << 0) > +#define QEMU_TPM_PPI_FUNC_MASK (7 << 0) > + > +// > +// The following structure is shared between firmware and ACPI. > +// > +#pragma pack (1) > +typedef struct { > + UINT8 Func[256]; /* func */ > + UINT8 In; /* ppin */ > + UINT32 Ip; /* ppip */ > + UINT32 Response; /* pprp */ > + UINT32 Request; /* pprq */ > + UINT32 RequestParameter; /* pprm */ > + UINT32 LastRequest; /* lppr */ > + UINT32 FRet; /* fret */ > + UINT8 Res1[0x40]; /* res1 */ > + UINT8 NextStep; /* next_step */ > +} QEMU_TPM_PPI; > +#pragma pack () > + > +// > +// The following structure is for the fw_cfg etc/tpm/config file. > +// > +#pragma pack (1) > +typedef struct { > + UINT32 PpiAddress; > + UINT8 TpmVersion; > + UINT8 PpiVersion; > +} QEMU_FWCFG_TPM_CONFIG; > +#pragma pack () > + > +#define QEMU_TPM_VERSION_UNSPEC 0 > +#define QEMU_TPM_VERSION_1_2 1 > +#define QEMU_TPM_VERSION_2 2 > + > +#define QEMU_TPM_PPI_VERSION_NONE 0 > +#define QEMU_TPM_PPI_VERSION_1_30 1 > + > +#endif > (1) Please update the subject line as discussed earlier; for example: OvmfPkg/IndustryStandard: add QemuTpm.h header (2) Please convert the file to CRLF. (3) Please use the "// ..." comment style near the fields of QEMU_TPM_PPI. (4) Please align the member identifiers in each of QEMU_TPM_PPI and QEMU_FWCFG_TPM_CONFIG -- in practice this means inserting another space char after each "UINT8" type name. With those changes: Acked-by: Laszlo Ersek Thanks! Laszlo