From nobody Sun May 5 12:07:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+60689+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+60689+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1591203877; cv=none; d=zohomail.com; s=zohoarc; b=FhELVdytVXz6qmW/vFbXRSBNYxbviOAWfjkBW76zeDiXzZpxsqEWCTqjswQ1PgxA0r1vbnp7yQcB13xJHpsb+RoFFNBiZbr7wyTc9Z09hQW+5OFi+KJQl9JMxPerVjSkBnUVP8HkuN2bYSmiQehGObOT7exdns0UskMtUPFmy2I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591203877; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=LLWJCC9UzRnkfkVV8JamLaep4R3Kvdf9oTNeiFYrdzA=; b=KPfHKp/sGFiUSA/W1dbdhWne/GM1IA5EmehClJwaxSjupEhff0Bw86T5N5ZvBpRbvX/PdpYSrlx0LODOEVt9RuJb1nRB4WZHuUVdVoyN6VOvIr9spgxj/QaX87JIst1y8V14FzQbKC3VgIgiAz+zdvdIghDlQGR+ufLagOjgNPE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+60689+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1591203877490961.5242144342685; Wed, 3 Jun 2020 10:04:37 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id VE4EYY1788612xoUEseu3S6K; Wed, 03 Jun 2020 10:04:37 -0700 X-Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.120]) by mx.groups.io with SMTP id smtpd.web11.274.1591203876266612524 for ; Wed, 03 Jun 2020 10:04:36 -0700 X-Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-141-xCdWVgxOMyO1ei23BhGayg-1; Wed, 03 Jun 2020 13:04:23 -0400 X-MC-Unique: xCdWVgxOMyO1ei23BhGayg-1 X-Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8F787188360E; Wed, 3 Jun 2020 17:04:22 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-115-50.ams2.redhat.com [10.36.115.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1B8115D9CD; Wed, 3 Jun 2020 17:04:20 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Ard Biesheuvel , Jordan Justen , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Berger Subject: [edk2-devel] [PATCH 1/2] OvmfPkg/Tcg2ConfigPei: generalize TPM2-only file-top comments Date: Wed, 3 Jun 2020 19:04:12 +0200 Message-Id: <20200603170413.23936-2-lersek@redhat.com> In-Reply-To: <20200603170413.23936-1-lersek@redhat.com> References: <20200603170413.23936-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,lersek@redhat.com X-Gm-Message-State: BLUb06NERHkC24tKITkJ6Cxpx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1591203877; bh=LLWJCC9UzRnkfkVV8JamLaep4R3Kvdf9oTNeiFYrdzA=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=sjwkzxeMmEHpwVDKRF/+lSaQte/H4keo6F7y0fKRr/mlI30RebI+KPrygQ/xwCpiRmW bO4GDAZngRyhlHDhlS1gQSkhMhqON7ECOFwMlWfDrP2ZbPqYBy6VJBk4ll6N7b3ka3nmz /WrsESy3/wT1vkHa8R37jOTK3qwlPXQDAU8= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" The leading comments in "Tcg2ConfigPei.inf" and "Tcg2ConfigPeim.c" say, "In OvmfPkg, the module only performs TPM2 hardware detection". The statement hasn't been correct since commit 89236992913f ("OvmfPkg: detect TPM 1.2 in Tcg2ConfigPei", 2020-03-04). Replace "TPM2" with "TPM" (without stating a version) in those file-top comments. Cc: Ard Biesheuvel Cc: Jordan Justen Cc: Marc-Andr=C3=A9 Lureau Cc: Philippe Mathieu-Daud=C3=A9 Cc: Stefan Berger Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2752 Signed-off-by: Laszlo Ersek Reviewed-by: Ard Biesheuvel Reviewed-by: Philippe Mathieu-Daude --- OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf | 2 +- OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf b/OvmfPkg/Tcg/Tcg2Con= fig/Tcg2ConfigPei.inf index 194ebfba6409..55c20db963e8 100644 --- a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf +++ b/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf @@ -2,7 +2,7 @@ # Set TPM device type # # In SecurityPkg, this module initializes the TPM device type based on a U= EFI -# variable and/or hardware detection. In OvmfPkg, the module only performs= TPM2 +# variable and/or hardware detection. In OvmfPkg, the module only performs= TPM # hardware detection. # # Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
diff --git a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c b/OvmfPkg/Tcg/Tcg2Conf= ig/Tcg2ConfigPeim.c index cc54d95cad19..b3b9035eea1b 100644 --- a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c +++ b/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c @@ -2,7 +2,7 @@ Set TPM device type =20 In SecurityPkg, this module initializes the TPM device type based on a U= EFI - variable and/or hardware detection. In OvmfPkg, the module only performs= TPM2 + variable and/or hardware detection. In OvmfPkg, the module only performs= TPM hardware detection. =20 Copyright (c) 2015, Intel Corporation. All rights reserved.
--=20 2.19.1.3.g30247aa5d201 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#60689): https://edk2.groups.io/g/devel/message/60689 Mute This Topic: https://groups.io/mt/74654145/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sun May 5 12:07:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+60688+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+60688+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1591203877; cv=none; d=zohomail.com; s=zohoarc; b=OWsVXEiD3Mwt8NfW9z/yuRS8T/PaePdZ9GPXZ6y/iM99N1pCGPaSsXRMGFa+ldbsrG6Uf2uSV26yho2gffn0L6kMcY1Hm9m6WrLkI/vbWR9zshpEyR1D1cp3UBM+ZU+BPj/yHKFkyLhmbJw8o0Mf2Wq3q1LmfR+coJb95hDo5Go= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591203877; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=fQNr9fV/NesB9Qw5qQIAdnX3+/Aj/z89OWiYB7bLNPA=; b=RTvTxEn7hzmyi5W/6BJ2IV8p/dN3yl0MWPuqfEdiDAjwRGT6bhG8Wjc4YMIOKSEymxvRZVr66XTqK0GVgUeBXRRPxyJdLrElf3z3f0TWlpzewkarIKgKqA/tHSjQB532+ca3qQsDiSy+IDNxXYadha8Ea9RnqwSpT5OYRIMFRd0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+60688+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 159120387710460.266028063366775; Wed, 3 Jun 2020 10:04:37 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id SoFIYY1788612xRDhbbQLSyP; Wed, 03 Jun 2020 10:04:36 -0700 X-Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.120]) by mx.groups.io with SMTP id smtpd.web11.273.1591203876105728562 for ; Wed, 03 Jun 2020 10:04:36 -0700 X-Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-388-KCjqWUxQPgCw201lqfDbqQ-1; Wed, 03 Jun 2020 13:04:25 -0400 X-MC-Unique: KCjqWUxQPgCw201lqfDbqQ-1 X-Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 617001883609; Wed, 3 Jun 2020 17:04:24 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-115-50.ams2.redhat.com [10.36.115.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id E299F5D9CD; Wed, 3 Jun 2020 17:04:22 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Ard Biesheuvel , Jordan Justen , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Berger Subject: [edk2-devel] [PATCH 2/2] OvmfPkg/Tcg2ConfigPei: restrict BaseLib class dependency to IA32 and X64 Date: Wed, 3 Jun 2020 19:04:13 +0200 Message-Id: <20200603170413.23936-3-lersek@redhat.com> In-Reply-To: <20200603170413.23936-1-lersek@redhat.com> References: <20200603170413.23936-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,lersek@redhat.com X-Gm-Message-State: NObpPIVWfYDPLpWPLXph7NLYx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1591203876; bh=fQNr9fV/NesB9Qw5qQIAdnX3+/Aj/z89OWiYB7bLNPA=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=Yn1IsSpG+6u6AZVfCOzfUKNbigQeQe7EZ8B2j7x8zBUdThiYLvxijGeim8NIKyQFNtq kTsMxi3xI9QuGXUSYcPYDVi5BdZX0K9fgt65eAhhCtOidniacoJ5gTK0XcGAOIRSJmK3s Oo+HycyWV9CjcvWGqdslMPi94aPff0pBCJ4= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" BaseLib interfaces (namely, SwapBytesXx()) are only used in "Tpm12Support.c", which is IA32/X64-only. Therefore the BaseLib class dependency should also be restricted to IA32 & X64, in the INF file. The "#include " directive is already present in "Tpm12Support.c" only. (The BaseLib dependency should have been restricted to IA32 and X64 together with the Tpm12DeviceLib dependency, as part of commit 74f90d38c446, "OvmfPkg/Tcg2ConfigPei: skip TPM-1.2 detection when building for ARM/AARCH64", 2020-05-21.) This is a trivial cleanup; functionally a no-op. Cc: Ard Biesheuvel Cc: Jordan Justen Cc: Marc-Andr=C3=A9 Lureau Cc: Philippe Mathieu-Daud=C3=A9 Cc: Stefan Berger Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2752 Signed-off-by: Laszlo Ersek Reviewed-by: Ard Biesheuvel Reviewed-by: Philippe Mathieu-Daude --- OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf b/OvmfPkg/Tcg/Tcg2Con= fig/Tcg2ConfigPei.inf index 55c20db963e8..6776ec931ce0 100644 --- a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf +++ b/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf @@ -37,12 +37,12 @@ [Packages] =20 [LibraryClasses] PeimEntryPoint - BaseLib DebugLib PeiServicesLib Tpm2DeviceLib =20 [LibraryClasses.IA32, LibraryClasses.X64] + BaseLib Tpm12DeviceLib =20 [Guids] --=20 2.19.1.3.g30247aa5d201 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#60688): https://edk2.groups.io/g/devel/message/60688 Mute This Topic: https://groups.io/mt/74654144/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-