From nobody Wed Feb 11 10:43:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1689318721838358.94167712894364; Fri, 14 Jul 2023 00:12:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qKCwD-0006NE-C9; Fri, 14 Jul 2023 03:10:01 -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 1qKCwB-0006MK-3N for qemu-devel@nongnu.org; Fri, 14 Jul 2023 03:09:59 -0400 Received: from mail-pf1-f173.google.com ([209.85.210.173]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qKCw9-00059F-Cg for qemu-devel@nongnu.org; Fri, 14 Jul 2023 03:09:58 -0400 Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-666e916b880so1015506b3a.2 for ; Fri, 14 Jul 2023 00:09:57 -0700 (PDT) Received: from localhost.localdomain ([2607:fb90:dd17:8dad:e558:8948:1ff6:c8c1]) by smtp.gmail.com with ESMTPSA id t8-20020a170902b20800b001b89466a5f4sm7041513plr.105.2023.07.14.00.09.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 14 Jul 2023 00:09:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689318596; x=1691910596; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4VTJlfLzpuxxNKZPxm/qCkrMkuqDPIbMWB1AskfZxJw=; b=DaTMft0XCieZIYcamTU7TGeeFn0Ahay5MfSoOjcsk7RfSN/Fhdh9jSxnz2jx/GUgYT KKUm34JV5CthWhP/l6F+S3KLIAsxIB/LTK4TPVkncKTgNRJNjRS2vR3823z/hTGtBZsn GJpHrVp+vTI9O7P5qIFJdvquSRCFHOq/rpJyUbSud1NQkQim0jsXsBn/pd34JEHkhFGU ywCgJD/Cife2Z9V7J6hTtpRzJjaQgn3YpTg4R5YSGzk9l0mIBGg2V+rBWFNk7gP0ISQX 19VW/YjYkKqkl8qHcJ5JMVhUB5hKvQj/f0GUQdFnJFV8wqE714vRpWcI/w9t/qYm3JRU K9Yg== X-Gm-Message-State: ABy/qLZhWtoB+5LhUEpbWtssTIyNrTdxFOM8qomDkqoQ8ElxX2clZ41z pKMfmC/+u8JSA7y4pnm6Rxb7Cmjvz2lJyQ== X-Google-Smtp-Source: APBJJlFsilXxLKUBS2u5iqcs7EV/kT2uJP+HQOp3MEUY+bNnbN8LJWtZI3f22HySdA2Hx9isB5z/Xw== X-Received: by 2002:a05:6a20:4406:b0:131:b3fa:eaaa with SMTP id ce6-20020a056a20440600b00131b3faeaaamr3622973pzb.61.1689318595802; Fri, 14 Jul 2023 00:09:55 -0700 (PDT) From: Joelle van Dyne To: qemu-devel@nongnu.org Cc: Joelle van Dyne , Stefan Berger , Paolo Bonzini Subject: [PATCH v2 05/11] tpm_crb: use the ISA bus Date: Fri, 14 Jul 2023 00:09:21 -0700 Message-ID: <20230714070931.23476-6-j@getutm.app> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230714070931.23476-1-j@getutm.app> References: <20230714070931.23476-1-j@getutm.app> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=209.85.210.173; envelope-from=osy86dev@gmail.com; helo=mail-pf1-f173.google.com X-Spam_score_int: -13 X-Spam_score: -1.4 X-Spam_bar: - X-Spam_report: (-1.4 / 5.0 requ) BAYES_00=-1.9, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=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=no 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1689318722039100001 Content-Type: text/plain; charset="utf-8" Since this device is gated to only build for targets with the PC configuration, we should use the ISA bus like with TPM TIS. Signed-off-by: Joelle van Dyne --- hw/tpm/tpm_crb.c | 52 ++++++++++++++++++++++++------------------------ hw/tpm/Kconfig | 2 +- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/hw/tpm/tpm_crb.c b/hw/tpm/tpm_crb.c index 07c6868d8d..6144081d30 100644 --- a/hw/tpm/tpm_crb.c +++ b/hw/tpm/tpm_crb.c @@ -22,6 +22,7 @@ #include "hw/qdev-properties.h" #include "hw/pci/pci_ids.h" #include "hw/acpi/tpm.h" +#include "hw/isa/isa.h" #include "migration/vmstate.h" #include "sysemu/tpm_backend.h" #include "sysemu/tpm_util.h" @@ -34,7 +35,7 @@ #include "tpm_crb.h" =20 struct CRBState { - DeviceState parent_obj; + ISADevice parent_obj; =20 TPMCRBState state; }; @@ -43,49 +44,49 @@ typedef struct CRBState CRBState; DECLARE_INSTANCE_CHECKER(CRBState, CRB, TYPE_TPM_CRB) =20 -static void tpm_crb_none_request_completed(TPMIf *ti, int ret) +static void tpm_crb_isa_request_completed(TPMIf *ti, int ret) { CRBState *s =3D CRB(ti); =20 tpm_crb_request_completed(&s->state, ret); } =20 -static enum TPMVersion tpm_crb_none_get_version(TPMIf *ti) +static enum TPMVersion tpm_crb_isa_get_version(TPMIf *ti) { CRBState *s =3D CRB(ti); =20 return tpm_crb_get_version(&s->state); } =20 -static int tpm_crb_none_pre_save(void *opaque) +static int tpm_crb_isa_pre_save(void *opaque) { CRBState *s =3D opaque; =20 return tpm_crb_pre_save(&s->state); } =20 -static const VMStateDescription vmstate_tpm_crb_none =3D { +static const VMStateDescription vmstate_tpm_crb_isa =3D { .name =3D "tpm-crb", - .pre_save =3D tpm_crb_none_pre_save, + .pre_save =3D tpm_crb_isa_pre_save, .fields =3D (VMStateField[]) { VMSTATE_END_OF_LIST(), } }; =20 -static Property tpm_crb_none_properties[] =3D { +static Property tpm_crb_isa_properties[] =3D { DEFINE_PROP_TPMBE("tpmdev", CRBState, state.tpmbe), DEFINE_PROP_BOOL("ppi", CRBState, state.ppi_enabled, true), DEFINE_PROP_END_OF_LIST(), }; =20 -static void tpm_crb_none_reset(void *dev) +static void tpm_crb_isa_reset(void *dev) { CRBState *s =3D CRB(dev); =20 return tpm_crb_reset(&s->state, TPM_CRB_ADDR_BASE); } =20 -static void tpm_crb_none_realize(DeviceState *dev, Error **errp) +static void tpm_crb_isa_realize(DeviceState *dev, Error **errp) { CRBState *s =3D CRB(dev); =20 @@ -100,52 +101,51 @@ static void tpm_crb_none_realize(DeviceState *dev, Er= ror **errp) =20 tpm_crb_init_memory(OBJECT(s), &s->state, errp); =20 - memory_region_add_subregion(get_system_memory(), + memory_region_add_subregion(isa_address_space(ISA_DEVICE(dev)), TPM_CRB_ADDR_BASE, &s->state.mmio); =20 if (s->state.ppi_enabled) { - memory_region_add_subregion(get_system_memory(), + memory_region_add_subregion(isa_address_space(ISA_DEVICE(dev)), TPM_PPI_ADDR_BASE, &s->state.ppi.ram); } =20 if (xen_enabled()) { - tpm_crb_none_reset(dev); + tpm_crb_isa_reset(dev); } else { - qemu_register_reset(tpm_crb_none_reset, dev); + qemu_register_reset(tpm_crb_isa_reset, dev); } } =20 -static void tpm_crb_none_class_init(ObjectClass *klass, void *data) +static void tpm_crb_isa_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); TPMIfClass *tc =3D TPM_IF_CLASS(klass); =20 - dc->realize =3D tpm_crb_none_realize; - device_class_set_props(dc, tpm_crb_none_properties); - dc->vmsd =3D &vmstate_tpm_crb_none; + dc->realize =3D tpm_crb_isa_realize; + device_class_set_props(dc, tpm_crb_isa_properties); + dc->vmsd =3D &vmstate_tpm_crb_isa; dc->user_creatable =3D true; tc->model =3D TPM_MODEL_TPM_CRB; - tc->get_version =3D tpm_crb_none_get_version; - tc->request_completed =3D tpm_crb_none_request_completed; + tc->get_version =3D tpm_crb_isa_get_version; + tc->request_completed =3D tpm_crb_isa_request_completed; =20 set_bit(DEVICE_CATEGORY_MISC, dc->categories); } =20 -static const TypeInfo tpm_crb_none_info =3D { +static const TypeInfo tpm_crb_isa_info =3D { .name =3D TYPE_TPM_CRB, - /* could be TYPE_SYS_BUS_DEVICE (or LPC etc) */ - .parent =3D TYPE_DEVICE, + .parent =3D TYPE_ISA_DEVICE, .instance_size =3D sizeof(CRBState), - .class_init =3D tpm_crb_none_class_init, + .class_init =3D tpm_crb_isa_class_init, .interfaces =3D (InterfaceInfo[]) { { TYPE_TPM_IF }, { } } }; =20 -static void tpm_crb_none_register(void) +static void tpm_crb_isa_register(void) { - type_register_static(&tpm_crb_none_info); + type_register_static(&tpm_crb_isa_info); } =20 -type_init(tpm_crb_none_register) +type_init(tpm_crb_isa_register) diff --git a/hw/tpm/Kconfig b/hw/tpm/Kconfig index a46663288c..1fd73fe617 100644 --- a/hw/tpm/Kconfig +++ b/hw/tpm/Kconfig @@ -22,7 +22,7 @@ config TPM_TIS =20 config TPM_CRB bool - depends on TPM && PC + depends on TPM && ISA_BUS select TPM_BACKEND =20 config TPM_SPAPR --=20 2.39.2 (Apple Git-143)