From nobody Sat Apr 11 23:07:57 2026 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773068008; cv=none; d=zohomail.com; s=zohoarc; b=nmK5Wd7ezNrqIvS1fxDNHdasEXZgwW7I/NObwWCyPWLMuJO0SE4rxIsqvHwICIphXHMMgGjFRdGFupIF6KZdSDLDHgfI3yzKtW4g+OZ+/2Tnk+Ajk/rjpS/87hSEyVVe9FseMtMEKWLLJHxzDtGdXhJKPtWhEvW63DKpP+SkUgU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773068008; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=nFBD0qDRhedXBZOSg9THzlFQsk+WFfdCetsuF6KGnOc=; b=g66xEP6sKYZ5iByt+umAZKa93qIbOYpl5kJKXYUwZJmUyeVCUdI2Xq6YGODTeL2Cosb92gCii6BZAPX/wK3aw3q6Bi69HI251ubWwCHjXbMcgC3GxiS2H++MaEKd+U9hRjVMj5MlSixda++AKVp05J7CmWvq6klm/a6T5dIvKFI= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177306800804771.8762094379316; Mon, 9 Mar 2026 07:53:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzbyb-00060z-Sm; Mon, 09 Mar 2026 10:52:57 -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 1vzbxC-0004Ml-GG for qemu-devel@nongnu.org; Mon, 09 Mar 2026 10:51:36 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vzbx9-0005mG-Pc for qemu-devel@nongnu.org; Mon, 09 Mar 2026 10:51:29 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-4852e09e23dso18591655e9.0 for ; Mon, 09 Mar 2026 07:51:27 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48527681e2bsm265186225e9.5.2026.03.09.07.51.24 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Mar 2026 07:51:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773067886; x=1773672686; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nFBD0qDRhedXBZOSg9THzlFQsk+WFfdCetsuF6KGnOc=; b=AEg37BPFT/x1MbsaFLJcwmiTDCnQfa7dgdAJqjtGUnAWC0clok+AVZs5dHaNIbdeGr t/Bwe8p5nB+v5YLNTrYXrtWGcBPsel0YDC04k0ZHu5QCXOwpovvsvXkwEo1LDUC5vGEA hPPHnqrXVtiUyNih+dBflfQGlP49afXYJblrXRL9gONqjKYZ1ZANqTzsTLO3GuDhzrFz G6at3TLbDpCpY8JIND2R2Ux5nhYR+Oq2NFSetXbBTIwsqDdD9fQcPs95fYiZD+stUJ5A l1Ah/JKMKxSoNK0JRAnS/8uaq94yMy9wzNAJmVGOjShDnC/kEx/7D4xSeyAZg3RKT0uo IaJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773067886; x=1773672686; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=nFBD0qDRhedXBZOSg9THzlFQsk+WFfdCetsuF6KGnOc=; b=O7mekDvIvtwrNN1yT1Rp6fQnx/6ym488Ljlio99+dS8eTx0e0PkmXxXgbW1wpJJoWq 1flnbKzwaOVSuN0synQSUjwbY3iDJ6JYb/Q2NHecXjfe9HgzgBYJK4KB75s+mbChieIk +CJN+iz0EwpJIBPRfmbAMfcUXNFB5+VjMfOItWYF0AiD0M89T/8uItzkt6DvABYxTs2Y u/vQ1CVlpQeA7R/FOxsSTprbZP8M3WQfUVnV2ldksii43szAL0pvBRBtjILJyXAbGL0j 31p5xL0XBknOxehYMp8FUFLTJXEhT7EZZz3oYSsbbC2q9jtJkRTjhJOk500xkY5DciiP 1dag== X-Gm-Message-State: AOJu0Yy/gZClWQ1RByWF5Y4OrKIYDGbk7+I396Yg/w5+sdpGCvSSo0Vs aSO9wv1eulbdzEc4pbIYB/INxJ00ThPIGUhkGAf9VzPzw+XMOOqbN3w2RhNqJCx9fY6IW7eKcOB +xpxt+rQ= X-Gm-Gg: ATEYQzyc8Mx/wmrcXbaK8TVcX86QK4oBPS1VyEs+HNgUw91GRCtBWFDhxGi5PoGAiYB giXL6pUzjI3VV2UsX5epRxtok8+05AlNOZ/0+QifEGrbpxA0q0s8+5ljIjclzxO9lSFGwyvX1Jc 6UelnEyFyDdgeCr+wdI+3uXNHAPmXEtjBs1LkmprPdq+83erBbpL91k6P7cXVabeN/8WyB+XfXa wGhLyNE74eorkqwGg7eSsubcnfLe4vK7yPLpyQdoBQlO4/7Ech2kmwZ1Ox2mGFSeQJlWqyf61Ye eiboKT+zZci3Wl6OKMa3bEf4UG6xXgN9+T8DNjGkzKUV+vFDhfRiwARJ/Mrt6JwOKj6aH46wbYY 1MlQSm5sjS2ymPS+IQQZTKc4USpXh03Ws0oNVrdvXb3gtdSkZHxOnJEeTzfowdVoTKIbH2g2MV4 zYqoWnBnlDnnSvN182naJnQEYYVI8cwskozS9D8oz4d2ijFDjRsEbhIrkdnWBiDqff21ujcrGvJ 3lGaA== X-Received: by 2002:a05:600c:350e:b0:485:17a7:ba0d with SMTP id 5b1f17b1804b1-485269785bamr190793715e9.32.1773067885916; Mon, 09 Mar 2026 07:51:25 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Zhao Liu , Yi Liu , Paolo Bonzini , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" , Igor Mammedov , Ani Sinha , Richard Henderson , Eduardo Habkost , Marcel Apfelbaum , Stefan Berger Subject: [PATCH v2 10/10] hw/tpm: Remove CRBState::ppi_enabled field Date: Mon, 9 Mar 2026 15:50:12 +0100 Message-ID: <20260309145013.44327-11-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309145013.44327-1-philmd@linaro.org> References: <20260309145013.44327-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.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, RCVD_IN_DNSWL_NONE=-0.0001, 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: qemu development 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 @linaro.org) X-ZM-MESSAGEID: 1773068010481154100 The CRBState::ppi_enabled boolean was only set in the hw_compat_3_1[] array, via the 'ppi=3Dfalse' property. We removed all machines using that array, lets remove that property and all the code around it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Message-Id: <20260307152635.83893-11-philmd@linaro.org> --- hw/tpm/tpm_tis.h | 1 - hw/acpi/tpm.c | 4 ---- hw/i386/acpi-build.c | 2 +- hw/tpm/tpm_crb.c | 12 +++--------- hw/tpm/tpm_tis_common.c | 4 +--- hw/tpm/tpm_tis_isa.c | 7 ++----- 6 files changed, 7 insertions(+), 23 deletions(-) diff --git a/hw/tpm/tpm_tis.h b/hw/tpm/tpm_tis.h index 184632ff66b..0df45f0c716 100644 --- a/hw/tpm/tpm_tis.h +++ b/hw/tpm/tpm_tis.h @@ -75,7 +75,6 @@ typedef struct TPMState { =20 size_t be_buffer_size; =20 - bool ppi_enabled; TPMPPI ppi; } TPMState; =20 diff --git a/hw/acpi/tpm.c b/hw/acpi/tpm.c index cdc02275365..922030a29bf 100644 --- a/hw/acpi/tpm.c +++ b/hw/acpi/tpm.c @@ -25,10 +25,6 @@ void tpm_build_ppi_acpi(TPMIf *tpm, Aml *dev) Aml *method, *field, *ifctx, *ifctx2, *ifctx3, *func_mask, *not_implemented, *pak, *tpm2, *tpm3, *pprm, *pprq, *zero, *one; =20 - if (!object_property_get_bool(OBJECT(tpm), "ppi", &error_abort)) { - return; - } - zero =3D aml_int(0); one =3D aml_int(1); func_mask =3D aml_int(TPM_PPI_FUNC_MASK); diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index f622b91b76a..6b7cd00c5db 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -2218,7 +2218,7 @@ void acpi_setup(void) tables.tcpalog->data, acpi_data_len(tables.tcpalog)); =20 tpm =3D tpm_find(); - if (tpm && object_property_get_bool(OBJECT(tpm), "ppi", &error_abort))= { + if (tpm) { tpm_config =3D (FwCfgTPMConfig) { .tpmppi_address =3D cpu_to_le32(TPM_PPI_ADDR_BASE), .tpm_version =3D tpm_get_version(tpm), diff --git a/hw/tpm/tpm_crb.c b/hw/tpm/tpm_crb.c index 8723536f931..40ffc7b006b 100644 --- a/hw/tpm/tpm_crb.c +++ b/hw/tpm/tpm_crb.c @@ -43,7 +43,6 @@ struct CRBState { =20 size_t be_buffer_size; =20 - bool ppi_enabled; TPMPPI ppi; }; typedef struct CRBState CRBState; @@ -228,16 +227,13 @@ static const VMStateDescription vmstate_tpm_crb =3D { =20 static const Property tpm_crb_properties[] =3D { DEFINE_PROP_TPMBE("tpmdev", CRBState, tpmbe), - DEFINE_PROP_BOOL("ppi", CRBState, ppi_enabled, true), }; =20 static void tpm_crb_reset(void *dev) { CRBState *s =3D CRB(dev); =20 - if (s->ppi_enabled) { - tpm_ppi_reset(&s->ppi); - } + tpm_ppi_reset(&s->ppi); tpm_backend_reset(s->tpmbe); =20 memset(s->regs, 0, sizeof(s->regs)); @@ -303,10 +299,8 @@ static void tpm_crb_realize(DeviceState *dev, Error **= errp) memory_region_add_subregion(get_system_memory(), TPM_CRB_ADDR_BASE + sizeof(s->regs), &s->cmdmem); =20 - if (s->ppi_enabled) { - tpm_ppi_init(&s->ppi, get_system_memory(), - TPM_PPI_ADDR_BASE, OBJECT(s)); - } + tpm_ppi_init(&s->ppi, get_system_memory(), + TPM_PPI_ADDR_BASE, OBJECT(s)); =20 if (xen_enabled()) { tpm_crb_reset(dev); diff --git a/hw/tpm/tpm_tis_common.c b/hw/tpm/tpm_tis_common.c index f594b15b8ab..712d64b60f1 100644 --- a/hw/tpm/tpm_tis_common.c +++ b/hw/tpm/tpm_tis_common.c @@ -821,9 +821,7 @@ void tpm_tis_reset(TPMState *s) s->be_buffer_size =3D MIN(tpm_backend_get_buffer_size(s->be_driver), TPM_TIS_BUFFER_MAX); =20 - if (s->ppi_enabled) { - tpm_ppi_reset(&s->ppi); - } + tpm_ppi_reset(&s->ppi); tpm_backend_reset(s->be_driver); =20 s->active_locty =3D TPM_TIS_NO_LOCALITY; diff --git a/hw/tpm/tpm_tis_isa.c b/hw/tpm/tpm_tis_isa.c index 61e95434f5b..aadca4ed79b 100644 --- a/hw/tpm/tpm_tis_isa.c +++ b/hw/tpm/tpm_tis_isa.c @@ -94,7 +94,6 @@ static void tpm_tis_isa_reset(DeviceState *dev) static const Property tpm_tis_isa_properties[] =3D { DEFINE_PROP_UINT32("irq", TPMStateISA, state.irq_num, TPM_TIS_IRQ), DEFINE_PROP_TPMBE("tpmdev", TPMStateISA, state.be_driver), - DEFINE_PROP_BOOL("ppi", TPMStateISA, state.ppi_enabled, true), }; =20 static void tpm_tis_isa_initfn(Object *obj) @@ -132,10 +131,8 @@ static void tpm_tis_isa_realizefn(DeviceState *dev, Er= ror **errp) memory_region_add_subregion(isa_address_space(ISA_DEVICE(dev)), TPM_TIS_ADDR_BASE, &s->mmio); =20 - if (s->ppi_enabled) { - tpm_ppi_init(&s->ppi, isa_address_space(ISA_DEVICE(dev)), - TPM_PPI_ADDR_BASE, OBJECT(dev)); - } + tpm_ppi_init(&s->ppi, isa_address_space(ISA_DEVICE(dev)), + TPM_PPI_ADDR_BASE, OBJECT(dev)); } =20 static void build_tpm_tis_isa_aml(AcpiDevAmlIf *adev, Aml *scope) --=20 2.53.0