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 1B603C25B06 for ; Thu, 4 Aug 2022 18:08:43 +0000 (UTC) Received: from localhost ([::1]:43324 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oJfH0-0008Nr-7j for qemu-devel@archiver.kernel.org; Thu, 04 Aug 2022 14:08:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58764) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oJfFp-0006rR-B4; Thu, 04 Aug 2022 14:07:29 -0400 Received: from mail-qv1-xf34.google.com ([2607:f8b0:4864:20::f34]:35411) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oJfFl-00085D-29; Thu, 04 Aug 2022 14:07:28 -0400 Received: by mail-qv1-xf34.google.com with SMTP id b7so187879qvq.2; Thu, 04 Aug 2022 11:07:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc; bh=3b5Vj2xeH8mRPvwr3nsSzNInUGNHMkJh4gypXzt6Kd0=; b=Var5bLAFGeYxWYH3ftfaRmYjuPV4f5ckjTSg5c9h3ffuRx9FxP+Gpbj2Rt8ngfhQzM MhIzk6VyyLSYWMlkjyxzYVdBTQqzPjSOV2ykBcRhZEwKlFb7VYZvwUwdpHDrjm7A2Yd5 E3mzaunadARQqMxlmfhIm04aBeg80OJ9X/GlAGAg4QiSvxt16Qx8wtD315iKIAHr/eQH 7vOwy28Q0rCg0frNnVd665xnESdhZ6My65scy6bJsahsI6GrjqEJ0RR0IPx85pz1gtqZ +89C7tkPggcH8p+DWl1ryDdFEJOAAJY+4CBltYDxqk51oRlZotE0LHJMZbEAZsv1gQmj jf7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc; bh=3b5Vj2xeH8mRPvwr3nsSzNInUGNHMkJh4gypXzt6Kd0=; b=oZLbWhLn8yZeA/MZPvqjUYpiEWBHGFIz7dUF0t8dpa5dx5gWb093+pIcfdEItYCVlE 0ZKzJ2MuLGUDB0vuXmJG+fWFrN7Hcl6+a58NeISW/6Awub0mQSnc+BjjtOLXia/QA063 ou7QKf/vgkSEQGcyr7pFzol6fxWM9zAN4qh0mRbr5K2ZRk8aXNWKHb8s2Lwq8QX6Sx6n ytgNyTfrzj7d3P8ccgWrl7BoS9qp6+i8vdsO0eAr776UEB2lVA+Vji4jCMcS38Njq+Pl 7iXk8JZPA6erZ/MQJyltpP8dtOBa49R28n5qQkAPTryWYqcL3iP0bEBabZhZRlcoTey4 VziA== X-Gm-Message-State: ACgBeo3VneJFu2Y9rxJr0nll361V13Zr+5uxx6G/rcl7bCwACa1/d/5N ZDYDGG00+plR8X7228M426xGFIg4lsNV6SinqXU= X-Google-Smtp-Source: AA6agR521lLW489seE1Vy1uStV4hi+kPKc4AES5X5XPkYhVrquhg7VUeunyQkZD2L54LXcsKDJzPl3uhPDUTh+2t0x0= X-Received: by 2002:a05:6214:2621:b0:476:6092:3687 with SMTP id gv1-20020a056214262100b0047660923687mr2548460qvb.21.1659636441648; Thu, 04 Aug 2022 11:07:21 -0700 (PDT) MIME-Version: 1.0 References: <20220803023241.63739-1-irischenlj@gmail.com> <20220803023241.63739-2-irischenlj@gmail.com> <36a20515-461d-0f27-3be8-a4edd099165a@kaod.org> In-Reply-To: From: Dan Zhang Date: Thu, 4 Aug 2022 11:07:10 -0700 Message-ID: Subject: Re: [RFC 1/1] hw: tpmtisspi: add SPI support to QEMU TPM implementation To: Peter Delevoryas Cc: =?UTF-8?Q?C=C3=A9dric_Le_Goater?= , Iris Chen , Iris Chen , Peter Delevoryas , Cameron Esfahani via , qemu-arm , patrick@stwcx.xyz, Alistair Francis , kwolf@redhat.com, hreitz@redhat.com, Peter Maydell , Andrew Jeffery , Joel Stanley , thuth@redhat.com, lvivier@redhat.com, pbonzini@redhat.com, qemu-block@nongnu.org, Stefan Berger Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=2607:f8b0:4864:20::f34; envelope-from=dz4list@gmail.com; helo=mail-qv1-xf34.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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" On Wed, Aug 3, 2022 at 10:30 AM Peter Delevoryas wrote: > > On Wed, Aug 03, 2022 at 10:52:23AM +0200, C=C3=A9dric Le Goater wrote: > > On 8/3/22 04:32, Iris Chen wrote: > > > From: Iris Chen > > > > A commit log telling us about this new device would be good to have. > > > > > > > Signed-off-by: Iris Chen > > > --- > > > configs/devices/arm-softmmu/default.mak | 1 + > > > hw/arm/Kconfig | 5 + > > > hw/tpm/Kconfig | 5 + > > > hw/tpm/meson.build | 1 + > > > hw/tpm/tpm_tis_spi.c | 311 +++++++++++++++++++++= +++ > > > include/sysemu/tpm.h | 3 + > > > 6 files changed, 326 insertions(+) > > > create mode 100644 hw/tpm/tpm_tis_spi.c > > > > > > diff --git a/configs/devices/arm-softmmu/default.mak b/configs/device= s/arm-softmmu/default.mak > > > index 6985a25377..80d2841568 100644 > > > --- a/configs/devices/arm-softmmu/default.mak > > > +++ b/configs/devices/arm-softmmu/default.mak > > > @@ -42,3 +42,4 @@ CONFIG_FSL_IMX6UL=3Dy > > > CONFIG_SEMIHOSTING=3Dy > > > CONFIG_ARM_COMPATIBLE_SEMIHOSTING=3Dy > > > CONFIG_ALLWINNER_H3=3Dy > > > +CONFIG_FBOBMC_AST=3Dy > > > > I don't think this extra config is useful for now > > > > > diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig > > > index 15fa79afd3..193decaec1 100644 > > > --- a/hw/arm/Kconfig > > > +++ b/hw/arm/Kconfig > > > @@ -458,6 +458,11 @@ config ASPEED_SOC > > > select PMBUS > > > select MAX31785 > > > +config FBOBMC_AST > > > + bool > > > + select ASPEED_SOC > > > + select TPM_TIS_SPI > > > + > > > config MPS2 > > > bool > > > imply I2C_DEVICES > > > diff --git a/hw/tpm/Kconfig b/hw/tpm/Kconfig > > > index 29e82f3c92..370a43f045 100644 > > > --- a/hw/tpm/Kconfig > > > +++ b/hw/tpm/Kconfig > > > @@ -8,6 +8,11 @@ config TPM_TIS_SYSBUS > > > depends on TPM > > > select TPM_TIS > > > +config TPM_TIS_SPI > > > + bool > > > + depends on TPM > > > + select TPM_TIS > > > + > > > config TPM_TIS > > > bool > > > depends on TPM > > > diff --git a/hw/tpm/meson.build b/hw/tpm/meson.build > > > index 1c68d81d6a..1a057f4e36 100644 > > > --- a/hw/tpm/meson.build > > > +++ b/hw/tpm/meson.build > > > @@ -2,6 +2,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_t= is_sysbus.c')) > > > softmmu_ss.add(when: 'CONFIG_TPM_CRB', if_true: files('tpm_crb.c')) > > > +softmmu_ss.add(when: 'CONFIG_TPM_TIS_SPI', if_true: files('tpm_tis_s= pi.c')) > > > specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TPM_TIS'], if_true= : files('tpm_ppi.c')) > > > specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TPM_CRB'], if_true= : files('tpm_ppi.c')) > > > diff --git a/hw/tpm/tpm_tis_spi.c b/hw/tpm/tpm_tis_spi.c > > > new file mode 100644 > > > index 0000000000..c98ddcfddb > > > --- /dev/null > > > +++ b/hw/tpm/tpm_tis_spi.c > > > @@ -0,0 +1,311 @@ > > > +#include "qemu/osdep.h" > > > +#include "hw/qdev-properties.h" > > > +#include "migration/vmstate.h" > > > +#include "hw/acpi/tpm.h" > > > +#include "tpm_prop.h" > > > +#include "tpm_tis.h" > > > +#include "qom/object.h" > > > +#include "hw/ssi/ssi.h" > > > +#include "hw/ssi/spi_gpio.h" > > > + > > > +#define TPM_TIS_SPI_ADDR_BYTES 3 > > > +#define SPI_WRITE 0 > > > + > > > +typedef enum { > > > + TIS_SPI_PKT_STATE_DEACTIVATED =3D 0, > > > + TIS_SPI_PKT_STATE_START, > > > + TIS_SPI_PKT_STATE_ADDRESS, > > > + TIS_SPI_PKT_STATE_DATA_WR, > > > + TIS_SPI_PKT_STATE_DATA_RD, > > > + TIS_SPI_PKT_STATE_DONE, > > > +} TpmTisSpiPktState; > > > + > > > +union TpmTisRWSizeByte { > > > + uint8_t byte; > > > + struct { > > > + uint8_t data_expected_size:6; > > > + uint8_t resv:1; > > > + uint8_t rwflag:1; > > > + }; > > > +}; > > > + > > > +union TpmTisSpiHwAddr { > > > + hwaddr addr; > > > + uint8_t bytes[sizeof(hwaddr)]; > > > +}; > > > + > > > +union TpmTisSpiData { > > > + uint32_t data; > > > + uint8_t bytes[64]; > > > +}; > > > + > > > +struct TpmTisSpiState { > > > + /*< private >*/ > > > + SSIPeripheral parent_obj; > > > + > > > + /*< public >*/ > > > + TPMState tpm_state; /* not a QOM object */ > > > + TpmTisSpiPktState tpm_tis_spi_state; > > > + > > > + union TpmTisRWSizeByte first_byte; > > > + union TpmTisSpiHwAddr addr; > > > + union TpmTisSpiData data; > > > > Are these device registers ? I am not sure the unions are very useful. > > +1, I don't think we should be using unions, instead we should split out > all the relevant fields we want to store and use extract32/deposit32/etc > if necessary. These union is used to saving us code to extract the bits from first byte and assembling the hwaddr and unint32_t data from bytes. I think as the bitfields has compiler implementation dependency of endianne= ss we can switch to use extract8. or handle it for gcc https://stackoverflow.com/questions/47600584/bitfield-endianness-in-gcc > > > > > > + uint32_t data_size; > > > + uint8_t data_idx; > > > + uint8_t addr_idx; > > > +}; > > > + > > > +struct TpmTisSpiClass { > > > + SSIPeripheralClass parent_class; > > > +}; > > > + > > > +OBJECT_DECLARE_TYPE(TpmTisSpiState, TpmTisSpiClass, TPM_TIS_SPI) > > > + > > > +static void tpm_tis_spi_mmio_read(TpmTisSpiState *tts) > > > +{ > > > + uint16_t offset =3D tts->addr.addr & 0xffc; > > > + > > > + switch (offset) { > > > + case TPM_TIS_REG_DATA_FIFO: > > > + for (uint8_t i =3D 0; i < tts->data_size; i++) { > > > + tts->data.bytes[i] =3D (uint8_t)tpm_tis_memory_ops.read( > > > > > > you should add an address space for these memory transactions. Look for > > address_space_read/write calls, in the Aspeed I2C model for example. > > Yeah, or an even better example might be tpm_tis_isa. I feel like a > shortcut might have been taken here to pull in tpm_tis_memory_ops > directly, but we should have been treating the interface with the TPM as > a generic address space. > No, in our application we did not have those memory region [0xFFD4_0000 ~ 0xFFD4_FFFF] here we mapping the TPM TIS SPI message operations into mmio operations is = to reuse the TIS registers models already implemented in tpm_tis_common.c > > > > > + &tts->tpm_state, > > > + tts->addr.addr, > > > + 1); > > > + } > > > + break; > > > + default: > > > + tts->data.data =3D (uint32_t)tpm_tis_memory_ops.read( > > > + &tts->tpm_state, > > > + tts->addr.addr, > > > + tts->data_size); > > > + } > > > +} > > > + > > > +static void tpm_tis_spi_mmio_write(TpmTisSpiState *tts) > > > +{ > > > + uint16_t offset =3D tts->addr.addr & 0xffc; > > > + > > > + switch (offset) { > > > + case TPM_TIS_REG_DATA_FIFO: > > > + for (uint8_t i =3D 0; i < tts->data_size; i++) { > > > + tpm_tis_memory_ops.write(&tts->tpm_state, > > > + tts->addr.addr, > > > + tts->data.bytes[i], > > > + 1); > > > + } > > > + break; > > > + default: > > > + tpm_tis_memory_ops.write(&tts->tpm_state, > > > + tts->addr.addr, > > > + tts->data.data, > > > + tts->data_size); > > > + } > > > +} > > > + > > > +static uint32_t tpm_tis_spi_transfer8(SSIPeripheral *ss, uint32_t tx= ) > > > +{ > > > + TpmTisSpiState *tts =3D TPM_TIS_SPI(ss); > > > + uint32_t r =3D 1; > > > + > > > + switch (tts->tpm_tis_spi_state) { > > > + case TIS_SPI_PKT_STATE_START: > > > + tts->first_byte.byte =3D (uint8_t)tx; > > > + tts->data_size =3D tts->first_byte.data_expected_size + 1; > > > + tts->data_idx =3D 0; > > > + tts->addr_idx =3D TPM_TIS_SPI_ADDR_BYTES; > > > + tts->tpm_tis_spi_state =3D TIS_SPI_PKT_STATE_ADDRESS; > > > + break; > > > + case TIS_SPI_PKT_STATE_ADDRESS: > > > + assert(tts->addr_idx > 0); > > > + tts->addr.bytes[--tts->addr_idx] =3D (uint8_t)tx; > > > + > > > + if (tts->addr_idx =3D=3D 0) { > > > + if (tts->first_byte.rwflag =3D=3D SPI_WRITE) { > > > + tts->tpm_tis_spi_state =3D TIS_SPI_PKT_STATE_DATA_WR= ; > > > + } else { /* read and get the data ready */ > > > + tpm_tis_spi_mmio_read(tts); > > > + tts->tpm_tis_spi_state =3D TIS_SPI_PKT_STATE_DATA_RD= ; > > > + } > > > + } > > > + break; > > > + case TIS_SPI_PKT_STATE_DATA_WR: > > > + tts->data.bytes[tts->data_idx++] =3D (uint8_t)tx; > > > + if (tts->data_idx =3D=3D tts->data_size) { > > > + tpm_tis_spi_mmio_write(tts); > > > + tts->tpm_tis_spi_state =3D TIS_SPI_PKT_STATE_DONE; > > > + } > > > + break; > > > + case TIS_SPI_PKT_STATE_DATA_RD: > > > + r =3D tts->data.bytes[tts->data_idx++]; > > > + if (tts->data_idx =3D=3D tts->data_size) { > > > + tts->tpm_tis_spi_state =3D TIS_SPI_PKT_STATE_DONE; > > > + } > > > + break; > > > + default: > > > + tts->tpm_tis_spi_state =3D TIS_SPI_PKT_STATE_DEACTIVATED; > > > + r =3D (uint32_t) -1; > > > + } > > > + > > > + return r; > > > +} > > > + > > > +/* > > > + * Pre-reading logic for transfer: > > > + * This is to fix the transaction between reading and writing. > > > + * The first byte is arbitrarily inserted so we need to > > > + * shift the all the output bytes (timeline) one byte right. > > > + */ > > > +static uint32_t tpm_tis_spi_transfer8_ex(SSIPeripheral *ss, uint32_t= tx) > > > +{ > > > + TpmTisSpiState *tts =3D TPM_TIS_SPI(ss); > > > + SSIBus *ssibus =3D (SSIBus *)qdev_get_parent_bus(DEVICE(tts)); > > > + > > > + TpmTisSpiPktState prev_state =3D tts->tpm_tis_spi_state; > > > + uint32_t r =3D tpm_tis_spi_transfer8(ss, tx); > > > + TpmTisSpiPktState curr_state =3D tts->tpm_tis_spi_state; > > > + > > > + if (ssibus->preread && > > > + /* cmd state has changed into DATA reading state */ > > > + prev_state !=3D TIS_SPI_PKT_STATE_DATA_RD && > > > + curr_state =3D=3D TIS_SPI_PKT_STATE_DATA_RD) { > > > + r =3D tpm_tis_spi_transfer8(ss, 0xFF); > > > + } > > > + > > > + return r; > > > +} > > > + > > > +static int tpm_tis_spi_cs(SSIPeripheral *ss, bool select) > > > +{ > > > + TpmTisSpiState *tts =3D TPM_TIS_SPI(ss); > > > + > > > + if (select) { /* cs de-assert */ > > > + tts->tpm_tis_spi_state =3D TIS_SPI_PKT_STATE_DEACTIVATED; > > > + } else { > > > + tts->tpm_tis_spi_state =3D TIS_SPI_PKT_STATE_START; > > > + tts->first_byte.byte =3D 0; > > > + tts->addr.addr =3D 0; > > > + tts->data.data =3D 0; > > > + } > > > + > > > + return 0; > > > +} > > > + > > > +static int tpm_tis_pre_save_spi(void *opaque) > > > +{ > > > + TpmTisSpiState *sbdev =3D opaque; > > > + > > > + return tpm_tis_pre_save(&sbdev->tpm_state); > > > +} > > > + > > > +static const VMStateDescription vmstate_tpm_tis_spi =3D { > > > + .name =3D "tpm-tis-spi", > > > + .version_id =3D 0, > > > + .pre_save =3D tpm_tis_pre_save_spi, > > > + .fields =3D (VMStateField[]) { > > > + VMSTATE_BUFFER(tpm_state.buffer, TpmTisSpiState), > > > + VMSTATE_UINT16(tpm_state.rw_offset, TpmTisSpiState), > > > + VMSTATE_UINT8(tpm_state.active_locty, TpmTisSpiState), > > > + VMSTATE_UINT8(tpm_state.aborting_locty, TpmTisSpiState), > > > + VMSTATE_UINT8(tpm_state.next_locty, TpmTisSpiState), > > > + > > > + VMSTATE_STRUCT_ARRAY(tpm_state.loc, TpmTisSpiState, TPM_TIS_= NUM_LOCALITIES, > > > + 0, vmstate_locty, TPMLocality), > > > + > > > + VMSTATE_END_OF_LIST() > > > + } > > > +}; > > > + > > > +static void tpm_tis_spi_request_completed(TPMIf *ti, int ret) > > > +{ > > > + TpmTisSpiState *sbdev =3D TPM_TIS_SPI(ti); > > > + TPMState *s =3D &sbdev->tpm_state; > > > + > > > + tpm_tis_request_completed(s, ret); > > > +} > > > + > > > +static enum TPMVersion tpm_tis_spi_get_tpm_version(TPMIf *ti) > > > +{ > > > + TpmTisSpiState *sbdev =3D TPM_TIS_SPI(ti); > > > + TPMState *s =3D &sbdev->tpm_state; > > > + > > > + return tpm_tis_get_tpm_version(s); > > > +} > > > + > > > +static void tpm_tis_spi_reset(DeviceState *dev) > > > +{ > > > + TpmTisSpiState *sbdev =3D TPM_TIS_SPI(dev); > > > + TPMState *s =3D &sbdev->tpm_state; > > > + > > > + return tpm_tis_reset(s); > > > +} > > > + > > > +static Property tpm_tis_spi_properties[] =3D { > > > + DEFINE_PROP_UINT32("irq", TpmTisSpiState, tpm_state.irq_num, TPM= _TIS_IRQ), > > > + DEFINE_PROP_TPMBE("tpmdev", TpmTisSpiState, tpm_state.be_driver)= , > > > + DEFINE_PROP_BOOL("ppi", TpmTisSpiState, tpm_state.ppi_enabled, f= alse), > > > + DEFINE_PROP_END_OF_LIST(), > > > +}; > > > + > > > +static void tpm_tis_spi_realizefn(SSIPeripheral *ss, Error **errp) > > > +{ > > > + TpmTisSpiState *sbdev =3D TPM_TIS_SPI(ss); > > > + > > > + if (!tpm_find()) { > > > + error_setg(errp, "at most one TPM device is permitted"); > > > + return; > > > + } > > > + > > > + if (!sbdev->tpm_state.be_driver) { > > > + error_setg(errp, "'tpmdev' property is required"); > > > + return; > > > + } > > > + > > > + DeviceState *spi_gpio =3D qdev_find_recursive(sysbus_get_default= (), > > > + TYPE_SPI_GPIO); > > > + qdev_connect_gpio_out_named(spi_gpio, > > > + "SPI_CS_out", 0, > > > + qdev_get_gpio_in_named(DEVICE(ss), > > > + SSI_GPIO_CS, 0)); > > Typically, this part is done at the machine/board level because it > > has knowledge of all devices but it is possible with the TPM devices? > > +1, yeah this part should be removed. > > > > > How do you invoke QEMU ? > > We have some hard-coded machine/board level code that wires up stuff, > and then I think Iris was hard-coding this stuff in the TPM TIS SPI > model so that the whole thing could be hidden behind a Kconfig and wired > in automatically when the Kconfig was enabled. But we should require > users to wire it up themselves in the board code. > > > > > Thanks, > > > > C. > > > > > +} > > > + > > > +static void tpm_tis_spi_class_init(ObjectClass *klass, void *data) > > > +{ > > > + DeviceClass *dc =3D DEVICE_CLASS(klass); > > > + SSIPeripheralClass *k =3D SSI_PERIPHERAL_CLASS(klass); > > > + TPMIfClass *tc =3D TPM_IF_CLASS(klass); > > > + > > > + device_class_set_props(dc, tpm_tis_spi_properties); > > > + k->realize =3D tpm_tis_spi_realizefn; > > > + k->transfer =3D tpm_tis_spi_transfer8_ex; > > > + k->set_cs =3D tpm_tis_spi_cs; > > > + k->cs_polarity =3D SSI_CS_LOW; > > > + > > > + dc->vmsd =3D &vmstate_tpm_tis_spi; > > > + tc->model =3D TPM_MODEL_TPM_TIS; > > > + dc->user_creatable =3D true; > > > + dc->reset =3D tpm_tis_spi_reset; > > > + tc->request_completed =3D tpm_tis_spi_request_completed; > > > + tc->get_version =3D tpm_tis_spi_get_tpm_version; > > > + set_bit(DEVICE_CATEGORY_MISC, dc->categories); > > > +} > > > + > > > +static const TypeInfo tpm_tis_spi_info =3D { > > > + .name =3D TYPE_TPM_TIS_SPI, > > > + .parent =3D TYPE_SSI_PERIPHERAL, > > > + .instance_size =3D sizeof(TpmTisSpiState), > > > + .class_size =3D sizeof(TpmTisSpiClass), > > > + .class_init =3D tpm_tis_spi_class_init, > > > + .interfaces =3D (InterfaceInfo[]) { > > > + { TYPE_TPM_IF }, > > > + { } > > > + } > > > +}; > > > + > > > +static void tpm_tis_spi_register(void) > > > +{ > > > + type_register_static(&tpm_tis_spi_info); > > > +} > > > + > > > +type_init(tpm_tis_spi_register) > > > diff --git a/include/sysemu/tpm.h b/include/sysemu/tpm.h > > > index fb40e30ff6..6a6b311e47 100644 > > > --- a/include/sysemu/tpm.h > > > +++ b/include/sysemu/tpm.h > > > @@ -46,6 +46,7 @@ struct TPMIfClass { > > > #define TYPE_TPM_TIS_ISA "tpm-tis" > > > #define TYPE_TPM_TIS_SYSBUS "tpm-tis-device" > > > +#define TYPE_TPM_TIS_SPI "tpm-tis-spi-device" > > > #define TYPE_TPM_CRB "tpm-crb" > > > #define TYPE_TPM_SPAPR "tpm-spapr" > > > @@ -53,6 +54,8 @@ struct TPMIfClass { > > > object_dynamic_cast(OBJECT(chr), TYPE_TPM_TIS_ISA) > > > #define TPM_IS_TIS_SYSBUS(chr) \ > > > object_dynamic_cast(OBJECT(chr), TYPE_TPM_TIS_SYSBUS) > > > +#define TPM_IS_TIS_SPI(chr) \ > > > + object_dynamic_cast(OBJECT(chr), TYPE_TPM_TIS_SPI) > > > #define TPM_IS_CRB(chr) \ > > > object_dynamic_cast(OBJECT(chr), TYPE_TPM_CRB) > > > #define TPM_IS_SPAPR(chr) \ > >