[edk2-devel] [PATCH v4 0/5] OvmfPkg: rework TPM configuration.

Gerd Hoffmann posted 5 patches 2 years, 4 months ago
Failed in applying to current master (apply log)
OvmfPkg/OvmfTpmComponentsDxe.dsc.inc          | 28 ++++++
OvmfPkg/OvmfTpmComponentsPei.dsc.inc          | 26 ++++++
OvmfPkg/OvmfTpmDefines.dsc.inc                |  8 ++
OvmfPkg/OvmfTpmLibs.dsc.inc                   | 16 ++++
OvmfPkg/OvmfTpmLibsDxe.dsc.inc                | 10 +++
OvmfPkg/OvmfTpmLibsPeim.dsc.inc               | 11 +++
OvmfPkg/OvmfTpmPcds.dsc.inc                   |  7 ++
OvmfPkg/OvmfTpmPcdsHii.dsc.inc                |  8 ++
OvmfPkg/OvmfTpmSecurityStub.dsc.inc           | 10 +++
OvmfPkg/AmdSev/AmdSevX64.dsc                  | 85 +++---------------
OvmfPkg/Microvm/MicrovmX64.dsc                |  2 -
OvmfPkg/OvmfPkgIa32.dsc                       | 88 +++----------------
OvmfPkg/OvmfPkgIa32X64.dsc                    | 85 +++---------------
OvmfPkg/OvmfPkgX64.dsc                        | 85 +++---------------
OvmfPkg/AmdSev/AmdSevX64.fdf                  | 17 +---
OvmfPkg/OvmfPkgIa32.fdf                       | 17 +---
OvmfPkg/OvmfPkgIa32X64.fdf                    | 17 +---
OvmfPkg/OvmfPkgX64.fdf                        | 17 +---
.../{Tcg2ConfigPei.inf => Tcg12ConfigPei.inf} | 11 +--
OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf      | 11 +--
OvmfPkg/OvmfTpmDxe.fdf.inc                    | 12 +++
OvmfPkg/OvmfTpmPei.fdf.inc                    | 15 ++++
.../.azurepipelines/Ubuntu-GCC5.yml           |  6 +-
.../.azurepipelines/Windows-VS2019.yml        |  6 +-
OvmfPkg/PlatformCI/ReadMe.md                  |  2 +-
25 files changed, 213 insertions(+), 387 deletions(-)
create mode 100644 OvmfPkg/OvmfTpmComponentsDxe.dsc.inc
create mode 100644 OvmfPkg/OvmfTpmComponentsPei.dsc.inc
create mode 100644 OvmfPkg/OvmfTpmDefines.dsc.inc
create mode 100644 OvmfPkg/OvmfTpmLibs.dsc.inc
create mode 100644 OvmfPkg/OvmfTpmLibsDxe.dsc.inc
create mode 100644 OvmfPkg/OvmfTpmLibsPeim.dsc.inc
create mode 100644 OvmfPkg/OvmfTpmPcds.dsc.inc
create mode 100644 OvmfPkg/OvmfTpmPcdsHii.dsc.inc
create mode 100644 OvmfPkg/OvmfTpmSecurityStub.dsc.inc
copy OvmfPkg/Tcg/Tcg2Config/{Tcg2ConfigPei.inf => Tcg12ConfigPei.inf} (82%)
create mode 100644 OvmfPkg/OvmfTpmDxe.fdf.inc
create mode 100644 OvmfPkg/OvmfTpmPei.fdf.inc
[edk2-devel] [PATCH v4 0/5] OvmfPkg: rework TPM configuration.
Posted by Gerd Hoffmann 2 years, 4 months ago
Allows to enable/disable TPM 1.2 support in OVMF.
Allows to enable SHA-1 support for TPM hashing.

v4:
 - rebase to latest master.
v3:
 - drop config menu for tpm 1.2 (needs other fixes first)
 - update some places missed.
 - add microvm cleanup.
 - add review/test tags.
v2:
 - drop TPM_CONFIG_ENABLE config option.
 - don't add SHA1 config option.
 - add config menu for tpm 1.2

Gerd Hoffmann (5):
  OvmfPkg: remove unused TPM options from MicrovmX64.dsc
  OvmfPkg: move tcg configuration to dsc and fdf include files
  OvmfPkg: drop TPM_CONFIG_ENABLE
  OvmfPkg: create Tcg12ConfigPei.inf
  OvmfPkg: rework TPM configuration

 OvmfPkg/OvmfTpmComponentsDxe.dsc.inc          | 28 ++++++
 OvmfPkg/OvmfTpmComponentsPei.dsc.inc          | 26 ++++++
 OvmfPkg/OvmfTpmDefines.dsc.inc                |  8 ++
 OvmfPkg/OvmfTpmLibs.dsc.inc                   | 16 ++++
 OvmfPkg/OvmfTpmLibsDxe.dsc.inc                | 10 +++
 OvmfPkg/OvmfTpmLibsPeim.dsc.inc               | 11 +++
 OvmfPkg/OvmfTpmPcds.dsc.inc                   |  7 ++
 OvmfPkg/OvmfTpmPcdsHii.dsc.inc                |  8 ++
 OvmfPkg/OvmfTpmSecurityStub.dsc.inc           | 10 +++
 OvmfPkg/AmdSev/AmdSevX64.dsc                  | 85 +++---------------
 OvmfPkg/Microvm/MicrovmX64.dsc                |  2 -
 OvmfPkg/OvmfPkgIa32.dsc                       | 88 +++----------------
 OvmfPkg/OvmfPkgIa32X64.dsc                    | 85 +++---------------
 OvmfPkg/OvmfPkgX64.dsc                        | 85 +++---------------
 OvmfPkg/AmdSev/AmdSevX64.fdf                  | 17 +---
 OvmfPkg/OvmfPkgIa32.fdf                       | 17 +---
 OvmfPkg/OvmfPkgIa32X64.fdf                    | 17 +---
 OvmfPkg/OvmfPkgX64.fdf                        | 17 +---
 .../{Tcg2ConfigPei.inf => Tcg12ConfigPei.inf} | 11 +--
 OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf      | 11 +--
 OvmfPkg/OvmfTpmDxe.fdf.inc                    | 12 +++
 OvmfPkg/OvmfTpmPei.fdf.inc                    | 15 ++++
 .../.azurepipelines/Ubuntu-GCC5.yml           |  6 +-
 .../.azurepipelines/Windows-VS2019.yml        |  6 +-
 OvmfPkg/PlatformCI/ReadMe.md                  |  2 +-
 25 files changed, 213 insertions(+), 387 deletions(-)
 create mode 100644 OvmfPkg/OvmfTpmComponentsDxe.dsc.inc
 create mode 100644 OvmfPkg/OvmfTpmComponentsPei.dsc.inc
 create mode 100644 OvmfPkg/OvmfTpmDefines.dsc.inc
 create mode 100644 OvmfPkg/OvmfTpmLibs.dsc.inc
 create mode 100644 OvmfPkg/OvmfTpmLibsDxe.dsc.inc
 create mode 100644 OvmfPkg/OvmfTpmLibsPeim.dsc.inc
 create mode 100644 OvmfPkg/OvmfTpmPcds.dsc.inc
 create mode 100644 OvmfPkg/OvmfTpmPcdsHii.dsc.inc
 create mode 100644 OvmfPkg/OvmfTpmSecurityStub.dsc.inc
 copy OvmfPkg/Tcg/Tcg2Config/{Tcg2ConfigPei.inf => Tcg12ConfigPei.inf} (82%)
 create mode 100644 OvmfPkg/OvmfTpmDxe.fdf.inc
 create mode 100644 OvmfPkg/OvmfTpmPei.fdf.inc

-- 
2.33.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#84894): https://edk2.groups.io/g/devel/message/84894
Mute This Topic: https://groups.io/mt/87742048/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-


Re: [edk2-devel] [PATCH v4 0/5] OvmfPkg: rework TPM configuration.
Posted by Yao, Jiewen 2 years, 4 months ago
Acked-by: Jiewen Yao <Jiewen.yao@intel.com>

A quick question: Have you run run CI for this patch by yourself?

Thank you
Yao Jiewen

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Gerd
> Hoffmann
> Sent: Wednesday, December 15, 2021 7:39 PM
> To: devel@edk2.groups.io
> Cc: Tom Lendacky <thomas.lendacky@amd.com>; James Bottomley
> <jejb@linux.ibm.com>; Yao, Jiewen <jiewen.yao@intel.com>; Justen, Jordan L
> <jordan.l.justen@intel.com>; Xu, Min M <min.m.xu@intel.com>; Stefan Berger
> <stefanb@linux.ibm.com>; Philippe Mathieu-Daudé <philmd@redhat.com>;
> Pawel Polawski <ppolawsk@redhat.com>; Marc-André Lureau
> <marcandre.lureau@redhat.com>; Brijesh Singh <brijesh.singh@amd.com>;
> Gerd Hoffmann <kraxel@redhat.com>; Aktas, Erdem
> <erdemaktas@google.com>; Ard Biesheuvel <ardb+tianocore@kernel.org>
> Subject: [edk2-devel] [PATCH v4 0/5] OvmfPkg: rework TPM configuration.
> 
> Allows to enable/disable TPM 1.2 support in OVMF.
> Allows to enable SHA-1 support for TPM hashing.
> 
> v4:
>  - rebase to latest master.
> v3:
>  - drop config menu for tpm 1.2 (needs other fixes first)
>  - update some places missed.
>  - add microvm cleanup.
>  - add review/test tags.
> v2:
>  - drop TPM_CONFIG_ENABLE config option.
>  - don't add SHA1 config option.
>  - add config menu for tpm 1.2
> 
> Gerd Hoffmann (5):
>   OvmfPkg: remove unused TPM options from MicrovmX64.dsc
>   OvmfPkg: move tcg configuration to dsc and fdf include files
>   OvmfPkg: drop TPM_CONFIG_ENABLE
>   OvmfPkg: create Tcg12ConfigPei.inf
>   OvmfPkg: rework TPM configuration
> 
>  OvmfPkg/OvmfTpmComponentsDxe.dsc.inc          | 28 ++++++
>  OvmfPkg/OvmfTpmComponentsPei.dsc.inc          | 26 ++++++
>  OvmfPkg/OvmfTpmDefines.dsc.inc                |  8 ++
>  OvmfPkg/OvmfTpmLibs.dsc.inc                   | 16 ++++
>  OvmfPkg/OvmfTpmLibsDxe.dsc.inc                | 10 +++
>  OvmfPkg/OvmfTpmLibsPeim.dsc.inc               | 11 +++
>  OvmfPkg/OvmfTpmPcds.dsc.inc                   |  7 ++
>  OvmfPkg/OvmfTpmPcdsHii.dsc.inc                |  8 ++
>  OvmfPkg/OvmfTpmSecurityStub.dsc.inc           | 10 +++
>  OvmfPkg/AmdSev/AmdSevX64.dsc                  | 85 +++---------------
>  OvmfPkg/Microvm/MicrovmX64.dsc                |  2 -
>  OvmfPkg/OvmfPkgIa32.dsc                       | 88 +++----------------
>  OvmfPkg/OvmfPkgIa32X64.dsc                    | 85 +++---------------
>  OvmfPkg/OvmfPkgX64.dsc                        | 85 +++---------------
>  OvmfPkg/AmdSev/AmdSevX64.fdf                  | 17 +---
>  OvmfPkg/OvmfPkgIa32.fdf                       | 17 +---
>  OvmfPkg/OvmfPkgIa32X64.fdf                    | 17 +---
>  OvmfPkg/OvmfPkgX64.fdf                        | 17 +---
>  .../{Tcg2ConfigPei.inf => Tcg12ConfigPei.inf} | 11 +--
>  OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf      | 11 +--
>  OvmfPkg/OvmfTpmDxe.fdf.inc                    | 12 +++
>  OvmfPkg/OvmfTpmPei.fdf.inc                    | 15 ++++
>  .../.azurepipelines/Ubuntu-GCC5.yml           |  6 +-
>  .../.azurepipelines/Windows-VS2019.yml        |  6 +-
>  OvmfPkg/PlatformCI/ReadMe.md                  |  2 +-
>  25 files changed, 213 insertions(+), 387 deletions(-)
>  create mode 100644 OvmfPkg/OvmfTpmComponentsDxe.dsc.inc
>  create mode 100644 OvmfPkg/OvmfTpmComponentsPei.dsc.inc
>  create mode 100644 OvmfPkg/OvmfTpmDefines.dsc.inc
>  create mode 100644 OvmfPkg/OvmfTpmLibs.dsc.inc
>  create mode 100644 OvmfPkg/OvmfTpmLibsDxe.dsc.inc
>  create mode 100644 OvmfPkg/OvmfTpmLibsPeim.dsc.inc
>  create mode 100644 OvmfPkg/OvmfTpmPcds.dsc.inc
>  create mode 100644 OvmfPkg/OvmfTpmPcdsHii.dsc.inc
>  create mode 100644 OvmfPkg/OvmfTpmSecurityStub.dsc.inc
>  copy OvmfPkg/Tcg/Tcg2Config/{Tcg2ConfigPei.inf => Tcg12ConfigPei.inf} (82%)
>  create mode 100644 OvmfPkg/OvmfTpmDxe.fdf.inc
>  create mode 100644 OvmfPkg/OvmfTpmPei.fdf.inc
> 
> --
> 2.33.1
> 
> 
> 
> 
> 



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#84900): https://edk2.groups.io/g/devel/message/84900
Mute This Topic: https://groups.io/mt/87742048/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-


Re: [edk2-devel] [PATCH v4 0/5] OvmfPkg: rework TPM configuration.
Posted by Gerd Hoffmann 2 years, 4 months ago
On Wed, Dec 15, 2021 at 12:09:10PM +0000, Yao, Jiewen wrote:
> Acked-by: Jiewen Yao <Jiewen.yao@intel.com>
> 
> A quick question: Have you run run CI for this patch by yourself?

Yep, usually I open a draft pull request for the snake of running CI
(this one is #2099).

take care,
  Gerd



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#84961): https://edk2.groups.io/g/devel/message/84961
Mute This Topic: https://groups.io/mt/87742048/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-


Re: [edk2-devel] [PATCH v4 0/5] OvmfPkg: rework TPM configuration.
Posted by Yao, Jiewen 2 years, 4 months ago
Ah, got it. I am just wondering since I did not see new CI opened for this.

Anyway, good enough. Thank you very much to confirm that.

Thank you
Yao Jiewen

> -----Original Message-----
> From: kraxel@redhat.com <kraxel@redhat.com>
> Sent: Thursday, December 16, 2021 1:58 PM
> To: Yao, Jiewen <jiewen.yao@intel.com>
> Cc: devel@edk2.groups.io; Tom Lendacky <thomas.lendacky@amd.com>;
> James Bottomley <jejb@linux.ibm.com>; Justen, Jordan L
> <jordan.l.justen@intel.com>; Xu, Min M <min.m.xu@intel.com>; Stefan Berger
> <stefanb@linux.ibm.com>; Philippe Mathieu-Daudé <philmd@redhat.com>;
> Pawel Polawski <ppolawsk@redhat.com>; Marc-André Lureau
> <marcandre.lureau@redhat.com>; Brijesh Singh <brijesh.singh@amd.com>;
> Aktas, Erdem <erdemaktas@google.com>; Ard Biesheuvel
> <ardb+tianocore@kernel.org>
> Subject: Re: [edk2-devel] [PATCH v4 0/5] OvmfPkg: rework TPM configuration.
> 
> On Wed, Dec 15, 2021 at 12:09:10PM +0000, Yao, Jiewen wrote:
> > Acked-by: Jiewen Yao <Jiewen.yao@intel.com>
> >
> > A quick question: Have you run run CI for this patch by yourself?
> 
> Yep, usually I open a draft pull request for the snake of running CI
> (this one is #2099).
> 
> take care,
>   Gerd



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#84962): https://edk2.groups.io/g/devel/message/84962
Mute This Topic: https://groups.io/mt/87742048/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-


Re: [edk2-devel] [PATCH v4 0/5] OvmfPkg: rework TPM configuration.
Posted by Gerd Hoffmann 2 years, 4 months ago
  Hi,

> Ah, got it. I am just wondering since I did not see new CI opened for this.

Yes, it's an old branch and old pull request with
fresh updates pushed (which re-runs the CI).

take care,
  Gerd



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#84965): https://edk2.groups.io/g/devel/message/84965
Mute This Topic: https://groups.io/mt/87742048/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-