Commit 6521130b authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2018-01-26-2' into staging 



Merge tpm 2018/01/26 v2

# gpg: Signature made Mon 29 Jan 2018 22:20:05 GMT
# gpg:                using RSA key 0x75AD65802A0B4211
# gpg: Good signature from "Stefan Berger <stefanb@linux.vnet.ibm.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: B818 B9CA DF90 89C2 D5CE  C66B 75AD 6580 2A0B 4211

* remotes/stefanberger/tags/pull-tpm-2018-01-26-2:
  tpm: add CRB device
  tpm: report backend request error
  tpm: replace GThreadPool with AIO threadpool
  tpm: lookup cancel path under tpm device class
  tpm: fix alignment issues
  tpm: Set the flags of the CMD_INIT command to 0

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 8ebb314b 4ab6cb4c

backends/tpm.c

+33 −26
Original line number Diff line number Diff line
@@ -19,30 +19,40 @@ 
#include "sysemu/tpm.h"

#include "qemu/thread.h"

#include "qemu/main-loop.h"

#include "block/thread-pool.h"

#include "qemu/error-report.h"



static void tpm_backend_request_completed_bh(void *opaque)

static void tpm_backend_request_completed(void *opaque, int ret)

{

    TPMBackend *s = TPM_BACKEND(opaque);

    TPMIfClass *tic = TPM_IF_GET_CLASS(s->tpmif);



    tic->request_completed(s->tpmif);

    tic->request_completed(s->tpmif, ret);



    /* no need for atomic, as long the BQL is taken */

    s->cmd = NULL;

    object_unref(OBJECT(s));

}



static void tpm_backend_worker_thread(gpointer data, gpointer user_data)

static int tpm_backend_worker_thread(gpointer data)

{

    TPMBackend *s = TPM_BACKEND(user_data);

    TPMBackend *s = TPM_BACKEND(data);

    TPMBackendClass *k = TPM_BACKEND_GET_CLASS(s);

    Error *err = NULL;



    k->handle_request(s, (TPMBackendCmd *)data);

    k->handle_request(s, s->cmd, &err);

    if (err) {

        error_report_err(err);

        return -1;

    }



    qemu_bh_schedule(s->bh);

    return 0;

}



static void tpm_backend_thread_end(TPMBackend *s)

void tpm_backend_finish_sync(TPMBackend *s)

{

    if (s->thread_pool) {

        g_thread_pool_free(s->thread_pool, FALSE, TRUE);

        s->thread_pool = NULL;

    while (s->cmd) {

        aio_poll(qemu_get_aio_context(), true);

    }

}
@@ -74,10 +84,7 @@ int tpm_backend_startup_tpm(TPMBackend *s, size_t buffersize) 
    TPMBackendClass *k = TPM_BACKEND_GET_CLASS(s);



    /* terminate a running TPM */

    tpm_backend_thread_end(s);



    s->thread_pool = g_thread_pool_new(tpm_backend_worker_thread, s, 1, TRUE,

                                       NULL);

    tpm_backend_finish_sync(s);



    res = k->startup_tpm ? k->startup_tpm(s, buffersize) : 0;
@@ -93,7 +100,17 @@ bool tpm_backend_had_startup_error(TPMBackend *s) 


void tpm_backend_deliver_request(TPMBackend *s, TPMBackendCmd *cmd)

{

    g_thread_pool_push(s->thread_pool, cmd, NULL);

    ThreadPool *pool = aio_get_thread_pool(qemu_get_aio_context());



    if (s->cmd != NULL) {

        error_report("There is a TPM request pending");

        return;

    }



    s->cmd = cmd;

    object_ref(OBJECT(s));

    thread_pool_submit_aio(pool, tpm_backend_worker_thread, s,

                           tpm_backend_request_completed, s);

}



void tpm_backend_reset(TPMBackend *s)
@@ -104,7 +121,7 @@ void tpm_backend_reset(TPMBackend *s) 
        k->reset(s);

    }



    tpm_backend_thread_end(s);

    tpm_backend_finish_sync(s);



    s->had_startup_error = false;

}
@@ -159,28 +176,18 @@ TPMInfo *tpm_backend_query_tpm(TPMBackend *s) 
    return info;

}



static void tpm_backend_instance_init(Object *obj)

{

    TPMBackend *s = TPM_BACKEND(obj);



    s->bh = qemu_bh_new(tpm_backend_request_completed_bh, s);

}



static void tpm_backend_instance_finalize(Object *obj)

{

    TPMBackend *s = TPM_BACKEND(obj);



    object_unref(OBJECT(s->tpmif));

    g_free(s->id);

    tpm_backend_thread_end(s);

    qemu_bh_delete(s->bh);

}



static const TypeInfo tpm_backend_info = {

    .name = TYPE_TPM_BACKEND,

    .parent = TYPE_OBJECT,

    .instance_size = sizeof(TPMBackend),

    .instance_init = tpm_backend_instance_init,

    .instance_finalize = tpm_backend_instance_finalize,

    .class_size = sizeof(TPMBackendClass),

    .abstract = true,

default-configs/i386-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ CONFIG_APPLESMC=y 
CONFIG_I8259=y

CONFIG_PFLASH_CFI01=y

CONFIG_TPM_TIS=$(CONFIG_TPM)

CONFIG_TPM_CRB=$(CONFIG_TPM)

CONFIG_MC146818RTC=y

CONFIG_PCI_PIIX=y

CONFIG_WDT_IB700=y

default-configs/x86_64-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ CONFIG_APPLESMC=y 
CONFIG_I8259=y

CONFIG_PFLASH_CFI01=y

CONFIG_TPM_TIS=$(CONFIG_TPM)

CONFIG_TPM_CRB=$(CONFIG_TPM)

CONFIG_MC146818RTC=y

CONFIG_PCI_PIIX=y

CONFIG_WDT_IB700=y

hw/i386/acpi-build.c

+26 −8
Original line number Diff line number Diff line
@@ -2224,6 +2224,22 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, 
            aml_append(sb_scope, scope);

        }

    }



    if (TPM_IS_CRB(tpm_find())) {

        dev = aml_device("TPM");

        aml_append(dev, aml_name_decl("_HID", aml_string("MSFT0101")));

        crs = aml_resource_template();

        aml_append(crs, aml_memory32_fixed(TPM_CRB_ADDR_BASE,

                                           TPM_CRB_ADDR_SIZE, AML_READ_WRITE));

        aml_append(dev, aml_name_decl("_CRS", crs));



        method = aml_method("_STA", 0, AML_NOTSERIALIZED);

        aml_append(method, aml_return(aml_int(0x0f)));

        aml_append(dev, method);



        aml_append(sb_scope, dev);

    }



    aml_append(dsdt, sb_scope);



    /* copy AML table into ACPI tables blob and patch header there */
@@ -2285,18 +2301,20 @@ build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog) 
    if (TPM_IS_TIS(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())) {

        tpm2_ptr->control_area_address = cpu_to_le64(TPM_CRB_ADDR_CTRL);

        tpm2_ptr->start_method = cpu_to_le32(TPM2_START_METHOD_CRB);

    } else {

        g_warn_if_reached();

    }



    tpm2_ptr->log_area_minimum_length =

        cpu_to_le32(TPM_LOG_AREA_MINIMUM_SIZE);



    /* log area start address to be filled by Guest linker */

        bios_linker_loader_add_pointer(linker,

            ACPI_BUILD_TABLE_FILE, log_addr_offset, log_addr_size,

    bios_linker_loader_add_pointer(linker, ACPI_BUILD_TABLE_FILE,

                                   log_addr_offset, log_addr_size,

                                   ACPI_BUILD_TPMLOG_FILE, 0);

    } else {

        g_warn_if_reached();

    }



    build_header(linker, table_data,

                 (void *)tpm2_ptr, "TPM2", sizeof(*tpm2_ptr), 4, NULL, NULL);

}

hw/tpm/Makefile.objs

+1 −0
Original line number Diff line number Diff line 
common-obj-y += tpm_util.o

common-obj-$(CONFIG_TPM_TIS) += tpm_tis.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