Commit a09a2b5a authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2020-01-29-1' into staging 



Merge tpm 2020/01/29 v1

# gpg: Signature made Wed 29 Jan 2020 13:01:37 GMT
# gpg:                using RSA key B818B9CADF9089C2D5CEC66B75AD65802A0B4211
# gpg: Good signature from "Stefan Berger <stefanb@linux.vnet.ibm.com>" [unknown]
# 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-2020-01-29-1:
  tpm-ppi: page-align PPI RAM

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents b7382e9e 71e415c8

hw/tpm/tpm_ppi.c

+2 −1
Original line number Diff line number Diff line
@@ -43,7 +43,8 @@ void tpm_ppi_reset(TPMPPI *tpmppi) 
void tpm_ppi_init(TPMPPI *tpmppi, struct MemoryRegion *m,

                  hwaddr addr, Object *obj)

{

    tpmppi->buf = g_malloc0(HOST_PAGE_ALIGN(TPM_PPI_ADDR_SIZE));

    tpmppi->buf = qemu_memalign(qemu_real_host_page_size,

                                HOST_PAGE_ALIGN(TPM_PPI_ADDR_SIZE));

    memory_region_init_ram_device_ptr(&tpmppi->ram, obj, "tpm-ppi",

                                      TPM_PPI_ADDR_SIZE, tpmppi->buf);

    vmstate_register_ram(&tpmppi->ram, DEVICE(obj));