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.3533.1590059242001323074 for ; Thu, 21 May 2020 04:07:22 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=biy3lBQJ; 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=1590059241; 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=n/eJDOUg2W6HRgOEvP2/z7LhAeC6DPPgBGomFWMF7mg=; b=biy3lBQJ5B0zoW8D4Uo5t97E10LSXJFMsunMLt3wZEzZI2X4kurvMzkkmoBGXRVaZTUEb2 Y0dWFsTvW3NvgmNxuT29yL8u2QUuYyIYZOE3A6ql6WbaazLIUue+ywjvUJMmEQ6xhVtjEZ 8GreGK4DZwI3uwSDzd0bjJVmLQ8CWp0= 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-146-GxJbL_tJNPqWWCWh-cKQ-A-1; Thu, 21 May 2020 07:07:13 -0400 X-MC-Unique: GxJbL_tJNPqWWCWh-cKQ-A-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5EABC108BD09; Thu, 21 May 2020 11:07:12 +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 A3A895C1B0; Thu, 21 May 2020 11:07:03 +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> <3c755f4a-b436-95fa-1697-7a054387b631@redhat.com> <0f7976cb-1138-cdeb-aef2-abc13441a1e7@redhat.com> Message-ID: <3d3a2837-fd07-c844-d4ba-933589a330a5@redhat.com> Date: Thu, 21 May 2020 13:07:02 +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: <0f7976cb-1138-cdeb-aef2-abc13441a1e7@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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 11:12, Laszlo Ersek wrote: > On 05/21/20 10:26, Laszlo Ersek wrote: >> 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 >>> >> >> It seems like noone has started reviewing / testing yet. That's good: >> >> Nacked-by: Laszlo Ersek >> >> I'll send a v2 with the following changes: >> >> - the first patch will also clean up some comments that are now stale >> (after the TPM-1.2 addition) >> >> - the last patch will restrict the BaseLib dependency as well to IA32/X64 > > I'm rescinding my self-NAK in light of Ard's Tested-by; the latter is > something I won't waste. > > The above-listed v2 updates can perfectly well wait until after the > stable tag. Right; I'm going to merge this series soon, with the R-b and T-b from Ard picked up. I've learned that: - Simon and Marc-André are both out of office at this time (auto-reply from Simon, independent message regarding Marc-André), - Ard covered the testing on AARCH64 (thanks again!), so no need to additionally burden Eric with that. I've now filed the followup BZ (for after the edk2-stable202005 tag, and dependent on TianoCore#2728 / this series): https://bugzilla.tianocore.org/show_bug.cgi?id=2752 Thanks! Laszlo