From patchwork Wed Jan 10 18:35:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Berger X-Patchwork-Id: 10155863 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 14CD460231 for ; Wed, 10 Jan 2018 18:39:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 078DE28355 for ; Wed, 10 Jan 2018 18:39:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EF48A28567; Wed, 10 Jan 2018 18:39:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A869D28355 for ; Wed, 10 Jan 2018 18:39:13 +0000 (UTC) Received: from localhost ([::1]:59348 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZLHM-0008Hj-4W for patchwork-qemu-devel@patchwork.kernel.org; Wed, 10 Jan 2018 13:39:12 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43481) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZLDs-0005I5-Bz for qemu-devel@nongnu.org; Wed, 10 Jan 2018 13:35:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eZLDn-0000rp-AD for qemu-devel@nongnu.org; Wed, 10 Jan 2018 13:35:36 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:44300) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eZLDm-0000r4-VU for qemu-devel@nongnu.org; Wed, 10 Jan 2018 13:35:31 -0500 Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w0AIYKnr060882 for ; Wed, 10 Jan 2018 13:35:29 -0500 Received: from e31.co.us.ibm.com (e31.co.us.ibm.com [32.97.110.149]) by mx0a-001b2d01.pphosted.com with ESMTP id 2fdkucnjkr-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Wed, 10 Jan 2018 13:35:29 -0500 Received: from localhost by e31.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 10 Jan 2018 11:35:27 -0700 Received: from b03cxnp08027.gho.boulder.ibm.com (9.17.130.19) by e31.co.us.ibm.com (192.168.1.131) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 10 Jan 2018 11:35:25 -0700 Received: from b03ledav001.gho.boulder.ibm.com (b03ledav001.gho.boulder.ibm.com [9.17.130.232]) by b03cxnp08027.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w0AIZPtW11207046; Wed, 10 Jan 2018 11:35:25 -0700 Received: from b03ledav001.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 528856E041; Wed, 10 Jan 2018 11:35:25 -0700 (MST) Received: from sbct-3.watson.ibm.com (unknown [9.47.158.153]) by b03ledav001.gho.boulder.ibm.com (Postfix) with ESMTP id C57726E040; Wed, 10 Jan 2018 11:35:24 -0700 (MST) From: Stefan Berger To: qemu-devel@nongnu.org Date: Wed, 10 Jan 2018 13:35:16 -0500 X-Mailer: git-send-email 2.5.5 In-Reply-To: <1515609318-1897-1-git-send-email-stefanb@linux.vnet.ibm.com> References: <1515609318-1897-1-git-send-email-stefanb@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18011018-8235-0000-0000-00000CD9F3A1 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00008355; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000245; SDB=6.00973082; UDB=6.00493022; IPR=6.00753032; BA=6.00005772; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00018965; XFM=3.00000015; UTC=2018-01-10 18:35:27 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18011018-8236-0000-0000-00003F30370D Message-Id: <1515609318-1897-2-git-send-email-stefanb@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2018-01-10_09:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1011 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1801100259 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.156.1 Subject: [Qemu-devel] [RFC PATCH 1/3] tpm: Implement virtual memory device for TPM PPI X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: marcandre.lureau@redhat.com, kevin@koconnor.net, stefanb@linux.vnet.ibm.com, mst@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Implement a virtual memory device for the TPM physical presence interface. The memory is located at 0xffff0000 and used by ACPI to send messages to the firmware (BIOS). This device should be used by all TPM interfaces on x86 and can be added through by calling tpm_ppi_init_io(). Signed-off-by: Stefan Berger --- hw/tpm/Makefile.objs | 2 +- hw/tpm/tpm_ppi.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++ hw/tpm/tpm_ppi.h | 25 ++++++++++++++++ hw/tpm/tpm_tis.c | 5 ++++ include/hw/acpi/tpm.h | 6 ++++ 5 files changed, 116 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..fa8c3c3 --- /dev/null +++ b/hw/tpm/tpm_ppi.c @@ -0,0 +1,79 @@ +/* + * tpm_ppi.c - TPM Physical Presence Interface + * + * Copyright (C) 2018 IBM Corporation + * + * Authors: + * Stefan Berger + * + * 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 1 + +#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; + uint32_t val = 0; + int c; + + for (c = size - 1; c >= 0; c--) { + val <<= 8; + val |= s->ram[addr + c]; + } + + DPRINTF("tpm_ppi: read.%u(%08x) = %08x\n", size, + (unsigned int)addr, (unsigned int)val); + + return val; +} + +static void tpm_ppi_mmio_write(void *opaque, hwaddr addr, + uint64_t val, unsigned size) +{ + TPMPPI *s = opaque; + int c; + + DPRINTF("tpm_ppi: write.%u(%08x) = %08x\n", size, + (unsigned int)addr, (unsigned int)val); + + for (c = 0; c <= size - 1; c++) { + s->ram[addr + c] = val; + val >>= 8; + } +} + +static const MemoryRegionOps tpm_ppi_memory_ops = { + .read = tpm_ppi_mmio_read, + .write = tpm_ppi_mmio_write, + .endianness = DEVICE_LITTLE_ENDIAN, + .valid = { + .min_access_size = 1, + .max_access_size = 4, + }, +}; + +void tpm_ppi_init_io(TPMPPI *tpmppi, 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(get_system_memory(), + 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..8959912 --- /dev/null +++ b/hw/tpm/tpm_ppi.h @@ -0,0 +1,25 @@ +/* + * TPM Physical Presence Interface + * + * Copyright (C) 2018 IBM Corporation + * + * Authors: + * Stefan Berger + * + * 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" + +typedef struct TPMPPI { + MemoryRegion mmio; + + uint8_t ram[TPM_PPI_ADDR_SIZE]; +} TPMPPI; + +void tpm_ppi_init_io(TPMPPI *tpmppi, Object *obj); + +#endif /* TPM_TPM_PPI_H */ diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c index 561384c..f980972 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) @@ -1050,6 +1053,8 @@ static void tpm_tis_initfn(Object *obj) memory_region_init_io(&s->mmio, OBJECT(s), &tpm_tis_memory_ops, s, "tpm-tis-mmio", TPM_TIS_NUM_LOCALITIES << TPM_TIS_LOCALITY_SHIFT); + + tpm_ppi_init_io(&s->ppi, obj); } static void tpm_tis_class_init(ObjectClass *klass, void *data) diff --git a/include/hw/acpi/tpm.h b/include/hw/acpi/tpm.h index 6d516c6..d9b7452 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 0x100 +#define TPM_PPI_ADDR_BASE 0xffff0000 + #endif /* HW_ACPI_TPM_H */