[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] 43bc7f: tpm: rename TPM_TIS into TPM_TIS_ISA
|
From: |
Peter Maydell |
|
Subject: |
[Qemu-commits] [qemu/qemu] 43bc7f: tpm: rename TPM_TIS into TPM_TIS_ISA |
|
Date: |
Thu, 05 Mar 2020 13:00:14 -0800 |
Branch: refs/heads/master
Home: https://github.com/qemu/qemu
Commit: 43bc7f84e14083eda3959127a2346c0f7e31a7ae
https://github.com/qemu/qemu/commit/43bc7f84e14083eda3959127a2346c0f7e31a7ae
Author: Eric Auger <address@hidden>
Date: 2020-03-05 (Thu, 05 Mar 2020)
Changed paths:
M hw/i386/acpi-build.c
M hw/tpm/tpm_tis.c
M include/sysemu/tpm.h
Log Message:
-----------
tpm: rename TPM_TIS into TPM_TIS_ISA
As we plan to introduce a sysbus TPM_TIS, let's rename
TPM_TIS into TPM_TIS_ISA.
Signed-off-by: Eric Auger <address@hidden>
Reviewed-by: Stefan Berger <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Ard Biesheuvel <address@hidden>
Acked-by: Ard Biesheuvel <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Berger <address@hidden>
Commit: ca75c421731d59b4a4b64d094cf2c747896c6922
https://github.com/qemu/qemu/commit/ca75c421731d59b4a4b64d094cf2c747896c6922
Author: Eric Auger <address@hidden>
Date: 2020-03-05 (Thu, 05 Mar 2020)
Changed paths:
M hw/tpm/tpm_tis.c
Log Message:
-----------
tpm: Use TPMState as a common struct
As we plan to introduce a SysBus TPM TIS device, let's
make the TPMState a common struct usable by both the
ISADevice and the SysBusDevice. TPMStateISA embeds the
struct and inherits from the ISADevice.
The prototype of functions bound to be used by both
the ISA and SysBus devices is changed to take TPMState
handle.
A bunch of structs also are renamed to be specialized
for the ISA device. Besides those transformations, no
functional change is expected.
Signed-off-by: Eric Auger <address@hidden>
Reviewed-by: Stefan Berger <address@hidden>
Tested-by: Ard Biesheuvel <address@hidden>
Acked-by: Ard Biesheuvel <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Berger <address@hidden>
Commit: ac90053dccea841298eee0133ddbcfd2be017c4b
https://github.com/qemu/qemu/commit/ac90053dccea841298eee0133ddbcfd2be017c4b
Author: Eric Auger <address@hidden>
Date: 2020-03-05 (Thu, 05 Mar 2020)
Changed paths:
M hw/tpm/Makefile.objs
R hw/tpm/tpm_tis.c
A hw/tpm/tpm_tis.h
A hw/tpm/tpm_tis_common.c
A hw/tpm/tpm_tis_isa.c
Log Message:
-----------
tpm: Separate tpm_tis common functions from isa code
Move the device agnostic code into tpm_tis_common.c and
put the ISA device specific code into tpm_tis_isa.c
Signed-off-by: Eric Auger <address@hidden>
Reviewed-by: Stefan Berger <address@hidden>
Tested-by: Ard Biesheuvel <address@hidden>
Acked-by: Ard Biesheuvel <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Berger <address@hidden>
Commit: 2e8f7675b59f9cf448ff3cf2ec1671350ad60a67
https://github.com/qemu/qemu/commit/2e8f7675b59f9cf448ff3cf2ec1671350ad60a67
Author: Eric Auger <address@hidden>
Date: 2020-03-05 (Thu, 05 Mar 2020)
Changed paths:
M default-configs/i386-softmmu.mak
M hw/i386/Kconfig
M hw/tpm/Kconfig
M hw/tpm/Makefile.objs
M tests/qtest/Makefile.include
Log Message:
-----------
tpm: Separate TPM_TIS and TPM_TIS_ISA configs
Let's separate the compilation of tpm_tis_common.c from
the compilation of tpm_tis_isa.c
The common part will be also compiled along with the
tpm_tis_sysbus device.
Signed-off-by: Eric Auger <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Ard Biesheuvel <address@hidden>
Acked-by: Ard Biesheuvel <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Berger <address@hidden>
Commit: 229de57ac50a1677879f38b98243b2d6d5e2c11b
https://github.com/qemu/qemu/commit/229de57ac50a1677879f38b98243b2d6d5e2c11b
Author: Eric Auger <address@hidden>
Date: 2020-03-05 (Thu, 05 Mar 2020)
Changed paths:
M hw/tpm/Kconfig
M hw/tpm/Makefile.objs
A hw/tpm/tpm_tis_sysbus.c
M include/sysemu/tpm.h
Log Message:
-----------
tpm: Add the SysBus TPM TIS device
Introduce the tpm-tis-device which is a sysbus device
and is bound to be used on ARM.
Signed-off-by: Eric Auger <address@hidden>
Reviewed-by: Stefan Berger <address@hidden>
Tested-by: Ard Biesheuvel <address@hidden>
Acked-by: Ard Biesheuvel <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Berger <address@hidden>
Commit: c294ac327ca99342b90bd3a83d2cef9b447afaa7
https://github.com/qemu/qemu/commit/c294ac327ca99342b90bd3a83d2cef9b447afaa7
Author: Eric Auger <address@hidden>
Date: 2020-03-05 (Thu, 05 Mar 2020)
Changed paths:
M hw/arm/Kconfig
M hw/arm/sysbus-fdt.c
M hw/arm/virt.c
Log Message:
-----------
hw/arm/virt: vTPM support
Let the TPM TIS SYSBUS device be dynamically instantiable
in ARM virt. A device tree node is dynamically created
(TPM via MMIO).
The TPM Physical Presence interface (PPI) is not supported.
To run with the swtmp TPM emulator, the qemu command line must
be augmented with:
-chardev socket,id=chrtpm,path=swtpm-sock \
-tpmdev emulator,id=tpm0,chardev=chrtpm \
-device tpm-tis-device,tpmdev=tpm0 \
swtpm/libtpms command line example:
swtpm socket --tpm2 -t -d --tpmstate dir=/tmp/tpm \
--ctrl type=unixio,path=swtpm-sock
Signed-off-by: Eric Auger <address@hidden>
Reviewed-by: Stefan Berger <address@hidden>
Tested-by: Ard Biesheuvel <address@hidden>
Acked-by: Ard Biesheuvel <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Berger <address@hidden>
Commit: fcaa204194e15ba24cd53087dd616aabbc29e64f
https://github.com/qemu/qemu/commit/fcaa204194e15ba24cd53087dd616aabbc29e64f
Author: Eric Auger <address@hidden>
Date: 2020-03-05 (Thu, 05 Mar 2020)
Changed paths:
M docs/specs/tpm.rst
Log Message:
-----------
docs/specs/tpm: Document TPM_TIS sysbus device for ARM
Update the documentation with recent changes related to the
sysbus TPM_TIS device addition and add the command line
to be used with arm VIRT.
Signed-off-by: Eric Auger <address@hidden>
Reviewed-by: Stefan Berger <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Berger <address@hidden>
Commit: 551cabdfa9acaf6bb245a5c01d3fa4a15fc714de
https://github.com/qemu/qemu/commit/551cabdfa9acaf6bb245a5c01d3fa4a15fc714de
Author: Eric Auger <address@hidden>
Date: 2020-03-05 (Thu, 05 Mar 2020)
Changed paths:
M tests/qtest/tpm-crb-swtpm-test.c
M tests/qtest/tpm-tests.c
M tests/qtest/tpm-tests.h
M tests/qtest/tpm-tis-swtpm-test.c
M tests/qtest/tpm-util.c
M tests/qtest/tpm-util.h
Log Message:
-----------
test: tpm: pass optional machine options to swtpm test functions
We plan to use swtpm test functions on ARM for testing the
sysbus TPM-TIS device. However on ARM there is no default machine
type. So we need to explictly pass some machine options on startup.
Let's allow this by adding a new parameter to both swtpm test
functions and update all call sites.
Signed-off-by: Eric Auger <address@hidden>
Reviewed-by: Stefan Berger <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Berger <address@hidden>
Commit: 5166c32617065a66e3f95e49381f15bf29ce6799
https://github.com/qemu/qemu/commit/5166c32617065a66e3f95e49381f15bf29ce6799
Author: Eric Auger <address@hidden>
Date: 2020-03-05 (Thu, 05 Mar 2020)
Changed paths:
M tests/qtest/Makefile.include
M tests/qtest/tpm-crb-swtpm-test.c
M tests/qtest/tpm-crb-test.c
M tests/qtest/tpm-tis-swtpm-test.c
M tests/qtest/tpm-tis-test.c
A tests/qtest/tpm-tis-util.c
A tests/qtest/tpm-tis-util.h
M tests/qtest/tpm-util.c
M tests/qtest/tpm-util.h
Log Message:
-----------
test: tpm-tis: Get prepared to share tests between ISA and sysbus devices
ISA and sysbus TPM-TIS devices will share their tests. Only
the main() will change (instantiation option is different).
Also the base address of the TPM-TIS device is going to be
different. on x86 it is located at 0xFED40000 while on ARM
it can be located at any location, discovered through the
device tree description.
So we put shared test functions in a new object module.
Each test needs to set tpm_tis_base_addr global variable.
Also take benefit of this move to fix "block comments using
a leading */ on a separate line" checkpatch warnings.
Signed-off-by: Eric Auger <address@hidden>
Reviewed-by: Stefan Berger <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Berger <address@hidden>
Commit: fe985ed6837ac6169ab9673547115df2897bcf6d
https://github.com/qemu/qemu/commit/fe985ed6837ac6169ab9673547115df2897bcf6d
Author: Eric Auger <address@hidden>
Date: 2020-03-05 (Thu, 05 Mar 2020)
Changed paths:
M tests/qtest/Makefile.include
A tests/qtest/tpm-tis-device-swtpm-test.c
A tests/qtest/tpm-tis-device-test.c
Log Message:
-----------
test: tpm-tis: Add Sysbus TPM-TIS device test
The tests themselves are the same as the ISA device ones.
Only the main() changes as the "tpm-tis-device" device gets
instantiated. Also the base address of the device is not
0xFED40000 anymore but matches the base address of the
ARM virt platform bus.
Signed-off-by: Eric Auger <address@hidden>
Reviewed-by: Stefan Berger <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Berger <address@hidden>
Commit: ef9f8fcbec6276414921dcd042575129a6331a2d
https://github.com/qemu/qemu/commit/ef9f8fcbec6276414921dcd042575129a6331a2d
Author: Peter Maydell <address@hidden>
Date: 2020-03-05 (Thu, 05 Mar 2020)
Changed paths:
M default-configs/i386-softmmu.mak
M docs/specs/tpm.rst
M hw/arm/Kconfig
M hw/arm/sysbus-fdt.c
M hw/arm/virt.c
M hw/i386/Kconfig
M hw/i386/acpi-build.c
M hw/tpm/Kconfig
M hw/tpm/Makefile.objs
R hw/tpm/tpm_tis.c
A hw/tpm/tpm_tis.h
A hw/tpm/tpm_tis_common.c
A hw/tpm/tpm_tis_isa.c
A hw/tpm/tpm_tis_sysbus.c
M include/sysemu/tpm.h
M tests/qtest/Makefile.include
M tests/qtest/tpm-crb-swtpm-test.c
M tests/qtest/tpm-crb-test.c
M tests/qtest/tpm-tests.c
M tests/qtest/tpm-tests.h
A tests/qtest/tpm-tis-device-swtpm-test.c
A tests/qtest/tpm-tis-device-test.c
M tests/qtest/tpm-tis-swtpm-test.c
M tests/qtest/tpm-tis-test.c
A tests/qtest/tpm-tis-util.c
A tests/qtest/tpm-tis-util.h
M tests/qtest/tpm-util.c
M tests/qtest/tpm-util.h
Log Message:
-----------
Merge remote-tracking branch
'remotes/stefanberger/tags/pull-tpm-2020-03-04-2' into staging
Merge tpm 2020/03/04 v2
# gpg: Signature made Thu 05 Mar 2020 17:21:05 GMT
# gpg: using RSA key B818B9CADF9089C2D5CEC66B75AD65802A0B4211
# gpg: Good signature from "Stefan Berger <address@hidden>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: B818 B9CA DF90 89C2 D5CE C66B 75AD 6580 2A0B 4211
* remotes/stefanberger/tags/pull-tpm-2020-03-04-2:
test: tpm-tis: Add Sysbus TPM-TIS device test
test: tpm-tis: Get prepared to share tests between ISA and sysbus devices
test: tpm: pass optional machine options to swtpm test functions
docs/specs/tpm: Document TPM_TIS sysbus device for ARM
hw/arm/virt: vTPM support
tpm: Add the SysBus TPM TIS device
tpm: Separate TPM_TIS and TPM_TIS_ISA configs
tpm: Separate tpm_tis common functions from isa code
tpm: Use TPMState as a common struct
tpm: rename TPM_TIS into TPM_TIS_ISA
Signed-off-by: Peter Maydell <address@hidden>
Compare: https://github.com/qemu/qemu/compare/55afdac3b29e...ef9f8fcbec62
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-commits] [qemu/qemu] 43bc7f: tpm: rename TPM_TIS into TPM_TIS_ISA,
Peter Maydell <=