From patchwork Wed Jan 10 18:35:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Berger X-Patchwork-Id: 10155859 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 1E4CC60231 for ; Wed, 10 Jan 2018 18:36:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 10E7628563 for ; Wed, 10 Jan 2018 18:36:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0562828569; Wed, 10 Jan 2018 18:36:57 +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 0C9BC28563 for ; Wed, 10 Jan 2018 18:36:55 +0000 (UTC) Received: from localhost ([::1]:59259 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZLF9-0006Pv-1O for patchwork-qemu-devel@patchwork.kernel.org; Wed, 10 Jan 2018 13:36:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43522) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZLDu-0005Ig-3g for qemu-devel@nongnu.org; Wed, 10 Jan 2018 13:35:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eZLDq-0000uQ-EH for qemu-devel@nongnu.org; Wed, 10 Jan 2018 13:35:38 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:40846 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eZLDq-0000to-1b for qemu-devel@nongnu.org; Wed, 10 Jan 2018 13:35:34 -0500 Received: from pps.filterd (m0098420.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w0AIYLs6042046 for ; Wed, 10 Jan 2018 13:35:33 -0500 Received: from e37.co.us.ibm.com (e37.co.us.ibm.com [32.97.110.158]) by mx0b-001b2d01.pphosted.com with ESMTP id 2fdny4f3qc-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Wed, 10 Jan 2018 13:35:32 -0500 Received: from localhost by e37.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 10 Jan 2018 11:35:31 -0700 Received: from b03cxnp07029.gho.boulder.ibm.com (9.17.130.16) by e37.co.us.ibm.com (192.168.1.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 10 Jan 2018 11:35:29 -0700 Received: from b03ledav001.gho.boulder.ibm.com (b03ledav001.gho.boulder.ibm.com [9.17.130.232]) by b03cxnp07029.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w0AIZS9B9109990; Wed, 10 Jan 2018 11:35:28 -0700 Received: from b03ledav001.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A407E6E038; Wed, 10 Jan 2018 11:35:28 -0700 (MST) Received: from sbct-3.watson.ibm.com (unknown [9.47.158.153]) by b03ledav001.gho.boulder.ibm.com (Postfix) with ESMTP id 185CF6E04A; Wed, 10 Jan 2018 11:35:28 -0700 (MST) From: Stefan Berger To: qemu-devel@nongnu.org Date: Wed, 10 Jan 2018 13:35:18 -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-0024-0000-0000-000017C5C74B 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:30 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18011018-0025-0000-0000-00004E3C6BDD Message-Id: <1515609318-1897-4-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=1015 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.158.5 Subject: [Qemu-devel] [RFC PATCH 3/3] acpi: Build TPM Physical Presence interface 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 The TPM Physical Presence interface consists of an ACPI part, a shared memory part, and code in the firmware. Users can send messages to the firmware by writing a code into the shared memory through invoking the ACPI code. When a reboot happens, the firmware looks for the code and acts on it by sending sequences of commands to the TPM. This patch adds the ACPI code. It is similar to the one in EDK2 but doesn't assume that SMIs are necessary to use. Besides that it tests the code entered by the user and checks whether it is supported. The range of codes supported matches the range of codes supported in SeaBIOS. It uses the same datastructure for the shared memory as EDK2 does so that EDK2 and SeaBIOS could both make use of the shared memory. The underlying TCG specification is accessible from the following page. https://trustedcomputinggroup.org/tcg-physical-presence-interface-specification/ This patch implements version 1.20. Signed-off-by: Stefan Berger --- hw/i386/acpi-build.c | 227 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/hw/acpi/tpm.h | 15 ++++ 2 files changed, 242 insertions(+) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 18b939e..e3905a3 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -42,6 +42,7 @@ #include "hw/acpi/memory_hotplug.h" #include "sysemu/tpm.h" #include "hw/acpi/tpm.h" +#include "hw/tpm/tpm_ppi.h" #include "hw/acpi/vmgenid.h" #include "sysemu/tpm_backend.h" #include "hw/timer/mc146818rtc_regs.h" @@ -1860,6 +1861,231 @@ static Aml *build_q35_osc_method(void) } static void +build_tpm_ppi(Aml *dev, TPMVersion tpm_version) +{ + Aml *method, *field, *ifctx, *ifctx2, *ifctx3, *pak; + + aml_append(dev, + aml_operation_region("TPPI", AML_SYSTEM_MEMORY, + aml_int(TPM_PPI_ADDR_BASE), + TPM_PPI_STRUCT_SIZE)); + + field = aml_field("TPPI", AML_ANY_ACC, AML_NOLOCK, AML_PRESERVE); + aml_append(field, aml_named_field("PPIN", + sizeof(uint8_t) * BITS_PER_BYTE)); + aml_append(field, aml_named_field("PPIP", + sizeof(uint32_t) * BITS_PER_BYTE)); + aml_append(field, aml_named_field("PPRP", + sizeof(uint32_t) * BITS_PER_BYTE)); + aml_append(field, aml_named_field("PPRQ", + sizeof(uint32_t) * BITS_PER_BYTE)); + aml_append(field, aml_named_field("PPRM", + sizeof(uint32_t) * BITS_PER_BYTE)); + aml_append(field, aml_named_field("LPPR", + sizeof(uint32_t) * BITS_PER_BYTE)); + aml_append(field, aml_named_field("FRET", + sizeof(uint32_t) * BITS_PER_BYTE)); + aml_append(field, aml_named_field("RES1", + sizeof(uint8_t) * BITS_PER_BYTE)); + aml_append(field, aml_named_field("RES2", + sizeof(uint32_t) * BITS_PER_BYTE * 4)); + aml_append(field, aml_named_field("FAIL", + sizeof(uint32_t) * BITS_PER_BYTE)); + aml_append(dev, field); + + /* + * Write the given operations code into 'PPRQ'. + */ + method = aml_method("WRAM", 2, AML_SERIALIZED); + { + aml_append(method, aml_store(aml_arg(0), aml_name("PPRQ"))); + aml_append(method, aml_store(aml_arg(1), aml_name("PPRM"))); + /* 0 = Success */ + aml_append(method, aml_return(aml_int(0))); + } + aml_append(dev, method); + + /* + * CKOP: Check whether the opcode is valid + */ + if (tpm_version == TPM_VERSION_1_2) { + method = aml_method("CKOP", 1, AML_NOTSERIALIZED); + { + ifctx = aml_if( + aml_or( + aml_or( + aml_and( + aml_lgreater_equal(aml_arg(0), aml_int(0)), + aml_lless_equal(aml_arg(0), aml_int(11)), + NULL + ), + aml_equal(aml_arg(0), aml_int(14)), + NULL + ), + aml_and( + aml_lgreater_equal(aml_arg(0), aml_int(21)), + aml_lless_equal(aml_arg(0), aml_int(22)), + NULL + ), + NULL + ) + ); + { + aml_append(ifctx, aml_return(aml_int(1))); + } + aml_append(method, ifctx); + + aml_append(method, aml_return(aml_int(0))); + } + } else { + method = aml_method("CKOP", 1, AML_NOTSERIALIZED); + { + ifctx = aml_if( + aml_equal(aml_arg(0), aml_int(0)) + ); + { + aml_append(ifctx, aml_return(aml_int(1))); + } + aml_append(method, ifctx); + + aml_append(method, aml_return(aml_int(0))); + } + } + aml_append(dev, method); + + method = aml_method("_DSM", 4, AML_SERIALIZED); + { + uint8_t zerobyte[1] = { 0 }; + + ifctx = aml_if( + aml_equal(aml_arg(0), + aml_touuid("3DDDFAA6-361B-4EB4-A424-8D10089D1653")) + ); + { + aml_append(ifctx, + aml_store(aml_to_integer(aml_arg(2)), aml_local(0))); + + /* standard DSM query function */ + ifctx2 = aml_if(aml_equal(aml_local(0), aml_int(0))); + { + uint8_t byte_list[2] = { 0xff, 0x01 }; + aml_append(ifctx2, aml_return(aml_buffer(2, byte_list))); + } + aml_append(ifctx, ifctx2); + + /* interface version: 1.2 */ + ifctx2 = aml_if(aml_equal(aml_local(0), aml_int(1))); + { + aml_append(ifctx2, aml_return(aml_string("1.2"))); + } + aml_append(ifctx, ifctx2); + + /* submit TPM operation */ + ifctx2 = aml_if(aml_equal(aml_local(0), aml_int(2))); + { + aml_append(ifctx2, + aml_store(aml_derefof(aml_index(aml_arg(3), + aml_int(0))), + aml_local(0))); + ifctx3 = aml_if(aml_call1("CKOP", aml_local(0))); + { + aml_append(ifctx3, + aml_return(aml_call2("WRAM", + aml_local(0), + aml_int(0)))); + } + aml_append(ifctx2, ifctx3); + aml_append(ifctx2, aml_return(aml_int(1))); + } + aml_append(ifctx, ifctx2); + + /* get pending TPM operation */ + ifctx2 = aml_if(aml_equal(aml_local(0), aml_int(3))); + { + pak = aml_package(2); + aml_append(pak, aml_int(0)); + aml_append(pak, aml_name("PPRQ")); + aml_append(ifctx2, aml_return(pak)); + } + aml_append(ifctx, ifctx2); + + /* get platform-specific action to transition to pre-OS env. */ + ifctx2 = aml_if(aml_equal(aml_local(0), aml_int(4))); + { + /* 2 = reboot */ + aml_append(ifctx2, aml_return(aml_int(2))); + } + aml_append(ifctx, ifctx2); + + /* get TPM operation response */ + ifctx2 = aml_if(aml_equal(aml_local(0), aml_int(5))); + { + pak = aml_package(3); + + aml_append(pak, aml_name("FAIL")); + aml_append(pak, aml_name("LPPR")); + aml_append(pak, aml_name("PPRP")); + + aml_append(ifctx2, aml_return(pak)); + } + aml_append(ifctx, ifctx2); + + /* submit preferred user language */ + ifctx2 = aml_if(aml_equal(aml_local(0), aml_int(6))); + { + /* 3 = not implemented */ + aml_append(ifctx2, aml_return(aml_int(3))); + } + aml_append(ifctx, ifctx2); + + /* submit TPM operation v2 */ + ifctx2 = aml_if(aml_equal(aml_local(0), aml_int(7))); + { + aml_append(ifctx2, + aml_store(aml_derefof(aml_index(aml_arg(3), + aml_int(0))), + aml_local(0))); + ifctx3 = aml_if(aml_call1("CKOP", aml_local(0))); + { + aml_append(ifctx3, + aml_store(aml_call2("WRAM", + aml_local(0), + aml_int(0)), + aml_local(1))); + aml_append(ifctx3, aml_return(aml_local(1))); + } + aml_append(ifctx2, ifctx3); + /* 1 = requested operation not implemented */ + aml_append(ifctx2, aml_return(aml_int(1))); + } + aml_append(ifctx, ifctx2); + + /* get user confirmation status for operation */ + ifctx2 = aml_if(aml_equal(aml_local(0), aml_int(8))); + { + aml_append(ifctx2, + aml_store(aml_derefof(aml_index(aml_arg(3), + aml_int(0))), + aml_local(0))); + ifctx3 = aml_if(aml_call1("CKOP", aml_local(0))); + { + /* 4 = Allowed and physically present user not required */ + aml_append(ifctx3, aml_return(aml_int(4))); + } + aml_append(ifctx2, ifctx3); + /* 0 = requested operation not implemented */ + aml_append(ifctx2, aml_return(aml_int(0))); + } + aml_append(ifctx, ifctx2); + + aml_append(ifctx, aml_return(aml_buffer(1, zerobyte))); + } + aml_append(method, ifctx); + } + aml_append(dev, method); +} + +static void build_dsdt(GArray *table_data, BIOSLinker *linker, AcpiPmInfo *pm, AcpiMiscInfo *misc, Range *pci_hole, Range *pci_hole64, MachineState *machine) @@ -2218,6 +2444,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, */ /* aml_append(crs, aml_irq_no_flags(TPM_TIS_IRQ)); */ aml_append(dev, aml_name_decl("_CRS", crs)); + build_tpm_ppi(dev, misc->tpm_version); aml_append(scope, dev); } diff --git a/include/hw/acpi/tpm.h b/include/hw/acpi/tpm.h index d9b7452..23f5da1 100644 --- a/include/hw/acpi/tpm.h +++ b/include/hw/acpi/tpm.h @@ -37,4 +37,19 @@ #define TPM_PPI_ADDR_SIZE 0x100 #define TPM_PPI_ADDR_BASE 0xffff0000 +struct tpm_ppi { + uint8_t ppin; /* set by BIOS; currently initialization flag */ + uint32_t ppip; /* set by ACPI; not used */ + uint32_t pprp; /* response from TPM; set by BIOS */ + uint32_t pprq; /* opcode; set by ACPI */ + uint32_t pprm; /* parameter for opcode; set by ACPI */ + uint32_t lppr; /* last opcode; set by BIOS */ + uint32_t fret; /* set by ACPI; not used*/ + uint32_t res1; /* reserved */ + uint32_t res2[4]; /* reserved */ + uint32_t fail; /* set by BIOS (0 = success) */ +} QEMU_PACKED; + +#define TPM_PPI_STRUCT_SIZE sizeof(struct tpm_ppi) + #endif /* HW_ACPI_TPM_H */