Skip to contentSkip to conversation

vTPM for aarch64

RFC Superseded Eric Auger 4 participants 30 messages Feb 14, 2020 – Feb 26, 2020

v2 of 5 Superseded Latest is v5 →

lore
Share & tools
lore

Eric Auger

author
#0 lore raw

v2 cover vTPM for aarch64

This series adds the capability to instantiate an MMIO TPM TIS in ARM virt.

The existing TPM TIS code is reshuffled into a generic part, the ISA device and the sysbus device. The last patch allows the instantiation of the TPM TIS sysbus device in ARM virt.

The series was tested with the swtpm/libtpms emulator. Automatic guest LUKS volume unlocking (tpm2) was successful. EDK2 support is under development [3]. Thanks to Ard for supporting me when setting up the test environment.

Best Regards

Eric

Testing:

mkdir /tmp/tpm
swtpm socket \
--tpm2 \
-t -d \
--tpmstate dir=/tmp/tpm \
--ctrl type=unixio,path=/tmp/swtpm-sock

qemu command line must be augmented with the following options:

-chardev socket,id=chrtpm,path=/tmp/swtpm-sock \
-tpmdev emulator,id=tpm0,chardev=chrtpm \
-device tpm-tis-device,tpmdev=tpm0 \

References:
[1] libtpms: https://github.com/stefanberger/libtpms/wiki
[2] swtpm: https://github.com/stefanberger/swtpm/wiki
[3] [PATCH 0/4] ArmVirtPkg: implement measured boot for ArmVirtQemu

This series can be found at:
https://github.com/eauger/qemu/tree/v4.2.0-tpm-rfc-v2

History:

RFC v1 -> RFC v2:
- restructure the existing code with common, ISA and sysbus part.
- both ARM and x86 integration were tested.
- acknowledgement: migration has not been tested

Eric Auger (6):
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

 default-configs/i386-softmmu.mak       |   2 +-
 hw/arm/Kconfig                         |   1 +
 hw/arm/sysbus-fdt.c                    |  36 +++++
 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           |   4 +-
 14 files changed, 502 insertions(+), 180 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
Signature · 1 line
2.20.1
author
#7 lore raw

RFC v2 2/6 tpm: Use TPMState as a common struct

As we plan to introdce 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.

---
 hw/tpm/tpm_tis.c | 146 +++++++++++++++++++++++++++++------------------
 1 file changed, 91 insertions(+), 55 deletions(-)
hw/tpm/tpm_tis.c +91 -55
index c609737272..fc6d7ca579 100644
@@ -65,7 +65,6 @@ typedef struct TPMLocality {
 } TPMLocality;
 
 typedef struct TPMState {
-    ISADevice busdev;
     MemoryRegion mmio;
 
     unsigned char buffer[TPM_TIS_BUFFER_MAX];
@@ -91,7 +90,15 @@ typedef struct TPMState {
     TPMPPI ppi;
 } TPMState;
 
-#define TPM(obj) OBJECT_CHECK(TPMState, (obj), TYPE_TPM_TIS_ISA)
+typedef struct TPMStateISA {
+    /*< private >*/
+    ISADevice parent_obj;
+
+    /*< public >*/
+    TPMState state; /* not a QOM object */
+} TPMStateISA;
+
+#define TPM_TIS_ISA(obj) OBJECT_CHECK(TPMStateISA, (obj), TYPE_TPM_TIS_ISA)
 
 #define DEBUG_TIS 0
 
@@ -281,9 +288,8 @@ static void tpm_tis_prep_abort(TPMState *s, uint8_t locty, uint8_t newlocty)
 /*
  * Callback from the TPM to indicate that the response was received.
  */
-static void tpm_tis_request_completed(TPMIf *ti, int ret)
+static void tpm_tis_request_completed(TPMState *s, int ret)
 {
-    TPMState *s = TPM(ti);
     uint8_t locty = s->cmd.locty;
     uint8_t l;
 
@@ -338,7 +344,7 @@ static uint32_t tpm_tis_data_read(TPMState *s, uint8_t locty)
 }
 
 #ifdef DEBUG_TIS
-static void tpm_tis_dump_state(void *opaque, hwaddr addr)
+static void tpm_tis_dump_state(TPMState *s, hwaddr addr)
 {
     static const unsigned regs[] = {
         TPM_TIS_REG_ACCESS,
@@ -353,7 +359,6 @@ static void tpm_tis_dump_state(void *opaque, hwaddr addr)
     int idx;
     uint8_t locty = tpm_tis_locality_from_addr(addr);
     hwaddr base = addr & ~0xfff;
-    TPMState *s = opaque;
 
     printf("tpm_tis: active locality      : %d\n"
            "tpm_tis: state of locality %d : %d\n"
@@ -363,7 +368,7 @@ static void tpm_tis_dump_state(void *opaque, hwaddr addr)
 
     for (idx = 0; regs[idx] != 0xfff; idx++) {
         printf("tpm_tis: 0x%04x : 0x%08x\n", regs[idx],
-               (int)tpm_tis_mmio_read(opaque, base + regs[idx], 4));
+               (int)tpm_tis_mmio_read(s, base + regs[idx], 4));
     }
 
     printf("tpm_tis: r/w offset    : %d\n"
@@ -488,7 +493,7 @@ static uint64_t tpm_tis_mmio_read(void *opaque, hwaddr addr,
         break;
 #ifdef DEBUG_TIS
     case TPM_TIS_REG_DEBUG:
-        tpm_tis_dump_state(opaque, addr);
+        tpm_tis_dump_state(s, addr);
         break;
 #endif
     }
@@ -835,10 +840,8 @@ static const MemoryRegionOps tpm_tis_memory_ops = {
 /*
  * Get the TPMVersion of the backend device being used
  */
-static enum TPMVersion tpm_tis_get_tpm_version(TPMIf *ti)
+static enum TPMVersion tpm_tis_get_tpm_version(TPMState *s)
 {
-    TPMState *s = TPM(ti);
-
     if (tpm_backend_had_startup_error(s->be_driver)) {
         return TPM_VERSION_UNSPEC;
     }
@@ -850,9 +853,8 @@ static enum TPMVersion tpm_tis_get_tpm_version(TPMIf *ti)
  * This function is called when the machine starts, resets or due to
  * S3 resume.
  */
-static void tpm_tis_reset(DeviceState *dev)
+static void tpm_tis_reset(TPMState *s)
 {
-    TPMState *s = TPM(dev);
     int c;
 
     s->be_tpm_version = tpm_backend_get_tpm_version(s->be_driver);
@@ -896,15 +898,14 @@ static void tpm_tis_reset(DeviceState *dev)
 
 /* persistent state handling */
 
-static int tpm_tis_pre_save(void *opaque)
+static int tpm_tis_pre_save(TPMState *s)
 {
-    TPMState *s = opaque;
     uint8_t locty = s->active_locty;
 
     trace_tpm_tis_pre_save(locty, s->rw_offset);
 
     if (DEBUG_TIS) {
-        tpm_tis_dump_state(opaque, 0);
+        tpm_tis_dump_state(s, 0);
     }
 
     /*
@@ -929,34 +930,78 @@ static const VMStateDescription vmstate_locty = {
     }
 };
 
-static const VMStateDescription vmstate_tpm_tis = {
+/* ISA */
+
+static int tpm_tis_pre_save_isa(void *opaque)
+{
+    TPMStateISA *isadev = opaque;
+
+    return tpm_tis_pre_save(&isadev->state);
+}
+
+static const VMStateDescription vmstate_tpm_tis_isa = {
     .name = "tpm-tis",
     .version_id = 0,
-    .pre_save  = tpm_tis_pre_save,
+    .pre_save  = tpm_tis_pre_save_isa,
     .fields = (VMStateField[]) {
-        VMSTATE_BUFFER(buffer, TPMState),
-        VMSTATE_UINT16(rw_offset, TPMState),
-        VMSTATE_UINT8(active_locty, TPMState),
-        VMSTATE_UINT8(aborting_locty, TPMState),
-        VMSTATE_UINT8(next_locty, TPMState),
+        VMSTATE_BUFFER(state.buffer, TPMStateISA),
+        VMSTATE_UINT16(state.rw_offset, TPMStateISA),
+        VMSTATE_UINT8(state.active_locty, TPMStateISA),
+        VMSTATE_UINT8(state.aborting_locty, TPMStateISA),
+        VMSTATE_UINT8(state.next_locty, TPMStateISA),
 
-        VMSTATE_STRUCT_ARRAY(loc, TPMState, TPM_TIS_NUM_LOCALITIES, 0,
+        VMSTATE_STRUCT_ARRAY(state.loc, TPMStateISA, TPM_TIS_NUM_LOCALITIES, 0,
                              vmstate_locty, TPMLocality),
 
         VMSTATE_END_OF_LIST()
     }
 };
 
-static Property tpm_tis_properties[] = {
-    DEFINE_PROP_UINT32("irq", TPMState, irq_num, TPM_TIS_IRQ),
-    DEFINE_PROP_TPMBE("tpmdev", TPMState, be_driver),
-    DEFINE_PROP_BOOL("ppi", TPMState, ppi_enabled, true),
+static void tpm_tis_isa_request_completed(TPMIf *ti, int ret)
+{
+    TPMStateISA *isadev = TPM_TIS_ISA(ti);
+    TPMState *s = &isadev->state;
+
+    tpm_tis_request_completed(s, ret);
+}
+
+static enum TPMVersion tpm_tis_isa_get_tpm_version(TPMIf *ti)
+{
+    TPMStateISA *isadev = TPM_TIS_ISA(ti);
+    TPMState *s = &isadev->state;
+
+    return tpm_tis_get_tpm_version(s);
+}
+
+static void tpm_tis_isa_reset(DeviceState *dev)
+{
+    TPMStateISA *isadev = TPM_TIS_ISA(dev);
+    TPMState *s = &isadev->state;
+
+    return tpm_tis_reset(s);
+}
+
+static Property tpm_tis_isa_properties[] = {
+    DEFINE_PROP_UINT32("irq", TPMStateISA, state.irq_num, TPM_TIS_IRQ),
+    DEFINE_PROP_TPMBE("tpmdev", TPMStateISA, state.be_driver),
+    DEFINE_PROP_BOOL("ppi", TPMStateISA, state.ppi_enabled, true),
     DEFINE_PROP_END_OF_LIST(),
 };
 
-static void tpm_tis_realizefn(DeviceState *dev, Error **errp)
+static void tpm_tis_isa_initfn(Object *obj)
 {
-    TPMState *s = TPM(dev);
+    TPMStateISA *isadev = TPM_TIS_ISA(obj);
+    TPMState *s = &isadev->state;
+
+    memory_region_init_io(&s->mmio, obj, &tpm_tis_memory_ops,
+                          s, "tpm-tis-mmio",
+                          TPM_TIS_NUM_LOCALITIES << TPM_TIS_LOCALITY_SHIFT);
+}
+
+static void tpm_tis_isa_realizefn(DeviceState *dev, Error **errp)
+{
+    TPMStateISA *isadev = TPM_TIS_ISA(dev);
+    TPMState *s = &isadev->state;
 
     if (!tpm_find()) {
         error_setg(errp, "at most one TPM device is permitted");
@@ -973,55 +1018,46 @@ static void tpm_tis_realizefn(DeviceState *dev, Error **errp)
         return;
     }
 
-    isa_init_irq(&s->busdev, &s->irq, s->irq_num);
+    isa_init_irq(ISA_DEVICE(dev), &s->irq, s->irq_num);
 
     memory_region_add_subregion(isa_address_space(ISA_DEVICE(dev)),
                                 TPM_TIS_ADDR_BASE, &s->mmio);
 
     if (s->ppi_enabled) {
         tpm_ppi_init(&s->ppi, isa_address_space(ISA_DEVICE(dev)),
-                     TPM_PPI_ADDR_BASE, OBJECT(s));
+                     TPM_PPI_ADDR_BASE, OBJECT(dev));
     }
 }
 
-static void tpm_tis_initfn(Object *obj)
-{
-    TPMState *s = TPM(obj);
-
-    memory_region_init_io(&s->mmio, OBJECT(s), &tpm_tis_memory_ops,
-                          s, "tpm-tis-mmio",
-                          TPM_TIS_NUM_LOCALITIES << TPM_TIS_LOCALITY_SHIFT);
-}
-
-static void tpm_tis_class_init(ObjectClass *klass, void *data)
+static void tpm_tis_isa_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
     TPMIfClass *tc = TPM_IF_CLASS(klass);
 
-    dc->realize = tpm_tis_realizefn;
-    device_class_set_props(dc, tpm_tis_properties);
-    dc->reset = tpm_tis_reset;
-    dc->vmsd  = &vmstate_tpm_tis;
+    device_class_set_props(dc, tpm_tis_isa_properties);
+    dc->vmsd  = &vmstate_tpm_tis_isa;
     tc->model = TPM_MODEL_TPM_TIS;
-    tc->get_version = tpm_tis_get_tpm_version;
-    tc->request_completed = tpm_tis_request_completed;
+    dc->realize = tpm_tis_isa_realizefn;
+    dc->reset = tpm_tis_isa_reset;
+    tc->request_completed = tpm_tis_isa_request_completed;
+    tc->get_version = tpm_tis_isa_get_tpm_version;
 }
 
-static const TypeInfo tpm_tis_info = {
+static const TypeInfo tpm_tis_isa_info = {
     .name = TYPE_TPM_TIS_ISA,
     .parent = TYPE_ISA_DEVICE,
-    .instance_size = sizeof(TPMState),
-    .instance_init = tpm_tis_initfn,
-    .class_init  = tpm_tis_class_init,
+    .instance_size = sizeof(TPMStateISA),
+    .instance_init = tpm_tis_isa_initfn,
+    .class_init  = tpm_tis_isa_class_init,
     .interfaces = (InterfaceInfo[]) {
         { TYPE_TPM_IF },
         { }
     }
 };
 
-static void tpm_tis_register(void)
+static void tpm_tis_isa_register(void)
 {
-    type_register_static(&tpm_tis_info);
+    type_register_static(&tpm_tis_isa_info);
 }
 
-type_init(tpm_tis_register)
+type_init(tpm_tis_isa_register)
Signature · 1 line
2.20.1
author
#13 lore raw

RFC v2 3/6 tpm: Separate tpm_tis common functions from isa code

In reply to Eric Auger

Move the device agnostic code into tpm_tis_common.c and put the ISA device specific code into tpm_tis_isa.c

---
 hw/tpm/Makefile.objs                   |   2 +-
 hw/tpm/tpm_tis.h                       |  91 +++++++++++
 hw/tpm/{tpm_tis.c => tpm_tis_common.c} | 209 ++-----------------------
 hw/tpm/tpm_tis_isa.c                   | 170 ++++++++++++++++++++
 4 files changed, 271 insertions(+), 201 deletions(-)
 create mode 100644 hw/tpm/tpm_tis.h
 rename hw/tpm/{tpm_tis.c => tpm_tis_common.c} (83%)
 create mode 100644 hw/tpm/tpm_tis_isa.c
hw/tpm/Makefile.objs +1 -1
index 85eb99ae05..fcc4c2f27c 100644
@@ -1,6 +1,6 @@
 common-obj-$(CONFIG_TPM) += tpm_util.o
 obj-$(call lor,$(CONFIG_TPM_TIS),$(CONFIG_TPM_CRB)) += tpm_ppi.o
-common-obj-$(CONFIG_TPM_TIS) += tpm_tis.o
+common-obj-$(CONFIG_TPM_TIS) += tpm_tis_isa.o tpm_tis_common.o
 common-obj-$(CONFIG_TPM_CRB) += tpm_crb.o
 common-obj-$(CONFIG_TPM_PASSTHROUGH) += tpm_passthrough.o
 common-obj-$(CONFIG_TPM_EMULATOR) += tpm_emulator.o
hw/tpm/tpm_tis.h new file +91 -0

91 lines not on this page · raw message

hw/tpm/tpm_tis_common.c renamed from hw/tpm/tpm_tis.c +9 -200

264 lines not on this page · raw message

hw/tpm/tpm_tis_isa.c new file +170 -0

170 lines not on this page · raw message

Signature · 1 line
2.20.1
author
#1 lore raw

RFC v2 1/6 tpm: rename TPM_TIS into TPM_TIS_ISA

In reply to Eric Auger

As we plan to introduce a sysbus TPM_TIS, let's rename TPM_TIS into TPM_TIS_ISA.

---
 hw/i386/acpi-build.c | 6 +++---
 hw/tpm/tpm_tis.c     | 4 ++--
 include/sysemu/tpm.h | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)
hw/i386/acpi-build.c +3 -3
index 9c4e46fa74..26777f8828 100644
@@ -2026,7 +2026,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
         }
     }
 
-    if (TPM_IS_TIS(tpm_find())) {
+    if (TPM_IS_TIS_ISA(tpm_find())) {
         aml_append(crs, aml_memory32_fixed(TPM_TIS_ADDR_BASE,
                    TPM_TIS_ADDR_SIZE, AML_READ_WRITE));
     }
@@ -2197,7 +2197,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
             /* Scan all PCI buses. Generate tables to support hotplug. */
             build_append_pci_bus_devices(scope, bus, pm->pcihp_bridge_en);
 
-            if (TPM_IS_TIS(tpm)) {
+            if (TPM_IS_TIS_ISA(tpm)) {
                 if (misc->tpm_version == TPM_VERSION_2_0) {
                     dev = aml_device("TPM");
                     aml_append(dev, aml_name_decl("_HID",
@@ -2304,7 +2304,7 @@ build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog)
         (char *)&tpm2_ptr->log_area_start_address - table_data->data;
 
     tpm2_ptr->platform_class = cpu_to_le16(TPM2_ACPI_CLASS_CLIENT);
-    if (TPM_IS_TIS(tpm_find())) {
+    if (TPM_IS_TIS_ISA(tpm_find())) {
         tpm2_ptr->control_area_address = cpu_to_le64(0);
         tpm2_ptr->start_method = cpu_to_le32(TPM2_START_METHOD_MMIO);
     } else if (TPM_IS_CRB(tpm_find())) {
hw/tpm/tpm_tis.c +2 -2
index 31facb896d..c609737272 100644
@@ -91,7 +91,7 @@ typedef struct TPMState {
     TPMPPI ppi;
 } TPMState;
 
-#define TPM(obj) OBJECT_CHECK(TPMState, (obj), TYPE_TPM_TIS)
+#define TPM(obj) OBJECT_CHECK(TPMState, (obj), TYPE_TPM_TIS_ISA)
 
 #define DEBUG_TIS 0
 
@@ -1008,7 +1008,7 @@ static void tpm_tis_class_init(ObjectClass *klass, void *data)
 }
 
 static const TypeInfo tpm_tis_info = {
-    .name = TYPE_TPM_TIS,
+    .name = TYPE_TPM_TIS_ISA,
     .parent = TYPE_ISA_DEVICE,
     .instance_size = sizeof(TPMState),
     .instance_init = tpm_tis_initfn,
include/sysemu/tpm.h +3 -3
index 15979a3647..1691b92c28 100644
@@ -43,12 +43,12 @@ typedef struct TPMIfClass {
     enum TPMVersion (*get_version)(TPMIf *obj);
 } TPMIfClass;
 
-#define TYPE_TPM_TIS                "tpm-tis"
+#define TYPE_TPM_TIS_ISA            "tpm-tis"
 #define TYPE_TPM_CRB                "tpm-crb"
 #define TYPE_TPM_SPAPR              "tpm-spapr"
 
-#define TPM_IS_TIS(chr)                             \
-    object_dynamic_cast(OBJECT(chr), TYPE_TPM_TIS)
+#define TPM_IS_TIS_ISA(chr)                         \
+    object_dynamic_cast(OBJECT(chr), TYPE_TPM_TIS_ISA)
 #define TPM_IS_CRB(chr)                             \
     object_dynamic_cast(OBJECT(chr), TYPE_TPM_CRB)
 #define TPM_IS_SPAPR(chr)                           \
Signature · 1 line
2.20.1
author
#25 lore raw

RFC v2 6/6 hw/arm/virt: vTPM support

In reply to Eric Auger

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

---
 hw/arm/Kconfig      |  1 +
 hw/arm/sysbus-fdt.c | 36 ++++++++++++++++++++++++++++++++++++
 hw/arm/virt.c       |  7 +++++++
 3 files changed, 44 insertions(+)
hw/arm/Kconfig +1 -0
index 3d86691ae0..b6f03f7f53 100644
@@ -5,6 +5,7 @@ config ARM_VIRT
     imply VFIO_AMD_XGBE
     imply VFIO_PLATFORM
     imply VFIO_XGMAC
+    imply TPM_TIS_SYSBUS
     select A15MPCORE
     select ACPI
     select ARM_SMMUV3
hw/arm/sysbus-fdt.c +36 -0
index 022fc97ecd..adf50444c2 100644
@@ -30,6 +30,7 @@
 #include "hw/arm/sysbus-fdt.h"
 #include "qemu/error-report.h"
 #include "sysemu/device_tree.h"
+#include "sysemu/tpm.h"
 #include "hw/platform-bus.h"
 #include "hw/vfio/vfio-platform.h"
 #include "hw/vfio/vfio-calxeda-xgmac.h"
@@ -434,6 +435,40 @@ static bool vfio_platform_match(SysBusDevice *sbdev,
 #define VFIO_PLATFORM_BINDING(compat, add_fn) \
     {TYPE_VFIO_PLATFORM, (compat), (add_fn), vfio_platform_match}
 
+/*
+ * add_tpm_tis_fdt_node: Create a DT node for TPM TIS
+ *
+ * See kernel documentation:
+ * Documentation/devicetree/bindings/security/tpm/tpm_tis_mmio.txt
+ * Optional interrupt for command completion is not exposed
+ */
+static int add_tpm_tis_fdt_node(SysBusDevice *sbdev, void *opaque)
+{
+    PlatformBusFDTData *data = opaque;
+    PlatformBusDevice *pbus = data->pbus;
+    void *fdt = data->fdt;
+    const char *parent_node = data->pbus_node_name;
+    int compat_str_len;
+    char *nodename;
+    uint32_t reg_attr[2];
+    uint64_t mmio_base;
+
+    mmio_base = platform_bus_get_mmio_addr(pbus, sbdev, 0);
+    nodename = g_strdup_printf("%s/tpm_tis@%" PRIx64, parent_node, mmio_base);
+    qemu_fdt_add_subnode(fdt, nodename);
+
+    compat_str_len = strlen("tcg,tpm-tis-mmio") + 1;
+    qemu_fdt_setprop(fdt, nodename, "compatible", "tcg,tpm-tis-mmio",
+                     compat_str_len);
+
+    reg_attr[0] = cpu_to_be32(mmio_base);
+    reg_attr[1] = cpu_to_be32(0x5000);
+    qemu_fdt_setprop(fdt, nodename, "reg", reg_attr, 2 * sizeof(uint32_t));
+
+    g_free(nodename);
+    return 0;
+}
+
 #endif /* CONFIG_LINUX */
 
 static int no_fdt_node(SysBusDevice *sbdev, void *opaque)
@@ -455,6 +490,7 @@ static const BindingEntry bindings[] = {
     TYPE_BINDING(TYPE_VFIO_CALXEDA_XGMAC, add_calxeda_midway_xgmac_fdt_node),
     TYPE_BINDING(TYPE_VFIO_AMD_XGBE, add_amd_xgbe_fdt_node),
     VFIO_PLATFORM_BINDING("amd,xgbe-seattle-v1a", add_amd_xgbe_fdt_node),
+    TYPE_BINDING(TYPE_TPM_TIS_SYSBUS, add_tpm_tis_fdt_node),
 #endif
     TYPE_BINDING(TYPE_RAMFB_DEVICE, no_fdt_node),
     TYPE_BINDING("", NULL), /* last element */
hw/arm/virt.c +7 -0
index f788fe27d6..4b967e39d1 100644
@@ -47,6 +47,7 @@
 #include "sysemu/numa.h"
 #include "sysemu/runstate.h"
 #include "sysemu/sysemu.h"
+#include "sysemu/tpm.h"
 #include "sysemu/kvm.h"
 #include "hw/loader.h"
 #include "exec/address-spaces.h"
@@ -2041,6 +2042,7 @@ static void virt_machine_class_init(ObjectClass *oc, void *data)
     machine_class_allow_dynamic_sysbus_dev(mc, TYPE_VFIO_AMD_XGBE);
     machine_class_allow_dynamic_sysbus_dev(mc, TYPE_RAMFB_DEVICE);
     machine_class_allow_dynamic_sysbus_dev(mc, TYPE_VFIO_PLATFORM);
+    machine_class_allow_dynamic_sysbus_dev(mc, TYPE_TPM_TIS_SYSBUS);
     mc->block_default_type = IF_VIRTIO;
     mc->no_cdrom = 1;
     mc->pci_allow_0_address = true;
@@ -2153,6 +2155,11 @@ type_init(machvirt_machine_init);
 
 static void virt_machine_5_0_options(MachineClass *mc)
 {
+    static GlobalProperty compat[] = {
+        { TYPE_TPM_TIS_SYSBUS, "ppi", "false" },
+    };
+
+    compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
 }
 DEFINE_VIRT_MACHINE_AS_LATEST(5, 0)
 
Signature · 1 line
2.20.1
author
#15 lore raw

RFC v2 4/6 tpm: Separate TPM_TIS and TPM_TIS_ISA configs

In reply to Eric Auger

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.

---
 default-configs/i386-softmmu.mak | 2 +-
 hw/i386/Kconfig                  | 2 +-
 hw/tpm/Kconfig                   | 7 ++++++-
 hw/tpm/Makefile.objs             | 3 ++-
 tests/qtest/Makefile.include     | 4 ++--
 5 files changed, 12 insertions(+), 6 deletions(-)
default-configs/i386-softmmu.mak +1 -1
index 4cc64dafa2..84d1a2487c 100644
@@ -20,7 +20,7 @@
 #CONFIG_SGA=n
 #CONFIG_TEST_DEVICES=n
 #CONFIG_TPM_CRB=n
-#CONFIG_TPM_TIS=n
+#CONFIG_TPM_TIS_ISA=n
 #CONFIG_VTD=n
 
 # Boards:
hw/i386/Kconfig +1 -1
index cdc851598c..c93f32f657 100644
@@ -20,7 +20,7 @@ config PC
     imply SGA
     imply TEST_DEVICES
     imply TPM_CRB
-    imply TPM_TIS
+    imply TPM_TIS_ISA
     imply VGA_PCI
     imply VIRTIO_VGA
     select FDC
hw/tpm/Kconfig +6 -1
index 9e67d990e8..686f8206bb 100644
@@ -2,9 +2,14 @@ config TPMDEV
     bool
     depends on TPM
 
-config TPM_TIS
+config TPM_TIS_ISA
     bool
     depends on TPM && ISA_BUS
+    select TPM_TIS
+
+config TPM_TIS
+    bool
+    depends on TPM
     select TPMDEV
 
 config TPM_CRB
hw/tpm/Makefile.objs +2 -1
index fcc4c2f27c..3ef2036cca 100644
@@ -1,6 +1,7 @@
 common-obj-$(CONFIG_TPM) += tpm_util.o
 obj-$(call lor,$(CONFIG_TPM_TIS),$(CONFIG_TPM_CRB)) += tpm_ppi.o
-common-obj-$(CONFIG_TPM_TIS) += tpm_tis_isa.o tpm_tis_common.o
+common-obj-$(CONFIG_TPM_TIS_ISA) += tpm_tis_isa.o
+common-obj-$(CONFIG_TPM_TIS) += tpm_tis_common.o
 common-obj-$(CONFIG_TPM_CRB) += tpm_crb.o
 common-obj-$(CONFIG_TPM_PASSTHROUGH) += tpm_passthrough.o
 common-obj-$(CONFIG_TPM_EMULATOR) += tpm_emulator.o
tests/qtest/Makefile.include +2 -2
index eb0f23b108..33dd3c89cc 100644
@@ -54,8 +54,8 @@ check-qtest-i386-y += q35-test
 check-qtest-i386-y += vmgenid-test
 check-qtest-i386-$(CONFIG_TPM_CRB) += tpm-crb-swtpm-test
 check-qtest-i386-$(CONFIG_TPM_CRB) += tpm-crb-test
-check-qtest-i386-$(CONFIG_TPM_TIS) += tpm-tis-swtpm-test
-check-qtest-i386-$(CONFIG_TPM_TIS) += tpm-tis-test
+check-qtest-i386-$(CONFIG_TPM_TIS_ISA) += tpm-tis-swtpm-test
+check-qtest-i386-$(CONFIG_TPM_TIS_ISA) += tpm-tis-test
 check-qtest-i386-$(CONFIG_SLIRP) += test-netfilter
 check-qtest-i386-$(CONFIG_POSIX) += test-filter-mirror
 check-qtest-i386-$(CONFIG_RTL8139_PCI) += test-filter-redirector
Signature · 1 line
2.20.1
author
#18 lore raw

RFC v2 5/6 tpm: Add the SysBus TPM TIS device

In reply to Eric Auger

Introduce the tpm-tis-device which is a sysbus device and is bound to be used on ARM.

---
 hw/tpm/Kconfig          |   5 ++
 hw/tpm/Makefile.objs    |   1 +
 hw/tpm/tpm_tis_sysbus.c | 159 ++++++++++++++++++++++++++++++++++++++++
 include/sysemu/tpm.h    |   1 +
 4 files changed, 166 insertions(+)
 create mode 100644 hw/tpm/tpm_tis_sysbus.c
hw/tpm/Kconfig +5 -0
index 686f8206bb..4794e7fe28 100644
@@ -7,6 +7,11 @@ config TPM_TIS_ISA
     depends on TPM && ISA_BUS
     select TPM_TIS
 
+config TPM_TIS_SYSBUS
+    bool
+    depends on TPM
+    select TPM_TIS
+
 config TPM_TIS
     bool
     depends on TPM
hw/tpm/Makefile.objs +1 -0
index 3ef2036cca..f1ec4beb95 100644
@@ -1,6 +1,7 @@
 common-obj-$(CONFIG_TPM) += tpm_util.o
 obj-$(call lor,$(CONFIG_TPM_TIS),$(CONFIG_TPM_CRB)) += tpm_ppi.o
 common-obj-$(CONFIG_TPM_TIS_ISA) += tpm_tis_isa.o
+common-obj-$(CONFIG_TPM_TIS_SYSBUS) += tpm_tis_sysbus.o
 common-obj-$(CONFIG_TPM_TIS) += tpm_tis_common.o
 common-obj-$(CONFIG_TPM_CRB) += tpm_crb.o
 common-obj-$(CONFIG_TPM_PASSTHROUGH) += tpm_passthrough.o
hw/tpm/tpm_tis_sysbus.c new file +159 -0

159 lines not on this page · raw message

include/sysemu/tpm.h +1 -0
index 1691b92c28..f37851b1aa 100644
@@ -44,6 +44,7 @@ typedef struct TPMIfClass {
 } TPMIfClass;
 
 #define TYPE_TPM_TIS_ISA            "tpm-tis"
+#define TYPE_TPM_TIS_SYSBUS         "tpm-tis-device"
 #define TYPE_TPM_CRB                "tpm-crb"
 #define TYPE_TPM_SPAPR              "tpm-spapr"
 
Signature · 1 line
2.20.1
Reviewed-by on v2 1/6
#2 lore raw

Re: [RFC v2 1/6] tpm: rename TPM_TIS into TPM_TIS_ISA

In reply to Eric Auger
Quoted 68 lines · Eric Auger

As we plan to introduce a sysbus TPM_TIS, let's rename TPM_TIS into TPM_TIS_ISA.

---
  hw/i386/acpi-build.c | 6 +++---
  hw/tpm/tpm_tis.c     | 4 ++--
  include/sysemu/tpm.h | 6 +++---
  3 files changed, 8 insertions(+), 8 deletions(-)
hw/i386/acpi-build.c +3 -3
index 9c4e46fa74..26777f8828 100644
@@ -2026,7 +2026,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
          }
      }
 
-    if (TPM_IS_TIS(tpm_find())) {
+    if (TPM_IS_TIS_ISA(tpm_find())) {
          aml_append(crs, aml_memory32_fixed(TPM_TIS_ADDR_BASE,
                     TPM_TIS_ADDR_SIZE, AML_READ_WRITE));
      }
@@ -2197,7 +2197,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
              /* Scan all PCI buses. Generate tables to support hotplug. */
              build_append_pci_bus_devices(scope, bus, pm->pcihp_bridge_en);
 
-            if (TPM_IS_TIS(tpm)) {
+            if (TPM_IS_TIS_ISA(tpm)) {
                  if (misc->tpm_version == TPM_VERSION_2_0) {
                      dev = aml_device("TPM");
                      aml_append(dev, aml_name_decl("_HID",
@@ -2304,7 +2304,7 @@ build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog)
          (char *)&tpm2_ptr->log_area_start_address - table_data->data;
 
      tpm2_ptr->platform_class = cpu_to_le16(TPM2_ACPI_CLASS_CLIENT);
-    if (TPM_IS_TIS(tpm_find())) {
+    if (TPM_IS_TIS_ISA(tpm_find())) {
          tpm2_ptr->control_area_address = cpu_to_le64(0);
          tpm2_ptr->start_method = cpu_to_le32(TPM2_START_METHOD_MMIO);
      } else if (TPM_IS_CRB(tpm_find())) {
hw/tpm/tpm_tis.c +2 -2
index 31facb896d..c609737272 100644
@@ -91,7 +91,7 @@ typedef struct TPMState {
      TPMPPI ppi;
  } TPMState;
 
-#define TPM(obj) OBJECT_CHECK(TPMState, (obj), TYPE_TPM_TIS)
+#define TPM(obj) OBJECT_CHECK(TPMState, (obj), TYPE_TPM_TIS_ISA)
 
  #define DEBUG_TIS 0
 
@@ -1008,7 +1008,7 @@ static void tpm_tis_class_init(ObjectClass *klass, void *data)
  }
 
  static const TypeInfo tpm_tis_info = {
-    .name = TYPE_TPM_TIS,
+    .name = TYPE_TPM_TIS_ISA,
      .parent = TYPE_ISA_DEVICE,
      .instance_size = sizeof(TPMState),
      .instance_init = tpm_tis_initfn,
include/sysemu/tpm.h +0 -0
index 15979a3647..1691b92c28 100644

include/sysemu/tpm.h typedef struct TPMIfClass { · line 46

Quoted 5 lines
include/sysemu/tpm.h +1 -1
@@ -43,12 +43,12 @@ typedef struct TPMIfClass {
      enum TPMVersion (*get_version)(TPMIf *obj);
  } TPMIfClass;
 
-#define TYPE_TPM_TIS                "tpm-tis"
+#define TYPE_TPM_TIS_ISA            "tpm-tis"

It should be safe to rename this "tpm-tis-isa" in this patch.

Regardless:

Quoted 11 lines
include/sysemu/tpm.h +2 -2
  #define TYPE_TPM_CRB                "tpm-crb"
  #define TYPE_TPM_SPAPR              "tpm-spapr"
 
-#define TPM_IS_TIS(chr)                             \
-    object_dynamic_cast(OBJECT(chr), TYPE_TPM_TIS)
+#define TPM_IS_TIS_ISA(chr)                         \
+    object_dynamic_cast(OBJECT(chr), TYPE_TPM_TIS_ISA)
  #define TPM_IS_CRB(chr)                             \
      object_dynamic_cast(OBJECT(chr), TYPE_TPM_CRB)
  #define TPM_IS_SPAPR(chr)                           \
Reviewed-by on v2 2/6
#8 lore raw

Re: [RFC v2 2/6] tpm: Use TPMState as a common struct

In reply to Eric Auger
Quoted 1 line · Eric Auger

As we plan to introdce a SysBus TPM TIS device, let's

typo "introduce"

Quoted 30 lines

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.

---
  hw/tpm/tpm_tis.c | 146 +++++++++++++++++++++++++++++------------------
  1 file changed, 91 insertions(+), 55 deletions(-)
hw/tpm/tpm_tis.c +0 -1
index c609737272..fc6d7ca579 100644
@@ -65,7 +65,6 @@ typedef struct TPMLocality {
  } TPMLocality;
 
  typedef struct TPMState {
-    ISADevice busdev;
      MemoryRegion mmio;
 
      unsigned char buffer[TPM_TIS_BUFFER_MAX];

hw/tpm/tpm_tis.c typedef struct TPMState { · line 98

Quoted 10 lines
hw/tpm/tpm_tis.c +6 -1
@@ -91,7 +90,15 @@ typedef struct TPMState {
      TPMPPI ppi;
  } TPMState;
 
-#define TPM(obj) OBJECT_CHECK(TPMState, (obj), TYPE_TPM_TIS_ISA)
+typedef struct TPMStateISA {
+    /*< private >*/
+    ISADevice parent_obj;
+
+    /*< public >*/
+    TPMState state; /* not a QOM object */

Maybe rename 'state' -> 'tpm'?

Anyway:

Quoted 259 lines
hw/tpm/tpm_tis.c +85 -53
+} TPMStateISA;
+
+#define TPM_TIS_ISA(obj) OBJECT_CHECK(TPMStateISA, (obj), TYPE_TPM_TIS_ISA)
 
  #define DEBUG_TIS 0
 
@@ -281,9 +288,8 @@ static void tpm_tis_prep_abort(TPMState *s, uint8_t locty, uint8_t newlocty)
  /*
   * Callback from the TPM to indicate that the response was received.
   */
-static void tpm_tis_request_completed(TPMIf *ti, int ret)
+static void tpm_tis_request_completed(TPMState *s, int ret)
  {
-    TPMState *s = TPM(ti);
      uint8_t locty = s->cmd.locty;
      uint8_t l;
 
@@ -338,7 +344,7 @@ static uint32_t tpm_tis_data_read(TPMState *s, uint8_t locty)
  }
 
  #ifdef DEBUG_TIS
-static void tpm_tis_dump_state(void *opaque, hwaddr addr)
+static void tpm_tis_dump_state(TPMState *s, hwaddr addr)
  {
      static const unsigned regs[] = {
          TPM_TIS_REG_ACCESS,
@@ -353,7 +359,6 @@ static void tpm_tis_dump_state(void *opaque, hwaddr addr)
      int idx;
      uint8_t locty = tpm_tis_locality_from_addr(addr);
      hwaddr base = addr & ~0xfff;
-    TPMState *s = opaque;
 
      printf("tpm_tis: active locality      : %d\n"
             "tpm_tis: state of locality %d : %d\n"
@@ -363,7 +368,7 @@ static void tpm_tis_dump_state(void *opaque, hwaddr addr)
 
      for (idx = 0; regs[idx] != 0xfff; idx++) {
          printf("tpm_tis: 0x%04x : 0x%08x\n", regs[idx],
-               (int)tpm_tis_mmio_read(opaque, base + regs[idx], 4));
+               (int)tpm_tis_mmio_read(s, base + regs[idx], 4));
      }
 
      printf("tpm_tis: r/w offset    : %d\n"
@@ -488,7 +493,7 @@ static uint64_t tpm_tis_mmio_read(void *opaque, hwaddr addr,
          break;
  #ifdef DEBUG_TIS
      case TPM_TIS_REG_DEBUG:
-        tpm_tis_dump_state(opaque, addr);
+        tpm_tis_dump_state(s, addr);
          break;
  #endif
      }
@@ -835,10 +840,8 @@ static const MemoryRegionOps tpm_tis_memory_ops = {
  /*
   * Get the TPMVersion of the backend device being used
   */
-static enum TPMVersion tpm_tis_get_tpm_version(TPMIf *ti)
+static enum TPMVersion tpm_tis_get_tpm_version(TPMState *s)
  {
-    TPMState *s = TPM(ti);
-
      if (tpm_backend_had_startup_error(s->be_driver)) {
          return TPM_VERSION_UNSPEC;
      }
@@ -850,9 +853,8 @@ static enum TPMVersion tpm_tis_get_tpm_version(TPMIf *ti)
   * This function is called when the machine starts, resets or due to
   * S3 resume.
   */
-static void tpm_tis_reset(DeviceState *dev)
+static void tpm_tis_reset(TPMState *s)
  {
-    TPMState *s = TPM(dev);
      int c;
 
      s->be_tpm_version = tpm_backend_get_tpm_version(s->be_driver);
@@ -896,15 +898,14 @@ static void tpm_tis_reset(DeviceState *dev)
 
  /* persistent state handling */
 
-static int tpm_tis_pre_save(void *opaque)
+static int tpm_tis_pre_save(TPMState *s)
  {
-    TPMState *s = opaque;
      uint8_t locty = s->active_locty;
 
      trace_tpm_tis_pre_save(locty, s->rw_offset);
 
      if (DEBUG_TIS) {
-        tpm_tis_dump_state(opaque, 0);
+        tpm_tis_dump_state(s, 0);
      }
 
      /*
@@ -929,34 +930,78 @@ static const VMStateDescription vmstate_locty = {
      }
  };
 
-static const VMStateDescription vmstate_tpm_tis = {
+/* ISA */
+
+static int tpm_tis_pre_save_isa(void *opaque)
+{
+    TPMStateISA *isadev = opaque;
+
+    return tpm_tis_pre_save(&isadev->state);
+}
+
+static const VMStateDescription vmstate_tpm_tis_isa = {
      .name = "tpm-tis",
      .version_id = 0,
-    .pre_save  = tpm_tis_pre_save,
+    .pre_save  = tpm_tis_pre_save_isa,
      .fields = (VMStateField[]) {
-        VMSTATE_BUFFER(buffer, TPMState),
-        VMSTATE_UINT16(rw_offset, TPMState),
-        VMSTATE_UINT8(active_locty, TPMState),
-        VMSTATE_UINT8(aborting_locty, TPMState),
-        VMSTATE_UINT8(next_locty, TPMState),
+        VMSTATE_BUFFER(state.buffer, TPMStateISA),
+        VMSTATE_UINT16(state.rw_offset, TPMStateISA),
+        VMSTATE_UINT8(state.active_locty, TPMStateISA),
+        VMSTATE_UINT8(state.aborting_locty, TPMStateISA),
+        VMSTATE_UINT8(state.next_locty, TPMStateISA),
 
-        VMSTATE_STRUCT_ARRAY(loc, TPMState, TPM_TIS_NUM_LOCALITIES, 0,
+        VMSTATE_STRUCT_ARRAY(state.loc, TPMStateISA, TPM_TIS_NUM_LOCALITIES, 0,
                               vmstate_locty, TPMLocality),
 
          VMSTATE_END_OF_LIST()
      }
  };
 
-static Property tpm_tis_properties[] = {
-    DEFINE_PROP_UINT32("irq", TPMState, irq_num, TPM_TIS_IRQ),
-    DEFINE_PROP_TPMBE("tpmdev", TPMState, be_driver),
-    DEFINE_PROP_BOOL("ppi", TPMState, ppi_enabled, true),
+static void tpm_tis_isa_request_completed(TPMIf *ti, int ret)
+{
+    TPMStateISA *isadev = TPM_TIS_ISA(ti);
+    TPMState *s = &isadev->state;
+
+    tpm_tis_request_completed(s, ret);
+}
+
+static enum TPMVersion tpm_tis_isa_get_tpm_version(TPMIf *ti)
+{
+    TPMStateISA *isadev = TPM_TIS_ISA(ti);
+    TPMState *s = &isadev->state;
+
+    return tpm_tis_get_tpm_version(s);
+}
+
+static void tpm_tis_isa_reset(DeviceState *dev)
+{
+    TPMStateISA *isadev = TPM_TIS_ISA(dev);
+    TPMState *s = &isadev->state;
+
+    return tpm_tis_reset(s);
+}
+
+static Property tpm_tis_isa_properties[] = {
+    DEFINE_PROP_UINT32("irq", TPMStateISA, state.irq_num, TPM_TIS_IRQ),
+    DEFINE_PROP_TPMBE("tpmdev", TPMStateISA, state.be_driver),
+    DEFINE_PROP_BOOL("ppi", TPMStateISA, state.ppi_enabled, true),
      DEFINE_PROP_END_OF_LIST(),
  };
 
-static void tpm_tis_realizefn(DeviceState *dev, Error **errp)
+static void tpm_tis_isa_initfn(Object *obj)
  {
-    TPMState *s = TPM(dev);
+    TPMStateISA *isadev = TPM_TIS_ISA(obj);
+    TPMState *s = &isadev->state;
+
+    memory_region_init_io(&s->mmio, obj, &tpm_tis_memory_ops,
+                          s, "tpm-tis-mmio",
+                          TPM_TIS_NUM_LOCALITIES << TPM_TIS_LOCALITY_SHIFT);
+}
+
+static void tpm_tis_isa_realizefn(DeviceState *dev, Error **errp)
+{
+    TPMStateISA *isadev = TPM_TIS_ISA(dev);
+    TPMState *s = &isadev->state;
 
      if (!tpm_find()) {
          error_setg(errp, "at most one TPM device is permitted");
@@ -973,55 +1018,46 @@ static void tpm_tis_realizefn(DeviceState *dev, Error **errp)
          return;
      }
 
-    isa_init_irq(&s->busdev, &s->irq, s->irq_num);
+    isa_init_irq(ISA_DEVICE(dev), &s->irq, s->irq_num);
 
      memory_region_add_subregion(isa_address_space(ISA_DEVICE(dev)),
                                  TPM_TIS_ADDR_BASE, &s->mmio);
 
      if (s->ppi_enabled) {
          tpm_ppi_init(&s->ppi, isa_address_space(ISA_DEVICE(dev)),
-                     TPM_PPI_ADDR_BASE, OBJECT(s));
+                     TPM_PPI_ADDR_BASE, OBJECT(dev));
      }
  }
 
-static void tpm_tis_initfn(Object *obj)
-{
-    TPMState *s = TPM(obj);
-
-    memory_region_init_io(&s->mmio, OBJECT(s), &tpm_tis_memory_ops,
-                          s, "tpm-tis-mmio",
-                          TPM_TIS_NUM_LOCALITIES << TPM_TIS_LOCALITY_SHIFT);
-}
-
-static void tpm_tis_class_init(ObjectClass *klass, void *data)
+static void tpm_tis_isa_class_init(ObjectClass *klass, void *data)
  {
      DeviceClass *dc = DEVICE_CLASS(klass);
      TPMIfClass *tc = TPM_IF_CLASS(klass);
 
-    dc->realize = tpm_tis_realizefn;
-    device_class_set_props(dc, tpm_tis_properties);
-    dc->reset = tpm_tis_reset;
-    dc->vmsd  = &vmstate_tpm_tis;
+    device_class_set_props(dc, tpm_tis_isa_properties);
+    dc->vmsd  = &vmstate_tpm_tis_isa;
      tc->model = TPM_MODEL_TPM_TIS;
-    tc->get_version = tpm_tis_get_tpm_version;
-    tc->request_completed = tpm_tis_request_completed;
+    dc->realize = tpm_tis_isa_realizefn;
+    dc->reset = tpm_tis_isa_reset;
+    tc->request_completed = tpm_tis_isa_request_completed;
+    tc->get_version = tpm_tis_isa_get_tpm_version;
  }
 
-static const TypeInfo tpm_tis_info = {
+static const TypeInfo tpm_tis_isa_info = {
      .name = TYPE_TPM_TIS_ISA,
      .parent = TYPE_ISA_DEVICE,
-    .instance_size = sizeof(TPMState),
-    .instance_init = tpm_tis_initfn,
-    .class_init  = tpm_tis_class_init,
+    .instance_size = sizeof(TPMStateISA),
+    .instance_init = tpm_tis_isa_initfn,
+    .class_init  = tpm_tis_isa_class_init,
      .interfaces = (InterfaceInfo[]) {
          { TYPE_TPM_IF },
          { }
      }
  };
 
-static void tpm_tis_register(void)
+static void tpm_tis_isa_register(void)
  {
-    type_register_static(&tpm_tis_info);
+    type_register_static(&tpm_tis_isa_info);
  }
 
-type_init(tpm_tis_register)
+type_init(tpm_tis_isa_register)
Reviewed-by on v2 4/6
#16 lore raw

Re: [RFC v2 4/6] tpm: Separate TPM_TIS and TPM_TIS_ISA configs

In reply to Eric Auger
Quoted 46 lines · Eric Auger

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.

---
  default-configs/i386-softmmu.mak | 2 +-
  hw/i386/Kconfig                  | 2 +-
  hw/tpm/Kconfig                   | 7 ++++++-
  hw/tpm/Makefile.objs             | 3 ++-
  tests/qtest/Makefile.include     | 4 ++--
  5 files changed, 12 insertions(+), 6 deletions(-)
default-configs/i386-softmmu.mak +1 -1
index 4cc64dafa2..84d1a2487c 100644
@@ -20,7 +20,7 @@
  #CONFIG_SGA=n
  #CONFIG_TEST_DEVICES=n
  #CONFIG_TPM_CRB=n
-#CONFIG_TPM_TIS=n
+#CONFIG_TPM_TIS_ISA=n
  #CONFIG_VTD=n
 
  # Boards:
hw/i386/Kconfig +1 -1
index cdc851598c..c93f32f657 100644
@@ -20,7 +20,7 @@ config PC
      imply SGA
      imply TEST_DEVICES
      imply TPM_CRB
-    imply TPM_TIS
+    imply TPM_TIS_ISA
      imply VGA_PCI
      imply VIRTIO_VGA
      select FDC
hw/tpm/Kconfig +0 -0
index 9e67d990e8..686f8206bb 100644

hw/tpm/Kconfig config TPMDEV · line 7

Quoted 7 lines
hw/tpm/Kconfig +1 -1
@@ -2,9 +2,14 @@ config TPMDEV
      bool
      depends on TPM
 
-config TPM_TIS
+config TPM_TIS_ISA
      bool
      depends on TPM && ISA_BUS

Maybe you can relax to "depends on ISA_BUS" ...

hw/tpm/Kconfig config TPMDEV · line 12

Quoted 5 lines
hw/tpm/Kconfig +5 -0
+    select TPM_TIS
+
+config TPM_TIS
+    bool
+    depends on TPM

... since TPM_TIS depends on TPM.

Quoted 22 lines
hw/tpm/Kconfig +0 -0
      select TPMDEV
 
  config TPM_CRB
hw/tpm/Makefile.objs +2 -1
index fcc4c2f27c..3ef2036cca 100644
@@ -1,6 +1,7 @@
  common-obj-$(CONFIG_TPM) += tpm_util.o
  obj-$(call lor,$(CONFIG_TPM_TIS),$(CONFIG_TPM_CRB)) += tpm_ppi.o
-common-obj-$(CONFIG_TPM_TIS) += tpm_tis_isa.o tpm_tis_common.o
+common-obj-$(CONFIG_TPM_TIS_ISA) += tpm_tis_isa.o
+common-obj-$(CONFIG_TPM_TIS) += tpm_tis_common.o
  common-obj-$(CONFIG_TPM_CRB) += tpm_crb.o
  common-obj-$(CONFIG_TPM_PASSTHROUGH) += tpm_passthrough.o
  common-obj-$(CONFIG_TPM_EMULATOR) += tpm_emulator.o
tests/qtest/Makefile.include +0 -0
index eb0f23b108..33dd3c89cc 100644

tests/qtest/Makefile.include check-qtest-i386-y += q35-test · line 61

Quoted 10 lines
tests/qtest/Makefile.include +2 -2
@@ -54,8 +54,8 @@ check-qtest-i386-y += q35-test
  check-qtest-i386-y += vmgenid-test
  check-qtest-i386-$(CONFIG_TPM_CRB) += tpm-crb-swtpm-test
  check-qtest-i386-$(CONFIG_TPM_CRB) += tpm-crb-test
-check-qtest-i386-$(CONFIG_TPM_TIS) += tpm-tis-swtpm-test
-check-qtest-i386-$(CONFIG_TPM_TIS) += tpm-tis-test
+check-qtest-i386-$(CONFIG_TPM_TIS_ISA) += tpm-tis-swtpm-test
+check-qtest-i386-$(CONFIG_TPM_TIS_ISA) += tpm-tis-test
  check-qtest-i386-$(CONFIG_SLIRP) += test-netfilter
  check-qtest-i386-$(CONFIG_POSIX) += test-filter-mirror
  check-qtest-i386-$(CONFIG_RTL8139_PCI) += test-filter-redirector
Tested-by Acked-by on the v2 series
#28 lore raw
In reply to Eric Auger
Quoted 47 lines · Eric Auger

This series adds the capability to instantiate an MMIO TPM TIS in ARM virt.

The existing TPM TIS code is reshuffled into a generic part, the ISA device and the sysbus device. The last patch allows the instantiation of the TPM TIS sysbus device in ARM virt.

The series was tested with the swtpm/libtpms emulator. Automatic guest LUKS volume unlocking (tpm2) was successful. EDK2 support is under development [3]. Thanks to Ard for supporting me when setting up the test environment.

Best Regards

Eric

Testing:

mkdir /tmp/tpm
swtpm socket \
--tpm2 \
-t -d \
--tpmstate dir=/tmp/tpm \
--ctrl type=unixio,path=/tmp/swtpm-sock

qemu command line must be augmented with the following options:

(quoted diff) +0 -3
-chardev socket,id=chrtpm,path=/tmp/swtpm-sock \
-tpmdev emulator,id=tpm0,chardev=chrtpm \
-device tpm-tis-device,tpmdev=tpm0 \

References:
[1] libtpms: https://github.com/stefanberger/libtpms/wiki
[2] swtpm: https://github.com/stefanberger/swtpm/wiki
[3] [PATCH 0/4] ArmVirtPkg: implement measured boot for ArmVirtQemu

This series can be found at:
https://github.com/eauger/qemu/tree/v4.2.0-tpm-rfc-v2

History:

RFC v1 -> RFC v2:
- restructure the existing code with common, ISA and sysbus part.
- both ARM and x86 integration were tested.
- acknowledgement: migration has not been tested

Quoted 8 lines

Eric Auger (6):
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

Many thanks to Eric for his work on this.

I have tested this with my EDK2 code and a Linux/arm64 VM booting in DT mode with the tpm-tis driver enabled, and it works as expected. I can observe the firmware taking measurements during boot, and can dump the PCRs from Linux using tpm2_pcrlist.

Note that the UEFI firmware is itself a consumer of the DT description, so we need the DT related changes regardless of whether the VM boots in DT or ACPI mode.

Quoted 23 lines
 default-configs/i386-softmmu.mak       |   2 +-
 hw/arm/Kconfig                         |   1 +
 hw/arm/sysbus-fdt.c                    |  36 +++++
 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           |   4 +-
 14 files changed, 502 insertions(+), 180 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

--
2.20.1

Reviewed-by on v2 1/6
#6 lore raw

Re: [RFC v2 1/6] tpm: rename TPM_TIS into TPM_TIS_ISA

In reply to Eric Auger
Quoted 2 lines · Eric Auger

As we plan to introduce a sysbus TPM_TIS, let's rename TPM_TIS into TPM_TIS_ISA.

Quoted 81 lines
---
  hw/i386/acpi-build.c | 6 +++---
  hw/tpm/tpm_tis.c     | 4 ++--
  include/sysemu/tpm.h | 6 +++---
  3 files changed, 8 insertions(+), 8 deletions(-)
hw/i386/acpi-build.c +3 -3
index 9c4e46fa74..26777f8828 100644
@@ -2026,7 +2026,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
          }
      }
 
-    if (TPM_IS_TIS(tpm_find())) {
+    if (TPM_IS_TIS_ISA(tpm_find())) {
          aml_append(crs, aml_memory32_fixed(TPM_TIS_ADDR_BASE,
                     TPM_TIS_ADDR_SIZE, AML_READ_WRITE));
      }
@@ -2197,7 +2197,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
              /* Scan all PCI buses. Generate tables to support hotplug. */
              build_append_pci_bus_devices(scope, bus, pm->pcihp_bridge_en);
 
-            if (TPM_IS_TIS(tpm)) {
+            if (TPM_IS_TIS_ISA(tpm)) {
                  if (misc->tpm_version == TPM_VERSION_2_0) {
                      dev = aml_device("TPM");
                      aml_append(dev, aml_name_decl("_HID",
@@ -2304,7 +2304,7 @@ build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog)
          (char *)&tpm2_ptr->log_area_start_address - table_data->data;
 
      tpm2_ptr->platform_class = cpu_to_le16(TPM2_ACPI_CLASS_CLIENT);
-    if (TPM_IS_TIS(tpm_find())) {
+    if (TPM_IS_TIS_ISA(tpm_find())) {
          tpm2_ptr->control_area_address = cpu_to_le64(0);
          tpm2_ptr->start_method = cpu_to_le32(TPM2_START_METHOD_MMIO);
      } else if (TPM_IS_CRB(tpm_find())) {
hw/tpm/tpm_tis.c +2 -2
index 31facb896d..c609737272 100644
@@ -91,7 +91,7 @@ typedef struct TPMState {
      TPMPPI ppi;
  } TPMState;
 
-#define TPM(obj) OBJECT_CHECK(TPMState, (obj), TYPE_TPM_TIS)
+#define TPM(obj) OBJECT_CHECK(TPMState, (obj), TYPE_TPM_TIS_ISA)
 
  #define DEBUG_TIS 0
 
@@ -1008,7 +1008,7 @@ static void tpm_tis_class_init(ObjectClass *klass, void *data)
  }
 
  static const TypeInfo tpm_tis_info = {
-    .name = TYPE_TPM_TIS,
+    .name = TYPE_TPM_TIS_ISA,
      .parent = TYPE_ISA_DEVICE,
      .instance_size = sizeof(TPMState),
      .instance_init = tpm_tis_initfn,
include/sysemu/tpm.h +3 -3
index 15979a3647..1691b92c28 100644
@@ -43,12 +43,12 @@ typedef struct TPMIfClass {
      enum TPMVersion (*get_version)(TPMIf *obj);
  } TPMIfClass;
 
-#define TYPE_TPM_TIS                "tpm-tis"
+#define TYPE_TPM_TIS_ISA            "tpm-tis"
  #define TYPE_TPM_CRB                "tpm-crb"
  #define TYPE_TPM_SPAPR              "tpm-spapr"
 
-#define TPM_IS_TIS(chr)                             \
-    object_dynamic_cast(OBJECT(chr), TYPE_TPM_TIS)
+#define TPM_IS_TIS_ISA(chr)                         \
+    object_dynamic_cast(OBJECT(chr), TYPE_TPM_TIS_ISA)
  #define TPM_IS_CRB(chr)                             \
      object_dynamic_cast(OBJECT(chr), TYPE_TPM_CRB)
  #define TPM_IS_SPAPR(chr)                           \
Reviewed-by on v2 2/6
#9 lore raw

Re: [RFC v2 2/6] tpm: Use TPMState as a common struct

In reply to Eric Auger
Quoted 9 lines · Eric Auger

As we plan to introdce 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.

Quoted 5 lines

A bunch of structs also are renamed to be specialized for the ISA device. Besides those transformations, no functional change is expected.

Quoted 285 lines
---
  hw/tpm/tpm_tis.c | 146 +++++++++++++++++++++++++++++------------------
  1 file changed, 91 insertions(+), 55 deletions(-)
hw/tpm/tpm_tis.c +91 -55
index c609737272..fc6d7ca579 100644
@@ -65,7 +65,6 @@ typedef struct TPMLocality {
  } TPMLocality;
 
  typedef struct TPMState {
-    ISADevice busdev;
      MemoryRegion mmio;
 
      unsigned char buffer[TPM_TIS_BUFFER_MAX];
@@ -91,7 +90,15 @@ typedef struct TPMState {
      TPMPPI ppi;
  } TPMState;
 
-#define TPM(obj) OBJECT_CHECK(TPMState, (obj), TYPE_TPM_TIS_ISA)
+typedef struct TPMStateISA {
+    /*< private >*/
+    ISADevice parent_obj;
+
+    /*< public >*/
+    TPMState state; /* not a QOM object */
+} TPMStateISA;
+
+#define TPM_TIS_ISA(obj) OBJECT_CHECK(TPMStateISA, (obj), TYPE_TPM_TIS_ISA)
 
  #define DEBUG_TIS 0
 
@@ -281,9 +288,8 @@ static void tpm_tis_prep_abort(TPMState *s, uint8_t locty, uint8_t newlocty)
  /*
   * Callback from the TPM to indicate that the response was received.
   */
-static void tpm_tis_request_completed(TPMIf *ti, int ret)
+static void tpm_tis_request_completed(TPMState *s, int ret)
  {
-    TPMState *s = TPM(ti);
      uint8_t locty = s->cmd.locty;
      uint8_t l;
 
@@ -338,7 +344,7 @@ static uint32_t tpm_tis_data_read(TPMState *s, uint8_t locty)
  }
 
  #ifdef DEBUG_TIS
-static void tpm_tis_dump_state(void *opaque, hwaddr addr)
+static void tpm_tis_dump_state(TPMState *s, hwaddr addr)
  {
      static const unsigned regs[] = {
          TPM_TIS_REG_ACCESS,
@@ -353,7 +359,6 @@ static void tpm_tis_dump_state(void *opaque, hwaddr addr)
      int idx;
      uint8_t locty = tpm_tis_locality_from_addr(addr);
      hwaddr base = addr & ~0xfff;
-    TPMState *s = opaque;
 
      printf("tpm_tis: active locality      : %d\n"
             "tpm_tis: state of locality %d : %d\n"
@@ -363,7 +368,7 @@ static void tpm_tis_dump_state(void *opaque, hwaddr addr)
 
      for (idx = 0; regs[idx] != 0xfff; idx++) {
          printf("tpm_tis: 0x%04x : 0x%08x\n", regs[idx],
-               (int)tpm_tis_mmio_read(opaque, base + regs[idx], 4));
+               (int)tpm_tis_mmio_read(s, base + regs[idx], 4));
      }
 
      printf("tpm_tis: r/w offset    : %d\n"
@@ -488,7 +493,7 @@ static uint64_t tpm_tis_mmio_read(void *opaque, hwaddr addr,
          break;
  #ifdef DEBUG_TIS
      case TPM_TIS_REG_DEBUG:
-        tpm_tis_dump_state(opaque, addr);
+        tpm_tis_dump_state(s, addr);
          break;
  #endif
      }
@@ -835,10 +840,8 @@ static const MemoryRegionOps tpm_tis_memory_ops = {
  /*
   * Get the TPMVersion of the backend device being used
   */
-static enum TPMVersion tpm_tis_get_tpm_version(TPMIf *ti)
+static enum TPMVersion tpm_tis_get_tpm_version(TPMState *s)
  {
-    TPMState *s = TPM(ti);
-
      if (tpm_backend_had_startup_error(s->be_driver)) {
          return TPM_VERSION_UNSPEC;
      }
@@ -850,9 +853,8 @@ static enum TPMVersion tpm_tis_get_tpm_version(TPMIf *ti)
   * This function is called when the machine starts, resets or due to
   * S3 resume.
   */
-static void tpm_tis_reset(DeviceState *dev)
+static void tpm_tis_reset(TPMState *s)
  {
-    TPMState *s = TPM(dev);
      int c;
 
      s->be_tpm_version = tpm_backend_get_tpm_version(s->be_driver);
@@ -896,15 +898,14 @@ static void tpm_tis_reset(DeviceState *dev)
 
  /* persistent state handling */
 
-static int tpm_tis_pre_save(void *opaque)
+static int tpm_tis_pre_save(TPMState *s)
  {
-    TPMState *s = opaque;
      uint8_t locty = s->active_locty;
 
      trace_tpm_tis_pre_save(locty, s->rw_offset);
 
      if (DEBUG_TIS) {
-        tpm_tis_dump_state(opaque, 0);
+        tpm_tis_dump_state(s, 0);
      }
 
      /*
@@ -929,34 +930,78 @@ static const VMStateDescription vmstate_locty = {
      }
  };
 
-static const VMStateDescription vmstate_tpm_tis = {
+/* ISA */
+
+static int tpm_tis_pre_save_isa(void *opaque)
+{
+    TPMStateISA *isadev = opaque;
+
+    return tpm_tis_pre_save(&isadev->state);
+}
+
+static const VMStateDescription vmstate_tpm_tis_isa = {
      .name = "tpm-tis",
      .version_id = 0,
-    .pre_save  = tpm_tis_pre_save,
+    .pre_save  = tpm_tis_pre_save_isa,
      .fields = (VMStateField[]) {
-        VMSTATE_BUFFER(buffer, TPMState),
-        VMSTATE_UINT16(rw_offset, TPMState),
-        VMSTATE_UINT8(active_locty, TPMState),
-        VMSTATE_UINT8(aborting_locty, TPMState),
-        VMSTATE_UINT8(next_locty, TPMState),
+        VMSTATE_BUFFER(state.buffer, TPMStateISA),
+        VMSTATE_UINT16(state.rw_offset, TPMStateISA),
+        VMSTATE_UINT8(state.active_locty, TPMStateISA),
+        VMSTATE_UINT8(state.aborting_locty, TPMStateISA),
+        VMSTATE_UINT8(state.next_locty, TPMStateISA),
 
-        VMSTATE_STRUCT_ARRAY(loc, TPMState, TPM_TIS_NUM_LOCALITIES, 0,
+        VMSTATE_STRUCT_ARRAY(state.loc, TPMStateISA, TPM_TIS_NUM_LOCALITIES, 0,
                               vmstate_locty, TPMLocality),
 
          VMSTATE_END_OF_LIST()
      }
  };
 
-static Property tpm_tis_properties[] = {
-    DEFINE_PROP_UINT32("irq", TPMState, irq_num, TPM_TIS_IRQ),
-    DEFINE_PROP_TPMBE("tpmdev", TPMState, be_driver),
-    DEFINE_PROP_BOOL("ppi", TPMState, ppi_enabled, true),
+static void tpm_tis_isa_request_completed(TPMIf *ti, int ret)
+{
+    TPMStateISA *isadev = TPM_TIS_ISA(ti);
+    TPMState *s = &isadev->state;
+
+    tpm_tis_request_completed(s, ret);
+}
+
+static enum TPMVersion tpm_tis_isa_get_tpm_version(TPMIf *ti)
+{
+    TPMStateISA *isadev = TPM_TIS_ISA(ti);
+    TPMState *s = &isadev->state;
+
+    return tpm_tis_get_tpm_version(s);
+}
+
+static void tpm_tis_isa_reset(DeviceState *dev)
+{
+    TPMStateISA *isadev = TPM_TIS_ISA(dev);
+    TPMState *s = &isadev->state;
+
+    return tpm_tis_reset(s);
+}
+
+static Property tpm_tis_isa_properties[] = {
+    DEFINE_PROP_UINT32("irq", TPMStateISA, state.irq_num, TPM_TIS_IRQ),
+    DEFINE_PROP_TPMBE("tpmdev", TPMStateISA, state.be_driver),
+    DEFINE_PROP_BOOL("ppi", TPMStateISA, state.ppi_enabled, true),
      DEFINE_PROP_END_OF_LIST(),
  };
 
-static void tpm_tis_realizefn(DeviceState *dev, Error **errp)
+static void tpm_tis_isa_initfn(Object *obj)
  {
-    TPMState *s = TPM(dev);
+    TPMStateISA *isadev = TPM_TIS_ISA(obj);
+    TPMState *s = &isadev->state;
+
+    memory_region_init_io(&s->mmio, obj, &tpm_tis_memory_ops,
+                          s, "tpm-tis-mmio",
+                          TPM_TIS_NUM_LOCALITIES << TPM_TIS_LOCALITY_SHIFT);
+}
+
+static void tpm_tis_isa_realizefn(DeviceState *dev, Error **errp)
+{
+    TPMStateISA *isadev = TPM_TIS_ISA(dev);
+    TPMState *s = &isadev->state;
 
      if (!tpm_find()) {
          error_setg(errp, "at most one TPM device is permitted");
@@ -973,55 +1018,46 @@ static void tpm_tis_realizefn(DeviceState *dev, Error **errp)
          return;
      }
 
-    isa_init_irq(&s->busdev, &s->irq, s->irq_num);
+    isa_init_irq(ISA_DEVICE(dev), &s->irq, s->irq_num);
 
      memory_region_add_subregion(isa_address_space(ISA_DEVICE(dev)),
                                  TPM_TIS_ADDR_BASE, &s->mmio);
 
      if (s->ppi_enabled) {
          tpm_ppi_init(&s->ppi, isa_address_space(ISA_DEVICE(dev)),
-                     TPM_PPI_ADDR_BASE, OBJECT(s));
+                     TPM_PPI_ADDR_BASE, OBJECT(dev));
      }
  }
 
-static void tpm_tis_initfn(Object *obj)
-{
-    TPMState *s = TPM(obj);
-
-    memory_region_init_io(&s->mmio, OBJECT(s), &tpm_tis_memory_ops,
-                          s, "tpm-tis-mmio",
-                          TPM_TIS_NUM_LOCALITIES << TPM_TIS_LOCALITY_SHIFT);
-}
-
-static void tpm_tis_class_init(ObjectClass *klass, void *data)
+static void tpm_tis_isa_class_init(ObjectClass *klass, void *data)
  {
      DeviceClass *dc = DEVICE_CLASS(klass);
      TPMIfClass *tc = TPM_IF_CLASS(klass);
 
-    dc->realize = tpm_tis_realizefn;
-    device_class_set_props(dc, tpm_tis_properties);
-    dc->reset = tpm_tis_reset;
-    dc->vmsd  = &vmstate_tpm_tis;
+    device_class_set_props(dc, tpm_tis_isa_properties);
+    dc->vmsd  = &vmstate_tpm_tis_isa;
      tc->model = TPM_MODEL_TPM_TIS;
-    tc->get_version = tpm_tis_get_tpm_version;
-    tc->request_completed = tpm_tis_request_completed;
+    dc->realize = tpm_tis_isa_realizefn;
+    dc->reset = tpm_tis_isa_reset;
+    tc->request_completed = tpm_tis_isa_request_completed;
+    tc->get_version = tpm_tis_isa_get_tpm_version;
  }
 
-static const TypeInfo tpm_tis_info = {
+static const TypeInfo tpm_tis_isa_info = {
      .name = TYPE_TPM_TIS_ISA,
      .parent = TYPE_ISA_DEVICE,
-    .instance_size = sizeof(TPMState),
-    .instance_init = tpm_tis_initfn,
-    .class_init  = tpm_tis_class_init,
+    .instance_size = sizeof(TPMStateISA),
+    .instance_init = tpm_tis_isa_initfn,
+    .class_init  = tpm_tis_isa_class_init,
      .interfaces = (InterfaceInfo[]) {
          { TYPE_TPM_IF },
          { }
      }
  };
 
-static void tpm_tis_register(void)
+static void tpm_tis_isa_register(void)
  {
-    type_register_static(&tpm_tis_info);
+    type_register_static(&tpm_tis_isa_info);
  }
 
-type_init(tpm_tis_register)
+type_init(tpm_tis_isa_register)
Reviewed-by on v2 3/6
#14 lore raw

Re: [RFC v2 3/6] tpm: Separate tpm_tis common functions from isa code

In reply to Eric Auger
Quoted 4 lines · Eric Auger

Move the device agnostic code into tpm_tis_common.c and put the ISA device specific code into tpm_tis_isa.c

Quoted 576 lines
---
  hw/tpm/Makefile.objs                   |   2 +-
  hw/tpm/tpm_tis.h                       |  91 +++++++++++
  hw/tpm/{tpm_tis.c => tpm_tis_common.c} | 209 ++-----------------------
  hw/tpm/tpm_tis_isa.c                   | 170 ++++++++++++++++++++
  4 files changed, 271 insertions(+), 201 deletions(-)

create mode 100644 hw/tpm/tpm_tis.h
rename hw/tpm/{tpm_tis.c => tpm_tis_common.c} (83%) create mode 100644 hw/tpm/tpm_tis_isa.c

hw/tpm/Makefile.objs +1 -1
index 85eb99ae05..fcc4c2f27c 100644
@@ -1,6 +1,6 @@
  common-obj-$(CONFIG_TPM) += tpm_util.o
  obj-$(call lor,$(CONFIG_TPM_TIS),$(CONFIG_TPM_CRB)) += tpm_ppi.o
-common-obj-$(CONFIG_TPM_TIS) += tpm_tis.o
+common-obj-$(CONFIG_TPM_TIS) += tpm_tis_isa.o tpm_tis_common.o
  common-obj-$(CONFIG_TPM_CRB) += tpm_crb.o
  common-obj-$(CONFIG_TPM_PASSTHROUGH) += tpm_passthrough.o
  common-obj-$(CONFIG_TPM_EMULATOR) += tpm_emulator.o
hw/tpm/tpm_tis.h new file +91 -0
new file mode 100644
index 0000000000..5554989395
@@ -0,0 +1,91 @@
+/*
+ * tpm_tis.h - QEMU's TPM TIS common header
+ *
+ * Copyright (C) 2006,2010-2013 IBM Corporation
+ *
+ * Authors:
+ *  Stefan Berger <[email protected]>
+ *  David Safford <[email protected]>
+ *
+ * Xen 4 support: Andrease Niederl <[email protected]>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ *
+ * Implementation of the TIS interface according to specs found at
+ * http://www.trustedcomputinggroup.org. This implementation currently
+ * supports version 1.3, 21 March 2013
+ * In the developers menu choose the PC Client section then find the TIS
+ * specification.
+ *
+ * TPM TIS for TPM 2 implementation following TCG PC Client Platform
+ * TPM Profile (PTP) Specification, Familiy 2.0, Revision 00.43
+ */
+#ifndef TPM_TPM_TIS_H
+#define TPM_TPM_TIS_H
+
+#include "qemu/osdep.h"
+#include "sysemu/tpm_backend.h"
+#include "tpm_ppi.h"
+
+#define TPM_TIS_NUM_LOCALITIES      5     /* per spec */
+#define TPM_TIS_LOCALITY_SHIFT      12
+#define TPM_TIS_NO_LOCALITY         0xff
+
+#define TPM_TIS_IS_VALID_LOCTY(x)   ((x) < TPM_TIS_NUM_LOCALITIES)
+
+#define TPM_TIS_BUFFER_MAX          4096
+
+typedef enum {
+    TPM_TIS_STATE_IDLE = 0,
+    TPM_TIS_STATE_READY,
+    TPM_TIS_STATE_COMPLETION,
+    TPM_TIS_STATE_EXECUTION,
+    TPM_TIS_STATE_RECEPTION,
+} TPMTISState;
+
+/* locality data  -- all fields are persisted */
+typedef struct TPMLocality {
+    TPMTISState state;
+    uint8_t access;
+    uint32_t sts;
+    uint32_t iface_id;
+    uint32_t inte;
+    uint32_t ints;
+} TPMLocality;
+
+typedef struct TPMState {
+    MemoryRegion mmio;
+
+    unsigned char buffer[TPM_TIS_BUFFER_MAX];
+    uint16_t rw_offset;
+
+    uint8_t active_locty;
+    uint8_t aborting_locty;
+    uint8_t next_locty;
+
+    TPMLocality loc[TPM_TIS_NUM_LOCALITIES];
+
+    qemu_irq irq;
+    uint32_t irq_num;
+
+    TPMBackendCmd cmd;
+
+    TPMBackend *be_driver;
+    TPMVersion be_tpm_version;
+
+    size_t be_buffer_size;
+
+    bool ppi_enabled;
+    TPMPPI ppi;
+} TPMState;
+
+extern const VMStateDescription vmstate_locty;
+extern const MemoryRegionOps tpm_tis_memory_ops;
+
+int tpm_tis_pre_save(TPMState *s);
+void tpm_tis_reset(TPMState *s);
+enum TPMVersion tpm_tis_get_tpm_version(TPMState *s);
+void tpm_tis_request_completed(TPMState *s, int ret);
+
+#endif /* TPM_TPM_TIS_H */
hw/tpm/tpm_tis_common.c renamed from hw/tpm/tpm_tis.c +9 -200
similarity index 83%
rename from hw/tpm/tpm_tis.c
rename to hw/tpm/tpm_tis_common.c
index fc6d7ca579..9ce64d4836 100644
@@ -1,5 +1,6 @@
  /*
- * tpm_tis.c - QEMU's TPM TIS interface emulator
+ * tpm_tis_common.c - QEMU's TPM TIS interface emulator
+ * device agnostic functions
   *
   * Copyright (C) 2006,2010-2013 IBM Corporation
   *
@@ -21,7 +22,6 @@
   * TPM TIS for TPM 2 implementation following TCG PC Client Platform
   * TPM Profile (PTP) Specification, Familiy 2.0, Revision 00.43
   */
-
  #include "qemu/osdep.h"
  #include "hw/irq.h"
  #include "hw/isa/isa.h"
@@ -38,67 +38,7 @@
  #include "tpm_ppi.h"
  #include "trace.h"
 
-#define TPM_TIS_NUM_LOCALITIES      5     /* per spec */
-#define TPM_TIS_LOCALITY_SHIFT      12
-#define TPM_TIS_NO_LOCALITY         0xff
-
-#define TPM_TIS_IS_VALID_LOCTY(x)   ((x) < TPM_TIS_NUM_LOCALITIES)
-
-#define TPM_TIS_BUFFER_MAX          4096
-
-typedef enum {
-    TPM_TIS_STATE_IDLE = 0,
-    TPM_TIS_STATE_READY,
-    TPM_TIS_STATE_COMPLETION,
-    TPM_TIS_STATE_EXECUTION,
-    TPM_TIS_STATE_RECEPTION,
-} TPMTISState;
-
-/* locality data  -- all fields are persisted */
-typedef struct TPMLocality {
-    TPMTISState state;
-    uint8_t access;
-    uint32_t sts;
-    uint32_t iface_id;
-    uint32_t inte;
-    uint32_t ints;
-} TPMLocality;
-
-typedef struct TPMState {
-    MemoryRegion mmio;
-
-    unsigned char buffer[TPM_TIS_BUFFER_MAX];
-    uint16_t rw_offset;
-
-    uint8_t active_locty;
-    uint8_t aborting_locty;
-    uint8_t next_locty;
-
-    TPMLocality loc[TPM_TIS_NUM_LOCALITIES];
-
-    qemu_irq irq;
-    uint32_t irq_num;
-
-    TPMBackendCmd cmd;
-
-    TPMBackend *be_driver;
-    TPMVersion be_tpm_version;
-
-    size_t be_buffer_size;
-
-    bool ppi_enabled;
-    TPMPPI ppi;
-} TPMState;
-
-typedef struct TPMStateISA {
-    /*< private >*/
-    ISADevice parent_obj;
-
-    /*< public >*/
-    TPMState state; /* not a QOM object */
-} TPMStateISA;
-
-#define TPM_TIS_ISA(obj) OBJECT_CHECK(TPMStateISA, (obj), TYPE_TPM_TIS_ISA)
+#include "tpm_tis.h"
 
  #define DEBUG_TIS 0
 
@@ -288,7 +228,7 @@ static void tpm_tis_prep_abort(TPMState *s, uint8_t locty, uint8_t newlocty)
  /*
   * Callback from the TPM to indicate that the response was received.
   */
-static void tpm_tis_request_completed(TPMState *s, int ret)
+void tpm_tis_request_completed(TPMState *s, int ret)
  {
      uint8_t locty = s->cmd.locty;
      uint8_t l;
@@ -827,7 +767,7 @@ static void tpm_tis_mmio_write(void *opaque, hwaddr addr,
      }
  }
 
-static const MemoryRegionOps tpm_tis_memory_ops = {
+const MemoryRegionOps tpm_tis_memory_ops = {
      .read = tpm_tis_mmio_read,
      .write = tpm_tis_mmio_write,
      .endianness = DEVICE_LITTLE_ENDIAN,
@@ -840,7 +780,7 @@ static const MemoryRegionOps tpm_tis_memory_ops = {
  /*
   * Get the TPMVersion of the backend device being used
   */
-static enum TPMVersion tpm_tis_get_tpm_version(TPMState *s)
+enum TPMVersion tpm_tis_get_tpm_version(TPMState *s)
  {
      if (tpm_backend_had_startup_error(s->be_driver)) {
          return TPM_VERSION_UNSPEC;
@@ -853,7 +793,7 @@ static enum TPMVersion tpm_tis_get_tpm_version(TPMState *s)
   * This function is called when the machine starts, resets or due to
   * S3 resume.
   */
-static void tpm_tis_reset(TPMState *s)
+void tpm_tis_reset(TPMState *s)
  {
      int c;
 
@@ -898,7 +838,7 @@ static void tpm_tis_reset(TPMState *s)
 
  /* persistent state handling */
 
-static int tpm_tis_pre_save(TPMState *s)
+int tpm_tis_pre_save(TPMState *s)
  {
      uint8_t locty = s->active_locty;
 
@@ -916,7 +856,7 @@ static int tpm_tis_pre_save(TPMState *s)
      return 0;
  }
 
-static const VMStateDescription vmstate_locty = {
+const VMStateDescription vmstate_locty = {
      .name = "tpm-tis/locty",
      .version_id = 0,
      .fields      = (VMStateField[]) {
@@ -930,134 +870,3 @@ static const VMStateDescription vmstate_locty = {
      }
  };
 
-/* ISA */
-
-static int tpm_tis_pre_save_isa(void *opaque)
-{
-    TPMStateISA *isadev = opaque;
-
-    return tpm_tis_pre_save(&isadev->state);
-}
-
-static const VMStateDescription vmstate_tpm_tis_isa = {
-    .name = "tpm-tis",
-    .version_id = 0,
-    .pre_save  = tpm_tis_pre_save_isa,
-    .fields = (VMStateField[]) {
-        VMSTATE_BUFFER(state.buffer, TPMStateISA),
-        VMSTATE_UINT16(state.rw_offset, TPMStateISA),
-        VMSTATE_UINT8(state.active_locty, TPMStateISA),
-        VMSTATE_UINT8(state.aborting_locty, TPMStateISA),
-        VMSTATE_UINT8(state.next_locty, TPMStateISA),
-
-        VMSTATE_STRUCT_ARRAY(state.loc, TPMStateISA, TPM_TIS_NUM_LOCALITIES, 0,
-                             vmstate_locty, TPMLocality),
-
-        VMSTATE_END_OF_LIST()
-    }
-};
-
-static void tpm_tis_isa_request_completed(TPMIf *ti, int ret)
-{
-    TPMStateISA *isadev = TPM_TIS_ISA(ti);
-    TPMState *s = &isadev->state;
-
-    tpm_tis_request_completed(s, ret);
-}
-
-static enum TPMVersion tpm_tis_isa_get_tpm_version(TPMIf *ti)
-{
-    TPMStateISA *isadev = TPM_TIS_ISA(ti);
-    TPMState *s = &isadev->state;
-
-    return tpm_tis_get_tpm_version(s);
-}
-
-static void tpm_tis_isa_reset(DeviceState *dev)
-{
-    TPMStateISA *isadev = TPM_TIS_ISA(dev);
-    TPMState *s = &isadev->state;
-
-    return tpm_tis_reset(s);
-}
-
-static Property tpm_tis_isa_properties[] = {
-    DEFINE_PROP_UINT32("irq", TPMStateISA, state.irq_num, TPM_TIS_IRQ),
-    DEFINE_PROP_TPMBE("tpmdev", TPMStateISA, state.be_driver),
-    DEFINE_PROP_BOOL("ppi", TPMStateISA, state.ppi_enabled, true),
-    DEFINE_PROP_END_OF_LIST(),
-};
-
-static void tpm_tis_isa_initfn(Object *obj)
-{
-    TPMStateISA *isadev = TPM_TIS_ISA(obj);
-    TPMState *s = &isadev->state;
-
-    memory_region_init_io(&s->mmio, obj, &tpm_tis_memory_ops,
-                          s, "tpm-tis-mmio",
-                          TPM_TIS_NUM_LOCALITIES << TPM_TIS_LOCALITY_SHIFT);
-}
-
-static void tpm_tis_isa_realizefn(DeviceState *dev, Error **errp)
-{
-    TPMStateISA *isadev = TPM_TIS_ISA(dev);
-    TPMState *s = &isadev->state;
-
-    if (!tpm_find()) {
-        error_setg(errp, "at most one TPM device is permitted");
-        return;
-    }
-
-    if (!s->be_driver) {
-        error_setg(errp, "'tpmdev' property is required");
-        return;
-    }
-    if (s->irq_num > 15) {
-        error_setg(errp, "IRQ %d is outside valid range of 0 to 15",
-                   s->irq_num);
-        return;
-    }
-
-    isa_init_irq(ISA_DEVICE(dev), &s->irq, s->irq_num);
-
-    memory_region_add_subregion(isa_address_space(ISA_DEVICE(dev)),
-                                TPM_TIS_ADDR_BASE, &s->mmio);
-
-    if (s->ppi_enabled) {
-        tpm_ppi_init(&s->ppi, isa_address_space(ISA_DEVICE(dev)),
-                     TPM_PPI_ADDR_BASE, OBJECT(dev));
-    }
-}
-
-static void tpm_tis_isa_class_init(ObjectClass *klass, void *data)
-{
-    DeviceClass *dc = DEVICE_CLASS(klass);
-    TPMIfClass *tc = TPM_IF_CLASS(klass);
-
-    device_class_set_props(dc, tpm_tis_isa_properties);
-    dc->vmsd  = &vmstate_tpm_tis_isa;
-    tc->model = TPM_MODEL_TPM_TIS;
-    dc->realize = tpm_tis_isa_realizefn;
-    dc->reset = tpm_tis_isa_reset;
-    tc->request_completed = tpm_tis_isa_request_completed;
-    tc->get_version = tpm_tis_isa_get_tpm_version;
-}
-
-static const TypeInfo tpm_tis_isa_info = {
-    .name = TYPE_TPM_TIS_ISA,
-    .parent = TYPE_ISA_DEVICE,
-    .instance_size = sizeof(TPMStateISA),
-    .instance_init = tpm_tis_isa_initfn,
-    .class_init  = tpm_tis_isa_class_init,
-    .interfaces = (InterfaceInfo[]) {
-        { TYPE_TPM_IF },
-        { }
-    }
-};
-
-static void tpm_tis_isa_register(void)
-{
-    type_register_static(&tpm_tis_isa_info);
-}
-
-type_init(tpm_tis_isa_register)
hw/tpm/tpm_tis_isa.c new file +170 -0
new file mode 100644
index 0000000000..30ba37079d
@@ -0,0 +1,170 @@
+/*
+ * tpm_tis_isa.c - QEMU's TPM TIS ISA Device
+ *
+ * Copyright (C) 2006,2010-2013 IBM Corporation
+ *
+ * Authors:
+ *  Stefan Berger <[email protected]>
+ *  David Safford <[email protected]>
+ *
+ * Xen 4 support: Andrease Niederl <[email protected]>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ *
+ * Implementation of the TIS interface according to specs found at
+ * http://www.trustedcomputinggroup.org. This implementation currently
+ * supports version 1.3, 21 March 2013
+ * In the developers menu choose the PC Client section then find the TIS
+ * specification.
+ *
+ * TPM TIS for TPM 2 implementation following TCG PC Client Platform
+ * TPM Profile (PTP) Specification, Familiy 2.0, Revision 00.43
+ */
+
+#include "qemu/osdep.h"
+#include "hw/isa/isa.h"
+#include "hw/qdev-properties.h"
+#include "migration/vmstate.h"
+#include "tpm_util.h"
+#include "tpm_tis.h"
+
+typedef struct TPMStateISA {
+    /*< private >*/
+    ISADevice parent_obj;
+
+    /*< public >*/
+    TPMState state; /* not a QOM object */
+} TPMStateISA;
+
+#define TPM_TIS_ISA(obj) OBJECT_CHECK(TPMStateISA, (obj), TYPE_TPM_TIS_ISA)
+
+static int tpm_tis_pre_save_isa(void *opaque)
+{
+    TPMStateISA *isadev = opaque;
+
+    return tpm_tis_pre_save(&isadev->state);
+}
+
+static const VMStateDescription vmstate_tpm_tis_isa = {
+    .name = "tpm-tis",
+    .version_id = 0,
+    .pre_save  = tpm_tis_pre_save_isa,
+    .fields = (VMStateField[]) {
+        VMSTATE_BUFFER(state.buffer, TPMStateISA),
+        VMSTATE_UINT16(state.rw_offset, TPMStateISA),
+        VMSTATE_UINT8(state.active_locty, TPMStateISA),
+        VMSTATE_UINT8(state.aborting_locty, TPMStateISA),
+        VMSTATE_UINT8(state.next_locty, TPMStateISA),
+
+        VMSTATE_STRUCT_ARRAY(state.loc, TPMStateISA, TPM_TIS_NUM_LOCALITIES, 0,
+                             vmstate_locty, TPMLocality),
+
+        VMSTATE_END_OF_LIST()
+    }
+};
+
+static void tpm_tis_isa_request_completed(TPMIf *ti, int ret)
+{
+    TPMStateISA *isadev = TPM_TIS_ISA(ti);
+    TPMState *s = &isadev->state;
+
+    tpm_tis_request_completed(s, ret);
+}
+
+static enum TPMVersion tpm_tis_isa_get_tpm_version(TPMIf *ti)
+{
+    TPMStateISA *isadev = TPM_TIS_ISA(ti);
+    TPMState *s = &isadev->state;
+
+    return tpm_tis_get_tpm_version(s);
+}
+
+static void tpm_tis_isa_reset(DeviceState *dev)
+{
+    TPMStateISA *isadev = TPM_TIS_ISA(dev);
+    TPMState *s = &isadev->state;
+
+    return tpm_tis_reset(s);
+}
+
+static Property tpm_tis_isa_properties[] = {
+    DEFINE_PROP_UINT32("irq", TPMStateISA, state.irq_num, TPM_TIS_IRQ),
+    DEFINE_PROP_TPMBE("tpmdev", TPMStateISA, state.be_driver),
+    DEFINE_PROP_BOOL("ppi", TPMStateISA, state.ppi_enabled, true),
+    DEFINE_PROP_END_OF_LIST(),
+};
+
+static void tpm_tis_isa_initfn(Object *obj)
+{
+    TPMStateISA *isadev = TPM_TIS_ISA(obj);
+    TPMState *s = &isadev->state;
+
+    memory_region_init_io(&s->mmio, obj, &tpm_tis_memory_ops,
+                          s, "tpm-tis-mmio",
+                          TPM_TIS_NUM_LOCALITIES << TPM_TIS_LOCALITY_SHIFT);
+}
+
+static void tpm_tis_isa_realizefn(DeviceState *dev, Error **errp)
+{
+    TPMStateISA *isadev = TPM_TIS_ISA(dev);
+    TPMState *s = &isadev->state;
+
+    if (!tpm_find()) {
+        error_setg(errp, "at most one TPM device is permitted");
+        return;
+    }
+
+    if (!s->be_driver) {
+        error_setg(errp, "'tpmdev' property is required");
+        return;
+    }
+    if (s->irq_num > 15) {
+        error_setg(errp, "IRQ %d is outside valid range of 0 to 15",
+                   s->irq_num);
+        return;
+    }
+
+    isa_init_irq(ISA_DEVICE(dev), &s->irq, s->irq_num);
+
+    memory_region_add_subregion(isa_address_space(ISA_DEVICE(dev)),
+                                TPM_TIS_ADDR_BASE, &s->mmio);
+
+    if (s->ppi_enabled) {
+        tpm_ppi_init(&s->ppi, isa_address_space(ISA_DEVICE(dev)),
+                     TPM_PPI_ADDR_BASE, OBJECT(dev));
+    }
+}
+
+static void tpm_tis_isa_class_init(ObjectClass *klass, void *data)
+{
+    DeviceClass *dc = DEVICE_CLASS(klass);
+    TPMIfClass *tc = TPM_IF_CLASS(klass);
+
+    device_class_set_props(dc, tpm_tis_isa_properties);
+    dc->vmsd  = &vmstate_tpm_tis_isa;
+    tc->model = TPM_MODEL_TPM_TIS;
+    dc->realize = tpm_tis_isa_realizefn;
+    dc->reset = tpm_tis_isa_reset;
+    tc->request_completed = tpm_tis_isa_request_completed;
+    tc->get_version = tpm_tis_isa_get_tpm_version;
+}
+
+static const TypeInfo tpm_tis_isa_info = {
+    .name = TYPE_TPM_TIS_ISA,
+    .parent = TYPE_ISA_DEVICE,
+    .instance_size = sizeof(TPMStateISA),
+    .instance_init = tpm_tis_isa_initfn,
+    .class_init  = tpm_tis_isa_class_init,
+    .interfaces = (InterfaceInfo[]) {
+        { TYPE_TPM_IF },
+        { }
+    }
+};
+
+static void tpm_tis_isa_register(void)
+{
+    type_register_static(&tpm_tis_isa_info);
+}
+
+type_init(tpm_tis_isa_register)
Reviewed-by on v2 5/6
#19 lore raw

Re: [RFC v2 5/6] tpm: Add the SysBus TPM TIS device

In reply to Eric Auger
Quoted 210 lines · Eric Auger

Introduce the tpm-tis-device which is a sysbus device and is bound to be used on ARM.

---
  hw/tpm/Kconfig          |   5 ++
  hw/tpm/Makefile.objs    |   1 +
  hw/tpm/tpm_tis_sysbus.c | 159 ++++++++++++++++++++++++++++++++++++++++
  include/sysemu/tpm.h    |   1 +
  4 files changed, 166 insertions(+)

create mode 100644 hw/tpm/tpm_tis_sysbus.c

hw/tpm/Kconfig +5 -0
index 686f8206bb..4794e7fe28 100644
@@ -7,6 +7,11 @@ config TPM_TIS_ISA
      depends on TPM && ISA_BUS
      select TPM_TIS
 
+config TPM_TIS_SYSBUS
+    bool
+    depends on TPM
+    select TPM_TIS
+
  config TPM_TIS
      bool
      depends on TPM
hw/tpm/Makefile.objs +1 -0
index 3ef2036cca..f1ec4beb95 100644
@@ -1,6 +1,7 @@
  common-obj-$(CONFIG_TPM) += tpm_util.o
  obj-$(call lor,$(CONFIG_TPM_TIS),$(CONFIG_TPM_CRB)) += tpm_ppi.o
  common-obj-$(CONFIG_TPM_TIS_ISA) += tpm_tis_isa.o
+common-obj-$(CONFIG_TPM_TIS_SYSBUS) += tpm_tis_sysbus.o
  common-obj-$(CONFIG_TPM_TIS) += tpm_tis_common.o
  common-obj-$(CONFIG_TPM_CRB) += tpm_crb.o
  common-obj-$(CONFIG_TPM_PASSTHROUGH) += tpm_passthrough.o
hw/tpm/tpm_tis_sysbus.c new file +159 -0
new file mode 100644
index 0000000000..18c02aed67
@@ -0,0 +1,159 @@
+/*
+ * tpm_tis_sysbus.c - QEMU's TPM TIS SYSBUS Device
+ *
+ * Copyright (C) 2006,2010-2013 IBM Corporation
+ *
+ * Authors:
+ *  Stefan Berger <[email protected]>
+ *  David Safford <[email protected]>
+ *
+ * Xen 4 support: Andrease Niederl <[email protected]>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ *
+ * Implementation of the TIS interface according to specs found at
+ * http://www.trustedcomputinggroup.org. This implementation currently
+ * supports version 1.3, 21 March 2013
+ * In the developers menu choose the PC Client section then find the TIS
+ * specification.
+ *
+ * TPM TIS for TPM 2 implementation following TCG PC Client Platform
+ * TPM Profile (PTP) Specification, Familiy 2.0, Revision 00.43
+ */
+
+#include "qemu/osdep.h"
+#include "hw/qdev-properties.h"
+#include "migration/vmstate.h"
+#include "tpm_util.h"
+#include "hw/sysbus.h"
+#include "tpm_tis.h"
+
+typedef struct TPMStateSysBus {
+    /*< private >*/
+    SysBusDevice parent_obj;
+
+    /*< public >*/
+    TPMState state; /* not a QOM object */
+} TPMStateSysBus;
+
+#define TPM_TIS_SYSBUS(obj) OBJECT_CHECK(TPMStateSysBus, (obj), TYPE_TPM_TIS_SYSBUS)
+
+static int tpm_tis_pre_save_sysbus(void *opaque)
+{
+    TPMStateSysBus *sbdev = opaque;
+
+    return tpm_tis_pre_save(&sbdev->state);
+}
+
+static const VMStateDescription vmstate_tpm_tis_sysbus = {
+    .name = "tpm-tis",
+    .version_id = 0,
+    .pre_save  = tpm_tis_pre_save_sysbus,
+    .fields = (VMStateField[]) {
+        VMSTATE_BUFFER(state.buffer, TPMStateSysBus),
+        VMSTATE_UINT16(state.rw_offset, TPMStateSysBus),
+        VMSTATE_UINT8(state.active_locty, TPMStateSysBus),
+        VMSTATE_UINT8(state.aborting_locty, TPMStateSysBus),
+        VMSTATE_UINT8(state.next_locty, TPMStateSysBus),
+
+        VMSTATE_STRUCT_ARRAY(state.loc, TPMStateSysBus, TPM_TIS_NUM_LOCALITIES,
+                             0, vmstate_locty, TPMLocality),
+
+        VMSTATE_END_OF_LIST()
+    }
+};
+
+static void tpm_tis_sysbus_request_completed(TPMIf *ti, int ret)
+{
+    TPMStateSysBus *sbdev = TPM_TIS_SYSBUS(ti);
+    TPMState *s = &sbdev->state;
+
+    tpm_tis_request_completed(s, ret);
+}
+
+static enum TPMVersion tpm_tis_sysbus_get_tpm_version(TPMIf *ti)
+{
+    TPMStateSysBus *sbdev = TPM_TIS_SYSBUS(ti);
+    TPMState *s = &sbdev->state;
+
+    return tpm_tis_get_tpm_version(s);
+}
+
+static void tpm_tis_sysbus_reset(DeviceState *dev)
+{
+    TPMStateSysBus *sbdev = TPM_TIS_SYSBUS(dev);
+    TPMState *s = &sbdev->state;
+
+    return tpm_tis_reset(s);
+}
+
+static Property tpm_tis_sysbus_properties[] = {
+    DEFINE_PROP_UINT32("irq", TPMStateSysBus, state.irq_num, TPM_TIS_IRQ),
+    DEFINE_PROP_TPMBE("tpmdev", TPMStateSysBus, state.be_driver),
+    DEFINE_PROP_BOOL("ppi", TPMStateSysBus, state.ppi_enabled, true),
+    DEFINE_PROP_END_OF_LIST(),
+};
+
+static void tpm_tis_sysbus_initfn(Object *obj)
+{
+    TPMStateSysBus *sbdev = TPM_TIS_SYSBUS(obj);
+    TPMState *s = &sbdev->state;
+
+    memory_region_init_io(&s->mmio, obj, &tpm_tis_memory_ops,
+                          s, "tpm-tis-mmio",
+                          TPM_TIS_NUM_LOCALITIES << TPM_TIS_LOCALITY_SHIFT);
+
+    sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->mmio);
+    sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->irq);
+}
+
+static void tpm_tis_sysbus_realizefn(DeviceState *dev, Error **errp)
+{
+    TPMStateSysBus *sbdev = TPM_TIS_SYSBUS(dev);
+    TPMState *s = &sbdev->state;
+
+    if (!tpm_find()) {
+        error_setg(errp, "at most one TPM device is permitted");
+        return;
+    }
+
+    if (!s->be_driver) {
+        error_setg(errp, "'tpmdev' property is required");
+        return;
+    }
+}
+
+static void tpm_tis_sysbus_class_init(ObjectClass *klass, void *data)
+{
+    DeviceClass *dc = DEVICE_CLASS(klass);
+    TPMIfClass *tc = TPM_IF_CLASS(klass);
+
+    device_class_set_props(dc, tpm_tis_sysbus_properties);
+    dc->vmsd  = &vmstate_tpm_tis_sysbus;
+    tc->model = TPM_MODEL_TPM_TIS;
+    dc->realize = tpm_tis_sysbus_realizefn;
+    dc->user_creatable = true;
+    dc->reset = tpm_tis_sysbus_reset;
+    tc->request_completed = tpm_tis_sysbus_request_completed;
+    tc->get_version = tpm_tis_sysbus_get_tpm_version;
+}
+
+static const TypeInfo tpm_tis_sysbus_info = {
+    .name = TYPE_TPM_TIS_SYSBUS,
+    .parent = TYPE_SYS_BUS_DEVICE,
+    .instance_size = sizeof(TPMStateSysBus),
+    .instance_init = tpm_tis_sysbus_initfn,
+    .class_init  = tpm_tis_sysbus_class_init,
+    .interfaces = (InterfaceInfo[]) {
+        { TYPE_TPM_IF },
+        { }
+    }
+};
+
+static void tpm_tis_sysbus_register(void)
+{
+    type_register_static(&tpm_tis_sysbus_info);
+}
+
+type_init(tpm_tis_sysbus_register)
include/sysemu/tpm.h +0 -0
index 1691b92c28..f37851b1aa 100644

include/sysemu/tpm.h typedef struct TPMIfClass { · line 47

Quoted 4 lines
include/sysemu/tpm.h +1 -0
@@ -44,6 +44,7 @@ typedef struct TPMIfClass {
  } TPMIfClass;
 
  #define TYPE_TPM_TIS_ISA            "tpm-tis"
+#define TYPE_TPM_TIS_SYSBUS         "tpm-tis-device"

hm, replace the rather generic 'device' with 'sysbus'?

Otherwise looks really good.

Quoted 3 lines
include/sysemu/tpm.h +0 -0
  #define TYPE_TPM_CRB                "tpm-crb"
  #define TYPE_TPM_SPAPR              "tpm-spapr"
 
#26 lore raw

Re: [RFC v2 6/6] hw/arm/virt: vTPM support

In reply to Eric Auger
Quoted 9 lines · Eric Auger

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:

Quoted 8 lines
         -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

Can you also extend docs/spec/tpm.rst for the arm case? And the test cases should probably also cover the arm sysbus device.

Quoted 45 lines
---
  hw/arm/Kconfig      |  1 +
  hw/arm/sysbus-fdt.c | 36 ++++++++++++++++++++++++++++++++++++
  hw/arm/virt.c       |  7 +++++++
  3 files changed, 44 insertions(+)
hw/arm/Kconfig +1 -0
index 3d86691ae0..b6f03f7f53 100644
@@ -5,6 +5,7 @@ config ARM_VIRT
      imply VFIO_AMD_XGBE
      imply VFIO_PLATFORM
      imply VFIO_XGMAC
+    imply TPM_TIS_SYSBUS
      select A15MPCORE
      select ACPI
      select ARM_SMMUV3
hw/arm/sysbus-fdt.c +10 -0
index 022fc97ecd..adf50444c2 100644
@@ -30,6 +30,7 @@
  #include "hw/arm/sysbus-fdt.h"
  #include "qemu/error-report.h"
  #include "sysemu/device_tree.h"
+#include "sysemu/tpm.h"
  #include "hw/platform-bus.h"
  #include "hw/vfio/vfio-platform.h"
  #include "hw/vfio/vfio-calxeda-xgmac.h"
@@ -434,6 +435,40 @@ static bool vfio_platform_match(SysBusDevice *sbdev,
  #define VFIO_PLATFORM_BINDING(compat, add_fn) \
      {TYPE_VFIO_PLATFORM, (compat), (add_fn), vfio_platform_match}
 
+/*
+ * add_tpm_tis_fdt_node: Create a DT node for TPM TIS
+ *
+ * See kernel documentation:
+ * Documentation/devicetree/bindings/security/tpm/tpm_tis_mmio.txt
+ * Optional interrupt for command completion is not exposed
+ */
+static int add_tpm_tis_fdt_node(SysBusDevice *sbdev, void *opaque)
+{

hw/arm/sysbus-fdt.c static bool vfio_platform_match(SysBusDevice *sbdev, · line 456

Quoted 10 lines
hw/arm/sysbus-fdt.c +10 -0
+    PlatformBusFDTData *data = opaque;
+    PlatformBusDevice *pbus = data->pbus;
+    void *fdt = data->fdt;
+    const char *parent_node = data->pbus_node_name;
+    int compat_str_len;
+    char *nodename;
+    uint32_t reg_attr[2];
+    uint64_t mmio_base;
+
+    mmio_base = platform_bus_get_mmio_addr(pbus, sbdev, 0);

I suppose any conditional creation of this device tree entry is covered with the TYPE_BINDING below, meaning no device tree is created if the device wasn't added.

hw/arm/sysbus-fdt.c static bool vfio_platform_match(SysBusDevice *sbdev, · line 462

Quoted 6 lines
hw/arm/sysbus-fdt.c +6 -0
+    nodename = g_strdup_printf("%s/tpm_tis@%" PRIx64, parent_node, mmio_base);
+    qemu_fdt_add_subnode(fdt, nodename);
+
+    compat_str_len = strlen("tcg,tpm-tis-mmio") + 1;
+    qemu_fdt_setprop(fdt, nodename, "compatible", "tcg,tpm-tis-mmio",
+                     compat_str_len);

You probably can use qemu_fdt_setprop_string()?

Quoted 52 lines
hw/arm/sysbus-fdt.c +10 -0
+
+    reg_attr[0] = cpu_to_be32(mmio_base);
+    reg_attr[1] = cpu_to_be32(0x5000);
+    qemu_fdt_setprop(fdt, nodename, "reg", reg_attr, 2 * sizeof(uint32_t));
+
+    g_free(nodename);
+    return 0;
+}
+
  #endif /* CONFIG_LINUX */
 
  static int no_fdt_node(SysBusDevice *sbdev, void *opaque)
@@ -455,6 +490,7 @@ static const BindingEntry bindings[] = {
      TYPE_BINDING(TYPE_VFIO_CALXEDA_XGMAC, add_calxeda_midway_xgmac_fdt_node),
      TYPE_BINDING(TYPE_VFIO_AMD_XGBE, add_amd_xgbe_fdt_node),
      VFIO_PLATFORM_BINDING("amd,xgbe-seattle-v1a", add_amd_xgbe_fdt_node),
+    TYPE_BINDING(TYPE_TPM_TIS_SYSBUS, add_tpm_tis_fdt_node),
  #endif
      TYPE_BINDING(TYPE_RAMFB_DEVICE, no_fdt_node),
      TYPE_BINDING("", NULL), /* last element */
hw/arm/virt.c +7 -0
index f788fe27d6..4b967e39d1 100644
@@ -47,6 +47,7 @@
  #include "sysemu/numa.h"
  #include "sysemu/runstate.h"
  #include "sysemu/sysemu.h"
+#include "sysemu/tpm.h"
  #include "sysemu/kvm.h"
  #include "hw/loader.h"
  #include "exec/address-spaces.h"
@@ -2041,6 +2042,7 @@ static void virt_machine_class_init(ObjectClass *oc, void *data)
      machine_class_allow_dynamic_sysbus_dev(mc, TYPE_VFIO_AMD_XGBE);
      machine_class_allow_dynamic_sysbus_dev(mc, TYPE_RAMFB_DEVICE);
      machine_class_allow_dynamic_sysbus_dev(mc, TYPE_VFIO_PLATFORM);
+    machine_class_allow_dynamic_sysbus_dev(mc, TYPE_TPM_TIS_SYSBUS);
      mc->block_default_type = IF_VIRTIO;
      mc->no_cdrom = 1;
      mc->pci_allow_0_address = true;
@@ -2153,6 +2155,11 @@ type_init(machvirt_machine_init);
 
  static void virt_machine_5_0_options(MachineClass *mc)
  {
+    static GlobalProperty compat[] = {
+        { TYPE_TPM_TIS_SYSBUS, "ppi", "false" },
+    };
+
+    compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
  }
  DEFINE_VIRT_MACHINE_AS_LATEST(5, 0)
 
#10 lore raw

Re: [RFC v2 2/6] tpm: Use TPMState as a common struct

In reply to Eric Auger

Hi Eric,

Quoted 154 lines · Eric Auger

As we plan to introdce 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.

---
  hw/tpm/tpm_tis.c | 146 +++++++++++++++++++++++++++++------------------
  1 file changed, 91 insertions(+), 55 deletions(-)
hw/tpm/tpm_tis.c +28 -18
index c609737272..fc6d7ca579 100644
@@ -65,7 +65,6 @@ typedef struct TPMLocality {
  } TPMLocality;
 
  typedef struct TPMState {
-    ISADevice busdev;
      MemoryRegion mmio;
 
      unsigned char buffer[TPM_TIS_BUFFER_MAX];
@@ -91,7 +90,15 @@ typedef struct TPMState {
      TPMPPI ppi;
  } TPMState;
 
-#define TPM(obj) OBJECT_CHECK(TPMState, (obj), TYPE_TPM_TIS_ISA)
+typedef struct TPMStateISA {
+    /*< private >*/
+    ISADevice parent_obj;
+
+    /*< public >*/
+    TPMState state; /* not a QOM object */
+} TPMStateISA;
+
+#define TPM_TIS_ISA(obj) OBJECT_CHECK(TPMStateISA, (obj), TYPE_TPM_TIS_ISA)
 
  #define DEBUG_TIS 0
 
@@ -281,9 +288,8 @@ static void tpm_tis_prep_abort(TPMState *s, uint8_t locty, uint8_t newlocty)
  /*
   * Callback from the TPM to indicate that the response was received.
   */
-static void tpm_tis_request_completed(TPMIf *ti, int ret)
+static void tpm_tis_request_completed(TPMState *s, int ret)
  {
-    TPMState *s = TPM(ti);
      uint8_t locty = s->cmd.locty;
      uint8_t l;
 
@@ -338,7 +344,7 @@ static uint32_t tpm_tis_data_read(TPMState *s, uint8_t locty)
  }
 
  #ifdef DEBUG_TIS
-static void tpm_tis_dump_state(void *opaque, hwaddr addr)
+static void tpm_tis_dump_state(TPMState *s, hwaddr addr)
  {
      static const unsigned regs[] = {
          TPM_TIS_REG_ACCESS,
@@ -353,7 +359,6 @@ static void tpm_tis_dump_state(void *opaque, hwaddr addr)
      int idx;
      uint8_t locty = tpm_tis_locality_from_addr(addr);
      hwaddr base = addr & ~0xfff;
-    TPMState *s = opaque;
 
      printf("tpm_tis: active locality      : %d\n"
             "tpm_tis: state of locality %d : %d\n"
@@ -363,7 +368,7 @@ static void tpm_tis_dump_state(void *opaque, hwaddr addr)
 
      for (idx = 0; regs[idx] != 0xfff; idx++) {
          printf("tpm_tis: 0x%04x : 0x%08x\n", regs[idx],
-               (int)tpm_tis_mmio_read(opaque, base + regs[idx], 4));
+               (int)tpm_tis_mmio_read(s, base + regs[idx], 4));
      }
 
      printf("tpm_tis: r/w offset    : %d\n"
@@ -488,7 +493,7 @@ static uint64_t tpm_tis_mmio_read(void *opaque, hwaddr addr,
          break;
  #ifdef DEBUG_TIS
      case TPM_TIS_REG_DEBUG:
-        tpm_tis_dump_state(opaque, addr);
+        tpm_tis_dump_state(s, addr);
          break;
  #endif
      }
@@ -835,10 +840,8 @@ static const MemoryRegionOps tpm_tis_memory_ops = {
  /*
   * Get the TPMVersion of the backend device being used
   */
-static enum TPMVersion tpm_tis_get_tpm_version(TPMIf *ti)
+static enum TPMVersion tpm_tis_get_tpm_version(TPMState *s)
  {
-    TPMState *s = TPM(ti);
-
      if (tpm_backend_had_startup_error(s->be_driver)) {
          return TPM_VERSION_UNSPEC;
      }
@@ -850,9 +853,8 @@ static enum TPMVersion tpm_tis_get_tpm_version(TPMIf *ti)
   * This function is called when the machine starts, resets or due to
   * S3 resume.
   */
-static void tpm_tis_reset(DeviceState *dev)
+static void tpm_tis_reset(TPMState *s)
  {
-    TPMState *s = TPM(dev);
      int c;
 
      s->be_tpm_version = tpm_backend_get_tpm_version(s->be_driver);
@@ -896,15 +898,14 @@ static void tpm_tis_reset(DeviceState *dev)
 
  /* persistent state handling */
 
-static int tpm_tis_pre_save(void *opaque)
+static int tpm_tis_pre_save(TPMState *s)
  {
-    TPMState *s = opaque;
      uint8_t locty = s->active_locty;
 
      trace_tpm_tis_pre_save(locty, s->rw_offset);
 
      if (DEBUG_TIS) {
-        tpm_tis_dump_state(opaque, 0);
+        tpm_tis_dump_state(s, 0);
      }
 
      /*
@@ -929,34 +930,78 @@ static const VMStateDescription vmstate_locty = {
      }
  };
 
-static const VMStateDescription vmstate_tpm_tis = {
+/* ISA */
+
+static int tpm_tis_pre_save_isa(void *opaque)
+{
+    TPMStateISA *isadev = opaque;
+
+    return tpm_tis_pre_save(&isadev->state);
+}
+
+static const VMStateDescription vmstate_tpm_tis_isa = {
      .name = "tpm-tis",
      .version_id = 0,
-    .pre_save  = tpm_tis_pre_save,
+    .pre_save  = tpm_tis_pre_save_isa,
      .fields = (VMStateField[]) {

hw/tpm/tpm_tis.c static const VMStateDescription vmstate_locty = { · line 951

Quoted 10 lines
hw/tpm/tpm_tis.c +5 -5
-        VMSTATE_BUFFER(buffer, TPMState),
-        VMSTATE_UINT16(rw_offset, TPMState),
-        VMSTATE_UINT8(active_locty, TPMState),
-        VMSTATE_UINT8(aborting_locty, TPMState),
-        VMSTATE_UINT8(next_locty, TPMState),
+        VMSTATE_BUFFER(state.buffer, TPMStateISA),
+        VMSTATE_UINT16(state.rw_offset, TPMStateISA),
+        VMSTATE_UINT8(state.active_locty, TPMStateISA),
+        VMSTATE_UINT8(state.aborting_locty, TPMStateISA),
+        VMSTATE_UINT8(state.next_locty, TPMStateISA),

On a second thought these fields seem to belong to a TPMCommonState. Why not QOM'ify an abstract common parent between ISA and SysBus?

Quoted 136 lines
hw/tpm/tpm_tis.c +58 -32
-        VMSTATE_STRUCT_ARRAY(loc, TPMState, TPM_TIS_NUM_LOCALITIES, 0,
+        VMSTATE_STRUCT_ARRAY(state.loc, TPMStateISA, TPM_TIS_NUM_LOCALITIES, 0,
                               vmstate_locty, TPMLocality),
 
          VMSTATE_END_OF_LIST()
      }
  };
 
-static Property tpm_tis_properties[] = {
-    DEFINE_PROP_UINT32("irq", TPMState, irq_num, TPM_TIS_IRQ),
-    DEFINE_PROP_TPMBE("tpmdev", TPMState, be_driver),
-    DEFINE_PROP_BOOL("ppi", TPMState, ppi_enabled, true),
+static void tpm_tis_isa_request_completed(TPMIf *ti, int ret)
+{
+    TPMStateISA *isadev = TPM_TIS_ISA(ti);
+    TPMState *s = &isadev->state;
+
+    tpm_tis_request_completed(s, ret);
+}
+
+static enum TPMVersion tpm_tis_isa_get_tpm_version(TPMIf *ti)
+{
+    TPMStateISA *isadev = TPM_TIS_ISA(ti);
+    TPMState *s = &isadev->state;
+
+    return tpm_tis_get_tpm_version(s);
+}
+
+static void tpm_tis_isa_reset(DeviceState *dev)
+{
+    TPMStateISA *isadev = TPM_TIS_ISA(dev);
+    TPMState *s = &isadev->state;
+
+    return tpm_tis_reset(s);
+}
+
+static Property tpm_tis_isa_properties[] = {
+    DEFINE_PROP_UINT32("irq", TPMStateISA, state.irq_num, TPM_TIS_IRQ),
+    DEFINE_PROP_TPMBE("tpmdev", TPMStateISA, state.be_driver),
+    DEFINE_PROP_BOOL("ppi", TPMStateISA, state.ppi_enabled, true),
      DEFINE_PROP_END_OF_LIST(),
  };
 
-static void tpm_tis_realizefn(DeviceState *dev, Error **errp)
+static void tpm_tis_isa_initfn(Object *obj)
  {
-    TPMState *s = TPM(dev);
+    TPMStateISA *isadev = TPM_TIS_ISA(obj);
+    TPMState *s = &isadev->state;
+
+    memory_region_init_io(&s->mmio, obj, &tpm_tis_memory_ops,
+                          s, "tpm-tis-mmio",
+                          TPM_TIS_NUM_LOCALITIES << TPM_TIS_LOCALITY_SHIFT);
+}
+
+static void tpm_tis_isa_realizefn(DeviceState *dev, Error **errp)
+{
+    TPMStateISA *isadev = TPM_TIS_ISA(dev);
+    TPMState *s = &isadev->state;
 
      if (!tpm_find()) {
          error_setg(errp, "at most one TPM device is permitted");
@@ -973,55 +1018,46 @@ static void tpm_tis_realizefn(DeviceState *dev, Error **errp)
          return;
      }
 
-    isa_init_irq(&s->busdev, &s->irq, s->irq_num);
+    isa_init_irq(ISA_DEVICE(dev), &s->irq, s->irq_num);
 
      memory_region_add_subregion(isa_address_space(ISA_DEVICE(dev)),
                                  TPM_TIS_ADDR_BASE, &s->mmio);
 
      if (s->ppi_enabled) {
          tpm_ppi_init(&s->ppi, isa_address_space(ISA_DEVICE(dev)),
-                     TPM_PPI_ADDR_BASE, OBJECT(s));
+                     TPM_PPI_ADDR_BASE, OBJECT(dev));
      }
  }
 
-static void tpm_tis_initfn(Object *obj)
-{
-    TPMState *s = TPM(obj);
-
-    memory_region_init_io(&s->mmio, OBJECT(s), &tpm_tis_memory_ops,
-                          s, "tpm-tis-mmio",
-                          TPM_TIS_NUM_LOCALITIES << TPM_TIS_LOCALITY_SHIFT);
-}
-
-static void tpm_tis_class_init(ObjectClass *klass, void *data)
+static void tpm_tis_isa_class_init(ObjectClass *klass, void *data)
  {
      DeviceClass *dc = DEVICE_CLASS(klass);
      TPMIfClass *tc = TPM_IF_CLASS(klass);
 
-    dc->realize = tpm_tis_realizefn;
-    device_class_set_props(dc, tpm_tis_properties);
-    dc->reset = tpm_tis_reset;
-    dc->vmsd  = &vmstate_tpm_tis;
+    device_class_set_props(dc, tpm_tis_isa_properties);
+    dc->vmsd  = &vmstate_tpm_tis_isa;
      tc->model = TPM_MODEL_TPM_TIS;
-    tc->get_version = tpm_tis_get_tpm_version;
-    tc->request_completed = tpm_tis_request_completed;
+    dc->realize = tpm_tis_isa_realizefn;
+    dc->reset = tpm_tis_isa_reset;
+    tc->request_completed = tpm_tis_isa_request_completed;
+    tc->get_version = tpm_tis_isa_get_tpm_version;
  }
 
-static const TypeInfo tpm_tis_info = {
+static const TypeInfo tpm_tis_isa_info = {
      .name = TYPE_TPM_TIS_ISA,
      .parent = TYPE_ISA_DEVICE,
-    .instance_size = sizeof(TPMState),
-    .instance_init = tpm_tis_initfn,
-    .class_init  = tpm_tis_class_init,
+    .instance_size = sizeof(TPMStateISA),
+    .instance_init = tpm_tis_isa_initfn,
+    .class_init  = tpm_tis_isa_class_init,
      .interfaces = (InterfaceInfo[]) {
          { TYPE_TPM_IF },
          { }
      }
  };
 
-static void tpm_tis_register(void)
+static void tpm_tis_isa_register(void)
  {
-    type_register_static(&tpm_tis_info);
+    type_register_static(&tpm_tis_isa_info);
  }
 
-type_init(tpm_tis_register)
+type_init(tpm_tis_isa_register)
author
#11 lore raw

Re: [RFC v2 2/6] tpm: Use TPMState as a common struct

Hi Philippe,

Quoted 152 lines · Philippe Mathieu-Daudé

Hi Eric,

Quoted 149 lines · Eric Auger

As we plan to introdce 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.

---
  hw/tpm/tpm_tis.c | 146 +++++++++++++++++++++++++++++------------------

  1 file changed, 91 insertions(+), 55 deletions(-)
hw/tpm/tpm_tis.c +9 -1
index c609737272..fc6d7ca579 100644
@@ -65,7 +65,6 @@ typedef struct TPMLocality {
   } TPMLocality;
     typedef struct TPMState {
-    ISADevice busdev;
       MemoryRegion mmio;
         unsigned char buffer[TPM_TIS_BUFFER_MAX];
@@ -91,7 +90,15 @@ typedef struct TPMState {
       TPMPPI ppi;
   } TPMState;
   -#define TPM(obj) OBJECT_CHECK(TPMState, (obj), TYPE_TPM_TIS_ISA)
+typedef struct TPMStateISA {
+    /*< private >*/
+    ISADevice parent_obj;
+
+    /*< public >*/
+    TPMState state; /* not a QOM object */
+} TPMStateISA;
+
+#define TPM_TIS_ISA(obj) OBJECT_CHECK(TPMStateISA, (obj),
 TYPE_TPM_TIS_ISA)
     #define DEBUG_TIS 0
   @@ -281,9 +288,8 @@ static void tpm_tis_prep_abort(TPMState *s,

uint8_t locty, uint8_t newlocty)
  /*
   * Callback from the TPM to indicate that the response was received. */

hw/tpm/tpm_tis.c +1 -1
-static void tpm_tis_request_completed(TPMIf *ti, int ret)
+static void tpm_tis_request_completed(TPMState *s, int ret)

  {
-    TPMState *s = TPM(ti);
      uint8_t locty = s->cmd.locty;
      uint8_t l;
  @@ -338,7 +344,7 @@ static uint32_t tpm_tis_data_read(TPMState *s, uint8_t locty)
  }
    #ifdef DEBUG_TIS

hw/tpm/tpm_tis.c +1 -1
-static void tpm_tis_dump_state(void *opaque, hwaddr addr)
+static void tpm_tis_dump_state(TPMState *s, hwaddr addr)

  {
      static const unsigned regs[] = {
          TPM_TIS_REG_ACCESS,

hw/tpm/tpm_tis.c +0 -1
@@ -353,7 +359,6 @@ static void tpm_tis_dump_state(void *opaque,
 hwaddr addr)
       int idx;
       uint8_t locty = tpm_tis_locality_from_addr(addr);
       hwaddr base = addr & ~0xfff;
-    TPMState *s = opaque;

        printf("tpm_tis: active locality      : %d\n" "tpm_tis: state of locality %d : %d\n"

hw/tpm/tpm_tis.c +1 -1
@@ -363,7 +368,7 @@ static void tpm_tis_dump_state(void *opaque,
 hwaddr addr)
         for (idx = 0; regs[idx] != 0xfff; idx++) {
           printf("tpm_tis: 0x%04x : 0x%08x\n", regs[idx],
-               (int)tpm_tis_mmio_read(opaque, base + regs[idx], 4));
+               (int)tpm_tis_mmio_read(s, base + regs[idx], 4));
       }

        printf("tpm_tis: r/w offset    : %d\n"

hw/tpm/tpm_tis.c +0 -0
@@ -488,7 +493,7 @@ static uint64_t tpm_tis_mmio_read(void *opaque,
 hwaddr addr,
           break;
   #ifdef DEBUG_TIS

      case TPM_TIS_REG_DEBUG:
-        tpm_tis_dump_state(opaque, addr);
+        tpm_tis_dump_state(s, addr);
          break;
  #endif
      }

hw/tpm/tpm_tis.c +15 -13
@@ -835,10 +840,8 @@ static const MemoryRegionOps tpm_tis_memory_ops = {
   /*
    * Get the TPMVersion of the backend device being used
    */
-static enum TPMVersion tpm_tis_get_tpm_version(TPMIf *ti)
+static enum TPMVersion tpm_tis_get_tpm_version(TPMState *s)
   {
-    TPMState *s = TPM(ti);
-
       if (tpm_backend_had_startup_error(s->be_driver)) {
           return TPM_VERSION_UNSPEC;
       }
@@ -850,9 +853,8 @@ static enum TPMVersion
 tpm_tis_get_tpm_version(TPMIf *ti)
    * This function is called when the machine starts, resets or due to
    * S3 resume.
    */
-static void tpm_tis_reset(DeviceState *dev)
+static void tpm_tis_reset(TPMState *s)
   {
-    TPMState *s = TPM(dev);
       int c;
         s->be_tpm_version = tpm_backend_get_tpm_version(s->be_driver);
@@ -896,15 +898,14 @@ static void tpm_tis_reset(DeviceState *dev)
     /* persistent state handling */
   -static int tpm_tis_pre_save(void *opaque)
+static int tpm_tis_pre_save(TPMState *s)
   {
-    TPMState *s = opaque;
       uint8_t locty = s->active_locty;
         trace_tpm_tis_pre_save(locty, s->rw_offset);
         if (DEBUG_TIS) {
-        tpm_tis_dump_state(opaque, 0);
+        tpm_tis_dump_state(s, 0);
       }
         /*
@@ -929,34 +930,78 @@ static const VMStateDescription vmstate_locty = {
       }
   };
   -static const VMStateDescription vmstate_tpm_tis = {
+/* ISA */
+
+static int tpm_tis_pre_save_isa(void *opaque)
+{
+    TPMStateISA *isadev = opaque;
+
+    return tpm_tis_pre_save(&isadev->state);
+}
+
+static const VMStateDescription vmstate_tpm_tis_isa = {
       .name = "tpm-tis",
       .version_id = 0,
-    .pre_save  = tpm_tis_pre_save,
+    .pre_save  = tpm_tis_pre_save_isa,
       .fields = (VMStateField[]) {
-        VMSTATE_BUFFER(buffer, TPMState),
-        VMSTATE_UINT16(rw_offset, TPMState),
-        VMSTATE_UINT8(active_locty, TPMState),
-        VMSTATE_UINT8(aborting_locty, TPMState),
-        VMSTATE_UINT8(next_locty, TPMState),
Quoted 8 lines

hw/tpm/tpm_tis.c static const VMStateDescription vmstate_locty = { · line 951

Quoted 5 lines
hw/tpm/tpm_tis.c +5 -0
+        VMSTATE_BUFFER(state.buffer, TPMStateISA),
+        VMSTATE_UINT16(state.rw_offset, TPMStateISA),
+        VMSTATE_UINT8(state.active_locty, TPMStateISA),
+        VMSTATE_UINT8(state.aborting_locty, TPMStateISA),
+        VMSTATE_UINT8(state.next_locty, TPMStateISA),

On a second thought these fields seem to belong to a TPMCommonState. Why not QOM'ify an abstract common parent between ISA and SysBus?

This would mean we have double QOM inheritance (ISADevice and Sysbus device already being QOM devices). As far as I know this is not supported (see qom/object.h). Here I use the same trick as the one being used in hw/vfio/platform or pci.c and also used in hw/block/fdc.c - as pointed out by Stefan- : see FDCtrlSysBus and FDCtrlISABus.

Thanks

Eric

Quoted 129 lines
Quoted 128 lines
hw/tpm/tpm_tis.c +58 -23
   -        VMSTATE_STRUCT_ARRAY(loc, TPMState, TPM_TIS_NUM_LOCALITIES, 0,
+        VMSTATE_STRUCT_ARRAY(state.loc, TPMStateISA,
 TPM_TIS_NUM_LOCALITIES, 0,
                                vmstate_locty, TPMLocality),
             VMSTATE_END_OF_LIST()
       }
   };
   -static Property tpm_tis_properties[] = {
-    DEFINE_PROP_UINT32("irq", TPMState, irq_num, TPM_TIS_IRQ),
-    DEFINE_PROP_TPMBE("tpmdev", TPMState, be_driver),
-    DEFINE_PROP_BOOL("ppi", TPMState, ppi_enabled, true),
+static void tpm_tis_isa_request_completed(TPMIf *ti, int ret)
+{
+    TPMStateISA *isadev = TPM_TIS_ISA(ti);
+    TPMState *s = &isadev->state;
+
+    tpm_tis_request_completed(s, ret);
+}
+
+static enum TPMVersion tpm_tis_isa_get_tpm_version(TPMIf *ti)
+{
+    TPMStateISA *isadev = TPM_TIS_ISA(ti);
+    TPMState *s = &isadev->state;
+
+    return tpm_tis_get_tpm_version(s);
+}
+
+static void tpm_tis_isa_reset(DeviceState *dev)
+{
+    TPMStateISA *isadev = TPM_TIS_ISA(dev);
+    TPMState *s = &isadev->state;
+
+    return tpm_tis_reset(s);
+}
+
+static Property tpm_tis_isa_properties[] = {
+    DEFINE_PROP_UINT32("irq", TPMStateISA, state.irq_num, TPM_TIS_IRQ),
+    DEFINE_PROP_TPMBE("tpmdev", TPMStateISA, state.be_driver),
+    DEFINE_PROP_BOOL("ppi", TPMStateISA, state.ppi_enabled, true),
       DEFINE_PROP_END_OF_LIST(),
   };
   -static void tpm_tis_realizefn(DeviceState *dev, Error **errp)
+static void tpm_tis_isa_initfn(Object *obj)
   {
-    TPMState *s = TPM(dev);
+    TPMStateISA *isadev = TPM_TIS_ISA(obj);
+    TPMState *s = &isadev->state;
+
+    memory_region_init_io(&s->mmio, obj, &tpm_tis_memory_ops,
+                          s, "tpm-tis-mmio",
+                          TPM_TIS_NUM_LOCALITIES <<
 TPM_TIS_LOCALITY_SHIFT);
+}
+
+static void tpm_tis_isa_realizefn(DeviceState *dev, Error **errp)
+{
+    TPMStateISA *isadev = TPM_TIS_ISA(dev);
+    TPMState *s = &isadev->state;
         if (!tpm_find()) {
           error_setg(errp, "at most one TPM device is permitted");
@@ -973,55 +1018,46 @@ static void tpm_tis_realizefn(DeviceState *dev,
 Error **errp)
           return;
       }
   -    isa_init_irq(&s->busdev, &s->irq, s->irq_num);
+    isa_init_irq(ISA_DEVICE(dev), &s->irq, s->irq_num);
         memory_region_add_subregion(isa_address_space(ISA_DEVICE(dev)),
                                   TPM_TIS_ADDR_BASE, &s->mmio);
         if (s->ppi_enabled) {
           tpm_ppi_init(&s->ppi, isa_address_space(ISA_DEVICE(dev)),
-                     TPM_PPI_ADDR_BASE, OBJECT(s));
+                     TPM_PPI_ADDR_BASE, OBJECT(dev));
       }
   }
   -static void tpm_tis_initfn(Object *obj)
-{
-    TPMState *s = TPM(obj);
-
-    memory_region_init_io(&s->mmio, OBJECT(s), &tpm_tis_memory_ops,
-                          s, "tpm-tis-mmio",
-                          TPM_TIS_NUM_LOCALITIES <<
 TPM_TIS_LOCALITY_SHIFT);
-}
-
-static void tpm_tis_class_init(ObjectClass *klass, void *data)
+static void tpm_tis_isa_class_init(ObjectClass *klass, void *data)
   {
       DeviceClass *dc = DEVICE_CLASS(klass);
       TPMIfClass *tc = TPM_IF_CLASS(klass);
   -    dc->realize = tpm_tis_realizefn;
-    device_class_set_props(dc, tpm_tis_properties);
-    dc->reset = tpm_tis_reset;
-    dc->vmsd  = &vmstate_tpm_tis;
+    device_class_set_props(dc, tpm_tis_isa_properties);
+    dc->vmsd  = &vmstate_tpm_tis_isa;
       tc->model = TPM_MODEL_TPM_TIS;
-    tc->get_version = tpm_tis_get_tpm_version;
-    tc->request_completed = tpm_tis_request_completed;
+    dc->realize = tpm_tis_isa_realizefn;
+    dc->reset = tpm_tis_isa_reset;
+    tc->request_completed = tpm_tis_isa_request_completed;
+    tc->get_version = tpm_tis_isa_get_tpm_version;
   }
   -static const TypeInfo tpm_tis_info = {
+static const TypeInfo tpm_tis_isa_info = {
       .name = TYPE_TPM_TIS_ISA,
       .parent = TYPE_ISA_DEVICE,
-    .instance_size = sizeof(TPMState),
-    .instance_init = tpm_tis_initfn,
-    .class_init  = tpm_tis_class_init,
+    .instance_size = sizeof(TPMStateISA),
+    .instance_init = tpm_tis_isa_initfn,
+    .class_init  = tpm_tis_isa_class_init,
       .interfaces = (InterfaceInfo[]) {
           { TYPE_TPM_IF },
           { }
       }
   };
   -static void tpm_tis_register(void)
+static void tpm_tis_isa_register(void)
   {
-    type_register_static(&tpm_tis_info);
+    type_register_static(&tpm_tis_isa_info);
   }
   -type_init(tpm_tis_register)
+type_init(tpm_tis_isa_register)
author
#29 lore raw
In reply to Ard Biesheuvel

Hi Ard,

Quoted 59 lines · Ard Biesheuvel
Quoted 47 lines · Eric Auger

This series adds the capability to instantiate an MMIO TPM TIS in ARM virt.

The existing TPM TIS code is reshuffled into a generic part, the ISA device and the sysbus device. The last patch allows the instantiation of the TPM TIS sysbus device in ARM virt.

The series was tested with the swtpm/libtpms emulator. Automatic guest LUKS volume unlocking (tpm2) was successful. EDK2 support is under development [3]. Thanks to Ard for supporting me when setting up the test environment.

Best Regards

Eric

Testing:

mkdir /tmp/tpm
swtpm socket \
--tpm2 \
-t -d \
--tpmstate dir=/tmp/tpm \
--ctrl type=unixio,path=/tmp/swtpm-sock

qemu command line must be augmented with the following options:

(quoted diff) +0 -3
-chardev socket,id=chrtpm,path=/tmp/swtpm-sock \
-tpmdev emulator,id=tpm0,chardev=chrtpm \
-device tpm-tis-device,tpmdev=tpm0 \

References:
[1] libtpms: https://github.com/stefanberger/libtpms/wiki
[2] swtpm: https://github.com/stefanberger/swtpm/wiki
[3] [PATCH 0/4] ArmVirtPkg: implement measured boot for ArmVirtQemu

This series can be found at:
https://github.com/eauger/qemu/tree/v4.2.0-tpm-rfc-v2

History:

RFC v1 -> RFC v2:
- restructure the existing code with common, ISA and sysbus part.
- both ARM and x86 integration were tested.
- acknowledgement: migration has not been tested

Quoted 8 lines

Eric Auger (6):
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

Many thanks to Eric for his work on this.

Quoted 7 lines

I have tested this with my EDK2 code and a Linux/arm64 VM booting in DT mode with the tpm-tis driver enabled, and it works as expected. I can observe the firmware taking measurements during boot, and can dump the PCRs from Linux using tpm2_pcrlist.

Many thanks for the testing.

Quoted 4 lines

Note that the UEFI firmware is itself a consumer of the DT description, so we need the DT related changes regardless of whether the VM boots in DT or ACPI mode.

OK thank you for the note. I will add this in my cover letter.

Best Regards

Eric

Quoted 27 lines
Quoted 26 lines


 default-configs/i386-softmmu.mak       |   2 +-
 hw/arm/Kconfig                         |   1 +
 hw/arm/sysbus-fdt.c                    |  36 +++++
 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           |   4 +-
 14 files changed, 502 insertions(+), 180 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

--
2.20.1

author
#20 lore raw

Re: [RFC v2 5/6] tpm: Add the SysBus TPM TIS device

In reply to Stefan Berger

Hi Stefan,

Quoted 213 lines · Stefan Berger
Quoted 212 lines · Eric Auger

Introduce the tpm-tis-device which is a sysbus device and is bound to be used on ARM.

---
  hw/tpm/Kconfig          |   5 ++
  hw/tpm/Makefile.objs    |   1 +
  hw/tpm/tpm_tis_sysbus.c | 159 ++++++++++++++++++++++++++++++++++++++++ include/sysemu/tpm.h    |   1 +

  4 files changed, 166 insertions(+)

  create mode 100644 hw/tpm/tpm_tis_sysbus.c

hw/tpm/Kconfig +0 -0
index 686f8206bb..4794e7fe28 100644
@@ -7,6 +7,11 @@ config TPM_TIS_ISA

      depends on TPM && ISA_BUS
      select TPM_TIS
  +config TPM_TIS_SYSBUS
+    bool
+    depends on TPM
+    select TPM_TIS
+
  config TPM_TIS
      bool
      depends on TPM

hw/tpm/Makefile.objs +0 -0
index 3ef2036cca..f1ec4beb95 100644
@@ -1,6 +1,7 @@

  common-obj-$(CONFIG_TPM) += tpm_util.o
  obj-$(call lor,$(CONFIG_TPM_TIS),$(CONFIG_TPM_CRB)) += tpm_ppi.o common-obj-$(CONFIG_TPM_TIS_ISA) += tpm_tis_isa.o +common-obj-$(CONFIG_TPM_TIS_SYSBUS) += tpm_tis_sysbus.o common-obj-$(CONFIG_TPM_TIS) += tpm_tis_common.o common-obj-$(CONFIG_TPM_CRB) += tpm_crb.o common-obj-$(CONFIG_TPM_PASSTHROUGH) += tpm_passthrough.o

hw/tpm/tpm_tis_sysbus.c new file +12 -0
new file mode 100644
index 0000000000..18c02aed67
@@ -0,0 +1,159 @@
+/*
+ * tpm_tis_sysbus.c - QEMU's TPM TIS SYSBUS Device
+ *
+ * Copyright (C) 2006,2010-2013 IBM Corporation
+ *
+ * Authors:
+ *  Stefan Berger <[email protected]>
+ *  David Safford <[email protected]>
+ *
+ * Xen 4 support: Andrease Niederl <[email protected]>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or

later.
+ * See the COPYING file in the top-level directory.
+ *
+ * Implementation of the TIS interface according to specs found at
+ * http://www.trustedcomputinggroup.org. This implementation currently
+ * supports version 1.3, 21 March 2013
+ * In the developers menu choose the PC Client section then find the TIS
+ * specification.
+ *
+ * TPM TIS for TPM 2 implementation following TCG PC Client Platform
+ * TPM Profile (PTP) Specification, Familiy 2.0, Revision 00.43
+ */

hw/tpm/tpm_tis_sysbus.c new file +17 -0
+
+#include "qemu/osdep.h"
+#include "hw/qdev-properties.h"
+#include "migration/vmstate.h"
+#include "tpm_util.h"
+#include "hw/sysbus.h"
+#include "tpm_tis.h"
+
+typedef struct TPMStateSysBus {
+    /*< private >*/
+    SysBusDevice parent_obj;
+
+    /*< public >*/
+    TPMState state; /* not a QOM object */
+} TPMStateSysBus;
+
+#define TPM_TIS_SYSBUS(obj) OBJECT_CHECK(TPMStateSysBus, (obj),

TYPE_TPM_TIS_SYSBUS)

hw/tpm/tpm_tis_sysbus.c new file +20 -0
+
+static int tpm_tis_pre_save_sysbus(void *opaque)
+{
+    TPMStateSysBus *sbdev = opaque;
+
+    return tpm_tis_pre_save(&sbdev->state);
+}
+
+static const VMStateDescription vmstate_tpm_tis_sysbus = {
+    .name = "tpm-tis",
+    .version_id = 0,
+    .pre_save  = tpm_tis_pre_save_sysbus,
+    .fields = (VMStateField[]) {
+        VMSTATE_BUFFER(state.buffer, TPMStateSysBus),
+        VMSTATE_UINT16(state.rw_offset, TPMStateSysBus),
+        VMSTATE_UINT8(state.active_locty, TPMStateSysBus),
+        VMSTATE_UINT8(state.aborting_locty, TPMStateSysBus),
+        VMSTATE_UINT8(state.next_locty, TPMStateSysBus),
+
+        VMSTATE_STRUCT_ARRAY(state.loc, TPMStateSysBus,

TPM_TIS_NUM_LOCALITIES,
+                             0, vmstate_locty, TPMLocality),

hw/tpm/tpm_tis_sysbus.c new file +31 -0
+
+        VMSTATE_END_OF_LIST()
+    }
+};
+
+static void tpm_tis_sysbus_request_completed(TPMIf *ti, int ret)
+{
+    TPMStateSysBus *sbdev = TPM_TIS_SYSBUS(ti);
+    TPMState *s = &sbdev->state;
+
+    tpm_tis_request_completed(s, ret);
+}
+
+static enum TPMVersion tpm_tis_sysbus_get_tpm_version(TPMIf *ti)
+{
+    TPMStateSysBus *sbdev = TPM_TIS_SYSBUS(ti);
+    TPMState *s = &sbdev->state;
+
+    return tpm_tis_get_tpm_version(s);
+}
+
+static void tpm_tis_sysbus_reset(DeviceState *dev)
+{
+    TPMStateSysBus *sbdev = TPM_TIS_SYSBUS(dev);
+    TPMState *s = &sbdev->state;
+
+    return tpm_tis_reset(s);
+}
+
+static Property tpm_tis_sysbus_properties[] = {
+    DEFINE_PROP_UINT32("irq", TPMStateSysBus, state.irq_num,

TPM_TIS_IRQ),
+    DEFINE_PROP_TPMBE("tpmdev", TPMStateSysBus, state.be_driver), +    DEFINE_PROP_BOOL("ppi", TPMStateSysBus, state.ppi_enabled, true), +    DEFINE_PROP_END_OF_LIST(),

hw/tpm/tpm_tis_sysbus.c new file +10 -0
+};
+
+static void tpm_tis_sysbus_initfn(Object *obj)
+{
+    TPMStateSysBus *sbdev = TPM_TIS_SYSBUS(obj);
+    TPMState *s = &sbdev->state;
+
+    memory_region_init_io(&s->mmio, obj, &tpm_tis_memory_ops,
+                          s, "tpm-tis-mmio",
+                          TPM_TIS_NUM_LOCALITIES <<

TPM_TIS_LOCALITY_SHIFT);

hw/tpm/tpm_tis_sysbus.c new file +54 -0
+
+    sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->mmio);
+    sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->irq);
+}
+
+static void tpm_tis_sysbus_realizefn(DeviceState *dev, Error **errp)
+{
+    TPMStateSysBus *sbdev = TPM_TIS_SYSBUS(dev);
+    TPMState *s = &sbdev->state;
+
+    if (!tpm_find()) {
+        error_setg(errp, "at most one TPM device is permitted");
+        return;
+    }
+
+    if (!s->be_driver) {
+        error_setg(errp, "'tpmdev' property is required");
+        return;
+    }
+}
+
+static void tpm_tis_sysbus_class_init(ObjectClass *klass, void *data)
+{
+    DeviceClass *dc = DEVICE_CLASS(klass);
+    TPMIfClass *tc = TPM_IF_CLASS(klass);
+
+    device_class_set_props(dc, tpm_tis_sysbus_properties);
+    dc->vmsd  = &vmstate_tpm_tis_sysbus;
+    tc->model = TPM_MODEL_TPM_TIS;
+    dc->realize = tpm_tis_sysbus_realizefn;
+    dc->user_creatable = true;
+    dc->reset = tpm_tis_sysbus_reset;
+    tc->request_completed = tpm_tis_sysbus_request_completed;
+    tc->get_version = tpm_tis_sysbus_get_tpm_version;
+}
+
+static const TypeInfo tpm_tis_sysbus_info = {
+    .name = TYPE_TPM_TIS_SYSBUS,
+    .parent = TYPE_SYS_BUS_DEVICE,
+    .instance_size = sizeof(TPMStateSysBus),
+    .instance_init = tpm_tis_sysbus_initfn,
+    .class_init  = tpm_tis_sysbus_class_init,
+    .interfaces = (InterfaceInfo[]) {
+        { TYPE_TPM_IF },
+        { }
+    }
+};
+
+static void tpm_tis_sysbus_register(void)
+{
+    type_register_static(&tpm_tis_sysbus_info);
+}
+
+type_init(tpm_tis_sysbus_register)
include/sysemu/tpm.h +0 -1
index 1691b92c28..f37851b1aa 100644
--- a/include/sysemu/tpm.h
Quoted 8 lines

include/sysemu/tpm.h typedef struct TPMIfClass { · line 46

Quoted 5 lines

+++ b/include/sysemu/tpm.h

include/sysemu/tpm.h +1 -0
@@ -44,6 +44,7 @@ typedef struct TPMIfClass {
   } TPMIfClass;
     #define TYPE_TPM_TIS_ISA            "tpm-tis"
+#define TYPE_TPM_TIS_SYSBUS         "tpm-tis-device"

hm, replace the rather generic 'device' with 'sysbus'?

I used the "-device" suffix because this kind of naming was used for virtio-<type>-device when based on MMIO rather than virtio-<type>-pci. For instance virtio-net-device instead of virtio-net-pci. There are quite a lot of devices using that suffix. I only see xen-sysbus with the sysbus suffix.

Now personally I don't have any strong preference and I will pick up the name chosen by consensus.

Quoted 3 lines

Otherwise looks really good.

Thank you

Best Regards

Eric

Quoted 10 lines
Quoted 3 lines
include/sysemu/tpm.h +0 -0
   #define TYPE_TPM_CRB                "tpm-crb"
   #define TYPE_TPM_SPAPR              "tpm-spapr"

author
#27 lore raw

Re: [RFC v2 6/6] hw/arm/virt: vTPM support

In reply to Stefan Berger

Hi Stefan,

Quoted 14 lines · Stefan Berger
Quoted 13 lines · Eric Auger

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 \

Quoted 7 lines
Quoted 4 lines

swtpm/libtpms command line example:

swtpm socket --tpm2 -t -d --tpmstate dir=/tmp/tpm \
--ctrl type=unixio,path=swtpm-sock

Can you also extend docs/spec/tpm.rst for the arm case?

Sure

And the test

Quoted 1 line

cases should probably also cover the arm sysbus device.

Yes I agree. At the moment I have made sure existing x86-64 qtests were running as before.

I will investigate what I can do to cover the sysbus device.

Quoted 52 lines
Quoted 52 lines

---
  hw/arm/Kconfig      |  1 +
  hw/arm/sysbus-fdt.c | 36 ++++++++++++++++++++++++++++++++++++ hw/arm/virt.c       |  7 +++++++

  3 files changed, 44 insertions(+)
hw/arm/Kconfig +0 -0
index 3d86691ae0..b6f03f7f53 100644
@@ -5,6 +5,7 @@ config ARM_VIRT

      imply VFIO_AMD_XGBE
      imply VFIO_PLATFORM
      imply VFIO_XGMAC
+    imply TPM_TIS_SYSBUS
      select A15MPCORE
      select ACPI
      select ARM_SMMUV3

hw/arm/sysbus-fdt.c +1 -0
index 022fc97ecd..adf50444c2 100644
@@ -30,6 +30,7 @@
   #include "hw/arm/sysbus-fdt.h"
   #include "qemu/error-report.h"
   #include "sysemu/device_tree.h"
+#include "sysemu/tpm.h"
   #include "hw/platform-bus.h"
   #include "hw/vfio/vfio-platform.h"
   #include "hw/vfio/vfio-calxeda-xgmac.h"
@@ -434,6 +435,40 @@ static bool vfio_platform_match(SysBusDevice *sbdev,
   #define VFIO_PLATFORM_BINDING(compat, add_fn) \
       {TYPE_VFIO_PLATFORM, (compat), (add_fn), vfio_platform_match}

  +/*
+ * add_tpm_tis_fdt_node: Create a DT node for TPM TIS
+ *
+ * See kernel documentation:
+ * Documentation/devicetree/bindings/security/tpm/tpm_tis_mmio.txt
+ * Optional interrupt for command completion is not exposed
+ */

hw/arm/sysbus-fdt.c +8 -0
+static int add_tpm_tis_fdt_node(SysBusDevice *sbdev, void *opaque)
+{
+    PlatformBusFDTData *data = opaque;
+    PlatformBusDevice *pbus = data->pbus;
+    void *fdt = data->fdt;
+    const char *parent_node = data->pbus_node_name;
+    int compat_str_len;
+    char *nodename;
Quoted 8 lines
Quoted 4 lines

+    uint32_t reg_attr[2];
+    uint64_t mmio_base;
+
+    mmio_base = platform_bus_get_mmio_addr(pbus, sbdev, 0);

I suppose any conditional creation of this device tree entry is covered with the TYPE_BINDING below, meaning no device tree is created if the device wasn't added.

Yes exactly, the dt node is not created if the -device tpm-tis-device is not passed in the qemu cmd line.

Quoted 11 lines
Quoted 9 lines

+    nodename = g_strdup_printf("%s/tpm_tis@%" PRIx64, parent_node, mmio_base);
+    qemu_fdt_add_subnode(fdt, nodename);
+
+    compat_str_len = strlen("tcg,tpm-tis-mmio") + 1;
+    qemu_fdt_setprop(fdt, nodename, "compatible", "tcg,tpm-tis-mmio", +                     compat_str_len);

You probably can use qemu_fdt_setprop_string()?

indeed!

Quoted 48 lines
Quoted 48 lines

+
+    reg_attr[0] = cpu_to_be32(mmio_base);
+    reg_attr[1] = cpu_to_be32(0x5000);
+    qemu_fdt_setprop(fdt, nodename, "reg", reg_attr, 2 * sizeof(uint32_t));

hw/arm/sysbus-fdt.c +5 -0
+
+    g_free(nodename);
+    return 0;
+}
+

  #endif /* CONFIG_LINUX */
    static int no_fdt_node(SysBusDevice *sbdev, void *opaque)

hw/arm/sysbus-fdt.c +1 -0
@@ -455,6 +490,7 @@ static const BindingEntry bindings[] = {
       TYPE_BINDING(TYPE_VFIO_CALXEDA_XGMAC,
 add_calxeda_midway_xgmac_fdt_node),
       TYPE_BINDING(TYPE_VFIO_AMD_XGBE, add_amd_xgbe_fdt_node),
       VFIO_PLATFORM_BINDING("amd,xgbe-seattle-v1a",
 add_amd_xgbe_fdt_node),
+    TYPE_BINDING(TYPE_TPM_TIS_SYSBUS, add_tpm_tis_fdt_node),
   #endif

      TYPE_BINDING(TYPE_RAMFB_DEVICE, no_fdt_node), TYPE_BINDING("", NULL), /* last element */

hw/arm/virt.c +2 -0
index f788fe27d6..4b967e39d1 100644
@@ -47,6 +47,7 @@
   #include "sysemu/numa.h"
   #include "sysemu/runstate.h"
   #include "sysemu/sysemu.h"
+#include "sysemu/tpm.h"
   #include "sysemu/kvm.h"
   #include "hw/loader.h"
   #include "exec/address-spaces.h"
@@ -2041,6 +2042,7 @@ static void virt_machine_class_init(ObjectClass
 *oc, void *data)
       machine_class_allow_dynamic_sysbus_dev(mc, TYPE_VFIO_AMD_XGBE);
       machine_class_allow_dynamic_sysbus_dev(mc, TYPE_RAMFB_DEVICE);
       machine_class_allow_dynamic_sysbus_dev(mc, TYPE_VFIO_PLATFORM);
+    machine_class_allow_dynamic_sysbus_dev(mc, TYPE_TPM_TIS_SYSBUS);
       mc->block_default_type = IF_VIRTIO;
       mc->no_cdrom = 1;

      mc->pci_allow_0_address = true;

hw/arm/virt.c +0 -0
@@ -2153,6 +2155,11 @@ type_init(machvirt_machine_init);
     static void virt_machine_5_0_options(MachineClass *mc)
   {
Quoted 10 lines
Quoted 8 lines
hw/arm/virt.c +5 -0
+    static GlobalProperty compat[] = {
+        { TYPE_TPM_TIS_SYSBUS, "ppi", "false" },
+    };
+
+    compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
   }
   DEFINE_VIRT_MACHINE_AS_LATEST(5, 0)

Thanks

Eric

author
#21 lore raw

Re: [RFC v2 5/6] tpm: Add the SysBus TPM TIS device

In reply to Auger Eric

Hi,

Quoted 224 lines · Auger Eric

Hi Stefan,

Quoted 213 lines · Stefan Berger
Quoted 212 lines · Eric Auger

Introduce the tpm-tis-device which is a sysbus device and is bound to be used on ARM.

---
  hw/tpm/Kconfig          |   5 ++
  hw/tpm/Makefile.objs    |   1 +
  hw/tpm/tpm_tis_sysbus.c | 159 ++++++++++++++++++++++++++++++++++++++++ include/sysemu/tpm.h    |   1 +

  4 files changed, 166 insertions(+)

  create mode 100644 hw/tpm/tpm_tis_sysbus.c

hw/tpm/Kconfig +0 -0
index 686f8206bb..4794e7fe28 100644
@@ -7,6 +7,11 @@ config TPM_TIS_ISA

      depends on TPM && ISA_BUS
      select TPM_TIS
  +config TPM_TIS_SYSBUS
+    bool
+    depends on TPM
+    select TPM_TIS
+
  config TPM_TIS
      bool
      depends on TPM

hw/tpm/Makefile.objs +0 -0
index 3ef2036cca..f1ec4beb95 100644
@@ -1,6 +1,7 @@

  common-obj-$(CONFIG_TPM) += tpm_util.o
  obj-$(call lor,$(CONFIG_TPM_TIS),$(CONFIG_TPM_CRB)) += tpm_ppi.o common-obj-$(CONFIG_TPM_TIS_ISA) += tpm_tis_isa.o +common-obj-$(CONFIG_TPM_TIS_SYSBUS) += tpm_tis_sysbus.o common-obj-$(CONFIG_TPM_TIS) += tpm_tis_common.o common-obj-$(CONFIG_TPM_CRB) += tpm_crb.o common-obj-$(CONFIG_TPM_PASSTHROUGH) += tpm_passthrough.o

hw/tpm/tpm_tis_sysbus.c new file +12 -0
new file mode 100644
index 0000000000..18c02aed67
@@ -0,0 +1,159 @@
+/*
+ * tpm_tis_sysbus.c - QEMU's TPM TIS SYSBUS Device
+ *
+ * Copyright (C) 2006,2010-2013 IBM Corporation
+ *
+ * Authors:
+ *  Stefan Berger <[email protected]>
+ *  David Safford <[email protected]>
+ *
+ * Xen 4 support: Andrease Niederl <[email protected]>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or

later.
+ * See the COPYING file in the top-level directory.
+ *
+ * Implementation of the TIS interface according to specs found at
+ * http://www.trustedcomputinggroup.org. This implementation currently
+ * supports version 1.3, 21 March 2013
+ * In the developers menu choose the PC Client section then find the TIS
+ * specification.
+ *
+ * TPM TIS for TPM 2 implementation following TCG PC Client Platform
+ * TPM Profile (PTP) Specification, Familiy 2.0, Revision 00.43
+ */

hw/tpm/tpm_tis_sysbus.c new file +17 -0
+
+#include "qemu/osdep.h"
+#include "hw/qdev-properties.h"
+#include "migration/vmstate.h"
+#include "tpm_util.h"
+#include "hw/sysbus.h"
+#include "tpm_tis.h"
+
+typedef struct TPMStateSysBus {
+    /*< private >*/
+    SysBusDevice parent_obj;
+
+    /*< public >*/
+    TPMState state; /* not a QOM object */
+} TPMStateSysBus;
+
+#define TPM_TIS_SYSBUS(obj) OBJECT_CHECK(TPMStateSysBus, (obj),

TYPE_TPM_TIS_SYSBUS)

hw/tpm/tpm_tis_sysbus.c new file +20 -0
+
+static int tpm_tis_pre_save_sysbus(void *opaque)
+{
+    TPMStateSysBus *sbdev = opaque;
+
+    return tpm_tis_pre_save(&sbdev->state);
+}
+
+static const VMStateDescription vmstate_tpm_tis_sysbus = {
+    .name = "tpm-tis",
+    .version_id = 0,
+    .pre_save  = tpm_tis_pre_save_sysbus,
+    .fields = (VMStateField[]) {
+        VMSTATE_BUFFER(state.buffer, TPMStateSysBus),
+        VMSTATE_UINT16(state.rw_offset, TPMStateSysBus),
+        VMSTATE_UINT8(state.active_locty, TPMStateSysBus),
+        VMSTATE_UINT8(state.aborting_locty, TPMStateSysBus),
+        VMSTATE_UINT8(state.next_locty, TPMStateSysBus),
+
+        VMSTATE_STRUCT_ARRAY(state.loc, TPMStateSysBus,

TPM_TIS_NUM_LOCALITIES,
+                             0, vmstate_locty, TPMLocality),

hw/tpm/tpm_tis_sysbus.c new file +31 -0
+
+        VMSTATE_END_OF_LIST()
+    }
+};
+
+static void tpm_tis_sysbus_request_completed(TPMIf *ti, int ret)
+{
+    TPMStateSysBus *sbdev = TPM_TIS_SYSBUS(ti);
+    TPMState *s = &sbdev->state;
+
+    tpm_tis_request_completed(s, ret);
+}
+
+static enum TPMVersion tpm_tis_sysbus_get_tpm_version(TPMIf *ti)
+{
+    TPMStateSysBus *sbdev = TPM_TIS_SYSBUS(ti);
+    TPMState *s = &sbdev->state;
+
+    return tpm_tis_get_tpm_version(s);
+}
+
+static void tpm_tis_sysbus_reset(DeviceState *dev)
+{
+    TPMStateSysBus *sbdev = TPM_TIS_SYSBUS(dev);
+    TPMState *s = &sbdev->state;
+
+    return tpm_tis_reset(s);
+}
+
+static Property tpm_tis_sysbus_properties[] = {
+    DEFINE_PROP_UINT32("irq", TPMStateSysBus, state.irq_num,

TPM_TIS_IRQ),
+    DEFINE_PROP_TPMBE("tpmdev", TPMStateSysBus, state.be_driver), +    DEFINE_PROP_BOOL("ppi", TPMStateSysBus, state.ppi_enabled, true), +    DEFINE_PROP_END_OF_LIST(),

hw/tpm/tpm_tis_sysbus.c new file +10 -0
+};
+
+static void tpm_tis_sysbus_initfn(Object *obj)
+{
+    TPMStateSysBus *sbdev = TPM_TIS_SYSBUS(obj);
+    TPMState *s = &sbdev->state;
+
+    memory_region_init_io(&s->mmio, obj, &tpm_tis_memory_ops,
+                          s, "tpm-tis-mmio",
+                          TPM_TIS_NUM_LOCALITIES <<

TPM_TIS_LOCALITY_SHIFT);

hw/tpm/tpm_tis_sysbus.c new file +54 -0
+
+    sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->mmio);
+    sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->irq);
+}
+
+static void tpm_tis_sysbus_realizefn(DeviceState *dev, Error **errp)
+{
+    TPMStateSysBus *sbdev = TPM_TIS_SYSBUS(dev);
+    TPMState *s = &sbdev->state;
+
+    if (!tpm_find()) {
+        error_setg(errp, "at most one TPM device is permitted");
+        return;
+    }
+
+    if (!s->be_driver) {
+        error_setg(errp, "'tpmdev' property is required");
+        return;
+    }
+}
+
+static void tpm_tis_sysbus_class_init(ObjectClass *klass, void *data)
+{
+    DeviceClass *dc = DEVICE_CLASS(klass);
+    TPMIfClass *tc = TPM_IF_CLASS(klass);
+
+    device_class_set_props(dc, tpm_tis_sysbus_properties);
+    dc->vmsd  = &vmstate_tpm_tis_sysbus;
+    tc->model = TPM_MODEL_TPM_TIS;
+    dc->realize = tpm_tis_sysbus_realizefn;
+    dc->user_creatable = true;
+    dc->reset = tpm_tis_sysbus_reset;
+    tc->request_completed = tpm_tis_sysbus_request_completed;
+    tc->get_version = tpm_tis_sysbus_get_tpm_version;
+}
+
+static const TypeInfo tpm_tis_sysbus_info = {
+    .name = TYPE_TPM_TIS_SYSBUS,
+    .parent = TYPE_SYS_BUS_DEVICE,
+    .instance_size = sizeof(TPMStateSysBus),
+    .instance_init = tpm_tis_sysbus_initfn,
+    .class_init  = tpm_tis_sysbus_class_init,
+    .interfaces = (InterfaceInfo[]) {
+        { TYPE_TPM_IF },
+        { }
+    }
+};
+
+static void tpm_tis_sysbus_register(void)
+{
+    type_register_static(&tpm_tis_sysbus_info);
+}
+
+type_init(tpm_tis_sysbus_register)
include/sysemu/tpm.h +0 -1
index 1691b92c28..f37851b1aa 100644
--- a/include/sysemu/tpm.h
Quoted 8 lines

include/sysemu/tpm.h typedef struct TPMIfClass { · line 46

Quoted 5 lines

+++ b/include/sysemu/tpm.h

include/sysemu/tpm.h +1 -0
@@ -44,6 +44,7 @@ typedef struct TPMIfClass {
   } TPMIfClass;
     #define TYPE_TPM_TIS_ISA            "tpm-tis"
+#define TYPE_TPM_TIS_SYSBUS         "tpm-tis-device"

hm, replace the rather generic 'device' with 'sysbus'?

Quoted 8 lines

I used the "-device" suffix because this kind of naming was used for virtio-<type>-device when based on MMIO rather than virtio-<type>-pci. For instance virtio-net-device instead of virtio-net-pci. There are quite a lot of devices using that suffix. I only see xen-sysbus with the sysbus suffix.

Now personally I don't have any strong preference and I will pick up the name chosen by consensus.

Does anyone else have an opinion on the name to be chosen for this new device:

1) tpm-tis-device or
2) tpm-tis-sysbus ?

Thanks

Eric

Quoted 20 lines
Quoted 3 lines

Otherwise looks really good.

Thank you

Best Regards

Eric

Quoted 10 lines
Quoted 3 lines
include/sysemu/tpm.h +0 -0
   #define TYPE_TPM_CRB                "tpm-crb"
   #define TYPE_TPM_SPAPR              "tpm-spapr"

#22 lore raw

Re: [RFC v2 5/6] tpm: Add the SysBus TPM TIS device

Quoted 234 lines · Auger Eric

Hi,

Quoted 230 lines · Auger Eric

Hi Stefan,

Quoted 213 lines · Stefan Berger
Quoted 212 lines · Eric Auger

Introduce the tpm-tis-device which is a sysbus device and is bound to be used on ARM.

---
  hw/tpm/Kconfig          |   5 ++
  hw/tpm/Makefile.objs    |   1 +
  hw/tpm/tpm_tis_sysbus.c | 159 ++++++++++++++++++++++++++++++++++++++++
  include/sysemu/tpm.h    |   1 +
  4 files changed, 166 insertions(+)

create mode 100644 hw/tpm/tpm_tis_sysbus.c

hw/tpm/Kconfig +4 -0
index 686f8206bb..4794e7fe28 100644
@@ -7,6 +7,11 @@ config TPM_TIS_ISA
      depends on TPM && ISA_BUS
      select TPM_TIS
  +config TPM_TIS_SYSBUS
+    bool
+    depends on TPM
+    select TPM_TIS
+
  config TPM_TIS
      bool
      depends on TPM
hw/tpm/Makefile.objs +1 -0
index 3ef2036cca..f1ec4beb95 100644
@@ -1,6 +1,7 @@
  common-obj-$(CONFIG_TPM) += tpm_util.o
  obj-$(call lor,$(CONFIG_TPM_TIS),$(CONFIG_TPM_CRB)) += tpm_ppi.o
  common-obj-$(CONFIG_TPM_TIS_ISA) += tpm_tis_isa.o
+common-obj-$(CONFIG_TPM_TIS_SYSBUS) += tpm_tis_sysbus.o
  common-obj-$(CONFIG_TPM_TIS) += tpm_tis_common.o
  common-obj-$(CONFIG_TPM_CRB) += tpm_crb.o
  common-obj-$(CONFIG_TPM_PASSTHROUGH) += tpm_passthrough.o
hw/tpm/tpm_tis_sysbus.c new file +12 -0
new file mode 100644
index 0000000000..18c02aed67
@@ -0,0 +1,159 @@
+/*
+ * tpm_tis_sysbus.c - QEMU's TPM TIS SYSBUS Device
+ *
+ * Copyright (C) 2006,2010-2013 IBM Corporation
+ *
+ * Authors:
+ *  Stefan Berger <[email protected]>
+ *  David Safford <[email protected]>
+ *
+ * Xen 4 support: Andrease Niederl <[email protected]>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or

later.
+ * See the COPYING file in the top-level directory.
+ *
+ * Implementation of the TIS interface according to specs found at
+ * http://www.trustedcomputinggroup.org. This implementation currently
+ * supports version 1.3, 21 March 2013
+ * In the developers menu choose the PC Client section then find the TIS
+ * specification.
+ *
+ * TPM TIS for TPM 2 implementation following TCG PC Client Platform
+ * TPM Profile (PTP) Specification, Familiy 2.0, Revision 00.43
+ */

hw/tpm/tpm_tis_sysbus.c new file +17 -0
+
+#include "qemu/osdep.h"
+#include "hw/qdev-properties.h"
+#include "migration/vmstate.h"
+#include "tpm_util.h"
+#include "hw/sysbus.h"
+#include "tpm_tis.h"
+
+typedef struct TPMStateSysBus {
+    /*< private >*/
+    SysBusDevice parent_obj;
+
+    /*< public >*/
+    TPMState state; /* not a QOM object */
+} TPMStateSysBus;
+
+#define TPM_TIS_SYSBUS(obj) OBJECT_CHECK(TPMStateSysBus, (obj),

TYPE_TPM_TIS_SYSBUS)

hw/tpm/tpm_tis_sysbus.c new file +20 -0
+
+static int tpm_tis_pre_save_sysbus(void *opaque)
+{
+    TPMStateSysBus *sbdev = opaque;
+
+    return tpm_tis_pre_save(&sbdev->state);
+}
+
+static const VMStateDescription vmstate_tpm_tis_sysbus = {
+    .name = "tpm-tis",
+    .version_id = 0,
+    .pre_save  = tpm_tis_pre_save_sysbus,
+    .fields = (VMStateField[]) {
+        VMSTATE_BUFFER(state.buffer, TPMStateSysBus),
+        VMSTATE_UINT16(state.rw_offset, TPMStateSysBus),
+        VMSTATE_UINT8(state.active_locty, TPMStateSysBus),
+        VMSTATE_UINT8(state.aborting_locty, TPMStateSysBus),
+        VMSTATE_UINT8(state.next_locty, TPMStateSysBus),
+
+        VMSTATE_STRUCT_ARRAY(state.loc, TPMStateSysBus,

TPM_TIS_NUM_LOCALITIES,

hw/tpm/tpm_tis_sysbus.c new file +32 -0
+                             0, vmstate_locty, TPMLocality),
+
+        VMSTATE_END_OF_LIST()
+    }
+};
+
+static void tpm_tis_sysbus_request_completed(TPMIf *ti, int ret)
+{
+    TPMStateSysBus *sbdev = TPM_TIS_SYSBUS(ti);
+    TPMState *s = &sbdev->state;
+
+    tpm_tis_request_completed(s, ret);
+}
+
+static enum TPMVersion tpm_tis_sysbus_get_tpm_version(TPMIf *ti)
+{
+    TPMStateSysBus *sbdev = TPM_TIS_SYSBUS(ti);
+    TPMState *s = &sbdev->state;
+
+    return tpm_tis_get_tpm_version(s);
+}
+
+static void tpm_tis_sysbus_reset(DeviceState *dev)
+{
+    TPMStateSysBus *sbdev = TPM_TIS_SYSBUS(dev);
+    TPMState *s = &sbdev->state;
+
+    return tpm_tis_reset(s);
+}
+
+static Property tpm_tis_sysbus_properties[] = {
+    DEFINE_PROP_UINT32("irq", TPMStateSysBus, state.irq_num,

TPM_TIS_IRQ),

hw/tpm/tpm_tis_sysbus.c new file +13 -0
+    DEFINE_PROP_TPMBE("tpmdev", TPMStateSysBus, state.be_driver),
+    DEFINE_PROP_BOOL("ppi", TPMStateSysBus, state.ppi_enabled, true),
+    DEFINE_PROP_END_OF_LIST(),
+};
+
+static void tpm_tis_sysbus_initfn(Object *obj)
+{
+    TPMStateSysBus *sbdev = TPM_TIS_SYSBUS(obj);
+    TPMState *s = &sbdev->state;
+
+    memory_region_init_io(&s->mmio, obj, &tpm_tis_memory_ops,
+                          s, "tpm-tis-mmio",
+                          TPM_TIS_NUM_LOCALITIES <<

TPM_TIS_LOCALITY_SHIFT);

hw/tpm/tpm_tis_sysbus.c new file +54 -0
+
+    sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->mmio);
+    sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->irq);
+}
+
+static void tpm_tis_sysbus_realizefn(DeviceState *dev, Error **errp)
+{
+    TPMStateSysBus *sbdev = TPM_TIS_SYSBUS(dev);
+    TPMState *s = &sbdev->state;
+
+    if (!tpm_find()) {
+        error_setg(errp, "at most one TPM device is permitted");
+        return;
+    }
+
+    if (!s->be_driver) {
+        error_setg(errp, "'tpmdev' property is required");
+        return;
+    }
+}
+
+static void tpm_tis_sysbus_class_init(ObjectClass *klass, void *data)
+{
+    DeviceClass *dc = DEVICE_CLASS(klass);
+    TPMIfClass *tc = TPM_IF_CLASS(klass);
+
+    device_class_set_props(dc, tpm_tis_sysbus_properties);
+    dc->vmsd  = &vmstate_tpm_tis_sysbus;
+    tc->model = TPM_MODEL_TPM_TIS;
+    dc->realize = tpm_tis_sysbus_realizefn;
+    dc->user_creatable = true;
+    dc->reset = tpm_tis_sysbus_reset;
+    tc->request_completed = tpm_tis_sysbus_request_completed;
+    tc->get_version = tpm_tis_sysbus_get_tpm_version;
+}
+
+static const TypeInfo tpm_tis_sysbus_info = {
+    .name = TYPE_TPM_TIS_SYSBUS,
+    .parent = TYPE_SYS_BUS_DEVICE,
+    .instance_size = sizeof(TPMStateSysBus),
+    .instance_init = tpm_tis_sysbus_initfn,
+    .class_init  = tpm_tis_sysbus_class_init,
+    .interfaces = (InterfaceInfo[]) {
+        { TYPE_TPM_IF },
+        { }
+    }
+};
+
+static void tpm_tis_sysbus_register(void)
+{
+    type_register_static(&tpm_tis_sysbus_info);
+}
+
+type_init(tpm_tis_sysbus_register)
include/sysemu/tpm.h +0 -1
index 1691b92c28..f37851b1aa 100644
--- a/include/sysemu/tpm.h
Quoted 8 lines

include/sysemu/tpm.h typedef struct TPMIfClass { · line 46

Quoted 5 lines

+++ b/include/sysemu/tpm.h

include/sysemu/tpm.h +1 -0
@@ -44,6 +44,7 @@ typedef struct TPMIfClass {
  } TPMIfClass;
    #define TYPE_TPM_TIS_ISA            "tpm-tis"
+#define TYPE_TPM_TIS_SYSBUS         "tpm-tis-device"

hm, replace the rather generic 'device' with 'sysbus'?

I used the "-device" suffix because this kind of naming was used for virtio-<type>-device when based on MMIO rather than virtio-<type>-pci. For instance virtio-net-device instead of virtio-net-pci. There are quite a lot of devices using that suffix. I only see xen-sysbus with the sysbus suffix.

Quoted 9 lines
Quoted 2 lines

Now personally I don't have any strong preference and I will pick up the name chosen by consensus.

Does anyone else have an opinion on the name to be chosen for this new device:

1) tpm-tis-device or
2) tpm-tis-sysbus ?

It is slightly unfortunate that we cannot retain the 'tpm-tis' name, given that this is simply a TPM with a memory mapped TIS frame, like the ISA one, and the fact that QEMU instantiates this differently based on the emulated architecture is really an implementation detail.

So I prefer 'tpm-tis-device', since it doesn't define how it is backed under the hood, and allows us to potentially instantiate it in a different way in the future if we wanted to. Alternatively, something like 'tpm-tis-mmmio' might be appropriate.

Signature · 1 line
Ard.
author
#17 lore raw

Re: [RFC v2 4/6] tpm: Separate TPM_TIS and TPM_TIS_ISA configs

In reply to Philippe Mathieu-Daudé

Hi Philippe,

Quoted 47 lines · Philippe Mathieu-Daudé
Quoted 46 lines · Eric Auger

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.

---
  default-configs/i386-softmmu.mak | 2 +-
  hw/i386/Kconfig                  | 2 +-
  hw/tpm/Kconfig                   | 7 ++++++-
  hw/tpm/Makefile.objs             | 3 ++-
  tests/qtest/Makefile.include     | 4 ++--

  5 files changed, 12 insertions(+), 6 deletions(-)
default-configs/i386-softmmu.mak +1 -1
index 4cc64dafa2..84d1a2487c 100644
@@ -20,7 +20,7 @@
   #CONFIG_SGA=n
   #CONFIG_TEST_DEVICES=n
   #CONFIG_TPM_CRB=n
-#CONFIG_TPM_TIS=n
+#CONFIG_TPM_TIS_ISA=n
   #CONFIG_VTD=n
     # Boards:
hw/i386/Kconfig +0 -0
index cdc851598c..c93f32f657 100644
@@ -20,7 +20,7 @@ config PC

      imply SGA
      imply TEST_DEVICES
      imply TPM_CRB
-    imply TPM_TIS
+    imply TPM_TIS_ISA
      imply VGA_PCI
      imply VIRTIO_VGA
      select FDC

hw/tpm/Kconfig +0 -0
index 9e67d990e8..686f8206bb 100644
@@ -2,9 +2,14 @@ config TPMDEV
Quoted 8 lines
Quoted 6 lines

      bool
      depends on TPM
  -config TPM_TIS
+config TPM_TIS_ISA
      bool
      depends on TPM && ISA_BUS

Maybe you can relax to "depends on ISA_BUS" ...

No I am forced to keep it to pass
make docker-test-mingw@fedora

Otherwise I get:
make: *** No rule to make target 'x86_64-softmmu/config-devices.mak', needed by 'config-all-devices.mak'. Stop.
Traceback (most recent call last):

As we discussed earlier with mingw configure sets TPM to false.

Quoted 34 lines

hw/tpm/Kconfig config TPMDEV · line 12

Quoted 6 lines

+    select TPM_TIS

hw/tpm/Kconfig +4 -0
+
+config TPM_TIS
+    bool
+    depends on TPM

... since TPM_TIS depends on TPM.

Quoted 25 lines

      select TPMDEV
    config TPM_CRB

hw/tpm/Makefile.objs +0 -0
index fcc4c2f27c..3ef2036cca 100644
@@ -1,6 +1,7 @@

  common-obj-$(CONFIG_TPM) += tpm_util.o
  obj-$(call lor,$(CONFIG_TPM_TIS),$(CONFIG_TPM_CRB)) += tpm_ppi.o

hw/tpm/Makefile.objs +2 -1
-common-obj-$(CONFIG_TPM_TIS) += tpm_tis_isa.o tpm_tis_common.o
+common-obj-$(CONFIG_TPM_TIS_ISA) += tpm_tis_isa.o
+common-obj-$(CONFIG_TPM_TIS) += tpm_tis_common.o

  common-obj-$(CONFIG_TPM_CRB) += tpm_crb.o common-obj-$(CONFIG_TPM_PASSTHROUGH) += tpm_passthrough.o common-obj-$(CONFIG_TPM_EMULATOR) += tpm_emulator.o

tests/qtest/Makefile.include +0 -0
index eb0f23b108..33dd3c89cc 100644
@@ -54,8 +54,8 @@ check-qtest-i386-y += q35-test

  check-qtest-i386-y += vmgenid-test check-qtest-i386-$(CONFIG_TPM_CRB) += tpm-crb-swtpm-test check-qtest-i386-$(CONFIG_TPM_CRB) += tpm-crb-test

tests/qtest/Makefile.include +0 -2
-check-qtest-i386-$(CONFIG_TPM_TIS) += tpm-tis-swtpm-test
-check-qtest-i386-$(CONFIG_TPM_TIS) += tpm-tis-test
Quoted 8 lines
Quoted 6 lines
tests/qtest/Makefile.include +2 -0
+check-qtest-i386-$(CONFIG_TPM_TIS_ISA) += tpm-tis-swtpm-test
+check-qtest-i386-$(CONFIG_TPM_TIS_ISA) += tpm-tis-test

  check-qtest-i386-$(CONFIG_SLIRP) += test-netfilter check-qtest-i386-$(CONFIG_POSIX) += test-filter-mirror check-qtest-i386-$(CONFIG_RTL8139_PCI) += test-filter-redirector

Thanks!

Eric

Quoted 1 line
author
#3 lore raw

Re: [RFC v2 1/6] tpm: rename TPM_TIS into TPM_TIS_ISA

In reply to Philippe Mathieu-Daudé

Hi Phil,

Quoted 64 lines · Philippe Mathieu-Daudé
Quoted 63 lines · Eric Auger

As we plan to introduce a sysbus TPM_TIS, let's rename TPM_TIS into TPM_TIS_ISA.

---
  hw/i386/acpi-build.c | 6 +++---
  hw/tpm/tpm_tis.c     | 4 ++--
  include/sysemu/tpm.h | 6 +++---

  3 files changed, 8 insertions(+), 8 deletions(-)
hw/i386/acpi-build.c +1 -0
index 9c4e46fa74..26777f8828 100644
@@ -2026,7 +2026,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
           }
       }
   -    if (TPM_IS_TIS(tpm_find())) {
+    if (TPM_IS_TIS_ISA(tpm_find())) {
           aml_append(crs, aml_memory32_fixed(TPM_TIS_ADDR_BASE,
                      TPM_TIS_ADDR_SIZE, AML_READ_WRITE));
       }
@@ -2197,7 +2197,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
               /* Scan all PCI buses. Generate tables to support

hotplug. */
              build_append_pci_bus_devices(scope, bus, pm->pcihp_bridge_en);
  -            if (TPM_IS_TIS(tpm)) {
+            if (TPM_IS_TIS_ISA(tpm)) {
                  if (misc->tpm_version == TPM_VERSION_2_0) { dev = aml_device("TPM"); aml_append(dev, aml_name_decl("_HID",

hw/i386/acpi-build.c +1 -1
@@ -2304,7 +2304,7 @@ build_tpm2(GArray *table_data, BIOSLinker
 *linker, GArray *tcpalog)
           (char *)&tpm2_ptr->log_area_start_address - table_data->data;
         tpm2_ptr->platform_class = cpu_to_le16(TPM2_ACPI_CLASS_CLIENT);
-    if (TPM_IS_TIS(tpm_find())) {
+    if (TPM_IS_TIS_ISA(tpm_find())) {
           tpm2_ptr->control_area_address = cpu_to_le64(0);
           tpm2_ptr->start_method = cpu_to_le32(TPM2_START_METHOD_MMIO);
       } else if (TPM_IS_CRB(tpm_find())) {
hw/tpm/tpm_tis.c +1 -0
index 31facb896d..c609737272 100644
@@ -91,7 +91,7 @@ typedef struct TPMState {
       TPMPPI ppi;
   } TPMState;
   -#define TPM(obj) OBJECT_CHECK(TPMState, (obj), TYPE_TPM_TIS)
+#define TPM(obj) OBJECT_CHECK(TPMState, (obj), TYPE_TPM_TIS_ISA)
     #define DEBUG_TIS 0

  @@ -1008,7 +1008,7 @@ static void tpm_tis_class_init(ObjectClass *klass, void *data)
  }
    static const TypeInfo tpm_tis_info = {
-    .name = TYPE_TPM_TIS,
+    .name = TYPE_TPM_TIS_ISA,
      .parent = TYPE_ISA_DEVICE,
      .instance_size = sizeof(TPMState),
      .instance_init = tpm_tis_initfn,

include/sysemu/tpm.h +0 -1
index 15979a3647..1691b92c28 100644
--- a/include/sysemu/tpm.h
Quoted 8 lines
Quoted 6 lines

+++ b/include/sysemu/tpm.h

include/sysemu/tpm.h +0 -0
@@ -43,12 +43,12 @@ typedef struct TPMIfClass {
       enum TPMVersion (*get_version)(TPMIf *obj);
   } TPMIfClass;

  -#define TYPE_TPM_TIS                "tpm-tis"
+#define TYPE_TPM_TIS_ISA            "tpm-tis"

It should be safe to rename this "tpm-tis-isa" in this patch.

This would change the name of the legacy ISA device and also the way we instantiate it through the cmd line. To avoid breaking the compatibility I kept the same name and used tpm-tis-device (?) for the new sysbus one.

Thanks

Eric

Quoted 15 lines

Regardless:

Quoted 10 lines

  #define TYPE_TPM_CRB                "tpm-crb" #define TYPE_TPM_SPAPR              "tpm-spapr" -#define TPM_IS_TIS(chr)                             \
-    object_dynamic_cast(OBJECT(chr), TYPE_TPM_TIS) +#define TPM_IS_TIS_ISA(chr)                         \
+    object_dynamic_cast(OBJECT(chr), TYPE_TPM_TIS_ISA) #define TPM_IS_CRB(chr)                             \
      object_dynamic_cast(OBJECT(chr), TYPE_TPM_CRB) #define TPM_IS_SPAPR(chr)                           \

author
#12 lore raw

Re: [RFC v2 2/6] tpm: Use TPMState as a common struct

In reply to Auger Eric

Hi Phil,

Quoted 163 lines · Auger Eric

Hi Philippe,

Quoted 152 lines · Philippe Mathieu-Daudé

Hi Eric,

Quoted 149 lines · Eric Auger

As we plan to introdce 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.

---
  hw/tpm/tpm_tis.c | 146 +++++++++++++++++++++++++++++------------------

  1 file changed, 91 insertions(+), 55 deletions(-)
hw/tpm/tpm_tis.c +9 -1
index c609737272..fc6d7ca579 100644
@@ -65,7 +65,6 @@ typedef struct TPMLocality {
   } TPMLocality;
     typedef struct TPMState {
-    ISADevice busdev;
       MemoryRegion mmio;
         unsigned char buffer[TPM_TIS_BUFFER_MAX];
@@ -91,7 +90,15 @@ typedef struct TPMState {
       TPMPPI ppi;
   } TPMState;
   -#define TPM(obj) OBJECT_CHECK(TPMState, (obj), TYPE_TPM_TIS_ISA)
+typedef struct TPMStateISA {
+    /*< private >*/
+    ISADevice parent_obj;
+
+    /*< public >*/
+    TPMState state; /* not a QOM object */
+} TPMStateISA;
+
+#define TPM_TIS_ISA(obj) OBJECT_CHECK(TPMStateISA, (obj),
 TYPE_TPM_TIS_ISA)
     #define DEBUG_TIS 0
   @@ -281,9 +288,8 @@ static void tpm_tis_prep_abort(TPMState *s,

uint8_t locty, uint8_t newlocty)
  /*
   * Callback from the TPM to indicate that the response was received. */

hw/tpm/tpm_tis.c +1 -1
-static void tpm_tis_request_completed(TPMIf *ti, int ret)
+static void tpm_tis_request_completed(TPMState *s, int ret)

  {
-    TPMState *s = TPM(ti);
      uint8_t locty = s->cmd.locty;
      uint8_t l;
  @@ -338,7 +344,7 @@ static uint32_t tpm_tis_data_read(TPMState *s, uint8_t locty)
  }
    #ifdef DEBUG_TIS

hw/tpm/tpm_tis.c +1 -1
-static void tpm_tis_dump_state(void *opaque, hwaddr addr)
+static void tpm_tis_dump_state(TPMState *s, hwaddr addr)

  {
      static const unsigned regs[] = {
          TPM_TIS_REG_ACCESS,

hw/tpm/tpm_tis.c +0 -1
@@ -353,7 +359,6 @@ static void tpm_tis_dump_state(void *opaque,
 hwaddr addr)
       int idx;
       uint8_t locty = tpm_tis_locality_from_addr(addr);
       hwaddr base = addr & ~0xfff;
-    TPMState *s = opaque;

        printf("tpm_tis: active locality      : %d\n" "tpm_tis: state of locality %d : %d\n"

hw/tpm/tpm_tis.c +1 -1
@@ -363,7 +368,7 @@ static void tpm_tis_dump_state(void *opaque,
 hwaddr addr)
         for (idx = 0; regs[idx] != 0xfff; idx++) {
           printf("tpm_tis: 0x%04x : 0x%08x\n", regs[idx],
-               (int)tpm_tis_mmio_read(opaque, base + regs[idx], 4));
+               (int)tpm_tis_mmio_read(s, base + regs[idx], 4));
       }

        printf("tpm_tis: r/w offset    : %d\n"

hw/tpm/tpm_tis.c +0 -0
@@ -488,7 +493,7 @@ static uint64_t tpm_tis_mmio_read(void *opaque,
 hwaddr addr,
           break;
   #ifdef DEBUG_TIS

      case TPM_TIS_REG_DEBUG:
-        tpm_tis_dump_state(opaque, addr);
+        tpm_tis_dump_state(s, addr);
          break;
  #endif
      }

hw/tpm/tpm_tis.c +15 -13
@@ -835,10 +840,8 @@ static const MemoryRegionOps tpm_tis_memory_ops = {
   /*
    * Get the TPMVersion of the backend device being used
    */
-static enum TPMVersion tpm_tis_get_tpm_version(TPMIf *ti)
+static enum TPMVersion tpm_tis_get_tpm_version(TPMState *s)
   {
-    TPMState *s = TPM(ti);
-
       if (tpm_backend_had_startup_error(s->be_driver)) {
           return TPM_VERSION_UNSPEC;
       }
@@ -850,9 +853,8 @@ static enum TPMVersion
 tpm_tis_get_tpm_version(TPMIf *ti)
    * This function is called when the machine starts, resets or due to
    * S3 resume.
    */
-static void tpm_tis_reset(DeviceState *dev)
+static void tpm_tis_reset(TPMState *s)
   {
-    TPMState *s = TPM(dev);
       int c;
         s->be_tpm_version = tpm_backend_get_tpm_version(s->be_driver);
@@ -896,15 +898,14 @@ static void tpm_tis_reset(DeviceState *dev)
     /* persistent state handling */
   -static int tpm_tis_pre_save(void *opaque)
+static int tpm_tis_pre_save(TPMState *s)
   {
-    TPMState *s = opaque;
       uint8_t locty = s->active_locty;
         trace_tpm_tis_pre_save(locty, s->rw_offset);
         if (DEBUG_TIS) {
-        tpm_tis_dump_state(opaque, 0);
+        tpm_tis_dump_state(s, 0);
       }
         /*
@@ -929,34 +930,78 @@ static const VMStateDescription vmstate_locty = {
       }
   };
   -static const VMStateDescription vmstate_tpm_tis = {
+/* ISA */
+
+static int tpm_tis_pre_save_isa(void *opaque)
+{
+    TPMStateISA *isadev = opaque;
+
+    return tpm_tis_pre_save(&isadev->state);
+}
+
+static const VMStateDescription vmstate_tpm_tis_isa = {
       .name = "tpm-tis",
       .version_id = 0,
-    .pre_save  = tpm_tis_pre_save,
+    .pre_save  = tpm_tis_pre_save_isa,
       .fields = (VMStateField[]) {
-        VMSTATE_BUFFER(buffer, TPMState),
-        VMSTATE_UINT16(rw_offset, TPMState),
-        VMSTATE_UINT8(active_locty, TPMState),
-        VMSTATE_UINT8(aborting_locty, TPMState),
-        VMSTATE_UINT8(next_locty, TPMState),
Quoted 8 lines

hw/tpm/tpm_tis.c static const VMStateDescription vmstate_locty = { · line 951

Quoted 5 lines
hw/tpm/tpm_tis.c +5 -0
+        VMSTATE_BUFFER(state.buffer, TPMStateISA),
+        VMSTATE_UINT16(state.rw_offset, TPMStateISA),
+        VMSTATE_UINT8(state.active_locty, TPMStateISA),
+        VMSTATE_UINT8(state.aborting_locty, TPMStateISA),
+        VMSTATE_UINT8(state.next_locty, TPMStateISA),

On a second thought these fields seem to belong to a TPMCommonState. Why not QOM'ify an abstract common parent between ISA and SysBus?

Quoted 5 lines

This would mean we have double QOM inheritance (ISADevice and Sysbus device already being QOM devices). As far as I know this is not supported (see qom/object.h). Here I use the same trick as the one being used in hw/vfio/platform or pci.c and also used in hw/block/fdc.c - as pointed out by Stefan- : see FDCtrlSysBus and FDCtrlISABus.

Does this justification make sense?

In the positive do you keep your R-b or shall I remove it?

Thanks

Eric

Quoted 133 lines

Thanks

Eric

Quoted 129 lines
Quoted 128 lines
hw/tpm/tpm_tis.c +58 -23
   -        VMSTATE_STRUCT_ARRAY(loc, TPMState, TPM_TIS_NUM_LOCALITIES, 0,
+        VMSTATE_STRUCT_ARRAY(state.loc, TPMStateISA,
 TPM_TIS_NUM_LOCALITIES, 0,
                                vmstate_locty, TPMLocality),
             VMSTATE_END_OF_LIST()
       }
   };
   -static Property tpm_tis_properties[] = {
-    DEFINE_PROP_UINT32("irq", TPMState, irq_num, TPM_TIS_IRQ),
-    DEFINE_PROP_TPMBE("tpmdev", TPMState, be_driver),
-    DEFINE_PROP_BOOL("ppi", TPMState, ppi_enabled, true),
+static void tpm_tis_isa_request_completed(TPMIf *ti, int ret)
+{
+    TPMStateISA *isadev = TPM_TIS_ISA(ti);
+    TPMState *s = &isadev->state;
+
+    tpm_tis_request_completed(s, ret);
+}
+
+static enum TPMVersion tpm_tis_isa_get_tpm_version(TPMIf *ti)
+{
+    TPMStateISA *isadev = TPM_TIS_ISA(ti);
+    TPMState *s = &isadev->state;
+
+    return tpm_tis_get_tpm_version(s);
+}
+
+static void tpm_tis_isa_reset(DeviceState *dev)
+{
+    TPMStateISA *isadev = TPM_TIS_ISA(dev);
+    TPMState *s = &isadev->state;
+
+    return tpm_tis_reset(s);
+}
+
+static Property tpm_tis_isa_properties[] = {
+    DEFINE_PROP_UINT32("irq", TPMStateISA, state.irq_num, TPM_TIS_IRQ),
+    DEFINE_PROP_TPMBE("tpmdev", TPMStateISA, state.be_driver),
+    DEFINE_PROP_BOOL("ppi", TPMStateISA, state.ppi_enabled, true),
       DEFINE_PROP_END_OF_LIST(),
   };
   -static void tpm_tis_realizefn(DeviceState *dev, Error **errp)
+static void tpm_tis_isa_initfn(Object *obj)
   {
-    TPMState *s = TPM(dev);
+    TPMStateISA *isadev = TPM_TIS_ISA(obj);
+    TPMState *s = &isadev->state;
+
+    memory_region_init_io(&s->mmio, obj, &tpm_tis_memory_ops,
+                          s, "tpm-tis-mmio",
+                          TPM_TIS_NUM_LOCALITIES <<
 TPM_TIS_LOCALITY_SHIFT);
+}
+
+static void tpm_tis_isa_realizefn(DeviceState *dev, Error **errp)
+{
+    TPMStateISA *isadev = TPM_TIS_ISA(dev);
+    TPMState *s = &isadev->state;
         if (!tpm_find()) {
           error_setg(errp, "at most one TPM device is permitted");
@@ -973,55 +1018,46 @@ static void tpm_tis_realizefn(DeviceState *dev,
 Error **errp)
           return;
       }
   -    isa_init_irq(&s->busdev, &s->irq, s->irq_num);
+    isa_init_irq(ISA_DEVICE(dev), &s->irq, s->irq_num);
         memory_region_add_subregion(isa_address_space(ISA_DEVICE(dev)),
                                   TPM_TIS_ADDR_BASE, &s->mmio);
         if (s->ppi_enabled) {
           tpm_ppi_init(&s->ppi, isa_address_space(ISA_DEVICE(dev)),
-                     TPM_PPI_ADDR_BASE, OBJECT(s));
+                     TPM_PPI_ADDR_BASE, OBJECT(dev));
       }
   }
   -static void tpm_tis_initfn(Object *obj)
-{
-    TPMState *s = TPM(obj);
-
-    memory_region_init_io(&s->mmio, OBJECT(s), &tpm_tis_memory_ops,
-                          s, "tpm-tis-mmio",
-                          TPM_TIS_NUM_LOCALITIES <<
 TPM_TIS_LOCALITY_SHIFT);
-}
-
-static void tpm_tis_class_init(ObjectClass *klass, void *data)
+static void tpm_tis_isa_class_init(ObjectClass *klass, void *data)
   {
       DeviceClass *dc = DEVICE_CLASS(klass);
       TPMIfClass *tc = TPM_IF_CLASS(klass);
   -    dc->realize = tpm_tis_realizefn;
-    device_class_set_props(dc, tpm_tis_properties);
-    dc->reset = tpm_tis_reset;
-    dc->vmsd  = &vmstate_tpm_tis;
+    device_class_set_props(dc, tpm_tis_isa_properties);
+    dc->vmsd  = &vmstate_tpm_tis_isa;
       tc->model = TPM_MODEL_TPM_TIS;
-    tc->get_version = tpm_tis_get_tpm_version;
-    tc->request_completed = tpm_tis_request_completed;
+    dc->realize = tpm_tis_isa_realizefn;
+    dc->reset = tpm_tis_isa_reset;
+    tc->request_completed = tpm_tis_isa_request_completed;
+    tc->get_version = tpm_tis_isa_get_tpm_version;
   }
   -static const TypeInfo tpm_tis_info = {
+static const TypeInfo tpm_tis_isa_info = {
       .name = TYPE_TPM_TIS_ISA,
       .parent = TYPE_ISA_DEVICE,
-    .instance_size = sizeof(TPMState),
-    .instance_init = tpm_tis_initfn,
-    .class_init  = tpm_tis_class_init,
+    .instance_size = sizeof(TPMStateISA),
+    .instance_init = tpm_tis_isa_initfn,
+    .class_init  = tpm_tis_isa_class_init,
       .interfaces = (InterfaceInfo[]) {
           { TYPE_TPM_IF },
           { }
       }
   };
   -static void tpm_tis_register(void)
+static void tpm_tis_isa_register(void)
   {
-    type_register_static(&tpm_tis_info);
+    type_register_static(&tpm_tis_isa_info);
   }
   -type_init(tpm_tis_register)
+type_init(tpm_tis_isa_register)
#23 lore raw

Re: [RFC v2 5/6] tpm: Add the SysBus TPM TIS device

In reply to Ard Biesheuvel
Quoted 241 lines · Ard Biesheuvel
Quoted 240 lines · Auger Eric

Hi,

Quoted 224 lines · Auger Eric

Hi Stefan,

Quoted 213 lines · Stefan Berger
Quoted 212 lines · Eric Auger

Introduce the tpm-tis-device which is a sysbus device and is bound to be used on ARM.

---
   hw/tpm/Kconfig          |   5 ++
   hw/tpm/Makefile.objs    |   1 +
   hw/tpm/tpm_tis_sysbus.c | 159 ++++++++++++++++++++++++++++++++++++++++
   include/sysemu/tpm.h    |   1 +
   4 files changed, 166 insertions(+)

create mode 100644 hw/tpm/tpm_tis_sysbus.c

hw/tpm/Kconfig +4 -0
index 686f8206bb..4794e7fe28 100644
@@ -7,6 +7,11 @@ config TPM_TIS_ISA
       depends on TPM && ISA_BUS
       select TPM_TIS
   +config TPM_TIS_SYSBUS
+    bool
+    depends on TPM
+    select TPM_TIS
+
   config TPM_TIS
       bool
       depends on TPM
hw/tpm/Makefile.objs +1 -0
index 3ef2036cca..f1ec4beb95 100644
@@ -1,6 +1,7 @@
   common-obj-$(CONFIG_TPM) += tpm_util.o
   obj-$(call lor,$(CONFIG_TPM_TIS),$(CONFIG_TPM_CRB)) += tpm_ppi.o
   common-obj-$(CONFIG_TPM_TIS_ISA) += tpm_tis_isa.o
+common-obj-$(CONFIG_TPM_TIS_SYSBUS) += tpm_tis_sysbus.o
   common-obj-$(CONFIG_TPM_TIS) += tpm_tis_common.o
   common-obj-$(CONFIG_TPM_CRB) += tpm_crb.o
   common-obj-$(CONFIG_TPM_PASSTHROUGH) += tpm_passthrough.o
hw/tpm/tpm_tis_sysbus.c new file +12 -0
new file mode 100644
index 0000000000..18c02aed67
@@ -0,0 +1,159 @@
+/*
+ * tpm_tis_sysbus.c - QEMU's TPM TIS SYSBUS Device
+ *
+ * Copyright (C) 2006,2010-2013 IBM Corporation
+ *
+ * Authors:
+ *  Stefan Berger <[email protected]>
+ *  David Safford <[email protected]>
+ *
+ * Xen 4 support: Andrease Niederl <[email protected]>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or

later.
+ * See the COPYING file in the top-level directory.
+ *
+ * Implementation of the TIS interface according to specs found at
+ * http://www.trustedcomputinggroup.org. This implementation currently
+ * supports version 1.3, 21 March 2013
+ * In the developers menu choose the PC Client section then find the TIS
+ * specification.
+ *
+ * TPM TIS for TPM 2 implementation following TCG PC Client Platform
+ * TPM Profile (PTP) Specification, Familiy 2.0, Revision 00.43
+ */

hw/tpm/tpm_tis_sysbus.c new file +17 -0
+
+#include "qemu/osdep.h"
+#include "hw/qdev-properties.h"
+#include "migration/vmstate.h"
+#include "tpm_util.h"
+#include "hw/sysbus.h"
+#include "tpm_tis.h"
+
+typedef struct TPMStateSysBus {
+    /*< private >*/
+    SysBusDevice parent_obj;
+
+    /*< public >*/
+    TPMState state; /* not a QOM object */
+} TPMStateSysBus;
+
+#define TPM_TIS_SYSBUS(obj) OBJECT_CHECK(TPMStateSysBus, (obj),

TYPE_TPM_TIS_SYSBUS)

hw/tpm/tpm_tis_sysbus.c new file +20 -0
+
+static int tpm_tis_pre_save_sysbus(void *opaque)
+{
+    TPMStateSysBus *sbdev = opaque;
+
+    return tpm_tis_pre_save(&sbdev->state);
+}
+
+static const VMStateDescription vmstate_tpm_tis_sysbus = {
+    .name = "tpm-tis",
+    .version_id = 0,
+    .pre_save  = tpm_tis_pre_save_sysbus,
+    .fields = (VMStateField[]) {
+        VMSTATE_BUFFER(state.buffer, TPMStateSysBus),
+        VMSTATE_UINT16(state.rw_offset, TPMStateSysBus),
+        VMSTATE_UINT8(state.active_locty, TPMStateSysBus),
+        VMSTATE_UINT8(state.aborting_locty, TPMStateSysBus),
+        VMSTATE_UINT8(state.next_locty, TPMStateSysBus),
+
+        VMSTATE_STRUCT_ARRAY(state.loc, TPMStateSysBus,

TPM_TIS_NUM_LOCALITIES,

hw/tpm/tpm_tis_sysbus.c new file +32 -0
+                             0, vmstate_locty, TPMLocality),
+
+        VMSTATE_END_OF_LIST()
+    }
+};
+
+static void tpm_tis_sysbus_request_completed(TPMIf *ti, int ret)
+{
+    TPMStateSysBus *sbdev = TPM_TIS_SYSBUS(ti);
+    TPMState *s = &sbdev->state;
+
+    tpm_tis_request_completed(s, ret);
+}
+
+static enum TPMVersion tpm_tis_sysbus_get_tpm_version(TPMIf *ti)
+{
+    TPMStateSysBus *sbdev = TPM_TIS_SYSBUS(ti);
+    TPMState *s = &sbdev->state;
+
+    return tpm_tis_get_tpm_version(s);
+}
+
+static void tpm_tis_sysbus_reset(DeviceState *dev)
+{
+    TPMStateSysBus *sbdev = TPM_TIS_SYSBUS(dev);
+    TPMState *s = &sbdev->state;
+
+    return tpm_tis_reset(s);
+}
+
+static Property tpm_tis_sysbus_properties[] = {
+    DEFINE_PROP_UINT32("irq", TPMStateSysBus, state.irq_num,

TPM_TIS_IRQ),

hw/tpm/tpm_tis_sysbus.c new file +13 -0
+    DEFINE_PROP_TPMBE("tpmdev", TPMStateSysBus, state.be_driver),
+    DEFINE_PROP_BOOL("ppi", TPMStateSysBus, state.ppi_enabled, true),
+    DEFINE_PROP_END_OF_LIST(),
+};
+
+static void tpm_tis_sysbus_initfn(Object *obj)
+{
+    TPMStateSysBus *sbdev = TPM_TIS_SYSBUS(obj);
+    TPMState *s = &sbdev->state;
+
+    memory_region_init_io(&s->mmio, obj, &tpm_tis_memory_ops,
+                          s, "tpm-tis-mmio",
+                          TPM_TIS_NUM_LOCALITIES <<

TPM_TIS_LOCALITY_SHIFT);

hw/tpm/tpm_tis_sysbus.c new file +54 -0
+
+    sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->mmio);
+    sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->irq);
+}
+
+static void tpm_tis_sysbus_realizefn(DeviceState *dev, Error **errp)
+{
+    TPMStateSysBus *sbdev = TPM_TIS_SYSBUS(dev);
+    TPMState *s = &sbdev->state;
+
+    if (!tpm_find()) {
+        error_setg(errp, "at most one TPM device is permitted");
+        return;
+    }
+
+    if (!s->be_driver) {
+        error_setg(errp, "'tpmdev' property is required");
+        return;
+    }
+}
+
+static void tpm_tis_sysbus_class_init(ObjectClass *klass, void *data)
+{
+    DeviceClass *dc = DEVICE_CLASS(klass);
+    TPMIfClass *tc = TPM_IF_CLASS(klass);
+
+    device_class_set_props(dc, tpm_tis_sysbus_properties);
+    dc->vmsd  = &vmstate_tpm_tis_sysbus;
+    tc->model = TPM_MODEL_TPM_TIS;
+    dc->realize = tpm_tis_sysbus_realizefn;
+    dc->user_creatable = true;
+    dc->reset = tpm_tis_sysbus_reset;
+    tc->request_completed = tpm_tis_sysbus_request_completed;
+    tc->get_version = tpm_tis_sysbus_get_tpm_version;
+}
+
+static const TypeInfo tpm_tis_sysbus_info = {
+    .name = TYPE_TPM_TIS_SYSBUS,
+    .parent = TYPE_SYS_BUS_DEVICE,
+    .instance_size = sizeof(TPMStateSysBus),
+    .instance_init = tpm_tis_sysbus_initfn,
+    .class_init  = tpm_tis_sysbus_class_init,
+    .interfaces = (InterfaceInfo[]) {
+        { TYPE_TPM_IF },
+        { }
+    }
+};
+
+static void tpm_tis_sysbus_register(void)
+{
+    type_register_static(&tpm_tis_sysbus_info);
+}
+
+type_init(tpm_tis_sysbus_register)
include/sysemu/tpm.h +0 -1
index 1691b92c28..f37851b1aa 100644
--- a/include/sysemu/tpm.h
Quoted 8 lines

include/sysemu/tpm.h typedef struct TPMIfClass { · line 46

Quoted 5 lines

+++ b/include/sysemu/tpm.h

include/sysemu/tpm.h +1 -0
@@ -44,6 +44,7 @@ typedef struct TPMIfClass {
   } TPMIfClass;
     #define TYPE_TPM_TIS_ISA            "tpm-tis"
+#define TYPE_TPM_TIS_SYSBUS         "tpm-tis-device"

hm, replace the rather generic 'device' with 'sysbus'?

Quoted 8 lines

I used the "-device" suffix because this kind of naming was used for virtio-<type>-device when based on MMIO rather than virtio-<type>-pci. For instance virtio-net-device instead of virtio-net-pci. There are quite a lot of devices using that suffix. I only see xen-sysbus with the sysbus suffix.

Now personally I don't have any strong preference and I will pick up the name chosen by consensus.

Does anyone else have an opinion on the name to be chosen for this new device:

Quoted 8 lines
Quoted 3 lines

1) tpm-tis-device or
2) tpm-tis-sysbus ?

It is slightly unfortunate that we cannot retain the 'tpm-tis' name, given that this is simply a TPM with a memory mapped TIS frame, like the ISA one, and the fact that QEMU instantiates this differently based on the emulated architecture is really an implementation detail.

Agreed.

As long as we don't change vmstate_tpm_tis::name, we can rename the QOM type names.

So I'd rather rename ISA as:

  #define TYPE_TPM_TIS_ISA            "tpm-tis-isa"

And the generic name for the sysbus/mmio device:

  #define TYPE_TPM_TIS_SYSBUS         "tpm-tis"

If we add the common ancestor, we can name it "tpm-tis-common".

Quoted 4 lines

So I prefer 'tpm-tis-device', since it doesn't define how it is backed under the hood, and allows us to potentially instantiate it in a different way in the future if we wanted to. Alternatively, something like 'tpm-tis-mmmio' might be appropriate.

#4 lore raw

Re: [RFC v2 1/6] tpm: rename TPM_TIS into TPM_TIS_ISA

In reply to Auger Eric
Quoted 75 lines · Auger Eric

Hi Phil,

Quoted 64 lines · Philippe Mathieu-Daudé
Quoted 63 lines · Eric Auger

As we plan to introduce a sysbus TPM_TIS, let's rename TPM_TIS into TPM_TIS_ISA.

---
   hw/i386/acpi-build.c | 6 +++---
   hw/tpm/tpm_tis.c     | 4 ++--
   include/sysemu/tpm.h | 6 +++---
   3 files changed, 8 insertions(+), 8 deletions(-)
hw/i386/acpi-build.c +1 -0
index 9c4e46fa74..26777f8828 100644
@@ -2026,7 +2026,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
           }
       }
   -    if (TPM_IS_TIS(tpm_find())) {
+    if (TPM_IS_TIS_ISA(tpm_find())) {
           aml_append(crs, aml_memory32_fixed(TPM_TIS_ADDR_BASE,
                      TPM_TIS_ADDR_SIZE, AML_READ_WRITE));
       }
@@ -2197,7 +2197,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
               /* Scan all PCI buses. Generate tables to support

hotplug. */
              build_append_pci_bus_devices(scope, bus,
pm->pcihp_bridge_en);
  -            if (TPM_IS_TIS(tpm)) {
+            if (TPM_IS_TIS_ISA(tpm)) {
                  if (misc->tpm_version == TPM_VERSION_2_0) { dev = aml_device("TPM"); aml_append(dev, aml_name_decl("_HID",

hw/i386/acpi-build.c +1 -1
@@ -2304,7 +2304,7 @@ build_tpm2(GArray *table_data, BIOSLinker
 *linker, GArray *tcpalog)
           (char *)&tpm2_ptr->log_area_start_address - table_data->data;
         tpm2_ptr->platform_class = cpu_to_le16(TPM2_ACPI_CLASS_CLIENT);
-    if (TPM_IS_TIS(tpm_find())) {
+    if (TPM_IS_TIS_ISA(tpm_find())) {
           tpm2_ptr->control_area_address = cpu_to_le64(0);
           tpm2_ptr->start_method = cpu_to_le32(TPM2_START_METHOD_MMIO);
       } else if (TPM_IS_CRB(tpm_find())) {
hw/tpm/tpm_tis.c +2 -1
index 31facb896d..c609737272 100644
@@ -91,7 +91,7 @@ typedef struct TPMState {
       TPMPPI ppi;
   } TPMState;
   -#define TPM(obj) OBJECT_CHECK(TPMState, (obj), TYPE_TPM_TIS)
+#define TPM(obj) OBJECT_CHECK(TPMState, (obj), TYPE_TPM_TIS_ISA)
     #define DEBUG_TIS 0
   @@ -1008,7 +1008,7 @@ static void tpm_tis_class_init(ObjectClass
 *klass, void *data)
   }
     static const TypeInfo tpm_tis_info = {
-    .name = TYPE_TPM_TIS,
+    .name = TYPE_TPM_TIS_ISA,
       .parent = TYPE_ISA_DEVICE,
       .instance_size = sizeof(TPMState),
       .instance_init = tpm_tis_initfn,
include/sysemu/tpm.h +0 -1
index 15979a3647..1691b92c28 100644
--- a/include/sysemu/tpm.h
Quoted 8 lines

include/sysemu/tpm.h typedef struct TPMIfClass { · line 46

Quoted 6 lines

+++ b/include/sysemu/tpm.h

include/sysemu/tpm.h +1 -0
@@ -43,12 +43,12 @@ typedef struct TPMIfClass {
       enum TPMVersion (*get_version)(TPMIf *obj);
   } TPMIfClass;
   -#define TYPE_TPM_TIS                "tpm-tis"
+#define TYPE_TPM_TIS_ISA            "tpm-tis"

It should be safe to rename this "tpm-tis-isa" in this patch.

Quoted 3 lines

This would change the name of the legacy ISA device and also the way we instantiate it through the cmd line. To avoid breaking the compatibility I kept the same name and used tpm-tis-device (?) for the new sysbus one.

I thought ISA devices were not user-creatable...

Quoted 20 lines

Thanks

Eric

Quoted 15 lines

Regardless:

Quoted 10 lines
include/sysemu/tpm.h +2 -1
   #define TYPE_TPM_CRB                "tpm-crb"
   #define TYPE_TPM_SPAPR              "tpm-spapr"
   -#define TPM_IS_TIS(chr)                             \
-    object_dynamic_cast(OBJECT(chr), TYPE_TPM_TIS)
+#define TPM_IS_TIS_ISA(chr)                         \
+    object_dynamic_cast(OBJECT(chr), TYPE_TPM_TIS_ISA)
   #define TPM_IS_CRB(chr)                             \
       object_dynamic_cast(OBJECT(chr), TYPE_TPM_CRB)
   #define TPM_IS_SPAPR(chr)                           \
author
#5 lore raw

Re: [RFC v2 1/6] tpm: rename TPM_TIS into TPM_TIS_ISA

Hi Phil,

Quoted 81 lines · Philippe Mathieu-Daudé
Quoted 80 lines · Auger Eric

Hi Phil,

Quoted 77 lines · Philippe Mathieu-Daudé
Quoted 72 lines · Eric Auger

As we plan to introduce a sysbus TPM_TIS, let's rename TPM_TIS into TPM_TIS_ISA.

---
   hw/i386/acpi-build.c | 6 +++---
   hw/tpm/tpm_tis.c     | 4 ++--
   include/sysemu/tpm.h | 6 +++---

   3 files changed, 8 insertions(+), 8 deletions(-)
hw/i386/acpi-build.c +1 -0
index 9c4e46fa74..26777f8828 100644
@@ -2026,7 +2026,7 @@ build_dsdt(GArray *table_data, BIOSLinker
 *linker,
            }
        }
    -    if (TPM_IS_TIS(tpm_find())) {
+    if (TPM_IS_TIS_ISA(tpm_find())) {
            aml_append(crs, aml_memory32_fixed(TPM_TIS_ADDR_BASE,
                       TPM_TIS_ADDR_SIZE, AML_READ_WRITE));

       }

hw/i386/acpi-build.c +0 -0
@@ -2197,7 +2197,7 @@ build_dsdt(GArray *table_data, BIOSLinker
 *linker,
                /* Scan all PCI buses. Generate tables to support

hotplug. */
               build_append_pci_bus_devices(scope, bus, pm->pcihp_bridge_en);
   -            if (TPM_IS_TIS(tpm)) {
+            if (TPM_IS_TIS_ISA(tpm)) {
                   if (misc->tpm_version == TPM_VERSION_2_0) { dev = aml_device("TPM"); aml_append(dev, aml_name_decl("_HID",

hw/i386/acpi-build.c +0 -0
@@ -2304,7 +2304,7 @@ build_tpm2(GArray *table_data, BIOSLinker
 *linker, GArray *tcpalog)

           (char *)&tpm2_ptr->log_area_start_address - table_data->data;
         tpm2_ptr->platform_class = cpu_to_le16(TPM2_ACPI_CLASS_CLIENT);
-    if (TPM_IS_TIS(tpm_find())) {
+    if (TPM_IS_TIS_ISA(tpm_find())) { tpm2_ptr->control_area_address = cpu_to_le64(0); tpm2_ptr->start_method = cpu_to_le32(TPM2_START_METHOD_MMIO);
       } else if (TPM_IS_CRB(tpm_find())) {

hw/tpm/tpm_tis.c +1 -0
index 31facb896d..c609737272 100644
@@ -91,7 +91,7 @@ typedef struct TPMState {
        TPMPPI ppi;
    } TPMState;
    -#define TPM(obj) OBJECT_CHECK(TPMState, (obj), TYPE_TPM_TIS)
+#define TPM(obj) OBJECT_CHECK(TPMState, (obj), TYPE_TPM_TIS_ISA)
      #define DEBUG_TIS 0

   @@ -1008,7 +1008,7 @@ static void tpm_tis_class_init(ObjectClass *klass, void *data)
   }
     static const TypeInfo tpm_tis_info = {
-    .name = TYPE_TPM_TIS,
+    .name = TYPE_TPM_TIS_ISA,
       .parent = TYPE_ISA_DEVICE,
       .instance_size = sizeof(TPMState),
       .instance_init = tpm_tis_initfn,

include/sysemu/tpm.h +0 -0
index 15979a3647..1691b92c28 100644
@@ -43,12 +43,12 @@ typedef struct TPMIfClass {
        enum TPMVersion (*get_version)(TPMIf *obj);
    } TPMIfClass;
Quoted 2 lines

   -#define TYPE_TPM_TIS                "tpm-tis"
+#define TYPE_TPM_TIS_ISA            "tpm-tis"

It should be safe to rename this "tpm-tis-isa" in this patch.

Quoted 5 lines
Quoted 3 lines

This would change the name of the legacy ISA device and also the way we instantiate it through the cmd line. To avoid breaking the compatibility I kept the same name and used tpm-tis-device (?) for the new sysbus one.

I thought ISA devices were not user-creatable...

See docs/specs/tpm.rst and the cmd line used for x86:

    ../..
    -chardev socket,id=chrtpm,path=/tmp/mytpm1/swtpm-sock \
    -tpmdev emulator,id=tpm0,chardev=chrtpm \
    -device tpm-tis,tpmdev=tpm0 test.img

Thanks

Eric

Quoted 23 lines
Quoted 21 lines

Thanks

Eric

Quoted 15 lines

Regardless:

Quoted 10 lines

   #define TYPE_TPM_CRB                "tpm-crb" #define TYPE_TPM_SPAPR              "tpm-spapr" -#define TPM_IS_TIS(chr)                             \
-    object_dynamic_cast(OBJECT(chr), TYPE_TPM_TIS) +#define TPM_IS_TIS_ISA(chr)                         \
+    object_dynamic_cast(OBJECT(chr), TYPE_TPM_TIS_ISA) #define TPM_IS_CRB(chr)                             \
       object_dynamic_cast(OBJECT(chr), TYPE_TPM_CRB) #define TPM_IS_SPAPR(chr)                           \

author
#24 lore raw

Re: [RFC v2 5/6] tpm: Add the SysBus TPM TIS device

In reply to Ard Biesheuvel

Hi Ard,

Quoted 241 lines · Ard Biesheuvel
Quoted 240 lines · Auger Eric

Hi,

Quoted 224 lines · Auger Eric

Hi Stefan,

Quoted 213 lines · Stefan Berger
Quoted 212 lines · Eric Auger

Introduce the tpm-tis-device which is a sysbus device and is bound to be used on ARM.

---
  hw/tpm/Kconfig          |   5 ++
  hw/tpm/Makefile.objs    |   1 +
  hw/tpm/tpm_tis_sysbus.c | 159 ++++++++++++++++++++++++++++++++++++++++
  include/sysemu/tpm.h    |   1 +
  4 files changed, 166 insertions(+)

create mode 100644 hw/tpm/tpm_tis_sysbus.c

hw/tpm/Kconfig +4 -0
index 686f8206bb..4794e7fe28 100644
@@ -7,6 +7,11 @@ config TPM_TIS_ISA
      depends on TPM && ISA_BUS
      select TPM_TIS
  +config TPM_TIS_SYSBUS
+    bool
+    depends on TPM
+    select TPM_TIS
+
  config TPM_TIS
      bool
      depends on TPM
hw/tpm/Makefile.objs +1 -0
index 3ef2036cca..f1ec4beb95 100644
@@ -1,6 +1,7 @@
  common-obj-$(CONFIG_TPM) += tpm_util.o
  obj-$(call lor,$(CONFIG_TPM_TIS),$(CONFIG_TPM_CRB)) += tpm_ppi.o
  common-obj-$(CONFIG_TPM_TIS_ISA) += tpm_tis_isa.o
+common-obj-$(CONFIG_TPM_TIS_SYSBUS) += tpm_tis_sysbus.o
  common-obj-$(CONFIG_TPM_TIS) += tpm_tis_common.o
  common-obj-$(CONFIG_TPM_CRB) += tpm_crb.o
  common-obj-$(CONFIG_TPM_PASSTHROUGH) += tpm_passthrough.o
hw/tpm/tpm_tis_sysbus.c new file +12 -0
new file mode 100644
index 0000000000..18c02aed67
@@ -0,0 +1,159 @@
+/*
+ * tpm_tis_sysbus.c - QEMU's TPM TIS SYSBUS Device
+ *
+ * Copyright (C) 2006,2010-2013 IBM Corporation
+ *
+ * Authors:
+ *  Stefan Berger <[email protected]>
+ *  David Safford <[email protected]>
+ *
+ * Xen 4 support: Andrease Niederl <[email protected]>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or

later.
+ * See the COPYING file in the top-level directory.
+ *
+ * Implementation of the TIS interface according to specs found at
+ * http://www.trustedcomputinggroup.org. This implementation currently
+ * supports version 1.3, 21 March 2013
+ * In the developers menu choose the PC Client section then find the TIS
+ * specification.
+ *
+ * TPM TIS for TPM 2 implementation following TCG PC Client Platform
+ * TPM Profile (PTP) Specification, Familiy 2.0, Revision 00.43
+ */

hw/tpm/tpm_tis_sysbus.c new file +17 -0
+
+#include "qemu/osdep.h"
+#include "hw/qdev-properties.h"
+#include "migration/vmstate.h"
+#include "tpm_util.h"
+#include "hw/sysbus.h"
+#include "tpm_tis.h"
+
+typedef struct TPMStateSysBus {
+    /*< private >*/
+    SysBusDevice parent_obj;
+
+    /*< public >*/
+    TPMState state; /* not a QOM object */
+} TPMStateSysBus;
+
+#define TPM_TIS_SYSBUS(obj) OBJECT_CHECK(TPMStateSysBus, (obj),

TYPE_TPM_TIS_SYSBUS)

hw/tpm/tpm_tis_sysbus.c new file +20 -0
+
+static int tpm_tis_pre_save_sysbus(void *opaque)
+{
+    TPMStateSysBus *sbdev = opaque;
+
+    return tpm_tis_pre_save(&sbdev->state);
+}
+
+static const VMStateDescription vmstate_tpm_tis_sysbus = {
+    .name = "tpm-tis",
+    .version_id = 0,
+    .pre_save  = tpm_tis_pre_save_sysbus,
+    .fields = (VMStateField[]) {
+        VMSTATE_BUFFER(state.buffer, TPMStateSysBus),
+        VMSTATE_UINT16(state.rw_offset, TPMStateSysBus),
+        VMSTATE_UINT8(state.active_locty, TPMStateSysBus),
+        VMSTATE_UINT8(state.aborting_locty, TPMStateSysBus),
+        VMSTATE_UINT8(state.next_locty, TPMStateSysBus),
+
+        VMSTATE_STRUCT_ARRAY(state.loc, TPMStateSysBus,

TPM_TIS_NUM_LOCALITIES,

hw/tpm/tpm_tis_sysbus.c new file +32 -0
+                             0, vmstate_locty, TPMLocality),
+
+        VMSTATE_END_OF_LIST()
+    }
+};
+
+static void tpm_tis_sysbus_request_completed(TPMIf *ti, int ret)
+{
+    TPMStateSysBus *sbdev = TPM_TIS_SYSBUS(ti);
+    TPMState *s = &sbdev->state;
+
+    tpm_tis_request_completed(s, ret);
+}
+
+static enum TPMVersion tpm_tis_sysbus_get_tpm_version(TPMIf *ti)
+{
+    TPMStateSysBus *sbdev = TPM_TIS_SYSBUS(ti);
+    TPMState *s = &sbdev->state;
+
+    return tpm_tis_get_tpm_version(s);
+}
+
+static void tpm_tis_sysbus_reset(DeviceState *dev)
+{
+    TPMStateSysBus *sbdev = TPM_TIS_SYSBUS(dev);
+    TPMState *s = &sbdev->state;
+
+    return tpm_tis_reset(s);
+}
+
+static Property tpm_tis_sysbus_properties[] = {
+    DEFINE_PROP_UINT32("irq", TPMStateSysBus, state.irq_num,

TPM_TIS_IRQ),

hw/tpm/tpm_tis_sysbus.c new file +13 -0
+    DEFINE_PROP_TPMBE("tpmdev", TPMStateSysBus, state.be_driver),
+    DEFINE_PROP_BOOL("ppi", TPMStateSysBus, state.ppi_enabled, true),
+    DEFINE_PROP_END_OF_LIST(),
+};
+
+static void tpm_tis_sysbus_initfn(Object *obj)
+{
+    TPMStateSysBus *sbdev = TPM_TIS_SYSBUS(obj);
+    TPMState *s = &sbdev->state;
+
+    memory_region_init_io(&s->mmio, obj, &tpm_tis_memory_ops,
+                          s, "tpm-tis-mmio",
+                          TPM_TIS_NUM_LOCALITIES <<

TPM_TIS_LOCALITY_SHIFT);

hw/tpm/tpm_tis_sysbus.c new file +54 -0
+
+    sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->mmio);
+    sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->irq);
+}
+
+static void tpm_tis_sysbus_realizefn(DeviceState *dev, Error **errp)
+{
+    TPMStateSysBus *sbdev = TPM_TIS_SYSBUS(dev);
+    TPMState *s = &sbdev->state;
+
+    if (!tpm_find()) {
+        error_setg(errp, "at most one TPM device is permitted");
+        return;
+    }
+
+    if (!s->be_driver) {
+        error_setg(errp, "'tpmdev' property is required");
+        return;
+    }
+}
+
+static void tpm_tis_sysbus_class_init(ObjectClass *klass, void *data)
+{
+    DeviceClass *dc = DEVICE_CLASS(klass);
+    TPMIfClass *tc = TPM_IF_CLASS(klass);
+
+    device_class_set_props(dc, tpm_tis_sysbus_properties);
+    dc->vmsd  = &vmstate_tpm_tis_sysbus;
+    tc->model = TPM_MODEL_TPM_TIS;
+    dc->realize = tpm_tis_sysbus_realizefn;
+    dc->user_creatable = true;
+    dc->reset = tpm_tis_sysbus_reset;
+    tc->request_completed = tpm_tis_sysbus_request_completed;
+    tc->get_version = tpm_tis_sysbus_get_tpm_version;
+}
+
+static const TypeInfo tpm_tis_sysbus_info = {
+    .name = TYPE_TPM_TIS_SYSBUS,
+    .parent = TYPE_SYS_BUS_DEVICE,
+    .instance_size = sizeof(TPMStateSysBus),
+    .instance_init = tpm_tis_sysbus_initfn,
+    .class_init  = tpm_tis_sysbus_class_init,
+    .interfaces = (InterfaceInfo[]) {
+        { TYPE_TPM_IF },
+        { }
+    }
+};
+
+static void tpm_tis_sysbus_register(void)
+{
+    type_register_static(&tpm_tis_sysbus_info);
+}
+
+type_init(tpm_tis_sysbus_register)
include/sysemu/tpm.h +0 -1
index 1691b92c28..f37851b1aa 100644
--- a/include/sysemu/tpm.h
Quoted 8 lines

include/sysemu/tpm.h typedef struct TPMIfClass { · line 46

Quoted 5 lines

+++ b/include/sysemu/tpm.h

include/sysemu/tpm.h +1 -0
@@ -44,6 +44,7 @@ typedef struct TPMIfClass {
  } TPMIfClass;
    #define TYPE_TPM_TIS_ISA            "tpm-tis"
+#define TYPE_TPM_TIS_SYSBUS         "tpm-tis-device"

hm, replace the rather generic 'device' with 'sysbus'?

Quoted 8 lines

I used the "-device" suffix because this kind of naming was used for virtio-<type>-device when based on MMIO rather than virtio-<type>-pci. For instance virtio-net-device instead of virtio-net-pci. There are quite a lot of devices using that suffix. I only see xen-sysbus with the sysbus suffix.

Now personally I don't have any strong preference and I will pick up the name chosen by consensus.

Does anyone else have an opinion on the name to be chosen for this new device:

Quoted 8 lines
Quoted 3 lines

1) tpm-tis-device or
2) tpm-tis-sysbus ?

It is slightly unfortunate that we cannot retain the 'tpm-tis' name, given that this is simply a TPM with a memory mapped TIS frame, like the ISA one, and the fact that QEMU instantiates this differently based on the emulated architecture is really an implementation detail.

I agree with you. However I don't see any other solution. The #ifdef'eries are frown upon. As I mentioned we have the same case for virtio devices (virtio-net-pci vs virtio-net-device for instance).

Quoted 5 lines

So I prefer 'tpm-tis-device', since it doesn't define how it is backed under the hood, and allows us to potentially instantiate it in a different way in the future if we wanted to. Alternatively, something like 'tpm-tis-mmmio' might be appropriate.

At the moment I have chosen to keep tpm-tis-device. But as I mentioned I am open to other choices if any consensus arises.

Thanks

Eric

Quoted 1 line