From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 69D22C74A5B for ; Mon, 27 Mar 2023 00:15:42 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pgaVn-000660-Aj; Sun, 26 Mar 2023 20:14:59 -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 1pgaVm-00065n-Be for qemu-devel@nongnu.org; Sun, 26 Mar 2023 20:14:58 -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 1pgaVk-0005K8-0X for qemu-devel@nongnu.org; Sun, 26 Mar 2023 20:14:58 -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 32QMHZLt000690; Mon, 27 Mar 2023 00:14:37 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=message-id : date : mime-version : subject : to : cc : references : from : in-reply-to : content-type : content-transfer-encoding; s=pp1; bh=kqKhPi1DxBxXmzal2eL8vWcq/S/6Khl58+OxvoKg2Oo=; b=lXU4rRb9E92C5uDAG6119ND0tdALGJruTSJ+Th41OYxHFdSS5nTkQ5MpBqxGIeHLEuLE XJhuSas6PTHGhSj/Yd6ygf13d/REmXLixXaErRed+lflHu60gusbkv3mYG/z7OBbu/Bc 3c2Jmf3LvOviPAkpdZyVtbgO/83jqsuevjAEui+U2hJzLWEYGzTTeKhqsltVg01kQdYD TbYr+NMAZTR+VAYr4zZZr4+YrTda4niMqOD85YGHQpoKllc8Mt23XAS14kqes1dmBv6T munPZ2SG1/nY+VxtZC4rpPjVDyYkUEkF5ImMKv+ePFeSHF6wiN7eznmnlDYxvN8puYNp Ig== Received: from ppma02dal.us.ibm.com (a.bd.3ea9.ip4.static.sl-reverse.com [169.62.189.10]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3pjarts3ur-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 27 Mar 2023 00:14:37 +0000 Received: from pps.filterd (ppma02dal.us.ibm.com [127.0.0.1]) by ppma02dal.us.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 32QNb2aD024768; Mon, 27 Mar 2023 00:14:36 GMT Received: from smtprelay04.wdc07v.mail.ibm.com ([9.208.129.114]) by ppma02dal.us.ibm.com (PPS) with ESMTPS id 3phrk72p9s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 27 Mar 2023 00:14:36 +0000 Received: from smtpav03.dal12v.mail.ibm.com (smtpav03.dal12v.mail.ibm.com [10.241.53.102]) by smtprelay04.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 32R0EYqS36962902 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 27 Mar 2023 00:14:35 GMT Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A13A75805A; Mon, 27 Mar 2023 00:14:34 +0000 (GMT) Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4D04B58056; Mon, 27 Mar 2023 00:14:34 +0000 (GMT) Received: from [9.47.158.152] (unknown [9.47.158.152]) by smtpav03.dal12v.mail.ibm.com (Postfix) with ESMTP; Mon, 27 Mar 2023 00:14:34 +0000 (GMT) Message-ID: Date: Sun, 26 Mar 2023 20:14:33 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 Subject: Re: [PATCH v7 2/3] tpm: Extend common APIs to support TPM TIS I2C Content-Language: en-US To: Ninad Palsule , qemu-devel@nongnu.org Cc: joel@jms.id.au, andrew@aj.id.au, clg@kaod.org References: <20230326224426.3918167-1-ninad@linux.ibm.com> <20230326224426.3918167-3-ninad@linux.ibm.com> From: Stefan Berger In-Reply-To: <20230326224426.3918167-3-ninad@linux.ibm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: 1nv1zs8WMJ8OJiUTOOunLbMf6m_Vwzfa X-Proofpoint-GUID: 1nv1zs8WMJ8OJiUTOOunLbMf6m_Vwzfa 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-24_11,2023-03-24_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 phishscore=0 spamscore=0 lowpriorityscore=0 adultscore=0 malwarescore=0 clxscore=1015 mlxlogscore=999 impostorscore=0 priorityscore=1501 mlxscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2303260191 Received-SPF: pass client-ip=148.163.156.1; envelope-from=stefanb@linux.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, NICE_REPLY_A=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 3/26/23 18:44, Ninad Palsule wrote: > 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. > > The TPM TIS I2C spec describes in the table in section "Interface Locality > Usage per Register" that the TPM_INT_ENABLE and TPM_INT_STATUS registers > must be writable for any locality even if the locality is not the active > locality. Therefore, remove the checks whether the writing locality is the > active locality for these registers. > > Signed-off-by: Ninad Palsule > Signed-off-by: Stefan Berger > --- > V2: > > Incorporated Stephen's comments. > > - Removed checksum enable and checksum get registers. > - Added checksum calculation function which can be called from > i2c layer. > > --- > V3: > Incorporated review comments from Cedric and Stefan. > > - Pass locality to the checksum calculation function and cleanup > - Moved I2C related definations in the acpi/tpm.h > > --- > V4: > > Incorporated review comments by Stefan > > - Remove the check for locality while calculating checksum > - Use bswap16 instead of cpu_ti_be16. > - Rename TPM_I2C register by dropping _TIS_ from it. > > --- > V7: > > Incorporated review comments from Stefan. > > - Removed locality check from INT_ENABLE and INT_STATUS registers write > path. > - Moved TPM_DATA_CSUM_ENABLED define in the tpm.h > --- > hw/tpm/tpm_tis.h | 3 +++ > hw/tpm/tpm_tis_common.c | 36 ++++++++++++++++++++++++++++-------- > include/hw/acpi/tpm.h | 31 +++++++++++++++++++++++++++++++ > 3 files changed, 62 insertions(+), 8 deletions(-) > > diff --git a/hw/tpm/tpm_tis.h b/hw/tpm/tpm_tis.h > index f6b5872ba6..6f29a508dd 100644 > --- a/hw/tpm/tpm_tis.h > +++ b/hw/tpm/tpm_tis.h > @@ -86,5 +86,8 @@ 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 size); > +uint16_t tpm_tis_get_checksum(TPMState *s); > > #endif /* TPM_TPM_TIS_H */ > diff --git a/hw/tpm/tpm_tis_common.c b/hw/tpm/tpm_tis_common.c > index 503be2a541..c07c179dbc 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" > > #include "hw/acpi/tpm.h" > @@ -447,6 +449,23 @@ static uint64_t tpm_tis_mmio_read(void *opaque, hwaddr addr, > return val; > } > > +/* > + * 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); > +} > + > +/* > + * Calculate current data buffer checksum > + */ > +uint16_t tpm_tis_get_checksum(TPMState *s) > +{ > + return bswap16(crc_ccitt(0, s->buffer, s->rw_offset)); > +} > + > /* > * Write a value to a register of the TIS interface > * See specs pages 33-63 for description of the registers > @@ -588,10 +607,6 @@ static void tpm_tis_mmio_write(void *opaque, hwaddr addr, > > break; > case TPM_TIS_REG_INT_ENABLE: > - if (s->active_locty != locty) { > - break; > - } > - > s->loc[locty].inte &= mask; > s->loc[locty].inte |= (val & (TPM_TIS_INT_ENABLED | > TPM_TIS_INT_POLARITY_MASK | > @@ -601,10 +616,6 @@ static void tpm_tis_mmio_write(void *opaque, hwaddr addr, > /* hard wired -- ignore */ > break; > case TPM_TIS_REG_INT_STATUS: > - if (s->active_locty != locty) { > - break; > - } > - > /* clearing of interrupt flags */ > if (((val & TPM_TIS_INTERRUPTS_SUPPORTED)) && > (s->loc[locty].ints & TPM_TIS_INTERRUPTS_SUPPORTED)) { > @@ -767,6 +778,15 @@ static void tpm_tis_mmio_write(void *opaque, hwaddr addr, > } > } > > +/* > + * 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 size) > +{ > + tpm_tis_mmio_write(s, addr, val, size); > +} > + > const MemoryRegionOps tpm_tis_memory_ops = { > .read = tpm_tis_mmio_read, > .write = tpm_tis_mmio_write, > diff --git a/include/hw/acpi/tpm.h b/include/hw/acpi/tpm.h > index 559ba6906c..39f1300aa0 100644 > --- a/include/hw/acpi/tpm.h > +++ b/include/hw/acpi/tpm.h > @@ -93,6 +93,7 @@ > #define TPM_TIS_CAP_DATA_TRANSFER_64B (3 << 9) > #define TPM_TIS_CAP_DATA_TRANSFER_LEGACY (0 << 9) > #define TPM_TIS_CAP_BURST_COUNT_DYNAMIC (0 << 8) > +#define TPM_TIS_CAP_BURST_COUNT_STATIC (1 << 8) > #define TPM_TIS_CAP_INTERRUPT_LOW_LEVEL (1 << 4) /* support is mandatory */ > #define TPM_TIS_CAPABILITIES_SUPPORTED1_3 \ > (TPM_TIS_CAP_INTERRUPT_LOW_LEVEL | \ > @@ -209,6 +210,36 @@ REG32(CRB_DATA_BUFFER, 0x80) > #define TPM_PPI_FUNC_ALLOWED_USR_NOT_REQ (4 << 0) > #define TPM_PPI_FUNC_MASK (7 << 0) > > +/* TPM TIS I2C registers */ > +#define TPM_I2C_REG_LOC_SEL 0x00 > +#define TPM_I2C_REG_ACCESS 0x04 > +#define TPM_I2C_REG_INT_ENABLE 0x08 > +#define TPM_I2C_REG_INT_CAPABILITY 0x14 > +#define TPM_I2C_REG_STS 0x18 > +#define TPM_I2C_REG_DATA_FIFO 0x24 > +#define TPM_I2C_REG_INTF_CAPABILITY 0x30 > +#define TPM_I2C_REG_I2C_DEV_ADDRESS 0x38 > +#define TPM_I2C_REG_DATA_CSUM_ENABLE 0x40 > +#define TPM_I2C_REG_DATA_CSUM_GET 0x44 > +#define TPM_I2C_REG_DID_VID 0x48 > +#define TPM_I2C_REG_RID 0x4c > +#define TPM_I2C_REG_UNKNOWN 0xff > + > +/* I2C specific interface capabilities */ > +#define TPM_I2C_CAP_INTERFACE_TYPE (0x2 << 0) /* FIFO interface */ > +#define TPM_I2C_CAP_INTERFACE_VER (0x0 << 4) /* TCG I2C intf 1.0 */ > +#define TPM_I2C_CAP_TPM2_FAMILY (0x1 << 7) /* TPM 2.0 family. */ > +#define TPM_I2C_CAP_DEV_ADDR_CHANGE (0x0 << 27) /* No dev addr chng */ > +#define TPM_I2C_CAP_BURST_COUNT_STATIC (0x1 << 29) /* Burst count static */ > +#define TPM_I2C_CAP_LOCALITY_CAP (0x1 << 25) /* 0-5 locality */ > +#define TPM_I2C_CAP_BUS_SPEED (3 << 21) /* std and fast mode */ > + > +/* TPM_STS mask for read bits 31:26 must be zero */ > +#define TPM_I2C_STS_READ_MASK 0x03ffffff > + > +/* Checksum enabled. */ > +#define TPM_DATA_CSUM_ENABLED 0x1 > + > void tpm_build_ppi_acpi(TPMIf *tpm, Aml *dev); > > #endif /* CONFIG_TPM */ Reviewed-by: Stefan Berger Tested-by: Stefan Berger