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 84B52C001DC for ; Fri, 14 Jul 2023 14:28:08 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qKJlU-0005nd-5Q; Fri, 14 Jul 2023 10:27:24 -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 1qKJlS-0005nK-AH; Fri, 14 Jul 2023 10:27:22 -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 1qKJlP-0005Cb-Is; Fri, 14 Jul 2023 10:27:22 -0400 Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 36EEPfue031879; Fri, 14 Jul 2023 14:27:05 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=message-id : date : subject : to : cc : references : from : in-reply-to : content-type : content-transfer-encoding : mime-version; s=pp1; bh=jfiSrSK2FzWeLscPQVwV/mpbDEYGTSH3nTziboYswCw=; b=PFJQR78fBEBp8h5c6kO41uUdYQr7PilcyK7eHc0TBxkD7GgsaOb93gGmbuDPpj66NGwA xg/p5l7yM+E7lsD2E6w1X+6icCBq3r23r1ud4m2dQwbP6eMx/GI5bA8BEtN6rPaPezzb eE/emWmSTpkutT4FlvhOuvRL33y4Bcb89YXCGeUdE6HpQrwi4YTfZnrk/GqAGEN5AYmK x8UIrR8Nk/dm+CaHK8FWxxG96X+IbvC38VeKRUu2earJobHonHJR2UKpzim/JPTxeKeJ oWKTT0CiHN6w+NrjL+5yVYjqva60cD3Ev7TPRuQfVBKU0q+ueIpEin7yfYH9H4dIq6uw WQ== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3ru805g7mw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 14 Jul 2023 14:27:05 +0000 Received: from m0353729.ppops.net (m0353729.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 36EEIYbt007927; Fri, 14 Jul 2023 14:27:04 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 3ru805g7me-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 14 Jul 2023 14:27:04 +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 36EDwTpV008407; Fri, 14 Jul 2023 14:27:03 GMT Received: from smtprelay07.dal12v.mail.ibm.com ([9.208.130.99]) by ppma04dal.us.ibm.com (PPS) with ESMTPS id 3rtq33pav2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 14 Jul 2023 14:27:03 +0000 Received: from smtpav04.dal12v.mail.ibm.com (smtpav04.dal12v.mail.ibm.com [10.241.53.103]) by smtprelay07.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 36EER2U932047716 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 14 Jul 2023 14:27:02 GMT Received: from smtpav04.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id F3BFD58056; Fri, 14 Jul 2023 14:27:01 +0000 (GMT) Received: from smtpav04.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id F305458052; Fri, 14 Jul 2023 14:27:00 +0000 (GMT) Received: from [9.47.158.152] (unknown [9.47.158.152]) by smtpav04.dal12v.mail.ibm.com (Postfix) with ESMTP; Fri, 14 Jul 2023 14:27:00 +0000 (GMT) Message-ID: Date: Fri, 14 Jul 2023 10:27:00 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Subject: Re: [PATCH v2 10/11] tpm_crb_sysbus: introduce TPM CRB SysBus device Content-Language: en-US To: Joelle van Dyne , qemu-devel@nongnu.org Cc: Stefan Berger , "Michael S. Tsirkin" , Igor Mammedov , Ani Sinha , Paolo Bonzini , Peter Maydell , Xiaojuan Yang , Song Gao , Palmer Dabbelt , Alistair Francis , Bin Meng , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , "open list:ARM TCG CPUs" , "open list:RISC-V TCG CPUs" References: <20230714070931.23476-1-j@getutm.app> <20230714070931.23476-11-j@getutm.app> From: Stefan Berger In-Reply-To: <20230714070931.23476-11-j@getutm.app> Content-Type: text/plain; charset=UTF-8; format=flowed X-TM-AS-GCONF: 00 X-Proofpoint-GUID: SfKY1FEivocPTB_wT-fFyXJSyTs_fPo9 X-Proofpoint-ORIG-GUID: uWHhROqxRsUFj1R7brPcPi_6Y3OKMQyf Content-Transfer-Encoding: 8bit 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.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-07-14_06,2023-07-13_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 malwarescore=0 priorityscore=1501 mlxlogscore=999 clxscore=1011 spamscore=0 adultscore=0 lowpriorityscore=0 impostorscore=0 phishscore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2307140128 Received-SPF: pass client-ip=148.163.156.1; envelope-from=stefanb@linux.ibm.com; helo=mx0a-001b2d01.pphosted.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_EF=-0.1, NICE_REPLY_A=-0.091, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, 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-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 7/14/23 03:09, Joelle van Dyne wrote: > This SysBus variant of the CRB interface supports dynamically locating > the MMIO interface so that Virt machines can use it. This interface > is currently the only one supported by QEMU that works on Windows 11 > ARM64. We largely follow the TPM TIS SysBus device as a template. > > To try out this device with Windows 11 before OVMF is updated, you > will need to modify `sysbud-fdt.c` and change the added line from: > > ```c > TYPE_BINDING(TYPE_TPM_CRB_SYSBUS, no_fdt_node), > ``` > > to > > ```c > TYPE_BINDING(TYPE_TPM_CRB_SYSBUS, add_tpm_tis_fdt_node), > ``` > > This change was not included because it can confuse Linux (although > from testing, it seems like Linux is able to properly ignore the > device from the TPM TIS driver and recognize it from the ACPI device > in the TPM CRB driver). A proper fix would require OVMF to recognize > the ACPI device and not depend on the FDT node for recognizing TPM. > > The command line to try out this device with SWTPM is: > > ``` > $ qemu-system-aarch64 \ > -chardev socket,id=chrtpm0,path=tpm.sock \ > -tpmdev emulator,id=tpm0,chardev=chrtpm0 \ > -device tpm-crb-device,tpmdev=tpm0 > ``` > > along with SWTPM: > > ``` > $ swtpm \ > --ctrl type=unixio,path=tpm.sock,terminate \ > --tpmstate backend-uri=file://tpm.data \ > --tpm2 > ``` > > Signed-off-by: Joelle van Dyne > --- > docs/specs/tpm.rst | 1 + > include/hw/acpi/aml-build.h | 1 + > include/sysemu/tpm.h | 3 + > hw/acpi/aml-build.c | 7 +- > hw/arm/virt.c | 1 + > hw/core/sysbus-fdt.c | 1 + > hw/loongarch/virt.c | 1 + > hw/riscv/virt.c | 1 + > hw/tpm/tpm_crb_sysbus.c | 170 ++++++++++++++++++++++++++++++++++++ > hw/arm/Kconfig | 1 + > hw/riscv/Kconfig | 1 + > hw/tpm/Kconfig | 5 ++ > hw/tpm/meson.build | 2 + > 13 files changed, 194 insertions(+), 1 deletion(-) > create mode 100644 hw/tpm/tpm_crb_sysbus.c > > diff --git a/docs/specs/tpm.rst b/docs/specs/tpm.rst > index 2bc29c9804..95aeb49220 100644 > --- a/docs/specs/tpm.rst > +++ b/docs/specs/tpm.rst > @@ -46,6 +46,7 @@ operating system. > QEMU files related to TPM CRB interface: > - ``hw/tpm/tpm_crb.c`` > - ``hw/tpm/tpm_crb_common.c`` > + - ``hw/tpm/tpm_crb_sysbus.c`` > If you added the command line to use for Windows guests to this document I think this would be helpful. And also mention that this must be used for Windows since the other ones don't work. > SPAPR interface > --------------- > diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h > index d1fb08514b..9660e16148 100644 > --- a/include/hw/acpi/aml-build.h > +++ b/include/hw/acpi/aml-build.h > @@ -3,6 +3,7 @@ > > #include "hw/acpi/acpi-defs.h" > #include "hw/acpi/bios-linker-loader.h" > +#include "exec/hwaddr.h" > > #define ACPI_BUILD_APPNAME6 "BOCHS " > #define ACPI_BUILD_APPNAME8 "BXPC " > diff --git a/include/sysemu/tpm.h b/include/sysemu/tpm.h > index 66e3b45f30..f79c8f3575 100644 > --- a/include/sysemu/tpm.h > +++ b/include/sysemu/tpm.h > @@ -47,6 +47,7 @@ struct TPMIfClass { > #define TYPE_TPM_TIS_ISA "tpm-tis" > #define TYPE_TPM_TIS_SYSBUS "tpm-tis-device" > #define TYPE_TPM_CRB "tpm-crb" > +#define TYPE_TPM_CRB_SYSBUS "tpm-crb-device" > #define TYPE_TPM_SPAPR "tpm-spapr" > #define TYPE_TPM_TIS_I2C "tpm-tis-i2c" > > @@ -56,6 +57,8 @@ struct TPMIfClass { > object_dynamic_cast(OBJECT(chr), TYPE_TPM_TIS_SYSBUS) > #define TPM_IS_CRB(chr) \ > object_dynamic_cast(OBJECT(chr), TYPE_TPM_CRB) > +#define TPM_IS_CRB_SYSBUS(chr) \ > + object_dynamic_cast(OBJECT(chr), TYPE_TPM_CRB_SYSBUS) > #define TPM_IS_SPAPR(chr) \ > object_dynamic_cast(OBJECT(chr), TYPE_TPM_SPAPR) > #define TPM_IS_TIS_I2C(chr) \ > diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c > index ea331a20d1..f809137fc9 100644 > --- a/hw/acpi/aml-build.c > +++ b/hw/acpi/aml-build.c > @@ -31,6 +31,7 @@ > #include "hw/pci/pci_bus.h" > #include "hw/pci/pci_bridge.h" > #include "qemu/cutils.h" > +#include "qom/object.h" > > static GArray *build_alloc_array(void) > { > @@ -2218,7 +2219,7 @@ void build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog, > { > uint8_t start_method_params[12] = {}; > unsigned log_addr_offset; > - uint64_t control_area_start_address; > + uint64_t baseaddr, control_area_start_address; > TPMIf *tpmif = tpm_find(); > uint32_t start_method; > AcpiTable table = { .sig = "TPM2", .rev = 4, > @@ -2236,6 +2237,10 @@ void build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog, > } else if (TPM_IS_CRB(tpmif)) { > control_area_start_address = TPM_CRB_ADDR_CTRL; > start_method = TPM2_START_METHOD_CRB; > + } else if (TPM_IS_CRB_SYSBUS(tpmif)) { > + baseaddr = object_property_get_uint(OBJECT(tpmif), "baseaddr", NULL); > + control_area_start_address = baseaddr + A_CRB_CTRL_REQ; > + start_method = TPM2_START_METHOD_CRB; > } else { > g_assert_not_reached(); > } > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index 432148ef47..88e8b16103 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -2977,6 +2977,7 @@ static void virt_machine_class_init(ObjectClass *oc, void *data) > machine_class_allow_dynamic_sysbus_dev(mc, TYPE_VFIO_PLATFORM); > #ifdef CONFIG_TPM > machine_class_allow_dynamic_sysbus_dev(mc, TYPE_TPM_TIS_SYSBUS); > + machine_class_allow_dynamic_sysbus_dev(mc, TYPE_TPM_CRB_SYSBUS); > #endif > mc->block_default_type = IF_VIRTIO; > mc->no_cdrom = 1; > diff --git a/hw/core/sysbus-fdt.c b/hw/core/sysbus-fdt.c > index eebcd28f9a..9c783f88eb 100644 > --- a/hw/core/sysbus-fdt.c > +++ b/hw/core/sysbus-fdt.c > @@ -493,6 +493,7 @@ static const BindingEntry bindings[] = { > #endif > #ifdef CONFIG_TPM > TYPE_BINDING(TYPE_TPM_TIS_SYSBUS, add_tpm_tis_fdt_node), > + TYPE_BINDING(TYPE_TPM_CRB_SYSBUS, no_fdt_node), > #endif > TYPE_BINDING(TYPE_RAMFB_DEVICE, no_fdt_node), > TYPE_BINDING("", NULL), /* last element */ > diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c > index 9c536c52bc..eb59fb04ee 100644 > --- a/hw/loongarch/virt.c > +++ b/hw/loongarch/virt.c > @@ -1194,6 +1194,7 @@ static void loongarch_class_init(ObjectClass *oc, void *data) > machine_class_allow_dynamic_sysbus_dev(mc, TYPE_RAMFB_DEVICE); > #ifdef CONFIG_TPM > machine_class_allow_dynamic_sysbus_dev(mc, TYPE_TPM_TIS_SYSBUS); > + machine_class_allow_dynamic_sysbus_dev(mc, TYPE_TPM_CRB_SYSBUS); > #endif > } > > diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c > index d90286dc46..5d639a870a 100644 > --- a/hw/riscv/virt.c > +++ b/hw/riscv/virt.c > @@ -1681,6 +1681,7 @@ static void virt_machine_class_init(ObjectClass *oc, void *data) > machine_class_allow_dynamic_sysbus_dev(mc, TYPE_RAMFB_DEVICE); > #ifdef CONFIG_TPM > machine_class_allow_dynamic_sysbus_dev(mc, TYPE_TPM_TIS_SYSBUS); > + machine_class_allow_dynamic_sysbus_dev(mc, TYPE_TPM_CRB_SYSBUS); > #endif > > if (tcg_enabled()) { > diff --git a/hw/tpm/tpm_crb_sysbus.c b/hw/tpm/tpm_crb_sysbus.c > new file mode 100644 > index 0000000000..66be57a532 > --- /dev/null > +++ b/hw/tpm/tpm_crb_sysbus.c > @@ -0,0 +1,170 @@ > +/* > + * tpm_crb_sysbus.c - QEMU's TPM CRB interface emulator > + * > + * Copyright (c) 2018 Red Hat, Inc. > + * > + * Authors: > + * Marc-André Lureau > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or later. > + * See the COPYING file in the top-level directory. > + * > + * tpm_crb is a device for TPM 2.0 Command Response Buffer (CRB) Interface > + * as defined in TCG PC Client Platform TPM Profile (PTP) Specification > + * Family “2.0” Level 00 Revision 01.03 v22 > + */ > + > +#include "qemu/osdep.h" > +#include "hw/acpi/acpi_aml_interface.h" > +#include "hw/acpi/tpm.h" > +#include "hw/qdev-properties.h" > +#include "migration/vmstate.h" > +#include "tpm_prop.h" > +#include "hw/pci/pci_ids.h" > +#include "hw/sysbus.h" > +#include "qapi/visitor.h" > +#include "qom/object.h" > +#include "sysemu/tpm_util.h" > +#include "trace.h" > +#include "tpm_crb.h" > + > +struct TPMCRBStateSysBus { > + /*< private >*/ > + SysBusDevice parent_obj; > + > + /*< public >*/ > + TPMCRBState state; > + uint64_t baseaddr; > + uint64_t size; > +}; > + > +OBJECT_DECLARE_SIMPLE_TYPE(TPMCRBStateSysBus, TPM_CRB_SYSBUS) > + > +static void tpm_crb_sysbus_request_completed(TPMIf *ti, int ret) > +{ > + TPMCRBStateSysBus *s = TPM_CRB_SYSBUS(ti); > + > + return tpm_crb_request_completed(&s->state, ret); > +} > + > +static enum TPMVersion tpm_crb_sysbus_get_tpm_version(TPMIf *ti) > +{ > + TPMCRBStateSysBus *s = TPM_CRB_SYSBUS(ti); > + > + return tpm_crb_get_version(&s->state); > +} > + > +static int tpm_crb_sysbus_pre_save(void *opaque) > +{ > + TPMCRBStateSysBus *s = opaque; > + > + return tpm_crb_pre_save(&s->state); > +} > + > +static const VMStateDescription vmstate_tpm_crb_sysbus = { > + .name = "tpm-crb-sysbus", > + .pre_save = tpm_crb_sysbus_pre_save, > + .fields = (VMStateField[]) { > + VMSTATE_END_OF_LIST(), > + } > +}; > + > +static Property tpm_crb_sysbus_properties[] = { > + DEFINE_PROP_TPMBE("tpmdev", TPMCRBStateSysBus, state.tpmbe), > + DEFINE_PROP_UINT64("baseaddr", TPMCRBStateSysBus, > + baseaddr, TPM_CRB_ADDR_BASE), > + DEFINE_PROP_UINT64("size", TPMCRBStateSysBus, size, TPM_CRB_ADDR_SIZE), > + DEFINE_PROP_END_OF_LIST(), > +}; > + > +static void tpm_crb_sysbus_initfn(Object *obj) > +{ > + TPMCRBStateSysBus *s = TPM_CRB_SYSBUS(obj); > + > + tpm_crb_init_memory(obj, &s->state, NULL); > + > + sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->state.mmio); > +} > + > +static void tpm_crb_sysbus_reset(DeviceState *dev) > +{ > + TPMCRBStateSysBus *s = TPM_CRB_SYSBUS(dev); > + > + return tpm_crb_reset(&s->state, s->baseaddr); > +} > + > +static void tpm_crb_sysbus_realizefn(DeviceState *dev, Error **errp) > +{ > + TPMCRBStateSysBus *s = TPM_CRB_SYSBUS(dev); > + > + if (!tpm_find()) { > + error_setg(errp, "at most one TPM device is permitted"); > + return; > + } > + > + if (!s->state.tpmbe) { > + error_setg(errp, "'tpmdev' property is required"); > + return; > + } > + > + if (tpm_crb_sysbus_get_tpm_version(TPM_IF(s)) != TPM_VERSION_2_0) { > + error_setg(errp, "TPM CRB only supports TPM 2.0 backends"); > + return; > + } > +} > + > +static void build_tpm_crb_sysbus_aml(AcpiDevAmlIf *adev, Aml *scope) > +{ > + Aml *dev, *crs; > + TPMCRBStateSysBus *s = TPM_CRB_SYSBUS(adev); > + TPMIf *ti = TPM_IF(s); ../hw/tpm/tpm_crb_sysbus.c: In function 'build_tpm_crb_sysbus_aml': ../hw/tpm/tpm_crb_sysbus.c:120:12: error: unused variable 'ti' [-Werror=unused-variable] 120 | TPMIf *ti = TPM_IF(s); | ^~ Rest LGTM. > + > + dev = aml_device("TPM"); > + aml_append(dev, aml_name_decl("_HID", aml_string("MSFT0101"))); > + aml_append(dev, aml_name_decl("_STR", aml_string("TPM 2.0 Device"))); > + aml_append(dev, aml_name_decl("_UID", aml_int(1))); > + aml_append(dev, aml_name_decl("_STA", aml_int(0xF))); > + crs = aml_resource_template(); > + aml_append(crs, aml_memory32_fixed(s->baseaddr, s->size, > + AML_READ_WRITE)); > + aml_append(dev, aml_name_decl("_CRS", crs)); > + aml_append(scope, dev); > +} > + > +static void tpm_crb_sysbus_class_init(ObjectClass *klass, void *data) > +{ > + DeviceClass *dc = DEVICE_CLASS(klass); > + TPMIfClass *tc = TPM_IF_CLASS(klass); > + AcpiDevAmlIfClass *adevc = ACPI_DEV_AML_IF_CLASS(klass); > + > + device_class_set_props(dc, tpm_crb_sysbus_properties); > + dc->vmsd = &vmstate_tpm_crb_sysbus; > + tc->model = TPM_MODEL_TPM_CRB; > + dc->realize = tpm_crb_sysbus_realizefn; > + dc->user_creatable = true; > + dc->reset = tpm_crb_sysbus_reset; > + tc->request_completed = tpm_crb_sysbus_request_completed; > + tc->get_version = tpm_crb_sysbus_get_tpm_version; > + set_bit(DEVICE_CATEGORY_MISC, dc->categories); > + adevc->build_dev_aml = build_tpm_crb_sysbus_aml; > +} > + > +static const TypeInfo tpm_crb_sysbus_info = { > + .name = TYPE_TPM_CRB_SYSBUS, > + .parent = TYPE_SYS_BUS_DEVICE, > + .instance_size = sizeof(TPMCRBStateSysBus), > + .instance_init = tpm_crb_sysbus_initfn, > + .class_init = tpm_crb_sysbus_class_init, > + .interfaces = (InterfaceInfo[]) { > + { TYPE_TPM_IF }, > + { TYPE_ACPI_DEV_AML_IF }, > + { } > + } > +}; > + > +static void tpm_crb_sysbus_register(void) > +{ > + type_register_static(&tpm_crb_sysbus_info); > +} > + > +type_init(tpm_crb_sysbus_register) > diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig > index 7e68348440..efe1beaa7b 100644 > --- a/hw/arm/Kconfig > +++ b/hw/arm/Kconfig > @@ -5,6 +5,7 @@ config ARM_VIRT > imply VFIO_AMD_XGBE > imply VFIO_PLATFORM > imply VFIO_XGMAC > + imply TPM_CRB_SYSBUS > imply TPM_TIS_SYSBUS > imply TPM_TIS_I2C > imply NVDIMM > diff --git a/hw/riscv/Kconfig b/hw/riscv/Kconfig > index b6a5eb4452..d824cb58f9 100644 > --- a/hw/riscv/Kconfig > +++ b/hw/riscv/Kconfig > @@ -29,6 +29,7 @@ config RISCV_VIRT > imply PCI_DEVICES > imply VIRTIO_VGA > imply TEST_DEVICES > + imply TPM_CRB_SYSBUS > imply TPM_TIS_SYSBUS > select RISCV_NUMA > select GOLDFISH_RTC > diff --git a/hw/tpm/Kconfig b/hw/tpm/Kconfig > index 1fd73fe617..3f294a20ba 100644 > --- a/hw/tpm/Kconfig > +++ b/hw/tpm/Kconfig > @@ -25,6 +25,11 @@ config TPM_CRB > depends on TPM && ISA_BUS > select TPM_BACKEND > > +config TPM_CRB_SYSBUS > + bool > + depends on TPM > + select TPM_BACKEND > + > config TPM_SPAPR > bool > default y > diff --git a/hw/tpm/meson.build b/hw/tpm/meson.build > index cb8204d5bc..d96de92c16 100644 > --- a/hw/tpm/meson.build > +++ b/hw/tpm/meson.build > @@ -4,6 +4,8 @@ system_ss.add(when: 'CONFIG_TPM_TIS_SYSBUS', if_true: files('tpm_tis_sysbus.c')) > system_ss.add(when: 'CONFIG_TPM_TIS_I2C', if_true: files('tpm_tis_i2c.c')) > system_ss.add(when: 'CONFIG_TPM_CRB', if_true: files('tpm_crb.c')) > system_ss.add(when: 'CONFIG_TPM_CRB', if_true: files('tpm_crb_common.c')) > +system_ss.add(when: 'CONFIG_TPM_CRB_SYSBUS', if_true: files('tpm_crb_sysbus.c')) > +system_ss.add(when: 'CONFIG_TPM_CRB_SYSBUS', if_true: files('tpm_crb_common.c')) > system_ss.add(when: 'CONFIG_TPM_TIS', if_true: files('tpm_ppi.c')) > system_ss.add(when: 'CONFIG_TPM_CRB', if_true: files('tpm_ppi.c')) >