Commit b6148757 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Michael S. Tsirkin
Browse files

tpm: add a "ppi" boolean property 



The following patches implement the TPM Physical Presence Interface,
make use of a new memory region and a fw_cfg entry. Enable PPI by
default with >=4.0 machine type, to avoid migration issues.

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Tested-by: default avatarStefan Berger <stefanb@linux.ibm.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 812e710a

hw/core/machine.c

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ GlobalProperty hw_compat_3_1[] = { 
    { "pcie-root-port", "x-width", "1" },

    { "memory-backend-file", "x-use-canonical-path-for-ramblock-id", "true" },

    { "memory-backend-memfd", "x-use-canonical-path-for-ramblock-id", "true" },

    { "tpm-crb", "ppi", "false" },

    { "tpm-tis", "ppi", "false" },

};

const size_t hw_compat_3_1_len = G_N_ELEMENTS(hw_compat_3_1);

hw/tpm/tpm_crb.c

+3 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ typedef struct CRBState { 
    MemoryRegion cmdmem;



    size_t be_buffer_size;



    bool ppi_enabled;

} CRBState;



#define CRB(obj) OBJECT_CHECK(CRBState, (obj), TYPE_TPM_CRB)
@@ -221,6 +223,7 @@ static const VMStateDescription vmstate_tpm_crb = { 


static Property tpm_crb_properties[] = {

    DEFINE_PROP_TPMBE("tpmdev", CRBState, tpmbe),

    DEFINE_PROP_BOOL("ppi", CRBState, ppi_enabled, true),

    DEFINE_PROP_END_OF_LIST(),

};

hw/tpm/tpm_tis.c

+3 −0
Original line number Diff line number Diff line
@@ -81,6 +81,8 @@ typedef struct TPMState { 
    TPMVersion be_tpm_version;



    size_t be_buffer_size;



    bool ppi_enabled;

} TPMState;



#define TPM(obj) OBJECT_CHECK(TPMState, (obj), TYPE_TPM_TIS)
@@ -954,6 +956,7 @@ static const VMStateDescription vmstate_tpm_tis = { 
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),

    DEFINE_PROP_END_OF_LIST(),

};