[PULL v2 00/10] Merge TPM 2020/03/04

Stefan Berger posted 10 patches 5 years, 8 months ago
Test docker-mingw@fedora passed
Test docker-quick@centos7 passed
Test checkpatch passed
Test FreeBSD passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20200305193855.278878-1-stefanb@linux.vnet.ibm.com
Maintainers: Eduardo Habkost <ehabkost@redhat.com>, Stefan Berger <stefanb@linux.ibm.com>, "Michael S. Tsirkin" <mst@redhat.com>, Thomas Huth <thuth@redhat.com>, Richard Henderson <rth@twiddle.net>, Igor Mammedov <imammedo@redhat.com>, Laurent Vivier <lvivier@redhat.com>, Peter Maydell <peter.maydell@linaro.org>, Paolo Bonzini <pbonzini@redhat.com>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
default-configs/i386-softmmu.mak        |   2 +-
docs/specs/tpm.rst                      |  25 +-
hw/arm/Kconfig                          |   1 +
hw/arm/sysbus-fdt.c                     |  33 ++
hw/arm/virt.c                           |   7 +
hw/i386/Kconfig                         |   2 +-
hw/i386/acpi-build.c                    |   6 +-
hw/tpm/Kconfig                          |  12 +-
hw/tpm/Makefile.objs                    |   4 +-
hw/tpm/tpm_tis.h                        |  91 +++++
hw/tpm/{tpm_tis.c => tpm_tis_common.c}  | 181 +---------
hw/tpm/tpm_tis_isa.c                    | 170 +++++++++
hw/tpm/tpm_tis_sysbus.c                 | 159 +++++++++
include/sysemu/tpm.h                    |   7 +-
tests/qtest/Makefile.include            |  11 +-
tests/qtest/tpm-crb-swtpm-test.c        |   9 +-
tests/qtest/tpm-crb-test.c              |   3 +
tests/qtest/tpm-tests.c                 |  10 +-
tests/qtest/tpm-tests.h                 |   5 +-
tests/qtest/tpm-tis-device-swtpm-test.c |  76 ++++
tests/qtest/tpm-tis-device-test.c       |  87 +++++
tests/qtest/tpm-tis-swtpm-test.c        |   8 +-
tests/qtest/tpm-tis-test.c              | 414 +---------------------
tests/qtest/tpm-tis-util.c              | 451 ++++++++++++++++++++++++
tests/qtest/tpm-tis-util.h              |  23 ++
tests/qtest/tpm-util.c                  |  11 +-
tests/qtest/tpm-util.h                  |   8 +-
27 files changed, 1207 insertions(+), 609 deletions(-)
create mode 100644 hw/tpm/tpm_tis.h
rename hw/tpm/{tpm_tis.c => tpm_tis_common.c} (85%)
create mode 100644 hw/tpm/tpm_tis_isa.c
create mode 100644 hw/tpm/tpm_tis_sysbus.c
create mode 100644 tests/qtest/tpm-tis-device-swtpm-test.c
create mode 100644 tests/qtest/tpm-tis-device-test.c
create mode 100644 tests/qtest/tpm-tis-util.c
create mode 100644 tests/qtest/tpm-tis-util.h
[PULL v2 00/10] Merge TPM 2020/03/04
Posted by Stefan Berger 5 years, 8 months ago
This series of patches adds support for TPM on ARM.
This PR is based on v5 of Eric's series.

Regards,
    Stefan

The following changes since commit af4378c39e54705d9b585089de80aae9526ac7e7:

  Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2020-03-05' into staging (2020-03-05 15:18:19 +0000)

are available in the Git repository at:

  git://github.com/stefanberger/qemu-tpm.git tags/pull-tpm-2020-03-04-2

for you to fetch changes up to fe985ed6837ac6169ab9673547115df2897bcf6d:

  test: tpm-tis: Add Sysbus TPM-TIS device test (2020-03-05 12:18:47 -0500)

----------------------------------------------------------------

Eric Auger (10):
  tpm: rename TPM_TIS into TPM_TIS_ISA
  tpm: Use TPMState as a common struct
  tpm: Separate tpm_tis common functions from isa code
  tpm: Separate TPM_TIS and TPM_TIS_ISA configs
  tpm: Add the SysBus TPM TIS device
  hw/arm/virt: vTPM support
  docs/specs/tpm: Document TPM_TIS sysbus device for ARM
  test: tpm: pass optional machine options to swtpm test functions
  test: tpm-tis: Get prepared to share tests between ISA and sysbus
    devices
  test: tpm-tis: Add Sysbus TPM-TIS device test

 default-configs/i386-softmmu.mak        |   2 +-
 docs/specs/tpm.rst                      |  25 +-
 hw/arm/Kconfig                          |   1 +
 hw/arm/sysbus-fdt.c                     |  33 ++
 hw/arm/virt.c                           |   7 +
 hw/i386/Kconfig                         |   2 +-
 hw/i386/acpi-build.c                    |   6 +-
 hw/tpm/Kconfig                          |  12 +-
 hw/tpm/Makefile.objs                    |   4 +-
 hw/tpm/tpm_tis.h                        |  91 +++++
 hw/tpm/{tpm_tis.c => tpm_tis_common.c}  | 181 +---------
 hw/tpm/tpm_tis_isa.c                    | 170 +++++++++
 hw/tpm/tpm_tis_sysbus.c                 | 159 +++++++++
 include/sysemu/tpm.h                    |   7 +-
 tests/qtest/Makefile.include            |  11 +-
 tests/qtest/tpm-crb-swtpm-test.c        |   9 +-
 tests/qtest/tpm-crb-test.c              |   3 +
 tests/qtest/tpm-tests.c                 |  10 +-
 tests/qtest/tpm-tests.h                 |   5 +-
 tests/qtest/tpm-tis-device-swtpm-test.c |  76 ++++
 tests/qtest/tpm-tis-device-test.c       |  87 +++++
 tests/qtest/tpm-tis-swtpm-test.c        |   8 +-
 tests/qtest/tpm-tis-test.c              | 414 +---------------------
 tests/qtest/tpm-tis-util.c              | 451 ++++++++++++++++++++++++
 tests/qtest/tpm-tis-util.h              |  23 ++
 tests/qtest/tpm-util.c                  |  11 +-
 tests/qtest/tpm-util.h                  |   8 +-
 27 files changed, 1207 insertions(+), 609 deletions(-)
 create mode 100644 hw/tpm/tpm_tis.h
 rename hw/tpm/{tpm_tis.c => tpm_tis_common.c} (85%)
 create mode 100644 hw/tpm/tpm_tis_isa.c
 create mode 100644 hw/tpm/tpm_tis_sysbus.c
 create mode 100644 tests/qtest/tpm-tis-device-swtpm-test.c
 create mode 100644 tests/qtest/tpm-tis-device-test.c
 create mode 100644 tests/qtest/tpm-tis-util.c
 create mode 100644 tests/qtest/tpm-tis-util.h

-- 
2.24.1


Re: [PULL v2 00/10] Merge TPM 2020/03/04
Posted by Peter Maydell 5 years, 8 months ago
On Thu, 5 Mar 2020 at 19:38, Stefan Berger <stefanb@linux.vnet.ibm.com> wrote:
>
> This series of patches adds support for TPM on ARM.
> This PR is based on v5 of Eric's series.
>
> Regards,
>     Stefan
>
> The following changes since commit af4378c39e54705d9b585089de80aae9526ac7e7:
>
>   Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2020-03-05' into staging (2020-03-05 15:18:19 +0000)
>
> are available in the Git repository at:
>
>   git://github.com/stefanberger/qemu-tpm.git tags/pull-tpm-2020-03-04-2
>
> for you to fetch changes up to fe985ed6837ac6169ab9673547115df2897bcf6d:
>
>   test: tpm-tis: Add Sysbus TPM-TIS device test (2020-03-05 12:18:47 -0500)
>
> ----------------------------------------------------------------
>
> Eric Auger (10):
>   tpm: rename TPM_TIS into TPM_TIS_ISA
>   tpm: Use TPMState as a common struct
>   tpm: Separate tpm_tis common functions from isa code
>   tpm: Separate TPM_TIS and TPM_TIS_ISA configs
>   tpm: Add the SysBus TPM TIS device
>   hw/arm/virt: vTPM support
>   docs/specs/tpm: Document TPM_TIS sysbus device for ARM
>   test: tpm: pass optional machine options to swtpm test functions
>   test: tpm-tis: Get prepared to share tests between ISA and sysbus
>     devices
>   test: tpm-tis: Add Sysbus TPM-TIS device test
>


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/5.0
for any user-visible changes.

-- PMM