From nobody Fri May 3 09:34:55 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1679404980; cv=none; d=zohomail.com; s=zohoarc; b=RkdGSiCmtaqs/IlnTJ9vZzjMge6kjSgLj1R1YygG0HR9GQLznqqf5HP+yUO5ISYW1vCT1z0HJSyCsSZ7aw6fadwZxmfy4DmJJu/h2D8E0XbKyPc/A93bnx1hAKDL8JKJ2Cs3q0VzyYqhjKxtJouG08jBfod9Qan7T1eQspxF/uU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679404980; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mrfvKJJmC9Db3P2xdSxxlZkt+/sU0sw80Ip+G8Vsbpg=; b=g/qbBurwYJBLmSE9jyXyS9YSxJ7LS4kJblu7M18dloel26qL9vhnaDO/gQwWO9v82SXIyrz2TsWEgxGiA62X/jZnM4gRk3zKmsJAPQ8tAYFmXwJYXpK8yfwB4VM3JDajhK1etd6UUfRg7v60T1hCO+LM8NVu5/O+f45IZlr0VNU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1679404980177139.07734832461574; Tue, 21 Mar 2023 06:23:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pebwz-0003zE-Nx; Tue, 21 Mar 2023 09:22:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1peUZr-0001sR-OZ for qemu-devel@nongnu.org; Tue, 21 Mar 2023 01:30:38 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1peUZp-0008Lz-4a for qemu-devel@nongnu.org; Tue, 21 Mar 2023 01:30:31 -0400 Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 32L3srMN016905; Tue, 21 Mar 2023 05:30:14 GMT Received: from ppma04wdc.us.ibm.com (1a.90.2fa9.ip4.static.sl-reverse.com [169.47.144.26]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3pf53csk9r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 21 Mar 2023 05:30:14 +0000 Received: from pps.filterd (ppma04wdc.us.ibm.com [127.0.0.1]) by ppma04wdc.us.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 32L2eLlh001582; Tue, 21 Mar 2023 05:30:12 GMT Received: from smtprelay05.wdc07v.mail.ibm.com ([9.208.129.117]) by ppma04wdc.us.ibm.com (PPS) with ESMTPS id 3pd4x70u2x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 21 Mar 2023 05:30:12 +0000 Received: from smtpav01.dal12v.mail.ibm.com (smtpav01.dal12v.mail.ibm.com [10.241.53.100]) by smtprelay05.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 32L5UAfc15663776 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 21 Mar 2023 05:30:11 GMT Received: from smtpav01.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CF2D958073; Tue, 21 Mar 2023 05:30:10 +0000 (GMT) Received: from smtpav01.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C01D058061; Tue, 21 Mar 2023 05:30:10 +0000 (GMT) Received: from gfwa601.aus.stglabs.ibm.com (unknown [9.3.62.226]) by smtpav01.dal12v.mail.ibm.com (Postfix) with ESMTPS; Tue, 21 Mar 2023 05:30:10 +0000 (GMT) Received: by gfwa601.aus.stglabs.ibm.com (Postfix, from userid 155676) id 4949C2E5673; Tue, 21 Mar 2023 00:30:10 -0500 (CDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=mrfvKJJmC9Db3P2xdSxxlZkt+/sU0sw80Ip+G8Vsbpg=; b=KN5RHVEQv8AwjL8iUUJEaRCYPA6zaKOI5GTUeiyfM4BIf/SxhwB/URlZPLEq25NcUVZr 1Z4F/prHcJn9yVI/zK3QWLSOhlgpcqnPEB1VrmynTaic/yZpp1AzORuD5iEoVjY6OftS C48RLev3YeVNIJ7euWpW+07hd0qZ4ghaMgPNRhMICbFsCfqg66qCmhbfFvKibXwjEaZW Criq4MG/mbvTMEmGQMmBMgIcELKc3Ce7kbWU/avFjmiQeOlABJ2LwL8ECiG3R2LUbnhx UkqvCkWg6JTvI90YR5UoIeYcIIpvMrc36QsEOv7JLeg2pemgc0O56paNilezCKOXbhP8 Jw== From: Ninad Palsule To: qemu-devel@nongnu.org Cc: Ninad Palsule , joel@jms.id.au, andrew@aj.id.au, stefanb@linux.ibm.com, clg@kaod.org Subject: [PATCH 1/3] Add support for TPM devices over I2C bus Date: Tue, 21 Mar 2023 00:29:59 -0500 Message-Id: <20230321053001.3886666-2-ninad@linux.ibm.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230321053001.3886666-1-ninad@linux.ibm.com> References: <20230321053001.3886666-1-ninad@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-GUID: UQ4YrOFzKsacz9MlZV4DhCl-3HJIZ_qi X-Proofpoint-ORIG-GUID: UQ4YrOFzKsacz9MlZV4DhCl-3HJIZ_qi X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-21_02,2023-03-20_02,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 clxscore=1015 malwarescore=0 mlxscore=0 suspectscore=0 impostorscore=0 bulkscore=0 adultscore=0 spamscore=0 mlxlogscore=899 lowpriorityscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303150002 definitions=main-2303210036 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=148.163.156.1; envelope-from=ninad@us.ibm.com; helo=mx0a-001b2d01.pphosted.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Tue, 21 Mar 2023 09:22:50 -0400 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ibm.com) X-ZM-MESSAGEID: 1679404981070100007 Content-Type: text/plain; charset="utf-8" This is a documentation change for I2C TPM device support. Qemu already supports devices attached to ISA and sysbus. This drop adds support for the I2C bus attached TPM devices. Signed-off-by: Ninad Palsule --- docs/specs/tpm.rst | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/specs/tpm.rst b/docs/specs/tpm.rst index 535912a92b..79a79f0640 100644 --- a/docs/specs/tpm.rst +++ b/docs/specs/tpm.rst @@ -21,11 +21,14 @@ QEMU files related to TPM TIS interface: - ``hw/tpm/tpm_tis_common.c`` - ``hw/tpm/tpm_tis_isa.c`` - ``hw/tpm/tpm_tis_sysbus.c`` + - ``hw/tpm/tpm_tis_i2c.c`` - ``hw/tpm/tpm_tis.h`` =20 Both an ISA device and a sysbus device are available. The former is used with pc/q35 machine while the latter can be instantiated in the -Arm virt machine. +Arm virt machine. An I2C device support is also added which can be +instantiated in the arm based emulation machine. I2C model only supports +TPM2 protocol. =20 CRB interface ------------- --=20 2.37.2 From nobody Fri May 3 09:34:55 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1679404992; cv=none; d=zohomail.com; s=zohoarc; b=Yjl1s/TvB+ksNdegqXzIM1Z4CJPq0sF+Besmks3dT869u2lv4xsGZ2AF+3Ekh0LO0vBMUpRpfVYzCtDoeMDVzkNjKwr9nX7g/mgRsje7LGAUpLRiMvcuXi3TNJL9pe4dN4TK145UbjyJUcpihAt2NJVLBHHOXyXSxRuMP186DP8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679404992; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=C1AZ4wfwgVOwqpFlw7CaI4DSaQgxPLiqvNjBQvEQ4v8=; b=I00mnL/QUvfmphKZUD4taPEY4qsIg/8cfTnNTnP6Amx8Fx1z6UZ496E4Krr2oufXnYB6KBaq8j1gyA58da3EWThIDDqLtipmX82wYHLPsiRronP9b8K1HvIDlqAX9K2oROJa2cBrlICphibqeyfGMVWmENXe5zbn+DWpdZAML3w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 167940499237088.6133395856665; Tue, 21 Mar 2023 06:23:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pebwz-0003zD-6a; Tue, 21 Mar 2023 09:22:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1peUZr-0001sS-OZ for qemu-devel@nongnu.org; Tue, 21 Mar 2023 01:30:38 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5] helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1peUZp-0008MD-Td for qemu-devel@nongnu.org; Tue, 21 Mar 2023 01:30:31 -0400 Received: from pps.filterd (m0098419.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 32L4shpX029106; Tue, 21 Mar 2023 05:30:14 GMT Received: from ppma01dal.us.ibm.com (83.d6.3fa9.ip4.static.sl-reverse.com [169.63.214.131]) by mx0b-001b2d01.pphosted.com (PPS) with ESMTPS id 3pf5yj8kvb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 21 Mar 2023 05:30:14 +0000 Received: from pps.filterd (ppma01dal.us.ibm.com [127.0.0.1]) by ppma01dal.us.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 32L4KckP011261; Tue, 21 Mar 2023 05:30:13 GMT Received: from smtprelay05.dal12v.mail.ibm.com ([9.208.130.101]) by ppma01dal.us.ibm.com (PPS) with ESMTPS id 3pd4x7cypq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 21 Mar 2023 05:30:13 +0000 Received: from smtpav04.wdc07v.mail.ibm.com (smtpav04.wdc07v.mail.ibm.com [10.39.53.231]) by smtprelay05.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 32L5UBx51639098 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 21 Mar 2023 05:30:11 GMT Received: from smtpav04.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 12A5C58056; Tue, 21 Mar 2023 05:30:11 +0000 (GMT) Received: from smtpav04.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id F1A8058062; Tue, 21 Mar 2023 05:30:10 +0000 (GMT) Received: from gfwa601.aus.stglabs.ibm.com (unknown [9.3.62.226]) by smtpav04.wdc07v.mail.ibm.com (Postfix) with ESMTPS; Tue, 21 Mar 2023 05:30:10 +0000 (GMT) Received: by gfwa601.aus.stglabs.ibm.com (Postfix, from userid 155676) id 4F76A2E5675; Tue, 21 Mar 2023 00:30:10 -0500 (CDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=C1AZ4wfwgVOwqpFlw7CaI4DSaQgxPLiqvNjBQvEQ4v8=; b=LNYAKp7fCo6mEMU19/sL6YzAuxcVvny2GToadr9OLQpgZlP+6sfenW9GNbZdTmJgfg8P 5w6MPV74v9vOggaGUFgaiaHNN/7S+dMH5deC1Z7VleIuXxWNrkyLoDfqYZ4HZCVvp7E4 ptxjsmFotPPlTMapkSJeR0T2ngASPfHqg0nyxNeuTi/REPbrFEqIZQzztGcH1EhXBPbK dli6tkMLB9DQMyqrEc/uI032swxm6ys9AzkcNjaIG1STuzvwnNvintYIwbY0f8s6CFO3 4kHuhpAwylgfJJwIKR9yP88COxQu1esPcUa0OosLn84LjptywPjAPpAcSQkySJTa4/Q+ vw== From: Ninad Palsule To: qemu-devel@nongnu.org Cc: Ninad Palsule , joel@jms.id.au, andrew@aj.id.au, stefanb@linux.ibm.com, clg@kaod.org Subject: [PATCH 2/3] Add support for TPM devices over I2C bus Date: Tue, 21 Mar 2023 00:30:00 -0500 Message-Id: <20230321053001.3886666-3-ninad@linux.ibm.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230321053001.3886666-1-ninad@linux.ibm.com> References: <20230321053001.3886666-1-ninad@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-GUID: HxDJXvv40n1tiG4X2jHIDT79mFm_kd6d X-Proofpoint-ORIG-GUID: HxDJXvv40n1tiG4X2jHIDT79mFm_kd6d X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-21_02,2023-03-20_02,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 bulkscore=0 mlxscore=0 spamscore=0 priorityscore=1501 suspectscore=0 phishscore=0 clxscore=1015 malwarescore=0 adultscore=0 impostorscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303150002 definitions=main-2303210040 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=148.163.158.5; envelope-from=ninad@us.ibm.com; helo=mx0a-001b2d01.pphosted.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Tue, 21 Mar 2023 09:22:50 -0400 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ibm.com) X-ZM-MESSAGEID: 1679404993088100003 Content-Type: text/plain; charset="utf-8" Qemu already supports devices attached to ISA and sysbus. This drop adds support for the I2C bus attached TPM devices. This commit includes changes for the common code. - Added support for the new checksum registers which are required for the I2C support. The checksum calculation is handled in the qemu common code. - Added wrapper function for read and write data so that I2C code can call it without MMIO interface. Signed-off-by: Ninad Palsule --- hw/tpm/tpm_tis.h | 2 ++ hw/tpm/tpm_tis_common.c | 33 +++++++++++++++++++++++++++++++++ include/hw/acpi/tpm.h | 2 ++ 3 files changed, 37 insertions(+) diff --git a/hw/tpm/tpm_tis.h b/hw/tpm/tpm_tis.h index f6b5872ba6..16b7baddd8 100644 --- a/hw/tpm/tpm_tis.h +++ b/hw/tpm/tpm_tis.h @@ -86,5 +86,7 @@ int tpm_tis_pre_save(TPMState *s); void tpm_tis_reset(TPMState *s); enum TPMVersion tpm_tis_get_tpm_version(TPMState *s); void tpm_tis_request_completed(TPMState *s, int ret); +uint32_t tpm_tis_read_data(TPMState *s, hwaddr addr, unsigned size); +void tpm_tis_write_data(TPMState *s, hwaddr addr, uint64_t val, uint32_t s= ize); =20 #endif /* TPM_TPM_TIS_H */ diff --git a/hw/tpm/tpm_tis_common.c b/hw/tpm/tpm_tis_common.c index 503be2a541..3c82f63179 100644 --- a/hw/tpm/tpm_tis_common.c +++ b/hw/tpm/tpm_tis_common.c @@ -26,6 +26,8 @@ #include "hw/irq.h" #include "hw/isa/isa.h" #include "qapi/error.h" +#include "qemu/bswap.h" +#include "qemu/crc-ccitt.h" #include "qemu/module.h" =20 #include "hw/acpi/tpm.h" @@ -422,6 +424,9 @@ static uint64_t tpm_tis_mmio_read(void *opaque, hwaddr = addr, shift =3D 0; /* no more adjustments */ } break; + case TPM_TIS_REG_DATA_CSUM_GET: + val =3D bswap16(crc_ccitt(0, s->buffer, s->rw_offset)); + break; case TPM_TIS_REG_INTERFACE_ID: val =3D s->loc[locty].iface_id; break; @@ -447,6 +452,15 @@ static uint64_t tpm_tis_mmio_read(void *opaque, hwaddr= addr, return val; } =20 +/* + * A wrapper read function so that it can be directly called without + * mmio. + */ +uint32_t tpm_tis_read_data(TPMState *s, hwaddr addr, unsigned size) +{ + return tpm_tis_mmio_read(s, addr, size); +} + /* * Write a value to a register of the TIS interface * See specs pages 33-63 for description of the registers @@ -600,6 +614,15 @@ static void tpm_tis_mmio_write(void *opaque, hwaddr ad= dr, case TPM_TIS_REG_INT_VECTOR: /* hard wired -- ignore */ break; + case TPM_TIS_REG_DATA_CSUM_ENABLE: + /* + * Checksum implemented by common code so no need to set + * any flags. + */ + break; + case TPM_TIS_REG_DATA_CSUM_GET: + /* This is readonly register so ignore */ + break; case TPM_TIS_REG_INT_STATUS: if (s->active_locty !=3D locty) { break; @@ -703,6 +726,7 @@ static void tpm_tis_mmio_write(void *opaque, hwaddr add= r, break; case TPM_TIS_REG_DATA_FIFO: case TPM_TIS_REG_DATA_XFIFO ... TPM_TIS_REG_DATA_XFIFO_END: + /* data fifo */ if (s->active_locty !=3D locty) { break; @@ -767,6 +791,15 @@ static void tpm_tis_mmio_write(void *opaque, hwaddr ad= dr, } } =20 +/* + * A wrapper write function so that it can be directly called without + * mmio. + */ +void tpm_tis_write_data(TPMState *s, hwaddr addr, uint64_t val, uint32_t s= ize) +{ + tpm_tis_mmio_write(s, addr, val, size); +} + const MemoryRegionOps tpm_tis_memory_ops =3D { .read =3D tpm_tis_mmio_read, .write =3D tpm_tis_mmio_write, diff --git a/include/hw/acpi/tpm.h b/include/hw/acpi/tpm.h index 559ba6906c..db12c002f4 100644 --- a/include/hw/acpi/tpm.h +++ b/include/hw/acpi/tpm.h @@ -40,6 +40,8 @@ #define TPM_TIS_REG_STS 0x18 #define TPM_TIS_REG_DATA_FIFO 0x24 #define TPM_TIS_REG_INTERFACE_ID 0x30 +#define TPM_TIS_REG_DATA_CSUM_ENABLE 0x40 +#define TPM_TIS_REG_DATA_CSUM_GET 0x44 #define TPM_TIS_REG_DATA_XFIFO 0x80 #define TPM_TIS_REG_DATA_XFIFO_END 0xbc #define TPM_TIS_REG_DID_VID 0xf00 --=20 2.37.2 From nobody Fri May 3 09:34:55 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1679405067; cv=none; d=zohomail.com; s=zohoarc; b=ArxaMArDn7ZwpSwUqDbt6tRx3DOM+vPBTPqZHT6ENJAUP/Zm0woFuJkqSTPKl34eCiIMyvzOZ6hD99spOhOYDnY1VxHOBRTZYcXJ+Nxhws7aIftx0SRuttfNth1JPo13sZgxlx/PmJtMLVLI+Dc23Tn3LWqpJ86d6uL6AALA0zo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679405067; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3inndFLitPrTAnA9reixPsFapWN29C/9St3NOC2msXY=; b=PLAhyFTlntV/QuAJfHuYEC9oWC9q21I7EzL1gvqRSjlf6oUANP7CO5BPA3AVO/XrGQcxcVW6rV9zHDYpn2zJG3z6izgqTUaGHhDYLIAuGZXn09ME+ojRY4i1hsscsHI00Q2SE3OiNzOI8AeVJAf//jvZK5V3nazVvrJnpQzz2vs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1679405067130701.9584298969066; Tue, 21 Mar 2023 06:24:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pebx1-00044v-2Q; Tue, 21 Mar 2023 09:22:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1peUZs-0001sT-1h for qemu-devel@nongnu.org; Tue, 21 Mar 2023 01:30:38 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1peUZp-0008MK-A8 for qemu-devel@nongnu.org; Tue, 21 Mar 2023 01:30:31 -0400 Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 32L3smEl016812; Tue, 21 Mar 2023 05:30:13 GMT Received: from ppma04dal.us.ibm.com (7a.29.35a9.ip4.static.sl-reverse.com [169.53.41.122]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3pf53csk9k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 21 Mar 2023 05:30:13 +0000 Received: from pps.filterd (ppma04dal.us.ibm.com [127.0.0.1]) by ppma04dal.us.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 32L2ZGZZ014726; Tue, 21 Mar 2023 05:30:12 GMT Received: from smtprelay06.dal12v.mail.ibm.com ([9.208.130.100]) by ppma04dal.us.ibm.com (PPS) with ESMTPS id 3pd4x74wmc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 21 Mar 2023 05:30:12 +0000 Received: from smtpav03.dal12v.mail.ibm.com (smtpav03.dal12v.mail.ibm.com [10.241.53.102]) by smtprelay06.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 32L5UAjd10093200 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 21 Mar 2023 05:30:11 GMT Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D41DA5803F; Tue, 21 Mar 2023 05:30:10 +0000 (GMT) Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C6CA658060; Tue, 21 Mar 2023 05:30:10 +0000 (GMT) Received: from gfwa601.aus.stglabs.ibm.com (unknown [9.3.62.226]) by smtpav03.dal12v.mail.ibm.com (Postfix) with ESMTPS; Tue, 21 Mar 2023 05:30:10 +0000 (GMT) Received: by gfwa601.aus.stglabs.ibm.com (Postfix, from userid 155676) id 640322E5677; Tue, 21 Mar 2023 00:30:10 -0500 (CDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : mime-version; s=pp1; bh=3inndFLitPrTAnA9reixPsFapWN29C/9St3NOC2msXY=; b=XFiGaQ1ODupuspjWL5jDMPFXgtiqKenBht/XAZKSHt8UvoxVgNe/uqfSW5m1GhfU+X6M ihAWFDETc4PKxiBlHYn+X26m3YAnoGnGcCz0hHFvztL4ehdW1fQdYnI1P/ydzdaplT6K B1Cwogl57G4j54xHYtPH5B7ft80SCOSlzf05mLfUCOMvApOc1Y3kKYgmNAbJN0ah9SQL w5p74k3D9kboN6gHsDyRsGtiao0xVAppUmB3IyUh+fxyU1DY3gncnTpJOMf5/9ogKDz6 wjnPFkNf8G9iBRmP+avGEa+VmhaOhufON+mvDLILb8wWxpuEPzR5yvv8M9Om6fEEMqgl Aw== From: Ninad Palsule To: qemu-devel@nongnu.org Cc: Ninad Palsule , joel@jms.id.au, andrew@aj.id.au, stefanb@linux.ibm.com, clg@kaod.org Subject: [PATCH 3/3] Add support for TPM devices over I2C bus Date: Tue, 21 Mar 2023 00:30:01 -0500 Message-Id: <20230321053001.3886666-4-ninad@linux.ibm.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230321053001.3886666-1-ninad@linux.ibm.com> References: <20230321053001.3886666-1-ninad@linux.ibm.com> X-TM-AS-GCONF: 00 X-Proofpoint-GUID: Gyi8tmk1MVk6Mm6tE5vE9zmfI_RJn_Vf X-Proofpoint-ORIG-GUID: Gyi8tmk1MVk6Mm6tE5vE9zmfI_RJn_Vf Content-Transfer-Encoding: quoted-printable X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-21_02,2023-03-20_02,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 clxscore=1015 malwarescore=0 mlxscore=0 suspectscore=0 impostorscore=0 bulkscore=0 adultscore=0 spamscore=0 mlxlogscore=999 lowpriorityscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303150002 definitions=main-2303210036 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=148.163.156.1; envelope-from=ninad@us.ibm.com; helo=mx0a-001b2d01.pphosted.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Tue, 21 Mar 2023 09:22:50 -0400 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ibm.com) X-ZM-MESSAGEID: 1679405067621100003 Content-Type: text/plain; charset="utf-8" Qemu already supports devices attached to ISA and sysbus. This drop adds support for the I2C bus attached TPM devices. I2C model only supports TPM2 protocol. This commit includes changes for the common code. - Added I2C emulation model. Logic was added in the model to temporarily cache the data as I2C interface works per byte basis. - New tpm type "tpm-tis-i2c" added for I2C support. User specify this string on command line. Testing: TPM I2C device modulte is tested using SWTPM (software based TPM package). The qemu used the rainier machine and it was connected to swtpm over the socket interface. The command to start swtpm is as follows: $ swtpm socket --tpmstate dir=3D/tmp/mytpm1 \ --ctrl type=3Dunixio,path=3D/tmp/mytpm1/swtpm-sock \ --tpm2 --log level=3D100 The command to start qemu is as follows: $ qemu-system-arm -M rainier-bmc -nographic \ -kernel ${IMAGEPATH}/fitImage-linux.bin \ -dtb ${IMAGEPATH}/aspeed-bmc-ibm-rainier.dtb \ -initrd ${IMAGEPATH}/obmc-phosphor-initramfs.rootfs.cpio.xz \ -drive file=3D${IMAGEPATH}/obmc-phosphor-image.rootfs.wic.qcow2= ,if=3Dsd,index=3D2 \ -net nic -net user,hostfwd=3D:127.0.0.1:2222-:22,hostfwd=3D:127= .0.0.1:2443-:443 \ -chardev socket,id=3Dchrtpm,path=3D/tmp/mytpm1/swtpm-sock \ -tpmdev emulator,id=3Dtpm0,chardev=3Dchrtpm \ -device tpm-tis-i2c,tpmdev=3Dtpm0,bus=3Daspeed.i2c.bus.12,addre= ss=3D0x2e Note: Currently you need to specify the I2C bus and device address on command line. In future we can add a device at board level. Signed-off-by: Ninad Palsule --- hw/tpm/meson.build | 1 + hw/tpm/tpm_tis_i2c.c | 342 +++++++++++++++++++++++++++++++++++++++++++ include/sysemu/tpm.h | 3 + 3 files changed, 346 insertions(+) create mode 100644 hw/tpm/tpm_tis_i2c.c diff --git a/hw/tpm/meson.build b/hw/tpm/meson.build index 7abc2d794a..76fe3cb098 100644 --- a/hw/tpm/meson.build +++ b/hw/tpm/meson.build @@ -1,6 +1,7 @@ softmmu_ss.add(when: 'CONFIG_TPM_TIS', if_true: files('tpm_tis_common.c')) softmmu_ss.add(when: 'CONFIG_TPM_TIS_ISA', if_true: files('tpm_tis_isa.c')) softmmu_ss.add(when: 'CONFIG_TPM_TIS_SYSBUS', if_true: files('tpm_tis_sysb= us.c')) +softmmu_ss.add(when: 'CONFIG_TPM_TIS_I2C', if_true: files('tpm_tis_i2c.c')) softmmu_ss.add(when: 'CONFIG_TPM_CRB', if_true: files('tpm_crb.c')) softmmu_ss.add(when: 'CONFIG_TPM_TIS', if_true: files('tpm_ppi.c')) softmmu_ss.add(when: 'CONFIG_TPM_CRB', if_true: files('tpm_ppi.c')) diff --git a/hw/tpm/tpm_tis_i2c.c b/hw/tpm/tpm_tis_i2c.c new file mode 100644 index 0000000000..3c45af4140 --- /dev/null +++ b/hw/tpm/tpm_tis_i2c.c @@ -0,0 +1,342 @@ +/* + * tpm_tis_i2c.c - QEMU's TPM TIS I2C Device + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + * + * Implementation of the TIS interface according to specs found at + * http://www.trustedcomputinggroup.org. This implementation currently + * supports version 1.3, 21 March 2013 + * In the developers menu choose the PC Client section then find the TIS + * specification. + * + * TPM TIS for TPM 2 implementation following TCG PC Client Platform + * TPM Profile (PTP) Specification, Familiy 2.0, Revision 00.43 + */ + +#include "qemu/osdep.h" +#include "hw/i2c/i2c.h" +#include "hw/qdev-properties.h" +#include "hw/acpi/tpm.h" +#include "migration/vmstate.h" +#include "tpm_prop.h" +#include "tpm_tis.h" +#include "qom/object.h" +#include "block/aio.h" +#include "qemu/main-loop.h" + +/* TPM TIS I2C registers */ +#define TPM_TIS_I2C_REG_LOC_SEL 0x00 +#define TPM_TIS_I2C_REG_ACCESS 0x04 +#define TPM_TIS_I2C_REG_INT_ENABLE 0x08 +#define TPM_TIS_I2C_REG_INT_CAPABILITY 0x14 +#define TPM_TIS_I2C_REG_STS 0x18 +#define TPM_TIS_I2C_REG_DATA_FIFO 0x24 +#define TPM_TIS_I2C_REG_INTF_CAPABILITY 0x30 +#define TPM_TIS_I2C_REG_DATA_CSUM_ENABLE 0x40 +#define TPM_TIS_I2C_REG_DATA_CSUM_GET 0x44 +#define TPM_TIS_I2C_REG_DID_VID 0x48 +#define TPM_TIS_I2C_REG_RID 0x4c +#define TPM_TIS_I2C_REG_UNKNOWN 0xff + +/* Operations */ +#define OP_SEND 1 +#define OP_RECV 2 + +typedef struct TPMStateI2C { + /*< private >*/ + I2CSlave parent_obj; + + int offset; /* offset in to data[] */ + int size; /* Size of the current reg data */ + uint8_t operation; /* OP_SEND & OP_RECV */ + uint8_t data[4096]; /* Data */ + + /*< public >*/ + TPMState state; /* not a QOM object */ + +} TPMStateI2C; + +DECLARE_INSTANCE_CHECKER(TPMStateI2C, TPM_TIS_I2C, + TYPE_TPM_TIS_I2C) + +static const VMStateDescription vmstate_tpm_tis_i2c =3D { + .name =3D "tpm", + .unmigratable =3D 1, +}; + +/* Register map */ +typedef struct reg_map { + uint16_t i2c_reg; /* I2C register */ + uint16_t tis_reg; /* TIS register */ + uint32_t data_size; /* data size expected */ +} i2c_reg_map; + +#define TPM_I2C_MAP_COUNT 11 + +/* + * The register values in the common code is different than the latest + * register numbers as per the spec hence add the conversion map + */ +i2c_reg_map tpm_tis_reg_map[] =3D { + { TPM_TIS_I2C_REG_LOC_SEL, TPM_TIS_REG_ACCESS, 1, }, + { TPM_TIS_I2C_REG_ACCESS, TPM_TIS_REG_ACCESS, 1, }, + { TPM_TIS_I2C_REG_INT_ENABLE, TPM_TIS_REG_INT_ENABLE, 4, }, + { TPM_TIS_I2C_REG_INT_CAPABILITY, TPM_TIS_REG_INT_VECTOR, 4, }, + { TPM_TIS_I2C_REG_STS, TPM_TIS_REG_STS, 4, }, + { TPM_TIS_I2C_REG_DATA_FIFO, TPM_TIS_REG_DATA_FIFO, 0, }, + { TPM_TIS_I2C_REG_INTF_CAPABILITY, TPM_TIS_REG_INTF_CAPABILITY, 4, }, + { TPM_TIS_I2C_REG_DATA_CSUM_ENABLE, TPM_TIS_REG_DATA_CSUM_ENABLE, 1, }, + { TPM_TIS_I2C_REG_DATA_CSUM_GET, TPM_TIS_REG_DATA_CSUM_GET, 2, }, + { TPM_TIS_I2C_REG_DID_VID, TPM_TIS_REG_DID_VID, 4, }, + { TPM_TIS_I2C_REG_RID, TPM_TIS_REG_RID, 1, }, +}; + +static inline uint16_t tpm_tis_i2c_to_tis_reg(uint64_t i2c_reg, int *size) +{ + uint16_t tis_reg =3D TPM_TIS_I2C_REG_UNKNOWN; + i2c_reg_map *reg_map; + int i; + + for (i =3D 0; i < TPM_I2C_MAP_COUNT; i++) { + reg_map =3D &tpm_tis_reg_map[i]; + if (reg_map->i2c_reg =3D=3D i2c_reg) { + tis_reg =3D reg_map->tis_reg; + *size =3D reg_map->data_size; + break; + } + } + + assert(tis_reg !=3D TPM_TIS_I2C_REG_UNKNOWN); + return tis_reg; +} + +/* Initialize the cached data */ +static inline void tpm_tis_i2c_init_cache(TPMStateI2C *i2cst) +{ + /* Clear operation and offset */ + i2cst->operation =3D 0; + i2cst->offset =3D 0; + i2cst->size =3D 0; + + return; +} + +/* Send data to TPM */ +static inline void tpm_tis_i2c_tpm_send(TPMStateI2C *i2cst) +{ + if ((i2cst->operation =3D=3D OP_SEND) && (i2cst->offset > 1)) { + uint16_t tis_reg; + uint32_t data; + int i; + + tis_reg =3D tpm_tis_i2c_to_tis_reg(i2cst->data[0], &i2cst->size); + + /* Index 0 is always a register */ + for (i =3D 1; i < i2cst->offset; i++) { + data =3D (i2cst->data[i] & 0xff); + tpm_tis_write_data(&i2cst->state, tis_reg, data, 1); + } + + tpm_tis_i2c_init_cache(i2cst); + } + + return; +} + +/* Callback from TPM to indicate that response is copied */ +static void tpm_tis_i2c_request_completed(TPMIf *ti, int ret) +{ + TPMStateI2C *i2cst =3D TPM_TIS_I2C(ti); + TPMState *s =3D &i2cst->state; + + /* Inform the common code. */ + tpm_tis_request_completed(s, ret); +} + +static enum TPMVersion tpm_tis_i2c_get_tpm_version(TPMIf *ti) +{ + TPMStateI2C *i2cst =3D TPM_TIS_I2C(ti); + TPMState *s =3D &i2cst->state; + + return tpm_tis_get_tpm_version(s); +} + +static int tpm_tis_i2c_event(I2CSlave *i2c, enum i2c_event event) +{ + TPMStateI2C *i2cst =3D TPM_TIS_I2C(i2c); + int ret =3D 0; + + switch (event) { + case I2C_START_RECV: + break; + case I2C_START_SEND: + tpm_tis_i2c_init_cache(i2cst); + break; + case I2C_FINISH: + if (i2cst->operation =3D=3D OP_SEND) { + tpm_tis_i2c_tpm_send(i2cst); + } else { + tpm_tis_i2c_init_cache(i2cst); + } + break; + default: + break; + } + + return ret; +} + +/* If data is for FIFO then it is received from tpm_tis_common buffer + * otherwise it will be handled using single call to common code and + * cached in the local buffer. + */ +static uint8_t tpm_tis_i2c_recv(I2CSlave *i2c) +{ + int ret =3D 0; + int i, j; + uint32_t addr; + uint32_t data_read; + uint16_t i2c_reg; + TPMStateI2C *i2cst =3D TPM_TIS_I2C(i2c); + TPMState *s =3D &i2cst->state; + + if (i2cst->operation =3D=3D OP_RECV) { + + /* Special handling for FIFO */ + if (i2cst->data[0] =3D=3D TPM_TIS_I2C_REG_DATA_FIFO) { + i2c_reg =3D i2cst->data[0]; + addr =3D tpm_tis_i2c_to_tis_reg(i2c_reg, &i2cst->size); + data_read =3D tpm_tis_read_data(s, addr, 1); + ret =3D (data_read & 0xff); + } else + ret =3D i2cst->data[i2cst->offset++]; + + } else if ((i2cst->operation =3D=3D OP_SEND) && (i2cst->offset < 2)) { + i2c_reg =3D i2cst->data[0]; + + i2cst->operation =3D OP_RECV; + i2cst->offset =3D 0; + + addr =3D tpm_tis_i2c_to_tis_reg(i2c_reg, &i2cst->size); + + /* Special handling for FIFO register */ + if (i2c_reg =3D=3D TPM_TIS_I2C_REG_DATA_FIFO) { + data_read =3D tpm_tis_read_data(s, addr, 1); + ret =3D (data_read & 0xff); + } else { + /* + * Save the data in the data field. Save it in the little + * endian format. + */ + for (i =3D 0; i < i2cst->size;) { + data_read =3D tpm_tis_read_data(s, addr, 4); + for (j =3D 0; j < 4; j++) { + i2cst->data[i++] =3D (data_read & 0xff); + data_read >>=3D 8; + } + } + + /* Return first byte with this call */ + ret =3D i2cst->data[i2cst->offset++]; + } + } else + i2cst->operation =3D OP_RECV; + + return ret; +} + +/* + * Send function only remembers data in the buffer and then calls + * TPM TIS common code during FINISH event. + */ +static int tpm_tis_i2c_send(I2CSlave *i2c, uint8_t data) +{ + TPMStateI2C *i2cst =3D TPM_TIS_I2C(i2c); + + /* Remember data locally */ + i2cst->operation =3D OP_SEND; + i2cst->data[i2cst->offset++] =3D data; + + return 0; +} + +static Property tpm_tis_i2c_properties[] =3D { + DEFINE_PROP_UINT32("irq", TPMStateI2C, state.irq_num, TPM_TIS_IRQ), + DEFINE_PROP_TPMBE("tpmdev", TPMStateI2C, state.be_driver), + DEFINE_PROP_END_OF_LIST(), +}; + +static void tpm_tis_i2c_realizefn(DeviceState *dev, Error **errp) +{ + TPMStateI2C *i2cst =3D TPM_TIS_I2C(dev); + TPMState *s =3D &i2cst->state; + + if (!tpm_find()) { + error_setg(errp, "at most one TPM device is permitted"); + return; + } + + /* Get the backend pointer. It is not initialized propery during + * device_class_set_props + */ + s->be_driver =3D qemu_find_tpm_be("tpm0"); + + if (!s->be_driver) { + error_setg(errp, "'tpmdev' property is required"); + return; + } + if (s->irq_num > 15) { + error_setg(errp, "IRQ %d is outside valid range of 0 to 15", + s->irq_num); + return; + } +} + +static void tpm_tis_i2c_reset(DeviceState *dev) +{ + TPMStateI2C *i2cst =3D TPM_TIS_I2C(dev); + TPMState *s =3D &i2cst->state; + + tpm_tis_i2c_init_cache(i2cst); + + return tpm_tis_reset(s); +} + +static void tpm_tis_i2c_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + I2CSlaveClass *k =3D I2C_SLAVE_CLASS(klass); + TPMIfClass *tc =3D TPM_IF_CLASS(klass); + + dc->realize =3D tpm_tis_i2c_realizefn; + dc->reset =3D tpm_tis_i2c_reset; + dc->vmsd =3D &vmstate_tpm_tis_i2c; + device_class_set_props(dc, tpm_tis_i2c_properties); + + k->event =3D tpm_tis_i2c_event; + k->recv =3D tpm_tis_i2c_recv; + k->send =3D tpm_tis_i2c_send; + + tc->model =3D TPM_MODEL_TPM_TIS; + tc->request_completed =3D tpm_tis_i2c_request_completed; + tc->get_version =3D tpm_tis_i2c_get_tpm_version; +} + +static const TypeInfo tpm_tis_i2c_info =3D { + .name =3D TYPE_TPM_TIS_I2C, + .parent =3D TYPE_I2C_SLAVE, + .instance_size =3D sizeof(TPMStateI2C), + .class_init =3D tpm_tis_i2c_class_init, + .interfaces =3D (InterfaceInfo[]) { + { TYPE_TPM_IF }, + { } + } +}; + +static void tpm_tis_i2c_register_types(void) +{ + type_register_static(&tpm_tis_i2c_info); +} + +type_init(tpm_tis_i2c_register_types) diff --git a/include/sysemu/tpm.h b/include/sysemu/tpm.h index fb40e30ff6..66e3b45f30 100644 --- a/include/sysemu/tpm.h +++ b/include/sysemu/tpm.h @@ -48,6 +48,7 @@ struct TPMIfClass { #define TYPE_TPM_TIS_SYSBUS "tpm-tis-device" #define TYPE_TPM_CRB "tpm-crb" #define TYPE_TPM_SPAPR "tpm-spapr" +#define TYPE_TPM_TIS_I2C "tpm-tis-i2c" =20 #define TPM_IS_TIS_ISA(chr) \ object_dynamic_cast(OBJECT(chr), TYPE_TPM_TIS_ISA) @@ -57,6 +58,8 @@ struct TPMIfClass { object_dynamic_cast(OBJECT(chr), TYPE_TPM_CRB) #define TPM_IS_SPAPR(chr) \ object_dynamic_cast(OBJECT(chr), TYPE_TPM_SPAPR) +#define TPM_IS_TIS_I2C(chr) \ + object_dynamic_cast(OBJECT(chr), TYPE_TPM_TIS_I2C) =20 /* returns NULL unless there is exactly one TPM device */ static inline TPMIf *tpm_find(void) --=20 2.37.2