* [Qemu-devel] [PATCH 1/3] Extend TPM TIS interface to version 2.0
2015-03-31 19:40 [Qemu-devel] [PATCH 0/3] tpm: Upgrade TPM TIS for support of a TPM 2 Stefan Berger
@ 2015-03-31 19:40 ` Stefan Berger
2015-04-14 5:50 ` Michael S. Tsirkin
2015-03-31 19:40 ` [Qemu-devel] [PATCH 2/3] tpm: Probe for connected TPM 1.2 or TPM 2 Stefan Berger
2015-03-31 19:40 ` [Qemu-devel] [PATCH 3/3] TPM2 ACPI table support Stefan Berger
2 siblings, 1 reply; 14+ messages in thread
From: Stefan Berger @ 2015-03-31 19:40 UTC (permalink / raw)
To: qemu-devel, mst; +Cc: quan.xu, Stefan Berger
Following the recent upgrade to version 1.3, extend the TPM TIS
interface with capabilities introduced for support of a TPM 2.
TPM TIS for TPM 2 introduced the following extensions beyond the
TPM TIS 1.3 (used for TPM 1.2):
- A new 32bit interface Id register was introduced.
- New flags for the status (STS) register were defined.
- New flags for the capability flags were defined.
Support the above if a TPM TIS 1.3 for TPM 2 is used with a TPM 2
on the backend side. Support the old TPM TIS 1.3 configuration if a
TPM 1.2 is being used. A subsequent patch will then determine which
TPM version is being used in the backend.
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
---
backends/tpm.c | 14 ++++++
hw/tpm/tpm_int.h | 1 +
hw/tpm/tpm_passthrough.c | 14 ++++++
hw/tpm/tpm_tis.c | 109 +++++++++++++++++++++++++++++++++++++++----
hw/tpm/tpm_tis.h | 1 +
include/sysemu/tpm.h | 7 +++
include/sysemu/tpm_backend.h | 23 +++++++++
7 files changed, 160 insertions(+), 9 deletions(-)
diff --git a/backends/tpm.c b/backends/tpm.c
index 4efe367..3ebb603 100644
--- a/backends/tpm.c
+++ b/backends/tpm.c
@@ -96,6 +96,20 @@ bool tpm_backend_get_tpm_established_flag(TPMBackend *s)
return k->ops->get_tpm_established_flag(s);
}
+int tpm_backend_reset_tpm_established_flag(TPMBackend *s, uint8_t locty)
+{
+ TPMBackendClass *k = TPM_BACKEND_GET_CLASS(s);
+
+ return k->ops->reset_tpm_established_flag(s, locty);
+}
+
+enum TPMVersion tpm_backend_get_tpm_version(TPMBackend *s)
+{
+ TPMBackendClass *k = TPM_BACKEND_GET_CLASS(s);
+
+ return k->ops->get_tpm_version(s);
+}
+
static bool tpm_backend_prop_get_opened(Object *obj, Error **errp)
{
TPMBackend *s = TPM_BACKEND(obj);
diff --git a/hw/tpm/tpm_int.h b/hw/tpm/tpm_int.h
index 2b35fe2..24e12ce 100644
--- a/hw/tpm/tpm_int.h
+++ b/hw/tpm/tpm_int.h
@@ -29,6 +29,7 @@ struct TPMState {
char *backend;
TPMBackend *be_driver;
+ enum TPMVersion be_tpm_version;
};
#define TPM(obj) OBJECT_CHECK(TPMState, (obj), TYPE_TPM_TIS)
diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c
index 73ca906..dd769a7 100644
--- a/hw/tpm/tpm_passthrough.c
+++ b/hw/tpm/tpm_passthrough.c
@@ -267,6 +267,13 @@ static bool tpm_passthrough_get_tpm_established_flag(TPMBackend *tb)
return false;
}
+static int tpm_passthrough_reset_tpm_established_flag(TPMBackend *tb,
+ uint8_t locty)
+{
+ /* only a TPM 2.0 will support this */
+ return 0;
+}
+
static bool tpm_passthrough_get_startup_error(TPMBackend *tb)
{
TPMPassthruState *tpm_pt = TPM_PASSTHROUGH(tb);
@@ -324,6 +331,11 @@ static const char *tpm_passthrough_create_desc(void)
return "Passthrough TPM backend driver";
}
+static enum TPMVersion tpm_passthrough_get_tpm_version(TPMBackend *tb)
+{
+ return TPMVersion1_2;
+}
+
/*
* A basic test of a TPM device. We expect a well formatted response header
* (error response is fine) within one second.
@@ -540,6 +552,8 @@ static const TPMDriverOps tpm_passthrough_driver = {
.deliver_request = tpm_passthrough_deliver_request,
.cancel_cmd = tpm_passthrough_cancel_cmd,
.get_tpm_established_flag = tpm_passthrough_get_tpm_established_flag,
+ .reset_tpm_established_flag = tpm_passthrough_reset_tpm_established_flag,
+ .get_tpm_version = tpm_passthrough_get_tpm_version,
};
static void tpm_passthrough_inst_init(Object *obj)
diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c
index 4b6d601..89e401d 100644
--- a/hw/tpm/tpm_tis.c
+++ b/hw/tpm/tpm_tis.c
@@ -17,6 +17,9 @@
* 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 "sysemu/tpm_backend.h"
@@ -49,6 +52,7 @@
#define TPM_TIS_REG_INTF_CAPABILITY 0x14
#define TPM_TIS_REG_STS 0x18
#define TPM_TIS_REG_DATA_FIFO 0x24
+#define TPM_TIS_REG_INTERFACE_ID 0x30
#define TPM_TIS_REG_DATA_XFIFO 0x80
#define TPM_TIS_REG_DATA_XFIFO_END 0xbc
#define TPM_TIS_REG_DID_VID 0xf00
@@ -57,6 +61,12 @@
/* vendor-specific registers */
#define TPM_TIS_REG_DEBUG 0xf90
+#define TPM_TIS_STS_TPM_FAMILY_MASK (0x3 << 26)/* TPM 2.0 */
+#define TPM_TIS_STS_TPM_FAMILY1_2 (0 << 26) /* TPM 2.0 */
+#define TPM_TIS_STS_TPM_FAMILY2_0 (1 << 26) /* TPM 2.0 */
+#define TPM_TIS_STS_RESET_ESTABLISHMENT_BIT (1 << 25) /* TPM 2.0 */
+#define TPM_TIS_STS_COMMAND_CANCEL (1 << 24) /* TPM 2.0 */
+
#define TPM_TIS_STS_VALID (1 << 7)
#define TPM_TIS_STS_COMMAND_READY (1 << 6)
#define TPM_TIS_STS_TPM_GO (1 << 5)
@@ -102,15 +112,42 @@
#endif
#define TPM_TIS_CAP_INTERFACE_VERSION1_3 (2 << 28)
+#define TPM_TIS_CAP_INTERFACE_VERSION1_3_FOR_TPM2_0 (3 << 28)
#define TPM_TIS_CAP_DATA_TRANSFER_64B (3 << 9)
#define TPM_TIS_CAP_DATA_TRANSFER_LEGACY (0 << 9)
#define TPM_TIS_CAP_BURST_COUNT_DYNAMIC (0 << 8)
#define TPM_TIS_CAP_INTERRUPT_LOW_LEVEL (1 << 4) /* support is mandatory */
-#define TPM_TIS_CAPABILITIES_SUPPORTED (TPM_TIS_CAP_INTERRUPT_LOW_LEVEL | \
- TPM_TIS_CAP_BURST_COUNT_DYNAMIC | \
- TPM_TIS_CAP_DATA_TRANSFER_64B | \
- TPM_TIS_CAP_INTERFACE_VERSION1_3 | \
- TPM_TIS_INTERRUPTS_SUPPORTED)
+#define TPM_TIS_CAPABILITIES_SUPPORTED1_3 \
+ (TPM_TIS_CAP_INTERRUPT_LOW_LEVEL | \
+ TPM_TIS_CAP_BURST_COUNT_DYNAMIC | \
+ TPM_TIS_CAP_DATA_TRANSFER_64B | \
+ TPM_TIS_CAP_INTERFACE_VERSION1_3 | \
+ TPM_TIS_INTERRUPTS_SUPPORTED)
+
+#define TPM_TIS_CAPABILITIES_SUPPORTED2_0 \
+ (TPM_TIS_CAP_INTERRUPT_LOW_LEVEL | \
+ TPM_TIS_CAP_BURST_COUNT_DYNAMIC | \
+ TPM_TIS_CAP_DATA_TRANSFER_64B | \
+ TPM_TIS_CAP_INTERFACE_VERSION1_3_FOR_TPM2_0 | \
+ TPM_TIS_INTERRUPTS_SUPPORTED)
+
+#define TPM_TIS_IFACE_ID_INTERFACE_TIS1_3 (0xf) /* TPM 2.0 */
+#define TPM_TIS_IFACE_ID_INTERFACE_FIFO (0x0) /* TPM 2.0 */
+#define TPM_TIS_IFACE_ID_INTERFACE_VER_FIFO (0 << 4) /* TPM 2.0 */
+#define TPM_TIS_IFACE_ID_CAP_5_LOCALITIES (1 << 8) /* TPM 2.0 */
+#define TPM_TIS_IFACE_ID_CAP_TIS_SUPPORTED (1 << 13) /* TPM 2.0 */
+#define TPM_TIS_IFACE_ID_INT_SEL_LOCK (1 << 19) /* TPM 2.0 */
+
+#define TPM_TIS_IFACE_ID_SUPPORTED_FLAGS1_3 \
+ (TPM_TIS_IFACE_ID_INTERFACE_TIS1_3 | \
+ (~0 << 4)/* all of it is don't care */)
+
+/* if backend was a TPM 2.0: */
+#define TPM_TIS_IFACE_ID_SUPPORTED_FLAGS2_0 \
+ (TPM_TIS_IFACE_ID_INTERFACE_FIFO | \
+ TPM_TIS_IFACE_ID_INTERFACE_VER_FIFO | \
+ TPM_TIS_IFACE_ID_CAP_5_LOCALITIES | \
+ TPM_TIS_IFACE_ID_CAP_TIS_SUPPORTED)
#define TPM_TIS_TPM_DID 0x0001
#define TPM_TIS_TPM_VID PCI_VENDOR_ID_IBM
@@ -154,7 +191,8 @@ static void tpm_tis_show_buffer(const TPMSizedBuffer *sb, const char *string)
/*
* Set the given flags in the STS register by clearing the register but
- * preserving the SELFTEST_DONE flag and then setting the new flags.
+ * preserving the SELFTEST_DONE and TPMFAMILY_MASK flags and then setting
+ * the new flags.
*
* The SELFTEST_DONE flag is acquired from the backend that determines it by
* peeking into TPM commands.
@@ -166,7 +204,7 @@ static void tpm_tis_show_buffer(const TPMSizedBuffer *sb, const char *string)
*/
static void tpm_tis_sts_set(TPMLocality *l, uint32_t flags)
{
- l->sts &= TPM_TIS_STS_SELFTEST_DONE;
+ l->sts &= (TPM_TIS_STS_SELFTEST_DONE | TPM_TIS_STS_TPM_FAMILY_MASK);
l->sts |= flags;
}
@@ -489,7 +527,17 @@ static uint64_t tpm_tis_mmio_read(void *opaque, hwaddr addr,
val = tis->loc[locty].ints;
break;
case TPM_TIS_REG_INTF_CAPABILITY:
- val = TPM_TIS_CAPABILITIES_SUPPORTED;
+ switch (s->be_tpm_version) {
+ case TPMVersion_Unspec:
+ val = 0;
+ break;
+ case TPMVersion1_2:
+ val = TPM_TIS_CAPABILITIES_SUPPORTED1_3;
+ break;
+ case TPMVersion2_0:
+ val = TPM_TIS_CAPABILITIES_SUPPORTED2_0;
+ break;
+ }
break;
case TPM_TIS_REG_STS:
if (tis->active_locty == locty) {
@@ -536,6 +584,9 @@ static uint64_t tpm_tis_mmio_read(void *opaque, hwaddr addr,
shift = 0; /* no more adjustments */
}
break;
+ case TPM_TIS_REG_INTERFACE_ID:
+ val = tis->loc[locty].iface_id;
+ break;
case TPM_TIS_REG_DID_VID:
val = (TPM_TIS_TPM_DID << 16) | TPM_TIS_TPM_VID;
break;
@@ -736,6 +787,25 @@ static void tpm_tis_mmio_write_intern(void *opaque, hwaddr addr,
break;
}
+ if (s->be_tpm_version == TPMVersion2_0) {
+ /* some flags that are only supported for TPM 2 */
+ if (val & TPM_TIS_STS_COMMAND_CANCEL) {
+ if (tis->loc[locty].state == TPM_TIS_STATE_EXECUTION) {
+ /*
+ * request the backend to cancel. Some backends may not
+ * support it
+ */
+ tpm_backend_cancel_cmd(s->be_driver);
+ }
+ }
+
+ if (val & TPM_TIS_STS_RESET_ESTABLISHMENT_BIT) {
+ if (locty == 3 || locty == 4) {
+ tpm_backend_reset_tpm_established_flag(s->be_driver, locty);
+ }
+ }
+ }
+
val &= (TPM_TIS_STS_COMMAND_READY | TPM_TIS_STS_TPM_GO |
TPM_TIS_STS_RESPONSE_RETRY);
@@ -860,6 +930,14 @@ static void tpm_tis_mmio_write_intern(void *opaque, hwaddr addr,
}
}
break;
+ case TPM_TIS_REG_INTERFACE_ID:
+ if (val & TPM_TIS_IFACE_ID_INT_SEL_LOCK) {
+ for (l = 0; l < TPM_TIS_NUM_LOCALITIES; l++) {
+ tis->loc[l].iface_id |= TPM_TIS_IFACE_ID_INT_SEL_LOCK;
+ }
+ }
+
+ break;
}
}
@@ -894,6 +972,8 @@ static void tpm_tis_reset(DeviceState *dev)
TPMTISEmuState *tis = &s->s.tis;
int c;
+ s->be_tpm_version = tpm_backend_get_tpm_version(s->be_driver);
+
tpm_backend_reset(s->be_driver);
tis->active_locty = TPM_TIS_NO_LOCALITY;
@@ -902,7 +982,18 @@ static void tpm_tis_reset(DeviceState *dev)
for (c = 0; c < TPM_TIS_NUM_LOCALITIES; c++) {
tis->loc[c].access = TPM_TIS_ACCESS_TPM_REG_VALID_STS;
- tis->loc[c].sts = 0;
+ switch (s->be_tpm_version) {
+ case TPMVersion_Unspec:
+ break;
+ case TPMVersion1_2:
+ tis->loc[c].sts = TPM_TIS_STS_TPM_FAMILY1_2;
+ tis->loc[c].iface_id = TPM_TIS_IFACE_ID_SUPPORTED_FLAGS1_3;
+ break;
+ case TPMVersion2_0:
+ tis->loc[c].sts = TPM_TIS_STS_TPM_FAMILY2_0;
+ tis->loc[c].iface_id = TPM_TIS_IFACE_ID_SUPPORTED_FLAGS2_0;
+ break;
+ }
tis->loc[c].inte = TPM_TIS_INT_POLARITY_LOW_LEVEL;
tis->loc[c].ints = 0;
tis->loc[c].state = TPM_TIS_STATE_IDLE;
diff --git a/hw/tpm/tpm_tis.h b/hw/tpm/tpm_tis.h
index db78d51..a1df41f 100644
--- a/hw/tpm/tpm_tis.h
+++ b/hw/tpm/tpm_tis.h
@@ -42,6 +42,7 @@ typedef struct TPMLocality {
TPMTISState state;
uint8_t access;
uint32_t sts;
+ uint32_t iface_id;
uint32_t inte;
uint32_t ints;
diff --git a/include/sysemu/tpm.h b/include/sysemu/tpm.h
index 9b81ce9..9a77889 100644
--- a/include/sysemu/tpm.h
+++ b/include/sysemu/tpm.h
@@ -20,6 +20,13 @@ int tpm_config_parse(QemuOptsList *opts_list, const char *optarg);
int tpm_init(void);
void tpm_cleanup(void);
+enum TPMVersion {
+ TPMVersion_Unspec = 0,
+ TPMVersion1_2 = 1,
+ TPMVersion2_0 = 2,
+};
+
+
#define TYPE_TPM_TIS "tpm-tis"
static inline bool tpm_find(void)
diff --git a/include/sysemu/tpm_backend.h b/include/sysemu/tpm_backend.h
index 540ee25..cbe064f 100644
--- a/include/sysemu/tpm_backend.h
+++ b/include/sysemu/tpm_backend.h
@@ -88,6 +88,10 @@ struct TPMDriverOps {
void (*cancel_cmd)(TPMBackend *t);
bool (*get_tpm_established_flag)(TPMBackend *t);
+
+ int (*reset_tpm_established_flag)(TPMBackend *t, uint8_t locty);
+
+ enum TPMVersion (*get_tpm_version)(TPMBackend *t);
};
@@ -192,6 +196,15 @@ void tpm_backend_cancel_cmd(TPMBackend *s);
bool tpm_backend_get_tpm_established_flag(TPMBackend *s);
/**
+ * tpm_backend_reset_tpm_established_flag:
+ * @s: the backend
+ * @locty: the locality number
+ *
+ * Reset the TPM establishment flag.
+ */
+int tpm_backend_reset_tpm_established_flag(TPMBackend *s, uint8_t locty);
+
+/**
* tpm_backend_open:
* @s: the backend to open
* @errp: a pointer to return the #Error object if an error occurs.
@@ -201,6 +214,16 @@ bool tpm_backend_get_tpm_established_flag(TPMBackend *s);
*/
void tpm_backend_open(TPMBackend *s, Error **errp);
+/**
+ * tpm_backend_get_tpm_version:
+ * @s: the backend to call into
+ *
+ * Get the TPM Version that is emulated at the backend.
+ *
+ * Returns an enum TPMVersion.
+ */
+enum TPMVersion tpm_backend_get_tpm_version(TPMBackend *s);
+
TPMBackend *qemu_find_tpm(const char *id);
const TPMDriverOps *tpm_get_backend_driver(const char *type);
--
1.9.3
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [Qemu-devel] [PATCH 1/3] Extend TPM TIS interface to version 2.0
2015-03-31 19:40 ` [Qemu-devel] [PATCH 1/3] Extend TPM TIS interface to version 2.0 Stefan Berger
@ 2015-04-14 5:50 ` Michael S. Tsirkin
0 siblings, 0 replies; 14+ messages in thread
From: Michael S. Tsirkin @ 2015-04-14 5:50 UTC (permalink / raw)
To: Stefan Berger; +Cc: qemu-devel, quan.xu
On Tue, Mar 31, 2015 at 03:40:11PM -0400, Stefan Berger wrote:
> Following the recent upgrade to version 1.3, extend the TPM TIS
> interface with capabilities introduced for support of a TPM 2.
>
> TPM TIS for TPM 2 introduced the following extensions beyond the
> TPM TIS 1.3 (used for TPM 1.2):
>
> - A new 32bit interface Id register was introduced.
> - New flags for the status (STS) register were defined.
> - New flags for the capability flags were defined.
>
> Support the above if a TPM TIS 1.3 for TPM 2 is used with a TPM 2
> on the backend side. Support the old TPM TIS 1.3 configuration if a
> TPM 1.2 is being used. A subsequent patch will then determine which
> TPM version is being used in the backend.
>
> Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
> ---
> backends/tpm.c | 14 ++++++
> hw/tpm/tpm_int.h | 1 +
> hw/tpm/tpm_passthrough.c | 14 ++++++
> hw/tpm/tpm_tis.c | 109 +++++++++++++++++++++++++++++++++++++++----
> hw/tpm/tpm_tis.h | 1 +
> include/sysemu/tpm.h | 7 +++
> include/sysemu/tpm_backend.h | 23 +++++++++
> 7 files changed, 160 insertions(+), 9 deletions(-)
>
> diff --git a/backends/tpm.c b/backends/tpm.c
> index 4efe367..3ebb603 100644
> --- a/backends/tpm.c
> +++ b/backends/tpm.c
> @@ -96,6 +96,20 @@ bool tpm_backend_get_tpm_established_flag(TPMBackend *s)
> return k->ops->get_tpm_established_flag(s);
> }
>
> +int tpm_backend_reset_tpm_established_flag(TPMBackend *s, uint8_t locty)
> +{
> + TPMBackendClass *k = TPM_BACKEND_GET_CLASS(s);
> +
> + return k->ops->reset_tpm_established_flag(s, locty);
> +}
> +
> +enum TPMVersion tpm_backend_get_tpm_version(TPMBackend *s)
use typedef without enum pls
> +{
> + TPMBackendClass *k = TPM_BACKEND_GET_CLASS(s);
> +
> + return k->ops->get_tpm_version(s);
> +}
> +
> static bool tpm_backend_prop_get_opened(Object *obj, Error **errp)
> {
> TPMBackend *s = TPM_BACKEND(obj);
> diff --git a/hw/tpm/tpm_int.h b/hw/tpm/tpm_int.h
> index 2b35fe2..24e12ce 100644
> --- a/hw/tpm/tpm_int.h
> +++ b/hw/tpm/tpm_int.h
> @@ -29,6 +29,7 @@ struct TPMState {
>
> char *backend;
> TPMBackend *be_driver;
> + enum TPMVersion be_tpm_version;
same
> };
>
> #define TPM(obj) OBJECT_CHECK(TPMState, (obj), TYPE_TPM_TIS)
> diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c
> index 73ca906..dd769a7 100644
> --- a/hw/tpm/tpm_passthrough.c
> +++ b/hw/tpm/tpm_passthrough.c
> @@ -267,6 +267,13 @@ static bool tpm_passthrough_get_tpm_established_flag(TPMBackend *tb)
> return false;
> }
>
> +static int tpm_passthrough_reset_tpm_established_flag(TPMBackend *tb,
> + uint8_t locty)
> +{
> + /* only a TPM 2.0 will support this */
> + return 0;
> +}
> +
> static bool tpm_passthrough_get_startup_error(TPMBackend *tb)
> {
> TPMPassthruState *tpm_pt = TPM_PASSTHROUGH(tb);
> @@ -324,6 +331,11 @@ static const char *tpm_passthrough_create_desc(void)
> return "Passthrough TPM backend driver";
> }
>
> +static enum TPMVersion tpm_passthrough_get_tpm_version(TPMBackend *tb)
> +{
> + return TPMVersion1_2;
> +}
> +
> /*
> * A basic test of a TPM device. We expect a well formatted response header
> * (error response is fine) within one second.
> @@ -540,6 +552,8 @@ static const TPMDriverOps tpm_passthrough_driver = {
> .deliver_request = tpm_passthrough_deliver_request,
> .cancel_cmd = tpm_passthrough_cancel_cmd,
> .get_tpm_established_flag = tpm_passthrough_get_tpm_established_flag,
> + .reset_tpm_established_flag = tpm_passthrough_reset_tpm_established_flag,
> + .get_tpm_version = tpm_passthrough_get_tpm_version,
> };
>
> static void tpm_passthrough_inst_init(Object *obj)
> diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c
> index 4b6d601..89e401d 100644
> --- a/hw/tpm/tpm_tis.c
> +++ b/hw/tpm/tpm_tis.c
> @@ -17,6 +17,9 @@
> * 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 "sysemu/tpm_backend.h"
> @@ -49,6 +52,7 @@
> #define TPM_TIS_REG_INTF_CAPABILITY 0x14
> #define TPM_TIS_REG_STS 0x18
> #define TPM_TIS_REG_DATA_FIFO 0x24
> +#define TPM_TIS_REG_INTERFACE_ID 0x30
> #define TPM_TIS_REG_DATA_XFIFO 0x80
> #define TPM_TIS_REG_DATA_XFIFO_END 0xbc
> #define TPM_TIS_REG_DID_VID 0xf00
> @@ -57,6 +61,12 @@
> /* vendor-specific registers */
> #define TPM_TIS_REG_DEBUG 0xf90
>
> +#define TPM_TIS_STS_TPM_FAMILY_MASK (0x3 << 26)/* TPM 2.0 */
> +#define TPM_TIS_STS_TPM_FAMILY1_2 (0 << 26) /* TPM 2.0 */
> +#define TPM_TIS_STS_TPM_FAMILY2_0 (1 << 26) /* TPM 2.0 */
> +#define TPM_TIS_STS_RESET_ESTABLISHMENT_BIT (1 << 25) /* TPM 2.0 */
> +#define TPM_TIS_STS_COMMAND_CANCEL (1 << 24) /* TPM 2.0 */
> +
> #define TPM_TIS_STS_VALID (1 << 7)
> #define TPM_TIS_STS_COMMAND_READY (1 << 6)
> #define TPM_TIS_STS_TPM_GO (1 << 5)
> @@ -102,15 +112,42 @@
> #endif
>
> #define TPM_TIS_CAP_INTERFACE_VERSION1_3 (2 << 28)
> +#define TPM_TIS_CAP_INTERFACE_VERSION1_3_FOR_TPM2_0 (3 << 28)
> #define TPM_TIS_CAP_DATA_TRANSFER_64B (3 << 9)
> #define TPM_TIS_CAP_DATA_TRANSFER_LEGACY (0 << 9)
> #define TPM_TIS_CAP_BURST_COUNT_DYNAMIC (0 << 8)
> #define TPM_TIS_CAP_INTERRUPT_LOW_LEVEL (1 << 4) /* support is mandatory */
> -#define TPM_TIS_CAPABILITIES_SUPPORTED (TPM_TIS_CAP_INTERRUPT_LOW_LEVEL | \
> - TPM_TIS_CAP_BURST_COUNT_DYNAMIC | \
> - TPM_TIS_CAP_DATA_TRANSFER_64B | \
> - TPM_TIS_CAP_INTERFACE_VERSION1_3 | \
> - TPM_TIS_INTERRUPTS_SUPPORTED)
> +#define TPM_TIS_CAPABILITIES_SUPPORTED1_3 \
> + (TPM_TIS_CAP_INTERRUPT_LOW_LEVEL | \
> + TPM_TIS_CAP_BURST_COUNT_DYNAMIC | \
> + TPM_TIS_CAP_DATA_TRANSFER_64B | \
> + TPM_TIS_CAP_INTERFACE_VERSION1_3 | \
> + TPM_TIS_INTERRUPTS_SUPPORTED)
> +
> +#define TPM_TIS_CAPABILITIES_SUPPORTED2_0 \
> + (TPM_TIS_CAP_INTERRUPT_LOW_LEVEL | \
> + TPM_TIS_CAP_BURST_COUNT_DYNAMIC | \
> + TPM_TIS_CAP_DATA_TRANSFER_64B | \
> + TPM_TIS_CAP_INTERFACE_VERSION1_3_FOR_TPM2_0 | \
> + TPM_TIS_INTERRUPTS_SUPPORTED)
> +
> +#define TPM_TIS_IFACE_ID_INTERFACE_TIS1_3 (0xf) /* TPM 2.0 */
> +#define TPM_TIS_IFACE_ID_INTERFACE_FIFO (0x0) /* TPM 2.0 */
> +#define TPM_TIS_IFACE_ID_INTERFACE_VER_FIFO (0 << 4) /* TPM 2.0 */
> +#define TPM_TIS_IFACE_ID_CAP_5_LOCALITIES (1 << 8) /* TPM 2.0 */
> +#define TPM_TIS_IFACE_ID_CAP_TIS_SUPPORTED (1 << 13) /* TPM 2.0 */
> +#define TPM_TIS_IFACE_ID_INT_SEL_LOCK (1 << 19) /* TPM 2.0 */
> +
> +#define TPM_TIS_IFACE_ID_SUPPORTED_FLAGS1_3 \
> + (TPM_TIS_IFACE_ID_INTERFACE_TIS1_3 | \
> + (~0 << 4)/* all of it is don't care */)
> +
> +/* if backend was a TPM 2.0: */
> +#define TPM_TIS_IFACE_ID_SUPPORTED_FLAGS2_0 \
> + (TPM_TIS_IFACE_ID_INTERFACE_FIFO | \
> + TPM_TIS_IFACE_ID_INTERFACE_VER_FIFO | \
> + TPM_TIS_IFACE_ID_CAP_5_LOCALITIES | \
> + TPM_TIS_IFACE_ID_CAP_TIS_SUPPORTED)
>
> #define TPM_TIS_TPM_DID 0x0001
> #define TPM_TIS_TPM_VID PCI_VENDOR_ID_IBM
> @@ -154,7 +191,8 @@ static void tpm_tis_show_buffer(const TPMSizedBuffer *sb, const char *string)
>
> /*
> * Set the given flags in the STS register by clearing the register but
> - * preserving the SELFTEST_DONE flag and then setting the new flags.
> + * preserving the SELFTEST_DONE and TPMFAMILY_MASK flags and then setting
> + * the new flags.
> *
> * The SELFTEST_DONE flag is acquired from the backend that determines it by
> * peeking into TPM commands.
> @@ -166,7 +204,7 @@ static void tpm_tis_show_buffer(const TPMSizedBuffer *sb, const char *string)
> */
> static void tpm_tis_sts_set(TPMLocality *l, uint32_t flags)
> {
> - l->sts &= TPM_TIS_STS_SELFTEST_DONE;
> + l->sts &= (TPM_TIS_STS_SELFTEST_DONE | TPM_TIS_STS_TPM_FAMILY_MASK);
no () to right of = please.
> l->sts |= flags;
> }
>
> @@ -489,7 +527,17 @@ static uint64_t tpm_tis_mmio_read(void *opaque, hwaddr addr,
> val = tis->loc[locty].ints;
> break;
> case TPM_TIS_REG_INTF_CAPABILITY:
> - val = TPM_TIS_CAPABILITIES_SUPPORTED;
> + switch (s->be_tpm_version) {
> + case TPMVersion_Unspec:
> + val = 0;
> + break;
> + case TPMVersion1_2:
> + val = TPM_TIS_CAPABILITIES_SUPPORTED1_3;
> + break;
> + case TPMVersion2_0:
> + val = TPM_TIS_CAPABILITIES_SUPPORTED2_0;
> + break;
> + }
> break;
> case TPM_TIS_REG_STS:
> if (tis->active_locty == locty) {
> @@ -536,6 +584,9 @@ static uint64_t tpm_tis_mmio_read(void *opaque, hwaddr addr,
> shift = 0; /* no more adjustments */
> }
> break;
> + case TPM_TIS_REG_INTERFACE_ID:
> + val = tis->loc[locty].iface_id;
> + break;
> case TPM_TIS_REG_DID_VID:
> val = (TPM_TIS_TPM_DID << 16) | TPM_TIS_TPM_VID;
> break;
> @@ -736,6 +787,25 @@ static void tpm_tis_mmio_write_intern(void *opaque, hwaddr addr,
> break;
> }
>
> + if (s->be_tpm_version == TPMVersion2_0) {
> + /* some flags that are only supported for TPM 2 */
> + if (val & TPM_TIS_STS_COMMAND_CANCEL) {
> + if (tis->loc[locty].state == TPM_TIS_STATE_EXECUTION) {
> + /*
> + * request the backend to cancel. Some backends may not
> + * support it
> + */
> + tpm_backend_cancel_cmd(s->be_driver);
> + }
> + }
> +
> + if (val & TPM_TIS_STS_RESET_ESTABLISHMENT_BIT) {
> + if (locty == 3 || locty == 4) {
> + tpm_backend_reset_tpm_established_flag(s->be_driver, locty);
> + }
> + }
> + }
> +
> val &= (TPM_TIS_STS_COMMAND_READY | TPM_TIS_STS_TPM_GO |
> TPM_TIS_STS_RESPONSE_RETRY);
>
> @@ -860,6 +930,14 @@ static void tpm_tis_mmio_write_intern(void *opaque, hwaddr addr,
> }
> }
> break;
> + case TPM_TIS_REG_INTERFACE_ID:
> + if (val & TPM_TIS_IFACE_ID_INT_SEL_LOCK) {
> + for (l = 0; l < TPM_TIS_NUM_LOCALITIES; l++) {
> + tis->loc[l].iface_id |= TPM_TIS_IFACE_ID_INT_SEL_LOCK;
> + }
> + }
> +
> + break;
> }
> }
>
> @@ -894,6 +972,8 @@ static void tpm_tis_reset(DeviceState *dev)
> TPMTISEmuState *tis = &s->s.tis;
> int c;
>
> + s->be_tpm_version = tpm_backend_get_tpm_version(s->be_driver);
> +
> tpm_backend_reset(s->be_driver);
>
> tis->active_locty = TPM_TIS_NO_LOCALITY;
> @@ -902,7 +982,18 @@ static void tpm_tis_reset(DeviceState *dev)
>
> for (c = 0; c < TPM_TIS_NUM_LOCALITIES; c++) {
> tis->loc[c].access = TPM_TIS_ACCESS_TPM_REG_VALID_STS;
> - tis->loc[c].sts = 0;
> + switch (s->be_tpm_version) {
> + case TPMVersion_Unspec:
> + break;
> + case TPMVersion1_2:
> + tis->loc[c].sts = TPM_TIS_STS_TPM_FAMILY1_2;
> + tis->loc[c].iface_id = TPM_TIS_IFACE_ID_SUPPORTED_FLAGS1_3;
> + break;
> + case TPMVersion2_0:
> + tis->loc[c].sts = TPM_TIS_STS_TPM_FAMILY2_0;
> + tis->loc[c].iface_id = TPM_TIS_IFACE_ID_SUPPORTED_FLAGS2_0;
> + break;
> + }
> tis->loc[c].inte = TPM_TIS_INT_POLARITY_LOW_LEVEL;
> tis->loc[c].ints = 0;
> tis->loc[c].state = TPM_TIS_STATE_IDLE;
> diff --git a/hw/tpm/tpm_tis.h b/hw/tpm/tpm_tis.h
> index db78d51..a1df41f 100644
> --- a/hw/tpm/tpm_tis.h
> +++ b/hw/tpm/tpm_tis.h
> @@ -42,6 +42,7 @@ typedef struct TPMLocality {
> TPMTISState state;
> uint8_t access;
> uint32_t sts;
> + uint32_t iface_id;
> uint32_t inte;
> uint32_t ints;
>
> diff --git a/include/sysemu/tpm.h b/include/sysemu/tpm.h
> index 9b81ce9..9a77889 100644
> --- a/include/sysemu/tpm.h
> +++ b/include/sysemu/tpm.h
> @@ -20,6 +20,13 @@ int tpm_config_parse(QemuOptsList *opts_list, const char *optarg);
> int tpm_init(void);
> void tpm_cleanup(void);
>
> +enum TPMVersion {
> + TPMVersion_Unspec = 0,
> + TPMVersion1_2 = 1,
> + TPMVersion2_0 = 2,
> +};
needs a typedef
> +
> +
don't add two empty lines pls
> #define TYPE_TPM_TIS "tpm-tis"
>
> static inline bool tpm_find(void)
> diff --git a/include/sysemu/tpm_backend.h b/include/sysemu/tpm_backend.h
> index 540ee25..cbe064f 100644
> --- a/include/sysemu/tpm_backend.h
> +++ b/include/sysemu/tpm_backend.h
> @@ -88,6 +88,10 @@ struct TPMDriverOps {
> void (*cancel_cmd)(TPMBackend *t);
>
> bool (*get_tpm_established_flag)(TPMBackend *t);
> +
> + int (*reset_tpm_established_flag)(TPMBackend *t, uint8_t locty);
> +
> + enum TPMVersion (*get_tpm_version)(TPMBackend *t);
drop enum
> };
>
>
> @@ -192,6 +196,15 @@ void tpm_backend_cancel_cmd(TPMBackend *s);
> bool tpm_backend_get_tpm_established_flag(TPMBackend *s);
>
> /**
> + * tpm_backend_reset_tpm_established_flag:
> + * @s: the backend
> + * @locty: the locality number
> + *
> + * Reset the TPM establishment flag.
> + */
> +int tpm_backend_reset_tpm_established_flag(TPMBackend *s, uint8_t locty);
> +
> +/**
> * tpm_backend_open:
> * @s: the backend to open
> * @errp: a pointer to return the #Error object if an error occurs.
> @@ -201,6 +214,16 @@ bool tpm_backend_get_tpm_established_flag(TPMBackend *s);
> */
> void tpm_backend_open(TPMBackend *s, Error **errp);
>
> +/**
> + * tpm_backend_get_tpm_version:
> + * @s: the backend to call into
> + *
> + * Get the TPM Version that is emulated at the backend.
> + *
> + * Returns an enum TPMVersion.
> + */
> +enum TPMVersion tpm_backend_get_tpm_version(TPMBackend *s);
> +
same
> TPMBackend *qemu_find_tpm(const char *id);
>
> const TPMDriverOps *tpm_get_backend_driver(const char *type);
> --
> 1.9.3
^ permalink raw reply [flat|nested] 14+ messages in thread
* [Qemu-devel] [PATCH 2/3] tpm: Probe for connected TPM 1.2 or TPM 2
2015-03-31 19:40 [Qemu-devel] [PATCH 0/3] tpm: Upgrade TPM TIS for support of a TPM 2 Stefan Berger
2015-03-31 19:40 ` [Qemu-devel] [PATCH 1/3] Extend TPM TIS interface to version 2.0 Stefan Berger
@ 2015-03-31 19:40 ` Stefan Berger
2015-04-07 8:54 ` Xu, Quan
2015-04-14 5:48 ` Michael S. Tsirkin
2015-03-31 19:40 ` [Qemu-devel] [PATCH 3/3] TPM2 ACPI table support Stefan Berger
2 siblings, 2 replies; 14+ messages in thread
From: Stefan Berger @ 2015-03-31 19:40 UTC (permalink / raw)
To: qemu-devel, mst; +Cc: Stefan Berger, quan.xu, Stefan Berger
In the TPM passthrough backend driver, modify the probing code so
that we can check whether a TPM 1.2 or TPM 2 is being used
and adapt the behavior of the TPM TIS accordingly.
Move the code that tested for a TPM 1.2 into tpm_utils.c
and extend it with test for probing for TPM 2. Have the
function return the version of TPM found.
Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
---
hw/tpm/Makefile.objs | 2 +-
hw/tpm/tpm_int.h | 6 +++
hw/tpm/tpm_passthrough.c | 59 +++-------------------
hw/tpm/tpm_util.c | 126 +++++++++++++++++++++++++++++++++++++++++++++++
hw/tpm/tpm_util.h | 28 +++++++++++
5 files changed, 167 insertions(+), 54 deletions(-)
create mode 100644 hw/tpm/tpm_util.c
create mode 100644 hw/tpm/tpm_util.h
diff --git a/hw/tpm/Makefile.objs b/hw/tpm/Makefile.objs
index 99f5983..64cecc3 100644
--- a/hw/tpm/Makefile.objs
+++ b/hw/tpm/Makefile.objs
@@ -1,2 +1,2 @@
common-obj-$(CONFIG_TPM_TIS) += tpm_tis.o
-common-obj-$(CONFIG_TPM_PASSTHROUGH) += tpm_passthrough.o
+common-obj-$(CONFIG_TPM_PASSTHROUGH) += tpm_passthrough.o tpm_util.o
diff --git a/hw/tpm/tpm_int.h b/hw/tpm/tpm_int.h
index 24e12ce..edab824 100644
--- a/hw/tpm/tpm_int.h
+++ b/hw/tpm/tpm_int.h
@@ -66,4 +66,10 @@ struct tpm_resp_hdr {
#define TPM_ORD_ContinueSelfTest 0x53
#define TPM_ORD_GetTicks 0xf1
+
+/* TPM2 defines */
+#define TPM_ST_NO_SESSIONS 0x8001
+
+#define TPM_CC_ReadClock 0x00000181
+
#endif /* TPM_TPM_INT_H */
diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c
index dd769a7..2e65703 100644
--- a/hw/tpm/tpm_passthrough.c
+++ b/hw/tpm/tpm_passthrough.c
@@ -33,6 +33,7 @@
#include "hw/i386/pc.h"
#include "sysemu/tpm_backend_int.h"
#include "tpm_tis.h"
+#include "tpm_util.h"
#define DEBUG_TPM 0
@@ -69,6 +70,8 @@ struct TPMPassthruState {
bool tpm_op_canceled;
int cancel_fd;
bool had_startup_error;
+
+ enum TPMVersion tpm_version;
};
typedef struct TPMPassthruState TPMPassthruState;
@@ -333,59 +336,9 @@ static const char *tpm_passthrough_create_desc(void)
static enum TPMVersion tpm_passthrough_get_tpm_version(TPMBackend *tb)
{
- return TPMVersion1_2;
-}
-
-/*
- * A basic test of a TPM device. We expect a well formatted response header
- * (error response is fine) within one second.
- */
-static int tpm_passthrough_test_tpmdev(int fd)
-{
- struct tpm_req_hdr req = {
- .tag = cpu_to_be16(TPM_TAG_RQU_COMMAND),
- .len = cpu_to_be32(sizeof(req)),
- .ordinal = cpu_to_be32(TPM_ORD_GetTicks),
- };
- struct tpm_resp_hdr *resp;
- fd_set readfds;
- int n;
- struct timeval tv = {
- .tv_sec = 1,
- .tv_usec = 0,
- };
- unsigned char buf[1024];
-
- n = write(fd, &req, sizeof(req));
- if (n < 0) {
- return errno;
- }
- if (n != sizeof(req)) {
- return EFAULT;
- }
-
- FD_ZERO(&readfds);
- FD_SET(fd, &readfds);
-
- /* wait for a second */
- n = select(fd + 1, &readfds, NULL, NULL, &tv);
- if (n != 1) {
- return errno;
- }
-
- n = read(fd, &buf, sizeof(buf));
- if (n < sizeof(struct tpm_resp_hdr)) {
- return EFAULT;
- }
-
- resp = (struct tpm_resp_hdr *)buf;
- /* check the header */
- if (be16_to_cpu(resp->tag) != TPM_TAG_RSP_COMMAND ||
- be32_to_cpu(resp->len) != n) {
- return EBADMSG;
- }
+ TPMPassthruState *tpm_pt = TPM_PASSTHROUGH(tb);
- return 0;
+ return tpm_pt->tpm_version;
}
/*
@@ -455,7 +408,7 @@ static int tpm_passthrough_handle_device_opts(QemuOpts *opts, TPMBackend *tb)
goto err_free_parameters;
}
- if (tpm_passthrough_test_tpmdev(tpm_pt->tpm_fd)) {
+ if (tpm_util_test_tpmdev(tpm_pt->tpm_fd, &tpm_pt->tpm_version)) {
error_report("'%s' is not a TPM device.",
tpm_pt->tpm_dev);
goto err_close_tpmdev;
diff --git a/hw/tpm/tpm_util.c b/hw/tpm/tpm_util.c
new file mode 100644
index 0000000..f9fb9c1
--- /dev/null
+++ b/hw/tpm/tpm_util.c
@@ -0,0 +1,126 @@
+/*
+ * TPM utility functions
+ *
+ * Copyright (c) 2010 - 2015 IBM Corporation
+ * Authors:
+ * Stefan Berger <stefanb@us.ibm.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>
+ */
+
+#include "tpm_util.h"
+#include "tpm_int.h"
+
+/*
+ * A basic test of a TPM device. We expect a well formatted response header
+ * (error response is fine) within one second.
+ */
+static int tpm_util_test(int fd,
+ unsigned char *request,
+ size_t requestlen,
+ uint16_t *returnTag)
+{
+ struct tpm_resp_hdr *resp;
+ fd_set readfds;
+ int n;
+ struct timeval tv = {
+ .tv_sec = 1,
+ .tv_usec = 0,
+ };
+ unsigned char buf[1024];
+
+ n = write(fd, request, requestlen);
+ if (n < 0) {
+ return errno;
+ }
+ if (n != requestlen) {
+ return EFAULT;
+ }
+
+ FD_ZERO(&readfds);
+ FD_SET(fd, &readfds);
+
+ /* wait for a second */
+ n = select(fd + 1, &readfds, NULL, NULL, &tv);
+ if (n != 1) {
+ return errno;
+ }
+
+ n = read(fd, &buf, sizeof(buf));
+ if (n < sizeof(struct tpm_resp_hdr)) {
+ return EFAULT;
+ }
+
+ resp = (struct tpm_resp_hdr *)buf;
+ /* check the header */
+ if (be32_to_cpu(resp->len) != n) {
+ return EBADMSG;
+ }
+
+ *returnTag = be16_to_cpu(resp->tag);
+
+ return 0;
+}
+
+/*
+ * Probe for the TPM device in the back
+ * Returns 0 on success with the version of the probed TPM set, 1 on failure.
+ */
+int tpm_util_test_tpmdev(int tpm_fd, enum TPMVersion *tpm_version)
+{
+ /*
+ * Sending a TPM1.2 command to a TPM2 should return a TPM1.2
+ * header (tag = 0xc4) and error code (TPM_BADTAG = 0x1e)
+ *
+ * Sending a TPM2 command to a TPM 2 will give a TPM 2 tag in the
+ * header.
+ * Sending a TPM2 command to a TPM 1.2 will give a TPM 1.2 tag
+ * in the header and an error code.
+ */
+ const struct tpm_req_hdr test_req = {
+ .tag = cpu_to_be16(TPM_TAG_RQU_COMMAND),
+ .len = cpu_to_be32(sizeof(test_req)),
+ .ordinal = cpu_to_be32(TPM_ORD_GetTicks),
+ };
+
+ const struct tpm_req_hdr test_req_tpm2 = {
+ .tag = cpu_to_be16(TPM_ST_NO_SESSIONS),
+ .len = cpu_to_be32(sizeof(test_req_tpm2)),
+ .ordinal = cpu_to_be32(TPM_CC_ReadClock),
+ };
+ uint16_t returnTag;
+ int ret;
+
+ /* Send TPM 2 command */
+ ret = tpm_util_test(tpm_fd, (unsigned char *)&test_req_tpm2,
+ sizeof(test_req_tpm2), &returnTag);
+ /* TPM 2 would respond with a tag of TPM_ST_NO_SESSIONS */
+ if (!ret && returnTag == TPM_ST_NO_SESSIONS) {
+ *tpm_version = TPMVersion2_0;
+ return 0;
+ }
+
+ /* Send TPM 1.2 command */
+ ret = tpm_util_test(tpm_fd, (unsigned char *)&test_req,
+ sizeof(test_req), &returnTag);
+ if (!ret && returnTag == TPM_TAG_RSP_COMMAND) {
+ *tpm_version = TPMVersion1_2;
+ /* this is a TPM 1.2 */
+ return 0;
+ }
+
+ *tpm_version = TPMVersion_Unspec;
+
+ return 1;
+}
diff --git a/hw/tpm/tpm_util.h b/hw/tpm/tpm_util.h
new file mode 100644
index 0000000..3ce25c8
--- /dev/null
+++ b/hw/tpm/tpm_util.h
@@ -0,0 +1,28 @@
+/*
+ * TPM utility functions
+ *
+ * Copyright (c) 2010 - 2015 IBM Corporation
+ * Authors:
+ * Stefan Berger <stefanb@us.ibm.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>
+ */
+#ifndef TPM_TPM_UTILS_H
+#define TPM_TPM_UTILS_H
+
+#include "sysemu/tpm_backend.h"
+
+int tpm_util_test_tpmdev(int tpm_fd, enum TPMVersion *tpm_version);
+
+#endif /* TPM_TPM_UTILS_H */
--
1.9.3
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [Qemu-devel] [PATCH 2/3] tpm: Probe for connected TPM 1.2 or TPM 2
2015-03-31 19:40 ` [Qemu-devel] [PATCH 2/3] tpm: Probe for connected TPM 1.2 or TPM 2 Stefan Berger
@ 2015-04-07 8:54 ` Xu, Quan
2015-04-12 20:59 ` Stefan Berger
2015-04-14 5:48 ` Michael S. Tsirkin
1 sibling, 1 reply; 14+ messages in thread
From: Xu, Quan @ 2015-04-07 8:54 UTC (permalink / raw)
To: Stefan Berger, qemu-devel, mst; +Cc: Stefan Berger
> -----Original Message-----
> From: Stefan Berger [mailto:stefanb@linux.vnet.ibm.com]
> Sent: Wednesday, April 01, 2015 3:40 AM
> To: qemu-devel@nongnu.org; mst@redhat.com
> Cc: Xu, Quan; Stefan Berger; Stefan Berger
> Subject: [PATCH 2/3] tpm: Probe for connected TPM 1.2 or TPM 2
>
> In the TPM passthrough backend driver, modify the probing code so that we can
> check whether a TPM 1.2 or TPM 2 is being used and adapt the behavior of the
> TPM TIS accordingly.
>
> Move the code that tested for a TPM 1.2 into tpm_utils.c and extend it with test
> for probing for TPM 2. Have the function return the version of TPM found.
>
> Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
> ---
> hw/tpm/Makefile.objs | 2 +-
> hw/tpm/tpm_int.h | 6 +++
> hw/tpm/tpm_passthrough.c | 59 +++-------------------
> hw/tpm/tpm_util.c | 126
> +++++++++++++++++++++++++++++++++++++++++++++++
> hw/tpm/tpm_util.h | 28 +++++++++++
> 5 files changed, 167 insertions(+), 54 deletions(-) create mode 100644
> hw/tpm/tpm_util.c create mode 100644 hw/tpm/tpm_util.h
>
> diff --git a/hw/tpm/Makefile.objs b/hw/tpm/Makefile.objs index
> 99f5983..64cecc3 100644
> --- a/hw/tpm/Makefile.objs
> +++ b/hw/tpm/Makefile.objs
> @@ -1,2 +1,2 @@
> common-obj-$(CONFIG_TPM_TIS) += tpm_tis.o
> -common-obj-$(CONFIG_TPM_PASSTHROUGH) += tpm_passthrough.o
> +common-obj-$(CONFIG_TPM_PASSTHROUGH) += tpm_passthrough.o
> tpm_util.o
> diff --git a/hw/tpm/tpm_int.h b/hw/tpm/tpm_int.h index 24e12ce..edab824
> 100644
> --- a/hw/tpm/tpm_int.h
> +++ b/hw/tpm/tpm_int.h
> @@ -66,4 +66,10 @@ struct tpm_resp_hdr { #define
> TPM_ORD_ContinueSelfTest 0x53
> #define TPM_ORD_GetTicks 0xf1
>
> +
> +/* TPM2 defines */
> +#define TPM_ST_NO_SESSIONS 0x8001
> +
> +#define TPM_CC_ReadClock 0x00000181
> +
Could you define TPM2 macro definitions beginning with 'TPM2_*'?
> #endif /* TPM_TPM_INT_H */
> diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c index
> dd769a7..2e65703 100644
> --- a/hw/tpm/tpm_passthrough.c
> +++ b/hw/tpm/tpm_passthrough.c
> @@ -33,6 +33,7 @@
> #include "hw/i386/pc.h"
> #include "sysemu/tpm_backend_int.h"
> #include "tpm_tis.h"
> +#include "tpm_util.h"
>
> #define DEBUG_TPM 0
>
> @@ -69,6 +70,8 @@ struct TPMPassthruState {
> bool tpm_op_canceled;
> int cancel_fd;
> bool had_startup_error;
> +
> + enum TPMVersion tpm_version;
> };
>
> typedef struct TPMPassthruState TPMPassthruState; @@ -333,59 +336,9 @@
> static const char *tpm_passthrough_create_desc(void)
>
> static enum TPMVersion tpm_passthrough_get_tpm_version(TPMBackend *tb)
> {
> - return TPMVersion1_2;
> -}
> -
> -/*
> - * A basic test of a TPM device. We expect a well formatted response header
> - * (error response is fine) within one second.
> - */
> -static int tpm_passthrough_test_tpmdev(int fd) -{
> - struct tpm_req_hdr req = {
> - .tag = cpu_to_be16(TPM_TAG_RQU_COMMAND),
> - .len = cpu_to_be32(sizeof(req)),
> - .ordinal = cpu_to_be32(TPM_ORD_GetTicks),
> - };
> - struct tpm_resp_hdr *resp;
> - fd_set readfds;
> - int n;
> - struct timeval tv = {
> - .tv_sec = 1,
> - .tv_usec = 0,
> - };
> - unsigned char buf[1024];
> -
> - n = write(fd, &req, sizeof(req));
> - if (n < 0) {
> - return errno;
> - }
> - if (n != sizeof(req)) {
> - return EFAULT;
> - }
> -
> - FD_ZERO(&readfds);
> - FD_SET(fd, &readfds);
> -
> - /* wait for a second */
> - n = select(fd + 1, &readfds, NULL, NULL, &tv);
> - if (n != 1) {
> - return errno;
> - }
> -
> - n = read(fd, &buf, sizeof(buf));
> - if (n < sizeof(struct tpm_resp_hdr)) {
> - return EFAULT;
> - }
> -
> - resp = (struct tpm_resp_hdr *)buf;
> - /* check the header */
> - if (be16_to_cpu(resp->tag) != TPM_TAG_RSP_COMMAND ||
> - be32_to_cpu(resp->len) != n) {
> - return EBADMSG;
> - }
> + TPMPassthruState *tpm_pt = TPM_PASSTHROUGH(tb);
>
> - return 0;
> + return tpm_pt->tpm_version;
> }
>
> /*
> @@ -455,7 +408,7 @@ static int
> tpm_passthrough_handle_device_opts(QemuOpts *opts, TPMBackend *tb)
> goto err_free_parameters;
> }
>
> - if (tpm_passthrough_test_tpmdev(tpm_pt->tpm_fd)) {
> + if (tpm_util_test_tpmdev(tpm_pt->tpm_fd, &tpm_pt->tpm_version)) {
> error_report("'%s' is not a TPM device.",
> tpm_pt->tpm_dev);
> goto err_close_tpmdev;
> diff --git a/hw/tpm/tpm_util.c b/hw/tpm/tpm_util.c new file mode 100644 index
> 0000000..f9fb9c1
> --- /dev/null
> +++ b/hw/tpm/tpm_util.c
> @@ -0,0 +1,126 @@
> +/*
> + * TPM utility functions
> + *
> + * Copyright (c) 2010 - 2015 IBM Corporation
> + * Authors:
> + * Stefan Berger <stefanb@us.ibm.com>
> + *
> + * This library is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public
> + * License as published by the Free Software Foundation; either
> + * version 2 of the License, or (at your option) any later version.
> + *
> + * This library is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + * Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public
> + * License along with this library; if not, see
> +<http://www.gnu.org/licenses/> */
> +
> +#include "tpm_util.h"
> +#include "tpm_int.h"
> +
> +/*
> + * A basic test of a TPM device. We expect a well formatted response
> +header
> + * (error response is fine) within one second.
> + */
> +static int tpm_util_test(int fd,
> + unsigned char *request,
> + size_t requestlen,
> + uint16_t *returnTag) {
> + struct tpm_resp_hdr *resp;
> + fd_set readfds;
> + int n;
> + struct timeval tv = {
> + .tv_sec = 1,
> + .tv_usec = 0,
> + };
> + unsigned char buf[1024];
> +
> + n = write(fd, request, requestlen);
> + if (n < 0) {
> + return errno;
> + }
> + if (n != requestlen) {
> + return EFAULT;
> + }
> +
> + FD_ZERO(&readfds);
> + FD_SET(fd, &readfds);
> +
> + /* wait for a second */
> + n = select(fd + 1, &readfds, NULL, NULL, &tv);
> + if (n != 1) {
> + return errno;
> + }
> +
> + n = read(fd, &buf, sizeof(buf));
> + if (n < sizeof(struct tpm_resp_hdr)) {
> + return EFAULT;
> + }
> +
> + resp = (struct tpm_resp_hdr *)buf;
> + /* check the header */
> + if (be32_to_cpu(resp->len) != n) {
> + return EBADMSG;
> + }
> +
> + *returnTag = be16_to_cpu(resp->tag);
> +
> + return 0;
> +}
> +
> +/*
> + * Probe for the TPM device in the back
> + * Returns 0 on success with the version of the probed TPM set, 1 on failure.
> + */
> +int tpm_util_test_tpmdev(int tpm_fd, enum TPMVersion *tpm_version) {
> + /*
> + * Sending a TPM1.2 command to a TPM2 should return a TPM1.2
> + * header (tag = 0xc4) and error code (TPM_BADTAG = 0x1e)
> + *
> + * Sending a TPM2 command to a TPM 2 will give a TPM 2 tag in the
> + * header.
> + * Sending a TPM2 command to a TPM 1.2 will give a TPM 1.2 tag
> + * in the header and an error code.
> + */
> + const struct tpm_req_hdr test_req = {
> + .tag = cpu_to_be16(TPM_TAG_RQU_COMMAND),
> + .len = cpu_to_be32(sizeof(test_req)),
> + .ordinal = cpu_to_be32(TPM_ORD_GetTicks),
> + };
> +
> + const struct tpm_req_hdr test_req_tpm2 = {
> + .tag = cpu_to_be16(TPM_ST_NO_SESSIONS),
> + .len = cpu_to_be32(sizeof(test_req_tpm2)),
> + .ordinal = cpu_to_be32(TPM_CC_ReadClock),
> + };
> + uint16_t returnTag;
> + int ret;
> +
> + /* Send TPM 2 command */
> + ret = tpm_util_test(tpm_fd, (unsigned char *)&test_req_tpm2,
> + sizeof(test_req_tpm2), &returnTag);
> + /* TPM 2 would respond with a tag of TPM_ST_NO_SESSIONS */
> + if (!ret && returnTag == TPM_ST_NO_SESSIONS) {
> + *tpm_version = TPMVersion2_0;
> + return 0;
> + }
> +
> + /* Send TPM 1.2 command */
> + ret = tpm_util_test(tpm_fd, (unsigned char *)&test_req,
> + sizeof(test_req), &returnTag);
> + if (!ret && returnTag == TPM_TAG_RSP_COMMAND) {
> + *tpm_version = TPMVersion1_2;
> + /* this is a TPM 1.2 */
> + return 0;
> + }
> +
> + *tpm_version = TPMVersion_Unspec;
> +
> + return 1;
> +}
In my opinion, I prefer to point out tpm_version in QEMU command line options, then
tpm_util_test_tpmdev() tries to verify it.
Intel
Quan Xu
> diff --git a/hw/tpm/tpm_util.h b/hw/tpm/tpm_util.h new file mode 100644 index
> 0000000..3ce25c8
> --- /dev/null
> +++ b/hw/tpm/tpm_util.h
> @@ -0,0 +1,28 @@
> +/*
> + * TPM utility functions
> + *
> + * Copyright (c) 2010 - 2015 IBM Corporation
> + * Authors:
> + * Stefan Berger <stefanb@us.ibm.com>
> + *
> + * This library is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public
> + * License as published by the Free Software Foundation; either
> + * version 2 of the License, or (at your option) any later version.
> + *
> + * This library is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + * Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public
> + * License along with this library; if not, see
> +<http://www.gnu.org/licenses/> */ #ifndef TPM_TPM_UTILS_H #define
> +TPM_TPM_UTILS_H
> +
> +#include "sysemu/tpm_backend.h"
> +
> +int tpm_util_test_tpmdev(int tpm_fd, enum TPMVersion *tpm_version);
> +
> +#endif /* TPM_TPM_UTILS_H */
> --
> 1.9.3
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [Qemu-devel] [PATCH 2/3] tpm: Probe for connected TPM 1.2 or TPM 2
2015-04-07 8:54 ` Xu, Quan
@ 2015-04-12 20:59 ` Stefan Berger
2015-04-13 14:43 ` Eric Blake
0 siblings, 1 reply; 14+ messages in thread
From: Stefan Berger @ 2015-04-12 20:59 UTC (permalink / raw)
To: Xu, Quan, qemu-devel, mst, Eric Blake; +Cc: Stefan Berger
On 04/07/2015 04:54 AM, Xu, Quan wrote:
>
>> -----Original Message-----
>> From: Stefan Berger [mailto:stefanb@linux.vnet.ibm.com]
>> Sent: Wednesday, April 01, 2015 3:40 AM
>> To: qemu-devel@nongnu.org; mst@redhat.com
>> Cc: Xu, Quan; Stefan Berger; Stefan Berger
>> Subject: [PATCH 2/3] tpm: Probe for connected TPM 1.2 or TPM 2
>>
>> In the TPM passthrough backend driver, modify the probing code so that we can
>> check whether a TPM 1.2 or TPM 2 is being used and adapt the behavior of the
>> TPM TIS accordingly.
>>
>> Move the code that tested for a TPM 1.2 into tpm_utils.c and extend it with test
>> for probing for TPM 2. Have the function return the version of TPM found.
>>
>> Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
>> ---
>> hw/tpm/Makefile.objs | 2 +-
>> hw/tpm/tpm_int.h | 6 +++
>> hw/tpm/tpm_passthrough.c | 59 +++-------------------
>> hw/tpm/tpm_util.c | 126
>> +++++++++++++++++++++++++++++++++++++++++++++++
>> hw/tpm/tpm_util.h | 28 +++++++++++
>> 5 files changed, 167 insertions(+), 54 deletions(-) create mode 100644
>> hw/tpm/tpm_util.c create mode 100644 hw/tpm/tpm_util.h
>>
>> diff --git a/hw/tpm/Makefile.objs b/hw/tpm/Makefile.objs index
>> 99f5983..64cecc3 100644
>> --- a/hw/tpm/Makefile.objs
>> +++ b/hw/tpm/Makefile.objs
>> @@ -1,2 +1,2 @@
>> common-obj-$(CONFIG_TPM_TIS) += tpm_tis.o
>> -common-obj-$(CONFIG_TPM_PASSTHROUGH) += tpm_passthrough.o
>> +common-obj-$(CONFIG_TPM_PASSTHROUGH) += tpm_passthrough.o
>> tpm_util.o
>> diff --git a/hw/tpm/tpm_int.h b/hw/tpm/tpm_int.h index 24e12ce..edab824
>> 100644
>> --- a/hw/tpm/tpm_int.h
>> +++ b/hw/tpm/tpm_int.h
>> @@ -66,4 +66,10 @@ struct tpm_resp_hdr { #define
>> TPM_ORD_ContinueSelfTest 0x53
>> #define TPM_ORD_GetTicks 0xf1
>>
>> +
>> +/* TPM2 defines */
>> +#define TPM_ST_NO_SESSIONS 0x8001
>> +
>> +#define TPM_CC_ReadClock 0x00000181
>> +
> Could you define TPM2 macro definitions beginning with 'TPM2_*'?
Ok, will do.
[...]
> +/*
> + * Probe for the TPM device in the back
> + * Returns 0 on success with the version of the probed TPM set, 1 on failure.
> + */
> +int tpm_util_test_tpmdev(int tpm_fd, enum TPMVersion *tpm_version) {
> + /*
> + * Sending a TPM1.2 command to a TPM2 should return a TPM1.2
> + * header (tag = 0xc4) and error code (TPM_BADTAG = 0x1e)
> + *
> + * Sending a TPM2 command to a TPM 2 will give a TPM 2 tag in the
> + * header.
> + * Sending a TPM2 command to a TPM 1.2 will give a TPM 1.2 tag
> + * in the header and an error code.
> + */
> + const struct tpm_req_hdr test_req = {
> + .tag = cpu_to_be16(TPM_TAG_RQU_COMMAND),
> + .len = cpu_to_be32(sizeof(test_req)),
> + .ordinal = cpu_to_be32(TPM_ORD_GetTicks),
> + };
> +
> + const struct tpm_req_hdr test_req_tpm2 = {
> + .tag = cpu_to_be16(TPM_ST_NO_SESSIONS),
> + .len = cpu_to_be32(sizeof(test_req_tpm2)),
> + .ordinal = cpu_to_be32(TPM_CC_ReadClock),
> + };
> + uint16_t returnTag;
> + int ret;
> +
> + /* Send TPM 2 command */
> + ret = tpm_util_test(tpm_fd, (unsigned char *)&test_req_tpm2,
> + sizeof(test_req_tpm2), &returnTag);
> + /* TPM 2 would respond with a tag of TPM_ST_NO_SESSIONS */
> + if (!ret && returnTag == TPM_ST_NO_SESSIONS) {
> + *tpm_version = TPMVersion2_0;
> + return 0;
> + }
> +
> + /* Send TPM 1.2 command */
> + ret = tpm_util_test(tpm_fd, (unsigned char *)&test_req,
> + sizeof(test_req), &returnTag);
> + if (!ret && returnTag == TPM_TAG_RSP_COMMAND) {
> + *tpm_version = TPMVersion1_2;
> + /* this is a TPM 1.2 */
> + return 0;
> + }
> +
> + *tpm_version = TPMVersion_Unspec;
> +
> + return 1;
> +}
>
> In my opinion, I prefer to point out tpm_version in QEMU command line options, then
> tpm_util_test_tpmdev() tries to verify it.
The only reason why I am not doing this was that libvirt for example
will need to probe for whether the additional parameter indicating the
TPM version is supported. Besides that I thought it should be possible
to probe on any platform and get a reliable result.
Maybe Eric has a comment. I have recently seen a discussion where an
additional parameter to an existing option was to be added, but cannot
remember which option that was.
Stefan
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [Qemu-devel] [PATCH 2/3] tpm: Probe for connected TPM 1.2 or TPM 2
2015-04-12 20:59 ` Stefan Berger
@ 2015-04-13 14:43 ` Eric Blake
2015-04-13 14:58 ` Stefan Berger
0 siblings, 1 reply; 14+ messages in thread
From: Eric Blake @ 2015-04-13 14:43 UTC (permalink / raw)
To: Stefan Berger, Xu, Quan, qemu-devel, mst; +Cc: Stefan Berger
[-- Attachment #1: Type: text/plain, Size: 1064 bytes --]
On 04/12/2015 02:59 PM, Stefan Berger wrote:
> On 04/07/2015 04:54 AM, Xu, Quan wrote:
>>
>> In my opinion, I prefer to point out tpm_version in QEMU command line
>> options, then
>> tpm_util_test_tpmdev() tries to verify it.
>
> The only reason why I am not doing this was that libvirt for example
> will need to probe for whether the additional parameter indicating the
> TPM version is supported. Besides that I thought it should be possible
> to probe on any platform and get a reliable result.
>
> Maybe Eric has a comment. I have recently seen a discussion where an
> additional parameter to an existing option was to be added, but cannot
> remember which option that was.
>
Hopefully, we are going to get introspection working for 2.4; at which
point, libvirt can use that to query what options are new to any other
command. Meanwhile, doesn't query-tpm-models already serve as a way to
query additions on this front?
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [Qemu-devel] [PATCH 2/3] tpm: Probe for connected TPM 1.2 or TPM 2
2015-04-13 14:43 ` Eric Blake
@ 2015-04-13 14:58 ` Stefan Berger
0 siblings, 0 replies; 14+ messages in thread
From: Stefan Berger @ 2015-04-13 14:58 UTC (permalink / raw)
To: Eric Blake; +Cc: Stefan Berger, qemu-devel, Xu, Quan, mst
[-- Attachment #1: Type: text/plain, Size: 1925 bytes --]
Eric Blake <eblake@redhat.com> wrote on 04/13/2015 10:43:40 AM:
> From: Eric Blake <eblake@redhat.com>
> To: Stefan Berger <stefanb@linux.vnet.ibm.com>, "Xu, Quan"
> <quan.xu@intel.com>, "qemu-devel@nongnu.org" <qemu-
> devel@nongnu.org>, "mst@redhat.com" <mst@redhat.com>
> Cc: Stefan Berger/Watson/IBM@IBMUS
> Date: 04/13/2015 10:43 AM
> Subject: Re: [Qemu-devel] [PATCH 2/3] tpm: Probe for connected TPM
> 1.2 or TPM 2
>
> On 04/12/2015 02:59 PM, Stefan Berger wrote:
> > On 04/07/2015 04:54 AM, Xu, Quan wrote:
> >>
>
> >> In my opinion, I prefer to point out tpm_version in QEMU command line
> >> options, then
> >> tpm_util_test_tpmdev() tries to verify it.
> >
> > The only reason why I am not doing this was that libvirt for example
> > will need to probe for whether the additional parameter indicating the
> > TPM version is supported. Besides that I thought it should be possible
> > to probe on any platform and get a reliable result.
> >
> > Maybe Eric has a comment. I have recently seen a discussion where an
> > additional parameter to an existing option was to be added, but cannot
> > remember which option that was.
> >
>
> Hopefully, we are going to get introspection working for 2.4; at which
> point, libvirt can use that to query what options are new to any other
> command. Meanwhile, doesn't query-tpm-models already serve as a way to
> query additions on this front?
It would be a new command line option parameter tpm-version (or similar)
introduced in 2.4:
-tpmdev passthrough,id=tpm0,...,tpm-version=2 \
-device tpm-tis,id=tpm0,tpmdev=tpm0 \
It would also be reflected through an extensions of the existing
TPMPassthroughOptions in
qapi-schema.json.
{ 'type': 'TPMPassthroughOptions', 'data': { '*path' : 'str',
'*cancel-path' : 'str',
'*tpm-version' : 'str'} }
Stefan
[-- Attachment #2: Type: text/html, Size: 3258 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [Qemu-devel] [PATCH 2/3] tpm: Probe for connected TPM 1.2 or TPM 2
2015-03-31 19:40 ` [Qemu-devel] [PATCH 2/3] tpm: Probe for connected TPM 1.2 or TPM 2 Stefan Berger
2015-04-07 8:54 ` Xu, Quan
@ 2015-04-14 5:48 ` Michael S. Tsirkin
1 sibling, 0 replies; 14+ messages in thread
From: Michael S. Tsirkin @ 2015-04-14 5:48 UTC (permalink / raw)
To: Stefan Berger; +Cc: Stefan Berger, qemu-devel, quan.xu
On Tue, Mar 31, 2015 at 03:40:12PM -0400, Stefan Berger wrote:
> In the TPM passthrough backend driver, modify the probing code so
> that we can check whether a TPM 1.2 or TPM 2 is being used
> and adapt the behavior of the TPM TIS accordingly.
>
> Move the code that tested for a TPM 1.2 into tpm_utils.c
> and extend it with test for probing for TPM 2. Have the
> function return the version of TPM found.
>
> Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
> ---
> hw/tpm/Makefile.objs | 2 +-
> hw/tpm/tpm_int.h | 6 +++
> hw/tpm/tpm_passthrough.c | 59 +++-------------------
> hw/tpm/tpm_util.c | 126 +++++++++++++++++++++++++++++++++++++++++++++++
> hw/tpm/tpm_util.h | 28 +++++++++++
> 5 files changed, 167 insertions(+), 54 deletions(-)
> create mode 100644 hw/tpm/tpm_util.c
> create mode 100644 hw/tpm/tpm_util.h
>
> diff --git a/hw/tpm/Makefile.objs b/hw/tpm/Makefile.objs
> index 99f5983..64cecc3 100644
> --- a/hw/tpm/Makefile.objs
> +++ b/hw/tpm/Makefile.objs
> @@ -1,2 +1,2 @@
> common-obj-$(CONFIG_TPM_TIS) += tpm_tis.o
> -common-obj-$(CONFIG_TPM_PASSTHROUGH) += tpm_passthrough.o
> +common-obj-$(CONFIG_TPM_PASSTHROUGH) += tpm_passthrough.o tpm_util.o
> diff --git a/hw/tpm/tpm_int.h b/hw/tpm/tpm_int.h
> index 24e12ce..edab824 100644
> --- a/hw/tpm/tpm_int.h
> +++ b/hw/tpm/tpm_int.h
> @@ -66,4 +66,10 @@ struct tpm_resp_hdr {
> #define TPM_ORD_ContinueSelfTest 0x53
> #define TPM_ORD_GetTicks 0xf1
>
> +
> +/* TPM2 defines */
> +#define TPM_ST_NO_SESSIONS 0x8001
> +
> +#define TPM_CC_ReadClock 0x00000181
> +
> #endif /* TPM_TPM_INT_H */
> diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c
> index dd769a7..2e65703 100644
> --- a/hw/tpm/tpm_passthrough.c
> +++ b/hw/tpm/tpm_passthrough.c
> @@ -33,6 +33,7 @@
> #include "hw/i386/pc.h"
> #include "sysemu/tpm_backend_int.h"
> #include "tpm_tis.h"
> +#include "tpm_util.h"
>
> #define DEBUG_TPM 0
>
> @@ -69,6 +70,8 @@ struct TPMPassthruState {
> bool tpm_op_canceled;
> int cancel_fd;
> bool had_startup_error;
> +
> + enum TPMVersion tpm_version;
Use a typedef please, without enum.
> };
>
> typedef struct TPMPassthruState TPMPassthruState;
> @@ -333,59 +336,9 @@ static const char *tpm_passthrough_create_desc(void)
>
> static enum TPMVersion tpm_passthrough_get_tpm_version(TPMBackend *tb)
> {
> - return TPMVersion1_2;
> -}
> -
> -/*
> - * A basic test of a TPM device. We expect a well formatted response header
> - * (error response is fine) within one second.
> - */
> -static int tpm_passthrough_test_tpmdev(int fd)
> -{
> - struct tpm_req_hdr req = {
> - .tag = cpu_to_be16(TPM_TAG_RQU_COMMAND),
> - .len = cpu_to_be32(sizeof(req)),
> - .ordinal = cpu_to_be32(TPM_ORD_GetTicks),
> - };
> - struct tpm_resp_hdr *resp;
> - fd_set readfds;
> - int n;
> - struct timeval tv = {
> - .tv_sec = 1,
> - .tv_usec = 0,
> - };
> - unsigned char buf[1024];
> -
> - n = write(fd, &req, sizeof(req));
> - if (n < 0) {
> - return errno;
> - }
> - if (n != sizeof(req)) {
> - return EFAULT;
> - }
> -
> - FD_ZERO(&readfds);
> - FD_SET(fd, &readfds);
> -
> - /* wait for a second */
> - n = select(fd + 1, &readfds, NULL, NULL, &tv);
> - if (n != 1) {
> - return errno;
> - }
> -
> - n = read(fd, &buf, sizeof(buf));
> - if (n < sizeof(struct tpm_resp_hdr)) {
> - return EFAULT;
> - }
> -
> - resp = (struct tpm_resp_hdr *)buf;
> - /* check the header */
> - if (be16_to_cpu(resp->tag) != TPM_TAG_RSP_COMMAND ||
> - be32_to_cpu(resp->len) != n) {
> - return EBADMSG;
> - }
> + TPMPassthruState *tpm_pt = TPM_PASSTHROUGH(tb);
>
> - return 0;
> + return tpm_pt->tpm_version;
> }
>
> /*
> @@ -455,7 +408,7 @@ static int tpm_passthrough_handle_device_opts(QemuOpts *opts, TPMBackend *tb)
> goto err_free_parameters;
> }
>
> - if (tpm_passthrough_test_tpmdev(tpm_pt->tpm_fd)) {
> + if (tpm_util_test_tpmdev(tpm_pt->tpm_fd, &tpm_pt->tpm_version)) {
> error_report("'%s' is not a TPM device.",
> tpm_pt->tpm_dev);
> goto err_close_tpmdev;
> diff --git a/hw/tpm/tpm_util.c b/hw/tpm/tpm_util.c
> new file mode 100644
> index 0000000..f9fb9c1
> --- /dev/null
> +++ b/hw/tpm/tpm_util.c
> @@ -0,0 +1,126 @@
> +/*
> + * TPM utility functions
> + *
> + * Copyright (c) 2010 - 2015 IBM Corporation
> + * Authors:
> + * Stefan Berger <stefanb@us.ibm.com>
> + *
> + * This library is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public
> + * License as published by the Free Software Foundation; either
> + * version 2 of the License, or (at your option) any later version.
> + *
> + * This library is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + * Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public
> + * License along with this library; if not, see <http://www.gnu.org/licenses/>
> + */
> +
> +#include "tpm_util.h"
> +#include "tpm_int.h"
> +
> +/*
> + * A basic test of a TPM device. We expect a well formatted response header
> + * (error response is fine) within one second.
> + */
> +static int tpm_util_test(int fd,
> + unsigned char *request,
> + size_t requestlen,
> + uint16_t *returnTag)
> +{
> + struct tpm_resp_hdr *resp;
> + fd_set readfds;
> + int n;
> + struct timeval tv = {
> + .tv_sec = 1,
> + .tv_usec = 0,
> + };
> + unsigned char buf[1024];
> +
> + n = write(fd, request, requestlen);
> + if (n < 0) {
> + return errno;
> + }
> + if (n != requestlen) {
> + return EFAULT;
> + }
> +
> + FD_ZERO(&readfds);
> + FD_SET(fd, &readfds);
> +
> + /* wait for a second */
> + n = select(fd + 1, &readfds, NULL, NULL, &tv);
> + if (n != 1) {
> + return errno;
> + }
> +
> + n = read(fd, &buf, sizeof(buf));
> + if (n < sizeof(struct tpm_resp_hdr)) {
> + return EFAULT;
> + }
> +
> + resp = (struct tpm_resp_hdr *)buf;
> + /* check the header */
> + if (be32_to_cpu(resp->len) != n) {
> + return EBADMSG;
> + }
> +
> + *returnTag = be16_to_cpu(resp->tag);
> +
> + return 0;
> +}
> +
> +/*
> + * Probe for the TPM device in the back
> + * Returns 0 on success with the version of the probed TPM set, 1 on failure.
> + */
> +int tpm_util_test_tpmdev(int tpm_fd, enum TPMVersion *tpm_version)
> +{
> + /*
> + * Sending a TPM1.2 command to a TPM2 should return a TPM1.2
> + * header (tag = 0xc4) and error code (TPM_BADTAG = 0x1e)
> + *
> + * Sending a TPM2 command to a TPM 2 will give a TPM 2 tag in the
> + * header.
> + * Sending a TPM2 command to a TPM 1.2 will give a TPM 1.2 tag
> + * in the header and an error code.
> + */
> + const struct tpm_req_hdr test_req = {
> + .tag = cpu_to_be16(TPM_TAG_RQU_COMMAND),
> + .len = cpu_to_be32(sizeof(test_req)),
> + .ordinal = cpu_to_be32(TPM_ORD_GetTicks),
> + };
> +
> + const struct tpm_req_hdr test_req_tpm2 = {
> + .tag = cpu_to_be16(TPM_ST_NO_SESSIONS),
> + .len = cpu_to_be32(sizeof(test_req_tpm2)),
> + .ordinal = cpu_to_be32(TPM_CC_ReadClock),
> + };
> + uint16_t returnTag;
use lower case for vars pls
> + int ret;
> +
> + /* Send TPM 2 command */
> + ret = tpm_util_test(tpm_fd, (unsigned char *)&test_req_tpm2,
> + sizeof(test_req_tpm2), &returnTag);
> + /* TPM 2 would respond with a tag of TPM_ST_NO_SESSIONS */
> + if (!ret && returnTag == TPM_ST_NO_SESSIONS) {
> + *tpm_version = TPMVersion2_0;
> + return 0;
> + }
> +
> + /* Send TPM 1.2 command */
> + ret = tpm_util_test(tpm_fd, (unsigned char *)&test_req,
> + sizeof(test_req), &returnTag);
> + if (!ret && returnTag == TPM_TAG_RSP_COMMAND) {
> + *tpm_version = TPMVersion1_2;
> + /* this is a TPM 1.2 */
> + return 0;
> + }
> +
> + *tpm_version = TPMVersion_Unspec;
> +
> + return 1;
> +}
> diff --git a/hw/tpm/tpm_util.h b/hw/tpm/tpm_util.h
> new file mode 100644
> index 0000000..3ce25c8
> --- /dev/null
> +++ b/hw/tpm/tpm_util.h
> @@ -0,0 +1,28 @@
> +/*
> + * TPM utility functions
> + *
> + * Copyright (c) 2010 - 2015 IBM Corporation
> + * Authors:
> + * Stefan Berger <stefanb@us.ibm.com>
> + *
> + * This library is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public
> + * License as published by the Free Software Foundation; either
> + * version 2 of the License, or (at your option) any later version.
> + *
> + * This library is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + * Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public
> + * License along with this library; if not, see <http://www.gnu.org/licenses/>
> + */
> +#ifndef TPM_TPM_UTILS_H
> +#define TPM_TPM_UTILS_H
> +
> +#include "sysemu/tpm_backend.h"
> +
> +int tpm_util_test_tpmdev(int tpm_fd, enum TPMVersion *tpm_version);
> +
> +#endif /* TPM_TPM_UTILS_H */
> --
> 1.9.3
^ permalink raw reply [flat|nested] 14+ messages in thread
* [Qemu-devel] [PATCH 3/3] TPM2 ACPI table support
2015-03-31 19:40 [Qemu-devel] [PATCH 0/3] tpm: Upgrade TPM TIS for support of a TPM 2 Stefan Berger
2015-03-31 19:40 ` [Qemu-devel] [PATCH 1/3] Extend TPM TIS interface to version 2.0 Stefan Berger
2015-03-31 19:40 ` [Qemu-devel] [PATCH 2/3] tpm: Probe for connected TPM 1.2 or TPM 2 Stefan Berger
@ 2015-03-31 19:40 ` Stefan Berger
2015-04-07 8:58 ` Xu, Quan
2015-04-13 6:27 ` Michael S. Tsirkin
2 siblings, 2 replies; 14+ messages in thread
From: Stefan Berger @ 2015-03-31 19:40 UTC (permalink / raw)
To: qemu-devel, mst; +Cc: quan.xu, Stefan Berger
Add a TPM2 ACPI table if a TPM2 is used in the backend.
Rename tpm_find() to tpm_get_version() and have this function
return the version of the TPM found, TPMVersion_Unspec if
no TPM is found. Use the version number to build version
specific ACPI tables.
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
---
hw/i386/acpi-build.c | 34 ++++++++++++++++++++++++++++++----
hw/i386/acpi-defs.h | 18 ++++++++++++++++++
hw/tpm/tpm_tis.c | 11 +++++++++++
include/hw/acpi/tpm.h | 5 +++++
include/sysemu/tpm.h | 10 ++++++++--
5 files changed, 72 insertions(+), 6 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index d0a5c85..8e01e1b 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -42,6 +42,7 @@
#include "hw/acpi/memory_hotplug.h"
#include "sysemu/tpm.h"
#include "hw/acpi/tpm.h"
+#include "sysemu/tpm_backend.h"
/* Supported chipsets: */
#include "hw/acpi/piix4.h"
@@ -111,7 +112,7 @@ typedef struct AcpiPmInfo {
typedef struct AcpiMiscInfo {
bool has_hpet;
- bool has_tpm;
+ enum TPMVersion tpm_version;
const unsigned char *dsdt_code;
unsigned dsdt_size;
uint16_t pvpanic_port;
@@ -239,7 +240,7 @@ static void acpi_get_pm_info(AcpiPmInfo *pm)
static void acpi_get_misc_info(AcpiMiscInfo *info)
{
info->has_hpet = hpet_find();
- info->has_tpm = tpm_find();
+ info->tpm_version = tpm_get_version();
info->pvpanic_port = pvpanic_port();
info->applesmc_io_base = applesmc_port();
}
@@ -1065,6 +1066,21 @@ build_tpm_ssdt(GArray *table_data, GArray *linker)
memcpy(tpm_ptr, ssdt_tpm_aml, sizeof(ssdt_tpm_aml));
}
+static void
+build_tpm2(GArray *table_data, GArray *linker)
+{
+ Acpi20TPM2 *tpm2_ptr;
+
+ tpm2_ptr = acpi_data_push(table_data, sizeof *tpm2_ptr);
+
+ tpm2_ptr->platform_class = cpu_to_le16(TPM2_ACPI_CLASS_CLIENT);
+ tpm2_ptr->control_area_address = cpu_to_le64(0);
+ tpm2_ptr->start_method = cpu_to_le32(TPM2_START_METHOD_MMIO);
+
+ build_header(linker, table_data,
+ (void *)tpm2_ptr, "TPM2", sizeof(*tpm2_ptr), 4);
+}
+
typedef enum {
MEM_AFFINITY_NOFLAGS = 0,
MEM_AFFINITY_ENABLED = (1 << 0),
@@ -1428,12 +1444,22 @@ void acpi_build(PcGuestInfo *guest_info, AcpiBuildTables *tables)
acpi_add_table(table_offsets, tables_blob);
build_hpet(tables_blob, tables->linker);
}
- if (misc.has_tpm) {
+ if (misc.tpm_version != TPMVersion_Unspec) {
acpi_add_table(table_offsets, tables_blob);
build_tpm_tcpa(tables_blob, tables->linker, tables->tcpalog);
acpi_add_table(table_offsets, tables_blob);
- build_tpm_ssdt(tables_blob, tables->linker);
+ switch (misc.tpm_version) {
+ case TPMVersion1_2:
+ build_tpm_ssdt(tables_blob, tables->linker);
+ break;
+ case TPMVersion2_0:
+ build_tpm2(tables_blob, tables->linker);
+ break;
+ case TPMVersion_Unspec:
+ /* not possible */
+ break;
+ }
}
if (guest_info->numa_nodes) {
acpi_add_table(table_offsets, tables_blob);
diff --git a/hw/i386/acpi-defs.h b/hw/i386/acpi-defs.h
index c4468f8..79ee9b1 100644
--- a/hw/i386/acpi-defs.h
+++ b/hw/i386/acpi-defs.h
@@ -316,6 +316,9 @@ typedef struct AcpiTableMcfg AcpiTableMcfg;
/*
* TCPA Description Table
+ *
+ * Following Level 00, Rev 00.37 of specs:
+ * http://www.trustedcomputinggroup.org/resources/tcg_acpi_specification
*/
struct Acpi20Tcpa {
ACPI_TABLE_HEADER_DEF /* ACPI common table header */
@@ -325,6 +328,21 @@ struct Acpi20Tcpa {
} QEMU_PACKED;
typedef struct Acpi20Tcpa Acpi20Tcpa;
+/*
+ * TPM2
+ *
+ * Following Level 00, Rev 00.37 of specs:
+ * http://www.trustedcomputinggroup.org/resources/tcg_acpi_specification
+ */
+struct Acpi20TPM2 {
+ ACPI_TABLE_HEADER_DEF
+ uint16_t platform_class;
+ uint16_t reserved;
+ uint64_t control_area_address;
+ uint32_t start_method;
+} QEMU_PACKED;
+typedef struct Acpi20TPM2 Acpi20TPM2;
+
/* DMAR - DMA Remapping table r2.2 */
struct AcpiTableDmar {
ACPI_TABLE_HEADER_DEF
diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c
index 89e401d..56ce1d2 100644
--- a/hw/tpm/tpm_tis.c
+++ b/hw/tpm/tpm_tis.c
@@ -32,6 +32,7 @@
#include "tpm_tis.h"
#include "qemu-common.h"
#include "qemu/main-loop.h"
+#include "sysemu/tpm_backend.h"
#define DEBUG_TIS 0
@@ -963,6 +964,16 @@ static int tpm_tis_do_startup_tpm(TPMState *s)
}
/*
+ * Get the TPMVersion of the backend device being used
+ */
+enum TPMVersion tpm_tis_get_tpm_version(Object *obj)
+{
+ TPMState *s = TPM(obj);
+
+ return tpm_backend_get_tpm_version(s->be_driver);
+}
+
+/*
* This function is called when the machine starts, resets or due to
* S3 resume.
*/
diff --git a/include/hw/acpi/tpm.h b/include/hw/acpi/tpm.h
index 792fcbf..6d516c6 100644
--- a/include/hw/acpi/tpm.h
+++ b/include/hw/acpi/tpm.h
@@ -26,4 +26,9 @@
#define TPM_TCPA_ACPI_CLASS_CLIENT 0
#define TPM_TCPA_ACPI_CLASS_SERVER 1
+#define TPM2_ACPI_CLASS_CLIENT 0
+#define TPM2_ACPI_CLASS_SERVER 1
+
+#define TPM2_START_METHOD_MMIO 6
+
#endif /* HW_ACPI_TPM_H */
diff --git a/include/sysemu/tpm.h b/include/sysemu/tpm.h
index 9a77889..b11d1c8 100644
--- a/include/sysemu/tpm.h
+++ b/include/sysemu/tpm.h
@@ -26,12 +26,18 @@ enum TPMVersion {
TPMVersion2_0 = 2,
};
+enum TPMVersion tpm_tis_get_tpm_version(Object *obj);
#define TYPE_TPM_TIS "tpm-tis"
-static inline bool tpm_find(void)
+static inline enum TPMVersion tpm_get_version(void)
{
- return object_resolve_path_type("", TYPE_TPM_TIS, NULL);
+ Object *obj = object_resolve_path_type("", TYPE_TPM_TIS, NULL);
+
+ if (obj) {
+ return tpm_tis_get_tpm_version(obj);
+ }
+ return TPMVersion_Unspec;
}
#endif /* QEMU_TPM_H */
--
1.9.3
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [Qemu-devel] [PATCH 3/3] TPM2 ACPI table support
2015-03-31 19:40 ` [Qemu-devel] [PATCH 3/3] TPM2 ACPI table support Stefan Berger
@ 2015-04-07 8:58 ` Xu, Quan
2015-04-13 6:27 ` Michael S. Tsirkin
1 sibling, 0 replies; 14+ messages in thread
From: Xu, Quan @ 2015-04-07 8:58 UTC (permalink / raw)
To: Stefan Berger; +Cc: qemu-devel, Xu, Quan, mst
> -----Original Message-----
> From: Stefan Berger [mailto:stefanb@linux.vnet.ibm.com]
> Sent: Wednesday, April 01, 2015 3:40 AM
> To: qemu-devel@nongnu.org; mst@redhat.com
> Cc: Xu, Quan; Stefan Berger
> Subject: [PATCH 3/3] TPM2 ACPI table support
>
> Add a TPM2 ACPI table if a TPM2 is used in the backend.
>
> Rename tpm_find() to tpm_get_version() and have this function return the
> version of the TPM found, TPMVersion_Unspec if no TPM is found. Use the
> version number to build version specific ACPI tables.
>
> Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
> ---
> hw/i386/acpi-build.c | 34 ++++++++++++++++++++++++++++++----
> hw/i386/acpi-defs.h | 18 ++++++++++++++++++
> hw/tpm/tpm_tis.c | 11 +++++++++++
> include/hw/acpi/tpm.h | 5 +++++
> include/sysemu/tpm.h | 10 ++++++++--
> 5 files changed, 72 insertions(+), 6 deletions(-)
>
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index d0a5c85..8e01e1b
> 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -42,6 +42,7 @@
> #include "hw/acpi/memory_hotplug.h"
> #include "sysemu/tpm.h"
> #include "hw/acpi/tpm.h"
> +#include "sysemu/tpm_backend.h"
>
> /* Supported chipsets: */
> #include "hw/acpi/piix4.h"
> @@ -111,7 +112,7 @@ typedef struct AcpiPmInfo {
>
> typedef struct AcpiMiscInfo {
> bool has_hpet;
> - bool has_tpm;
> + enum TPMVersion tpm_version;
> const unsigned char *dsdt_code;
> unsigned dsdt_size;
> uint16_t pvpanic_port;
> @@ -239,7 +240,7 @@ static void acpi_get_pm_info(AcpiPmInfo *pm) static
> void acpi_get_misc_info(AcpiMiscInfo *info) {
> info->has_hpet = hpet_find();
> - info->has_tpm = tpm_find();
> + info->tpm_version = tpm_get_version();
> info->pvpanic_port = pvpanic_port();
> info->applesmc_io_base = applesmc_port(); } @@ -1065,6 +1066,21 @@
> build_tpm_ssdt(GArray *table_data, GArray *linker)
> memcpy(tpm_ptr, ssdt_tpm_aml, sizeof(ssdt_tpm_aml)); }
>
> +static void
> +build_tpm2(GArray *table_data, GArray *linker) {
> + Acpi20TPM2 *tpm2_ptr;
> +
> + tpm2_ptr = acpi_data_push(table_data, sizeof *tpm2_ptr);
> +
> + tpm2_ptr->platform_class = cpu_to_le16(TPM2_ACPI_CLASS_CLIENT);
> + tpm2_ptr->control_area_address = cpu_to_le64(0);
> + tpm2_ptr->start_method = cpu_to_le32(TPM2_START_METHOD_MMIO);
> +
> + build_header(linker, table_data,
> + (void *)tpm2_ptr, "TPM2", sizeof(*tpm2_ptr), 4); }
> +
> typedef enum {
> MEM_AFFINITY_NOFLAGS = 0,
> MEM_AFFINITY_ENABLED = (1 << 0),
> @@ -1428,12 +1444,22 @@ void acpi_build(PcGuestInfo *guest_info,
> AcpiBuildTables *tables)
> acpi_add_table(table_offsets, tables_blob);
> build_hpet(tables_blob, tables->linker);
> }
> - if (misc.has_tpm) {
> + if (misc.tpm_version != TPMVersion_Unspec) {
> acpi_add_table(table_offsets, tables_blob);
> build_tpm_tcpa(tables_blob, tables->linker, tables->tcpalog);
>
> acpi_add_table(table_offsets, tables_blob);
> - build_tpm_ssdt(tables_blob, tables->linker);
> + switch (misc.tpm_version) {
> + case TPMVersion1_2:
> + build_tpm_ssdt(tables_blob, tables->linker);
> + break;
> + case TPMVersion2_0:
> + build_tpm2(tables_blob, tables->linker);
> + break;
> + case TPMVersion_Unspec:
> + /* not possible */
> + break;
> + }
> }
> if (guest_info->numa_nodes) {
> acpi_add_table(table_offsets, tables_blob); diff --git
> a/hw/i386/acpi-defs.h b/hw/i386/acpi-defs.h index c4468f8..79ee9b1 100644
> --- a/hw/i386/acpi-defs.h
> +++ b/hw/i386/acpi-defs.h
> @@ -316,6 +316,9 @@ typedef struct AcpiTableMcfg AcpiTableMcfg;
>
> /*
> * TCPA Description Table
> + *
> + * Following Level 00, Rev 00.37 of specs:
> + *
> + http://www.trustedcomputinggroup.org/resources/tcg_acpi_specification
> */
> struct Acpi20Tcpa {
> ACPI_TABLE_HEADER_DEF /* ACPI common table
> header */
> @@ -325,6 +328,21 @@ struct Acpi20Tcpa { } QEMU_PACKED; typedef struct
> Acpi20Tcpa Acpi20Tcpa;
>
> +/*
> + * TPM2
> + *
> + * Following Level 00, Rev 00.37 of specs:
> + *
> +http://www.trustedcomputinggroup.org/resources/tcg_acpi_specification
> + */
> +struct Acpi20TPM2 {
> + ACPI_TABLE_HEADER_DEF
> + uint16_t platform_class;
> + uint16_t reserved;
> + uint64_t control_area_address;
> + uint32_t start_method;
> +} QEMU_PACKED;
> +typedef struct Acpi20TPM2 Acpi20TPM2;
> +
> /* DMAR - DMA Remapping table r2.2 */
> struct AcpiTableDmar {
> ACPI_TABLE_HEADER_DEF
> diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c index 89e401d..56ce1d2
> 100644
> --- a/hw/tpm/tpm_tis.c
> +++ b/hw/tpm/tpm_tis.c
> @@ -32,6 +32,7 @@
> #include "tpm_tis.h"
> #include "qemu-common.h"
> #include "qemu/main-loop.h"
> +#include "sysemu/tpm_backend.h"
>
> #define DEBUG_TIS 0
>
> @@ -963,6 +964,16 @@ static int tpm_tis_do_startup_tpm(TPMState *s) }
>
> /*
> + * Get the TPMVersion of the backend device being used */ enum
> +TPMVersion tpm_tis_get_tpm_version(Object *obj) {
> + TPMState *s = TPM(obj);
> +
> + return tpm_backend_get_tpm_version(s->be_driver);
> +}
> +
> +/*
> * This function is called when the machine starts, resets or due to
> * S3 resume.
> */
> diff --git a/include/hw/acpi/tpm.h b/include/hw/acpi/tpm.h index
> 792fcbf..6d516c6 100644
> --- a/include/hw/acpi/tpm.h
> +++ b/include/hw/acpi/tpm.h
> @@ -26,4 +26,9 @@
> #define TPM_TCPA_ACPI_CLASS_CLIENT 0
> #define TPM_TCPA_ACPI_CLASS_SERVER 1
>
> +#define TPM2_ACPI_CLASS_CLIENT 0
> +#define TPM2_ACPI_CLASS_SERVER 1
> +
> +#define TPM2_START_METHOD_MMIO 6
> +
> #endif /* HW_ACPI_TPM_H */
> diff --git a/include/sysemu/tpm.h b/include/sysemu/tpm.h index
> 9a77889..b11d1c8 100644
> --- a/include/sysemu/tpm.h
> +++ b/include/sysemu/tpm.h
> @@ -26,12 +26,18 @@ enum TPMVersion {
> TPMVersion2_0 = 2,
> };
>
> +enum TPMVersion tpm_tis_get_tpm_version(Object *obj);
>
> #define TYPE_TPM_TIS "tpm-tis"
>
> -static inline bool tpm_find(void)
> +static inline enum TPMVersion tpm_get_version(void)
> {
> - return object_resolve_path_type("", TYPE_TPM_TIS, NULL);
> + Object *obj = object_resolve_path_type("", TYPE_TPM_TIS, NULL);
> +
> + if (obj) {
> + return tpm_tis_get_tpm_version(obj);
> + }
> + return TPMVersion_Unspec;
> }
>
> #endif /* QEMU_TPM_H */
> --
> 1.9.3
Looks good.
Intel
Quan Xu
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [Qemu-devel] [PATCH 3/3] TPM2 ACPI table support
2015-03-31 19:40 ` [Qemu-devel] [PATCH 3/3] TPM2 ACPI table support Stefan Berger
2015-04-07 8:58 ` Xu, Quan
@ 2015-04-13 6:27 ` Michael S. Tsirkin
2015-04-14 2:29 ` Stefan Berger
1 sibling, 1 reply; 14+ messages in thread
From: Michael S. Tsirkin @ 2015-04-13 6:27 UTC (permalink / raw)
To: Stefan Berger; +Cc: qemu-devel, quan.xu
> @@ -1428,12 +1444,22 @@ void acpi_build(PcGuestInfo *guest_info, AcpiBuildTables *tables)
> acpi_add_table(table_offsets, tables_blob);
> build_hpet(tables_blob, tables->linker);
> }
> - if (misc.has_tpm) {
> + if (misc.tpm_version != TPMVersion_Unspec) {
> acpi_add_table(table_offsets, tables_blob);
> build_tpm_tcpa(tables_blob, tables->linker, tables->tcpalog);
>
> acpi_add_table(table_offsets, tables_blob);
> - build_tpm_ssdt(tables_blob, tables->linker);
> + switch (misc.tpm_version) {
> + case TPMVersion1_2:
> + build_tpm_ssdt(tables_blob, tables->linker);
> + break;
> + case TPMVersion2_0:
> + build_tpm2(tables_blob, tables->linker);
> + break;
> + case TPMVersion_Unspec:
> + /* not possible */
> + break;
> + }
> }
> if (guest_info->numa_nodes) {
> acpi_add_table(table_offsets, tables_blob);
I think we should fix QEMU coding style violations in TPM code.
In particular, mixing of _ and camel case, enum and define values
not all upper case, local variables not all lower case.
This was less of an issue when the violations were contained
within hw/tpm/, but it's more of an issue now that this affects
other code.
--
MST
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [Qemu-devel] [PATCH 3/3] TPM2 ACPI table support
2015-04-13 6:27 ` Michael S. Tsirkin
@ 2015-04-14 2:29 ` Stefan Berger
2015-04-14 5:51 ` Michael S. Tsirkin
0 siblings, 1 reply; 14+ messages in thread
From: Stefan Berger @ 2015-04-14 2:29 UTC (permalink / raw)
To: Michael S. Tsirkin; +Cc: qemu-devel, quan.xu
On 04/13/2015 02:27 AM, Michael S. Tsirkin wrote:
>> @@ -1428,12 +1444,22 @@ void acpi_build(PcGuestInfo *guest_info, AcpiBuildTables *tables)
>> acpi_add_table(table_offsets, tables_blob);
>> build_hpet(tables_blob, tables->linker);
>> }
>> - if (misc.has_tpm) {
>> + if (misc.tpm_version != TPMVersion_Unspec) {
>> acpi_add_table(table_offsets, tables_blob);
>> build_tpm_tcpa(tables_blob, tables->linker, tables->tcpalog);
>>
>> acpi_add_table(table_offsets, tables_blob);
>> - build_tpm_ssdt(tables_blob, tables->linker);
>> + switch (misc.tpm_version) {
>> + case TPMVersion1_2:
>> + build_tpm_ssdt(tables_blob, tables->linker);
>> + break;
>> + case TPMVersion2_0:
>> + build_tpm2(tables_blob, tables->linker);
>> + break;
>> + case TPMVersion_Unspec:
>> + /* not possible */
>> + break;
>> + }
>> }
>> if (guest_info->numa_nodes) {
>> acpi_add_table(table_offsets, tables_blob);
> I think we should fix QEMU coding style violations in TPM code.
> In particular, mixing of _ and camel case, enum and define values
> not all upper case, local variables not all lower case.
> This was less of an issue when the violations were contained
> within hw/tpm/, but it's more of an issue now that this affects
> other code.
>
The above enums look like the only violation to me. Fixed.
Stefan
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [Qemu-devel] [PATCH 3/3] TPM2 ACPI table support
2015-04-14 2:29 ` Stefan Berger
@ 2015-04-14 5:51 ` Michael S. Tsirkin
0 siblings, 0 replies; 14+ messages in thread
From: Michael S. Tsirkin @ 2015-04-14 5:51 UTC (permalink / raw)
To: Stefan Berger; +Cc: qemu-devel, quan.xu
On Mon, Apr 13, 2015 at 10:29:32PM -0400, Stefan Berger wrote:
> On 04/13/2015 02:27 AM, Michael S. Tsirkin wrote:
> >>@@ -1428,12 +1444,22 @@ void acpi_build(PcGuestInfo *guest_info, AcpiBuildTables *tables)
> >> acpi_add_table(table_offsets, tables_blob);
> >> build_hpet(tables_blob, tables->linker);
> >> }
> >>- if (misc.has_tpm) {
> >>+ if (misc.tpm_version != TPMVersion_Unspec) {
> >> acpi_add_table(table_offsets, tables_blob);
> >> build_tpm_tcpa(tables_blob, tables->linker, tables->tcpalog);
> >> acpi_add_table(table_offsets, tables_blob);
> >>- build_tpm_ssdt(tables_blob, tables->linker);
> >>+ switch (misc.tpm_version) {
> >>+ case TPMVersion1_2:
> >>+ build_tpm_ssdt(tables_blob, tables->linker);
> >>+ break;
> >>+ case TPMVersion2_0:
> >>+ build_tpm2(tables_blob, tables->linker);
> >>+ break;
> >>+ case TPMVersion_Unspec:
> >>+ /* not possible */
> >>+ break;
> >>+ }
> >> }
> >> if (guest_info->numa_nodes) {
> >> acpi_add_table(table_offsets, tables_blob);
> >I think we should fix QEMU coding style violations in TPM code.
> >In particular, mixing of _ and camel case, enum and define values
> >not all upper case, local variables not all lower case.
> >This was less of an issue when the violations were contained
> >within hw/tpm/, but it's more of an issue now that this affects
> >other code.
> >
>
> The above enums look like the only violation to me. Fixed.
>
> Stefan
there's also needIrq in existing code, let's fix that.
^ permalink raw reply [flat|nested] 14+ messages in thread