From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.120]) by mx.groups.io with SMTP id smtpd.web12.4671.1590064031222854391 for ; Thu, 21 May 2020 05:27:12 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=I52egorc; spf=pass (domain: redhat.com, ip: 205.139.110.120, mailfrom: lersek@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590064030; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vUTXXr49RvY24FeueT253HsSke2CPqnnpIzR/6l5Mbc=; b=I52egorc9ApGAMb8y7dsrG4s1kOgyUUe8g6X4Ord3MAM2wI90R7Ry3b5nQQNcbvU3e4jXA uY2pTnpyqVItFWw2R6OY0PJZT6DAwqaSGmXpbWEIyP8OQhjvBJQH7pB6Xv7WzUErwaWr56 60sZzGIOrXXQQSreFaxIzFmKc3Nqixg= 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-62-LLbUKBl3Ni-VUBwHJm0V9A-1; Thu, 21 May 2020 08:27:04 -0400 X-MC-Unique: LLbUKBl3Ni-VUBwHJm0V9A-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 93E06EC1A1; Thu, 21 May 2020 12:27:03 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-113-225.ams2.redhat.com [10.36.113.225]) by smtp.corp.redhat.com (Postfix) with ESMTP id 245F56EA37; Thu, 21 May 2020 12:26:55 +0000 (UTC) Subject: Re: [edk2-devel] [PATCH 0/3] OvmfPkg/Tcg2ConfigPei: fix ARM/AARCH64 build failure From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Ard Biesheuvel , Eric Auger , Jordan Justen , =?UTF-8?Q?Marc-Andr=c3=a9_Lureau?= , =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , Simon Hardy , Stefan Berger Reply-To: devel@edk2.groups.io, lersek@redhat.com References: <20200520225841.17793-1-lersek@redhat.com> Message-ID: <508a81c4-629b-d317-ad23-36b02a012a15@redhat.com> Date: Thu, 21 May 2020 14:26:55 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20200520225841.17793-1-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit On 05/21/20 00:58, Laszlo Ersek wrote: > Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2728 > Repo: https://pagure.io/lersek/edk2.git > Branch: restrict_tpm12_to_x86_bz_2728 > > Another regression fix for edk2-stable202005. > > End of February 2020, Ard and Marc-André worked on two TPM-related > features in parallel. Respectively: > > - [edk2-devel] [PATCH v4 00/11] > ArmVirtPkg: implement measured boot for ArmVirtQemu > > http://mid.mail-archive.com/20200227144056.56988-1-ard.biesheuvel@linaro.org > https://edk2.groups.io/g/devel/message/55004 > > - [edk2-devel] [PATCH v4 0/5] > Ovmf: enable TPM 1.2 > > http://mid.mail-archive.com/20200226152433.1295789-1-marcandre.lureau@redhat.com > https://edk2.groups.io/g/devel/message/54894 > > Both series were merged tightly one after the other. There was no merge > conflict, and standing alone (without rebasing one on the other), each > series was self-contained and correct. Their combination however led to > an ArmVirtQemu build regression. There never was an intent to support > TPM-1.2 in ArmVirtQemu, but the TPM-1.2 series for OVMF kind of made > that "mandatory". > > Worse, the build regression has remained hidden for 2+ months because > (a) I didn't expect Marc-André's series to affect any ArmVirtPkg > platform, (b) my ArmVirtQemu build script did not set TPM2_ENABLE. > > This series fixes the build regression, and intends no functional > changes at all. > > Functional regression-testing would be appreciated: > > - from Simon regarding their TPM-1.2 passthrough use case, > > - from Marc-André regarding vTPM-2.0 on X64, > > - from Eric regarding vTPM-2.0 on AARCH64. > > This is a regression fix, therefore it is eligible for merging during > the edk2-stable202005 Hard Feature Freeze too > . > > If you plan to regression-test this series, then please say so soon, > otherwise I wouldn't like to wait for long -- assuming an R-b from Ard > or Jordan -- even without Tested-by's. > > In the future we should likely set some "-D" flags somewhere under > "ArmVirtPkg/PlatformCI/" (so that our CI coverage grow). The best I can > personally do about that is maybe file a BZ?... > > Cc: Ard Biesheuvel > Cc: Eric Auger > Cc: Jordan Justen > Cc: Marc-André Lureau > Cc: Philippe Mathieu-Daudé > Cc: Simon Hardy > Cc: Stefan Berger > > Thanks, > Laszlo > > Laszlo Ersek (3): > OvmfPkg/Tcg2ConfigPei: clean up some lib class dependencies > OvmfPkg/Tcg2ConfigPei: factor out InternalTpm12Detect() > OvmfPkg/Tcg2ConfigPei: skip TPM-1.2 detection when building for > ARM/AARCH64 > > OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf | 13 +++- > OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c | 46 +----------- > OvmfPkg/Tcg/Tcg2Config/Tpm12Support.c | 79 ++++++++++++++++++++ > OvmfPkg/Tcg/Tcg2Config/Tpm12Support.h | 34 +++++++++ > OvmfPkg/Tcg/Tcg2Config/Tpm12SupportNull.c | 25 +++++++ > 5 files changed, 153 insertions(+), 44 deletions(-) > create mode 100644 OvmfPkg/Tcg/Tcg2Config/Tpm12Support.c > create mode 100644 OvmfPkg/Tcg/Tcg2Config/Tpm12Support.h > create mode 100644 OvmfPkg/Tcg/Tcg2Config/Tpm12SupportNull.c > Merged in commit range 3f89db869028..74f90d38c446, via . Thanks! Laszlo