OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Merge tpm 2018/02/03 v1

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQEcBAABAgAGBQJadcD7AAoJEHWtZYAqC0IR8eoIAJn4Id/N+DB7xYvBBINUU/3H
 At0+N2R+PZde4qfQ4PykaH9/7ES+JVPSJmeC7i+tXwzzC53NvXdb7bip1MQaueei
 wSZiSviMKBIezfBCjZ075wNYxIeHHfHsJ7qM05ttyFl5ThRRiKSMIqDyfP8TYoBP
 xLwk2F+sQ2SSMQkk1dGhDP2gvhSSemkPE9S100LJ4u7In49/2ZI6do9nlimHHrsY
 AEwLZh+0A/hYBXKiIJUP9+5TRU29VS21GDECkpZ3iqCl078/DzUbph10uxsnwXvK
 VRhc8+WrzNLO5Hmi+3oRupqDj6lHen8jpoGwy234WOYAaRaTERndVihHGFKs/DQ=
 =MK+C
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2018-02-03-1' into staging

Merge tpm 2018/02/03 v1

# gpg: Signature made Sat 03 Feb 2018 14:02:35 GMT
# gpg:                using RSA key 75AD65802A0B4211
# 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-02-03-1:
  tpm: tis: move one-line function into caller
  MAINTAINERS: add pointer to tpm-next repository
  tpm: wrap stX_be_p in tpm_cmd_set_XYZ functions
  tpm: Split off tpm_crb_reset function

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2018-02-05 09:31:37 +00:00
commit 2b3805f370
5 changed files with 48 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MAINTAINERS
View File

@ -1602,6 +1602,7 @@ F: include/hw/acpi/tpm.h
F: include/sysemu/tpm*
F: qapi/tpm.json
F: backends/tpm.c
T: git git://github.com/stefanberger/qemu-tpm.git tpm-next
Checkpatch
S: Odd Fixes

48
hw/tpm/tpm_crb.c
View File

@ -26,6 +26,7 @@
#include "hw/acpi/tpm.h"
#include "migration/vmstate.h"
#include "sysemu/tpm_backend.h"
#include "sysemu/reset.h"
#include "tpm_int.h"
#include "tpm_util.h"
@ -210,29 +211,10 @@ static Property tpm_crb_properties[] = {
DEFINE_PROP_END_OF_LIST(),
};
static void tpm_crb_realize(DeviceState *dev, Error **errp)
static void tpm_crb_reset(void *dev)
{
CRBState *s = CRB(dev);
if (!tpm_find()) {
error_setg(errp, "at most one TPM device is permitted");
return;
}
if (!s->tpmbe) {
error_setg(errp, "'tpmdev' property is required");
return;
}
memory_region_init_io(&s->mmio, OBJECT(s), &tpm_crb_memory_ops, s,
"tpm-crb-mmio", sizeof(s->regs));
memory_region_init_ram(&s->cmdmem, OBJECT(s),
"tpm-crb-cmd", CRB_CTRL_CMD_SIZE, errp);
memory_region_add_subregion(get_system_memory(),
TPM_CRB_ADDR_BASE, &s->mmio);
memory_region_add_subregion(get_system_memory(),
TPM_CRB_ADDR_BASE + sizeof(s->regs), &s->cmdmem);
tpm_backend_reset(s->tpmbe);
ARRAY_FIELD_DP32(s->regs, CRB_INTF_ID,
@ -267,6 +249,32 @@ static void tpm_crb_realize(DeviceState *dev, Error **errp)
tpm_backend_startup_tpm(s->tpmbe, s->be_buffer_size);
}
static void tpm_crb_realize(DeviceState *dev, Error **errp)
{
CRBState *s = CRB(dev);
if (!tpm_find()) {
error_setg(errp, "at most one TPM device is permitted");
return;
}
if (!s->tpmbe) {
error_setg(errp, "'tpmdev' property is required");
return;
}
memory_region_init_io(&s->mmio, OBJECT(s), &tpm_crb_memory_ops, s,
"tpm-crb-mmio", sizeof(s->regs));
memory_region_init_ram(&s->cmdmem, OBJECT(s),
"tpm-crb-cmd", CRB_CTRL_CMD_SIZE, errp);
memory_region_add_subregion(get_system_memory(),
TPM_CRB_ADDR_BASE, &s->mmio);
memory_region_add_subregion(get_system_memory(),
TPM_CRB_ADDR_BASE + sizeof(s->regs), &s->cmdmem);
qemu_register_reset(tpm_crb_reset, dev);
}
static void tpm_crb_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);

7
hw/tpm/tpm_tis.c
View File

@ -946,11 +946,6 @@ static const MemoryRegionOps tpm_tis_memory_ops = {
},
};
static int tpm_tis_do_startup_tpm(TPMState *s, size_t buffersize)
{
return tpm_backend_startup_tpm(s->be_driver, buffersize);
}
/*
* Get the TPMVersion of the backend device being used
*/
@ -1005,7 +1000,7 @@ static void tpm_tis_reset(DeviceState *dev)
s->rw_offset = 0;
}
tpm_tis_do_startup_tpm(s, s->be_buffer_size);
tpm_backend_startup_tpm(s->be_driver, s->be_buffer_size);
}
static const VMStateDescription vmstate_tpm_tis = {

6
hw/tpm/tpm_util.c
View File

@ -106,9 +106,9 @@ const PropertyInfo qdev_prop_tpm = {
void tpm_util_write_fatal_error_response(uint8_t *out, uint32_t out_len)
{
if (out_len >= sizeof(struct tpm_resp_hdr)) {
stw_be_p(out, TPM_TAG_RSP_COMMAND);
stl_be_p(out + 2, sizeof(struct tpm_resp_hdr));
stl_be_p(out + 6, TPM_FAIL);
tpm_cmd_set_tag(out, TPM_TAG_RSP_COMMAND);
tpm_cmd_set_size(out, sizeof(struct tpm_resp_hdr));
tpm_cmd_set_error(out, TPM_FAIL);
}
}

15
hw/tpm/tpm_util.h
View File

@ -36,11 +36,21 @@ static inline uint16_t tpm_cmd_get_tag(const void *b)
return lduw_be_p(b);
}
static inline void tpm_cmd_set_tag(void *b, uint16_t tag)
{
stw_be_p(b, tag);
}
static inline uint32_t tpm_cmd_get_size(const void *b)
{
return ldl_be_p(b + 2);
}
static inline void tpm_cmd_set_size(void *b, uint32_t size)
{
stl_be_p(b + 2, size);
}
static inline uint32_t tpm_cmd_get_ordinal(const void *b)
{
return ldl_be_p(b + 6);
@ -51,6 +61,11 @@ static inline uint32_t tpm_cmd_get_errcode(const void *b)
return ldl_be_p(b + 6);
}
static inline void tpm_cmd_set_error(void *b, uint32_t error)
{
stl_be_p(b + 6, error);
}
int tpm_util_get_buffer_size(int tpm_fd, TPMVersion tpm_version,
size_t *buffersize);