From: Stefan Berger <stefanb@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: mst@redhat.com, stefanb@linux.vnet.ibm.com, kevin@koconnor.net,
marcandre.lureau@redhat.com, lersek@redhat.com
Subject: [Qemu-devel] [PATCH v2 1/4] tpm: implement virtual memory device for TPM PPI
Date: Tue, 16 Jan 2018 10:51:37 -0500 [thread overview]
Message-ID: <1516117900-11382-2-git-send-email-stefanb@linux.vnet.ibm.com> (raw)
In-Reply-To: <1516117900-11382-1-git-send-email-stefanb@linux.vnet.ibm.com>
Implement a virtual memory device for the TPM Physical Presence interface.
The memory is located at 0xfffef000 and used by ACPI to send messages to the
firmware (BIOS) and by the firmware to provide parameters for each one of
the supported codes.
This device should be used by all TPM interfaces on x86 and can be added
by calling tpm_ppi_init_io().
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
---
v1->v2:
- moved to byte access since an infrequently used device;
this simplifies code
- increase size of device to 0x400
- move device to 0xfffef000 since SeaBIOS has some code at 0xffff0000:
'On the emulators, the bios at 0xf0000 is also at 0xffff0000'
---
hw/tpm/Makefile.objs | 2 +-
hw/tpm/tpm_ppi.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++
hw/tpm/tpm_ppi.h | 26 ++++++++++++++++++++
hw/tpm/tpm_tis.c | 5 ++++
include/hw/acpi/tpm.h | 6 +++++
5 files changed, 105 insertions(+), 1 deletion(-)
create mode 100644 hw/tpm/tpm_ppi.c
create mode 100644 hw/tpm/tpm_ppi.h
diff --git a/hw/tpm/Makefile.objs b/hw/tpm/Makefile.objs
index 7a93b24..3eb0558 100644
--- a/hw/tpm/Makefile.objs
+++ b/hw/tpm/Makefile.objs
@@ -1,4 +1,4 @@
-common-obj-y += tpm_util.o
+common-obj-y += tpm_util.o tpm_ppi.o
common-obj-$(CONFIG_TPM_TIS) += tpm_tis.o
common-obj-$(CONFIG_TPM_PASSTHROUGH) += tpm_passthrough.o
common-obj-$(CONFIG_TPM_EMULATOR) += tpm_emulator.o
diff --git a/hw/tpm/tpm_ppi.c b/hw/tpm/tpm_ppi.c
new file mode 100644
index 0000000..98e8318
--- /dev/null
+++ b/hw/tpm/tpm_ppi.c
@@ -0,0 +1,67 @@
+/*
+ * tpm_ppi.c - TPM Physical Presence Interface
+ *
+ * Copyright (C) 2018 IBM Corporation
+ *
+ * Authors:
+ * Stefan Berger <stefanb@us.ibm.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ *
+ */
+
+#include "qemu/osdep.h"
+#include "exec/memory.h"
+#include "exec/address-spaces.h"
+
+#include "tpm_ppi.h"
+
+#define DEBUG_PPI 0
+
+#define DPRINTF(fmt, ...) do { \
+ if (DEBUG_PPI) { \
+ printf(fmt, ## __VA_ARGS__); \
+ } \
+} while (0)
+
+static uint64_t tpm_ppi_mmio_read(void *opaque, hwaddr addr,
+ unsigned size)
+{
+ TPMPPI *s = opaque;
+
+ DPRINTF("tpm_ppi: read(%04x) = %02x\n",
+ (unsigned int)addr, (unsigned int)s->ram[addr]);
+
+ return s->ram[addr];
+}
+
+static void tpm_ppi_mmio_write(void *opaque, hwaddr addr,
+ uint64_t val, unsigned size)
+{
+ TPMPPI *s = opaque;
+
+ DPRINTF("tpm_ppi: write(%04x) = %02x\n",
+ (unsigned int)addr, (unsigned int)val);
+
+ s->ram[addr] = val;
+}
+
+static const MemoryRegionOps tpm_ppi_memory_ops = {
+ .read = tpm_ppi_mmio_read,
+ .write = tpm_ppi_mmio_write,
+ .endianness = DEVICE_NATIVE_ENDIAN,
+ .valid = {
+ .min_access_size = 1,
+ .max_access_size = 1,
+ },
+};
+
+void tpm_ppi_init_io(TPMPPI *tpmppi, struct MemoryRegion *m, Object *obj)
+{
+ memory_region_init_io(&tpmppi->mmio, obj, &tpm_ppi_memory_ops,
+ tpmppi, "tpm-ppi-mmio",
+ TPM_PPI_ADDR_SIZE);
+
+ memory_region_add_subregion(m, TPM_PPI_ADDR_BASE, &tpmppi->mmio);
+}
diff --git a/hw/tpm/tpm_ppi.h b/hw/tpm/tpm_ppi.h
new file mode 100644
index 0000000..17030bd
--- /dev/null
+++ b/hw/tpm/tpm_ppi.h
@@ -0,0 +1,26 @@
+/*
+ * TPM Physical Presence Interface
+ *
+ * Copyright (C) 2018 IBM Corporation
+ *
+ * Authors:
+ * Stefan Berger <stefanb@us.ibm.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+#ifndef TPM_TPM_PPI_H
+#define TPM_TPM_PPI_H
+
+#include "hw/acpi/tpm.h"
+#include "exec/address-spaces.h"
+
+typedef struct TPMPPI {
+ MemoryRegion mmio;
+
+ uint8_t ram[TPM_PPI_ADDR_SIZE];
+} TPMPPI;
+
+void tpm_ppi_init_io(TPMPPI *tpmppi, struct MemoryRegion *m, Object *obj);
+
+#endif /* TPM_TPM_PPI_H */
diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c
index 561384c..13e7dd3 100644
--- a/hw/tpm/tpm_tis.c
+++ b/hw/tpm/tpm_tis.c
@@ -31,6 +31,7 @@
#include "sysemu/tpm_backend.h"
#include "tpm_int.h"
#include "tpm_util.h"
+#include "tpm_ppi.h"
#define TPM_TIS_NUM_LOCALITIES 5 /* per spec */
#define TPM_TIS_LOCALITY_SHIFT 12
@@ -80,6 +81,8 @@ typedef struct TPMState {
TPMVersion be_tpm_version;
size_t be_buffer_size;
+
+ TPMPPI ppi;
} TPMState;
#define TPM(obj) OBJECT_CHECK(TPMState, (obj), TYPE_TPM_TIS)
@@ -1041,6 +1044,8 @@ static void tpm_tis_realizefn(DeviceState *dev, Error **errp)
memory_region_add_subregion(isa_address_space(ISA_DEVICE(dev)),
TPM_TIS_ADDR_BASE, &s->mmio);
+
+ tpm_ppi_init_io(&s->ppi, isa_address_space(ISA_DEVICE(dev)), OBJECT(s));
}
static void tpm_tis_initfn(Object *obj)
diff --git a/include/hw/acpi/tpm.h b/include/hw/acpi/tpm.h
index 6d516c6..16227bc 100644
--- a/include/hw/acpi/tpm.h
+++ b/include/hw/acpi/tpm.h
@@ -31,4 +31,10 @@
#define TPM2_START_METHOD_MMIO 6
+/*
+ * Physical Presence Interface
+ */
+#define TPM_PPI_ADDR_SIZE 0x400
+#define TPM_PPI_ADDR_BASE 0xfffef000
+
#endif /* HW_ACPI_TPM_H */
--
2.5.5
next prev parent reply other threads:[~2018-01-16 15:52 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-16 15:51 [Qemu-devel] [PATCH v2 0/4] Implement Physical Presence interface for TPM 1.2 and 2 Stefan Berger
2018-01-16 15:51 ` Stefan Berger [this message]
2018-01-16 15:51 ` [Qemu-devel] [PATCH v2 2/4] acpi: build QEMU table for PPI virtual memory device Stefan Berger
2018-01-16 16:35 ` Michael S. Tsirkin
2018-01-16 20:42 ` Laszlo Ersek
2018-01-16 21:20 ` Stefan Berger
2018-01-16 15:51 ` [Qemu-devel] [PATCH v2 3/4] acpi: implement aml_lless_equal Stefan Berger
2018-01-16 16:13 ` Michael S. Tsirkin
2018-01-16 15:51 ` [Qemu-devel] [PATCH v2 4/4] acpi: build TPM Physical Presence interface Stefan Berger
2018-02-09 20:19 ` Stefan Berger
2018-02-12 14:27 ` Igor Mammedov
2018-02-12 16:44 ` Stefan Berger
2018-02-12 17:52 ` Igor Mammedov
2018-02-12 18:45 ` Stefan Berger
2018-02-13 12:50 ` Igor Mammedov
2018-02-12 19:45 ` Kevin O'Connor
2018-02-12 20:17 ` Stefan Berger
2018-02-13 12:57 ` Igor Mammedov
2018-02-13 13:31 ` Laszlo Ersek
2018-02-13 14:17 ` Igor Mammedov
2018-02-13 15:39 ` Laszlo Ersek
2018-02-13 16:19 ` Igor Mammedov
2018-02-13 16:34 ` Laszlo Ersek
2018-02-12 20:46 ` Kevin O'Connor
2018-02-12 20:49 ` Stefan Berger
2018-02-13 16:16 ` Laszlo Ersek
2018-02-13 16:34 ` Igor Mammedov
2018-02-13 17:01 ` Laszlo Ersek
2018-02-13 19:37 ` Kevin O'Connor
2018-02-13 19:59 ` Laszlo Ersek
2018-02-13 20:29 ` Stefan Berger
2018-02-13 21:04 ` Laszlo Ersek
2018-02-13 21:32 ` Stefan Berger
2018-02-14 18:39 ` Kevin O'Connor
2018-02-15 11:52 ` Stefan Berger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1516117900-11382-2-git-send-email-stefanb@linux.vnet.ibm.com \
--to=stefanb@linux.vnet.ibm.com \
--cc=kevin@koconnor.net \
--cc=lersek@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).