On Tue, 13 Jul 2021 16:15:37 -0400
Stefan Berger <stef...@linux.vnet.ibm.com> wrote:
> Signed-off-by: Stefan Berger <stef...@linux.ibm.com>
Reviewed-by: Igor Mammedov <imamm...@redhat.com>
>
> ---
> v3:
> - Added enum TPMVersion for when CONFIG_TPM is not defined
> ---
> tests/qtest/bios-tables-test.c | 5 +++--
> tests/qtest/tpm-crb-test.c | 1 +
> tests/qtest/tpm-emu.c | 13 ++++++++++---
> tests/qtest/tpm-emu.h | 8 ++++++++
> tests/qtest/tpm-tis-device-test.c | 1 +
> tests/qtest/tpm-tis-test.c | 1 +
> 6 files changed, 24 insertions(+), 5 deletions(-)
>
> diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
> index a622f91a37..93c9d306b5 100644
> --- a/tests/qtest/bios-tables-test.c
> +++ b/tests/qtest/bios-tables-test.c
> @@ -1092,7 +1092,7 @@ static void test_acpi_piix4_tcg_numamem(void)
> uint64_t tpm_tis_base_addr;
>
> static void test_acpi_tcg_tpm(const char *machine, const char *tpm_if,
> - uint64_t base)
> + uint64_t base, enum TPMVersion tpm_version)
> {
> #ifdef CONFIG_TPM
> gchar *tmp_dir_name = g_strdup_printf("qemu-test_acpi_%s_tcg_%s.XXXXXX",
> @@ -1113,6 +1113,7 @@ static void test_acpi_tcg_tpm(const char *machine,
> const char *tpm_if,
> g_mutex_init(&test.data_mutex);
> g_cond_init(&test.data_cond);
> test.data_cond_signal = false;
> + test.tpm_version = tpm_version;
>
> thread = g_thread_new(NULL, tpm_emu_ctrl_thread, &test);
> tpm_emu_test_wait_cond(&test);
> @@ -1145,7 +1146,7 @@ static void test_acpi_tcg_tpm(const char *machine,
> const char *tpm_if,
>
> static void test_acpi_q35_tcg_tpm_tis(void)
> {
> - test_acpi_tcg_tpm("q35", "tis", 0xFED40000);
> + test_acpi_tcg_tpm("q35", "tis", 0xFED40000, TPM_VERSION_2_0);
> }
>
> static void test_acpi_tcg_dimm_pxm(const char *machine)
> diff --git a/tests/qtest/tpm-crb-test.c b/tests/qtest/tpm-crb-test.c
> index 50936f1482..7b94453390 100644
> --- a/tests/qtest/tpm-crb-test.c
> +++ b/tests/qtest/tpm-crb-test.c
> @@ -156,6 +156,7 @@ int main(int argc, char **argv)
> g_mutex_init(&test.data_mutex);
> g_cond_init(&test.data_cond);
> test.data_cond_signal = false;
> + test.tpm_version = TPM_VERSION_2_0;
>
> thread = g_thread_new(NULL, tpm_emu_ctrl_thread, &test);
> tpm_emu_test_wait_cond(&test);
> diff --git a/tests/qtest/tpm-emu.c b/tests/qtest/tpm-emu.c
> index b9cddcc240..8baf49eafd 100644
> --- a/tests/qtest/tpm-emu.c
> +++ b/tests/qtest/tpm-emu.c
> @@ -56,9 +56,16 @@ static void *tpm_emu_tpm_thread(void *data)
> s->tpm_msg->code = be32_to_cpu(s->tpm_msg->code);
>
> /* reply error */
> - s->tpm_msg->tag = cpu_to_be16(TPM2_ST_NO_SESSIONS);
> - s->tpm_msg->len = cpu_to_be32(sizeof(struct tpm_hdr));
> - s->tpm_msg->code = cpu_to_be32(TPM_RC_FAILURE);
> + switch (s->tpm_version) {
> + case TPM_VERSION_2_0:
> + s->tpm_msg->tag = cpu_to_be16(TPM2_ST_NO_SESSIONS);
> + s->tpm_msg->len = cpu_to_be32(sizeof(struct tpm_hdr));
> + s->tpm_msg->code = cpu_to_be32(TPM_RC_FAILURE);
> + break;
> + default:
> + g_debug("unsupport TPM version %u", s->tpm_version);
> + g_assert_not_reached();
> + }
> qio_channel_write(ioc, (char *)s->tpm_msg,
> be32_to_cpu(s->tpm_msg->len),
> &error_abort);
> }
> diff --git a/tests/qtest/tpm-emu.h b/tests/qtest/tpm-emu.h
> index b066ad63fb..610519883a 100644
> --- a/tests/qtest/tpm-emu.h
> +++ b/tests/qtest/tpm-emu.h
> @@ -18,6 +18,7 @@
>
> #include "qemu/sockets.h"
> #include "io/channel.h"
> +#include "sysemu/tpm.h"
>
> struct tpm_hdr {
> uint16_t tag;
> @@ -26,6 +27,12 @@ struct tpm_hdr {
> char buffer[];
> } QEMU_PACKED;
>
> +#ifndef CONFIG_TPM
> +enum TPMVersion {
> + TPM_VERSION_2_0 = 2,
> +};
> +#endif
> +
> typedef struct TPMTestState {
> GMutex data_mutex;
> GCond data_cond;
> @@ -34,6 +41,7 @@ typedef struct TPMTestState {
> QIOChannel *tpm_ioc;
> GThread *emu_tpm_thread;
> struct tpm_hdr *tpm_msg;
> + enum TPMVersion tpm_version;
> } TPMTestState;
>
> void tpm_emu_test_wait_cond(TPMTestState *s);
> diff --git a/tests/qtest/tpm-tis-device-test.c
> b/tests/qtest/tpm-tis-device-test.c
> index d36ae20243..3ddefb51ec 100644
> --- a/tests/qtest/tpm-tis-device-test.c
> +++ b/tests/qtest/tpm-tis-device-test.c
> @@ -46,6 +46,7 @@ int main(int argc, char **argv)
> g_mutex_init(&test.data_mutex);
> g_cond_init(&test.data_cond);
> test.data_cond_signal = false;
> + test.tpm_version = TPM_VERSION_2_0;
>
> thread = g_thread_new(NULL, tpm_emu_ctrl_thread, &test);
> tpm_emu_test_wait_cond(&test);
> diff --git a/tests/qtest/tpm-tis-test.c b/tests/qtest/tpm-tis-test.c
> index 6fee4779ea..a4a25ba745 100644
> --- a/tests/qtest/tpm-tis-test.c
> +++ b/tests/qtest/tpm-tis-test.c
> @@ -40,6 +40,7 @@ int main(int argc, char **argv)
> g_mutex_init(&test.data_mutex);
> g_cond_init(&test.data_cond);
> test.data_cond_signal = false;
> + test.tpm_version = TPM_VERSION_2_0;
>
> thread = g_thread_new(NULL, tpm_emu_ctrl_thread, &test);
> tpm_emu_test_wait_cond(&test);
