From nobody Mon Apr 6 23:23:28 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=1773749040; cv=none; d=zohomail.com; s=zohoarc; b=cNl9TayOgfjh9/dC04toywjdaqmrUDHzEn/I3ZwWWlpjuln2r3aMXcmiuqFn4fQ5PT5xUrNXZXZOBPNEacAqYGqSx1YsXyirSF1LrMvVn9g0LO93y6PHI+CvjPWQG46uaQJQZU1SaD0NzgSujaqWHqZ1KHS/RagUehdyVT2ifQs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773749040; 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=hT+7qDaS9TXLWUeu0HUQpIId7ZLbZMO1RZ4Wz9uV/gc=; b=jyM+1Zlz/VkKPbNnYVh0GEUVPPveBcAQsgz/g3XugV2+ftfDU1EQUKm3L+hfKzF+mw2B6JL70tcYnCy2I98bMydLG1yVbIb6iAyKNhaLdnJopt707DI+m4N3OsndFn5hIxDPeWjU2UMcmWTy7aHo8EFl0gE0XW2Q8zMjvAW55wY= 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 1773749040615353.90957776733705; Tue, 17 Mar 2026 05:04:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w2T9A-00007e-9d; Tue, 17 Mar 2026 08:03:41 -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 1w2T8S-0008Na-7d for qemu-devel@nongnu.org; Tue, 17 Mar 2026 08:02:57 -0400 Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w2T8P-0001TQ-HG for qemu-devel@nongnu.org; Tue, 17 Mar 2026 08:02:54 -0400 Received: by mail-ej1-x62c.google.com with SMTP id a640c23a62f3a-b97b30fa5e5so389454066b.3 for ; Tue, 17 Mar 2026 05:02:52 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439fe20bb90sm52848199f8f.19.2026.03.17.05.02.49 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 17 Mar 2026 05:02:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773748971; x=1774353771; 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=hT+7qDaS9TXLWUeu0HUQpIId7ZLbZMO1RZ4Wz9uV/gc=; b=F8sKJS+5BzD2k3l0Sw/0tS9sI6vOtZG59c9Dr0fp/hL3Hv8My1mbihIoF7ZOIn1gHq kei9JK66edceC9RuJLocClZtIwNuhKtgijGbvIez39W84dVFDh/dOcmRgb+b7tz3Culr HzPiCEAjUZI5VBg8H4+ehyki/M4LjUCRPxgUeyo6g77Ue4yUTN+6OSm+zJyfUJp7+oR9 FnFFCu69JjeDvK6dp1g2GENg4UDOzZj5+/5iwnxVQMyXi9PkAPu5J0/gE9uyF0vYDSIS jfrO7tlJ0dJcFhGs0O7LlcWuzN/KHy/PiM+mxQmSFchzL2N5KYoDtbTXyYz8tWxF6jJU xzaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773748971; x=1774353771; 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=hT+7qDaS9TXLWUeu0HUQpIId7ZLbZMO1RZ4Wz9uV/gc=; b=jlTXPG5wup7OEug1cDof8Abt4FmoMwZ2QiY5lA0ppH+iKYq+zuO5+tAJbRCwCf4UFK 6VfUj+cUlAQO4TwDlT/51iFjMf35U96ONdOf2PWDELHjArmJDtM82JQCFOYidqY2g3hs x4NrAObPvypXiNUK4+KcxysLHUiwRQ3sVOYP9/+rZZhFgb+P805iOwSvGmZewOmrbT3b jdB2CMMmnIVY9bgHJ8xbnmaCbrgg5Rl5I5/T0GcpA1i9rjFJJv8SfJscf73k/5X7E3Hi 0O1m/U7uDvjyj8wT0UaacQWB9JolsnWGConSMzswvGD7gDZ1RHK0RWvzQOVrlNI2wDDr 25sA== X-Gm-Message-State: AOJu0YxYxPHMCsiL+ZUo6LASUYMFn6fcfMQOP8C+J7F9INasLreVGIYJ pDnOWikvv3HwA+32cqBjoYwCbHMsOmall6LzliJ507PY9XJiWS/NIIpe9hkZDFz5KGMSeNZSkSO ew5/Qp5s= X-Gm-Gg: ATEYQzz4Wmtw9RZkp2ImB36eJjo93mfsgUOfPfi+4CieqyyQmhxczaZtaj35p70pVTv PyPUgIVUOOManJku0GpUCnDzLlOX8PJLEE4KTzr6w8uDHr6TWH098diX+zFF8XROAH7rq2MIl49 Mjj6DjcGMm6yxEtY5Kv7zNKSavWyo6jmOyy4p6sNVv3lqIYwyfcPRgnlyt95MbwC40hgKus5PLj 1PGWaKFvj2x80cfQCZ2la85NK5CfwyNRvHq5upmM8qi5T/GHbnz94jyEE5yDz86q87SIpTYrLjb faP6VYGRdEPCA5Eum1h8SaDeQZsnMeStRP9GxobNBRrWnR+4uZ92DfaeehORzIbdQ2z9GLJTSwx bAwYSMKp08dw/2rBqOgEcEMU8Pzu7oeyfKGqLpuPuTbohKTZYSCkI9ncqAQGTLxLUHuyRU21Rpg pOEXDmziGteMO1q3RhgNGl7jHfJYN7l7tduRCkm/HW/j1g2n9O78+3P6jHF0vj1KrWDx9uQ+bX X-Received: by 2002:a17:907:60cf:b0:b97:a64d:8599 with SMTP id a640c23a62f3a-b97a64d888fmr589634166b.11.1773748971040; Tue, 17 Mar 2026 05:02:51 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Thomas Huth , Stefan Berger , "Michael S. Tsirkin" , Ani Sinha , Igor Mammedov , Richard Henderson , Marcel Apfelbaum , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 1/5] hw/tpm: Factor tpm_ppi_enabled() out Date: Tue, 17 Mar 2026 13:02:37 +0100 Message-ID: <20260317120241.16320-2-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260317120241.16320-1-philmd@linaro.org> References: <20260317120241.16320-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::62c; envelope-from=philmd@linaro.org; helo=mail-ej1-x62c.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=unavailable 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: 1773749043330154100 Factor tpm_ppi_enabled() out before modifying it in a unique place. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Stefan Berger --- include/system/tpm.h | 9 +++++++++ hw/acpi/tpm.c | 2 +- hw/i386/acpi-build.c | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/include/system/tpm.h b/include/system/tpm.h index 1ee568b3b62..b90dd4e8cb0 100644 --- a/include/system/tpm.h +++ b/include/system/tpm.h @@ -13,6 +13,7 @@ #define QEMU_TPM_H =20 #include "qapi/qapi-types-tpm.h" +#include "qapi/error.h" #include "qom/object.h" =20 #ifdef CONFIG_TPM @@ -78,6 +79,14 @@ static inline TPMVersion tpm_get_version(TPMIf *ti) return TPM_IF_GET_CLASS(ti)->get_version(ti); } =20 +static inline bool tpm_ppi_enabled(TPMIf *ti) +{ + if (!ti) { + return false; + } + return object_property_get_bool(OBJECT(ti), "ppi", &error_abort); +} + #else /* CONFIG_TPM */ =20 #define tpm_init() (0) diff --git a/hw/acpi/tpm.c b/hw/acpi/tpm.c index cdc02275365..5fe95f2e3f1 100644 --- a/hw/acpi/tpm.c +++ b/hw/acpi/tpm.c @@ -25,7 +25,7 @@ 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)) { + if (!tpm_ppi_enabled(tpm)) { return; } =20 diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index f622b91b76a..4f01e2c476e 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_ppi_enabled(tpm)) { tpm_config =3D (FwCfgTPMConfig) { .tpmppi_address =3D cpu_to_le32(TPM_PPI_ADDR_BASE), .tpm_version =3D tpm_get_version(tpm), --=20 2.53.0 From nobody Mon Apr 6 23:23:28 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=1773749147; cv=none; d=zohomail.com; s=zohoarc; b=mhqQ6RhmsJi8Y7T8Ho4eeSwZuzAND2NOZTLlk2HFVXlk0p7yr4Wn4lEDdlOIWgITY1/sXmxoDjQ1yvpZOJQHjO8MF1pF1f0YiyHXom7XQzTPNcCnsNhYdsfogNffhSkp8ZMxyUcgl7/JKyjBPDpwQHvA4UlkIsCz8+Sxd8iZgO4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773749147; 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=zf40uxhO/fec5b+8gTtkOYyrPHsmu6O6HFwfVcu28uU=; b=QTleG4fr87qgjRxoEFya/b1uu8GtfW2c3nZBrKuNuj9H4RRbMF+Oq/8QuW3z6sXaxIBGkeZ6fikamtP7hX6Mkerz6+qNT3BrtGjFwAFuwSwla0mL30wej3XSdtY/0/h2hHTqP2deLrlcPBXW3sJVBJq/yeLtXHDBcD/i3rVw7XQ= 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 1773749147557309.6047109394714; Tue, 17 Mar 2026 05:05:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w2TB2-0001H2-VJ; Tue, 17 Mar 2026 08:05:40 -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 1w2T8b-0008S7-Tt for qemu-devel@nongnu.org; Tue, 17 Mar 2026 08:03:12 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w2T8W-0001UV-E5 for qemu-devel@nongnu.org; Tue, 17 Mar 2026 08:03:02 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-43b43f5990dso1314810f8f.2 for ; Tue, 17 Mar 2026 05:03:00 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43b46b41eb2sm14250402f8f.1.2026.03.17.05.02.56 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 17 Mar 2026 05:02:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773748978; x=1774353778; 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=zf40uxhO/fec5b+8gTtkOYyrPHsmu6O6HFwfVcu28uU=; b=PU1BfXHwhVeICz+gi8uRY6pBaYC7z0wgZx7hZmB8AlRqJ4xZ8Jxl+gQsNgFY623Mst 0rQGiwW5UiQtBDHXdO4lVcm3Pr1RvppI7l+ksWAQsruAQKXM66m9B2Q/p3BHe/n3sRzu 0NkT85bwg080IHHvz8t8Ejo3HW99fBHADNMuJuK3NHCPi4/lXX5wWb/kDU9qRfJuJTmM 5Cw3rER4xyO2FkFOC9ZxKpGSnjq3dJib7eC263+Bhw2G9Vv60Ll50jaHW001MT55MUHE YOzKM2OmPPO3FiAKm+HwOy8dbDC4FZJz4mIEl+l2bsc72MIVOBMy4QvSuJXcfu7THUwh IlQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773748978; x=1774353778; 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=zf40uxhO/fec5b+8gTtkOYyrPHsmu6O6HFwfVcu28uU=; b=XKb6HAh4IptXQkaOIHYVjYafVz594NNi3EVjarE+MWhMxSRgW8FNg0TrwUyp/ydMya X40Y7sT6JdtZC9ZbPzlzLMCv5uhFJWccXNnbymtNqnlaDJ+Zyw7wQaP1BQeFZGXrK0uk HMcyXBLoZn6k96l04PE0PNWefz+tIKXnwyAY0bDXmvXy6fl3QL9rA1ZNr6ehUKjutKO6 8A8X+OLpMv9H8Hudv8e2yLjA0Pb3L24TY5dfs5zl9NdcbNrlQDIhzdJtyX4t5DufghcD EmK1FyPAWu8aqwWr6UwqWoIEl2w2Dwie0/hj/2ixZlnxtUIzsOTG+rbTIec4L3RhbuGK l61w== X-Gm-Message-State: AOJu0YyMp9tFxd9lCCKPwFh69eMUKj9RbEzrfU47KEw+i9W1xK/vc4S/ l5SB9/XdvScxjSObgCTlk7opBG8kv3mc6MCR9t6hkym9Bvh57s+JlBhHpCvkstkcSVKamz6yDUJ cIwEs+SQ= X-Gm-Gg: ATEYQzyxyEGSS7RT4Ns4BHAS8NwOxJgqCYKesekUDgMKckbg0/++dpBCOkC9VhzgCiM irnRr/TsWGbFiECNTAlQ1eV0gc+2qR2kRGWJ/GDK4As8kLPlJ+jE6pq1wPwy5vksATyjHlS5faj BUSnadKlOY0QnLcftgSGAZzmnsMhZpyMUYNSSAaHPgR5TCzLXbd6y6HTvwgivFeSvOYWWl8rmmi 2nT1+yL4LMBhdE1gdRhRLER5tNRDCXk76IYYEbthRwc5q1O3WNeC4OLGbZ7BcoyDxTl94n41jXc 2YI4wiyxM6JAmeFmgqL+OWp8JpXVQL5iPrB80jxx90RMc/jxE7crNr41pKwu7+aNzKyOLeFUfhz T2qtT5rPh+bsU6dkXqIQ/pQ7jGOouV+vNs/od/TXO/S1uQYMDfN+lvCYrtnd5v6Qz+YSHjducoz EuwxgjkwzE5k8lZe+3F9bAY50lmbolpvN+kwuLI0Kx3Ibayf0o8ktW1g807pC2K715tkM/tWkI X-Received: by 2002:a05:6000:2583:b0:439:c1ca:82be with SMTP id ffacd0b85a97d-43a04db18cfmr32111462f8f.28.1773748978182; Tue, 17 Mar 2026 05:02:58 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Thomas Huth , Stefan Berger , "Michael S. Tsirkin" , Ani Sinha , Igor Mammedov , Richard Henderson , Marcel Apfelbaum , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 2/5] hw/tpm: Add TPMIfClass::ppi_enabled field Date: Tue, 17 Mar 2026 13:02:38 +0100 Message-ID: <20260317120241.16320-3-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260317120241.16320-1-philmd@linaro.org> References: <20260317120241.16320-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::42c; envelope-from=philmd@linaro.org; helo=mail-wr1-x42c.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=unavailable 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: 1773749177072158500 Each TMP derived device has a @ppi_enabled field, itself exposed as a QOM property. External layers (like the ACPI subsystem) wanting to know whether a device implements PPI has to check for the QOM property available. This can be simplified by declaring a single field in the TPM interface. Here we add such field to TPMIfClass, before converting each TPM devices to use it in the following commits. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Stefan Berger --- include/system/tpm.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/system/tpm.h b/include/system/tpm.h index b90dd4e8cb0..9458ad6668a 100644 --- a/include/system/tpm.h +++ b/include/system/tpm.h @@ -43,6 +43,7 @@ struct TPMIfClass { enum TpmModel model; void (*request_completed)(TPMIf *obj, int ret); enum TPMVersion (*get_version)(TPMIf *obj); + bool ppi_enabled; }; =20 #define TYPE_TPM_TIS_ISA "tpm-tis" @@ -84,6 +85,9 @@ static inline bool tpm_ppi_enabled(TPMIf *ti) if (!ti) { return false; } + if (TPM_IF_GET_CLASS(ti)->ppi_enabled) { + return true; + } return object_property_get_bool(OBJECT(ti), "ppi", &error_abort); } =20 --=20 2.53.0 From nobody Mon Apr 6 23:23:28 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=1773749090; cv=none; d=zohomail.com; s=zohoarc; b=Iug521vMRhDK/JW2NfSCD1wKpHVB7VZiQOKEAtNydi0SwoX5WAYSMVXujAVtdvkIEk6qiSpJIwWFfrM2byQExpaBX83RQPmDHb0GtkKfcjl0cRg5DgLKmdEmTtaQNePgAa5JHxtn6ye3KrlCpUxlnzBeun57JllQnbr0wa4jFw0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773749090; 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=T0HxmPJnGmE7FQY9r6fCQKIQrTNRChdRwpx8XRwLBNY=; b=iVVPTatu+L4HqrnQWlNwJ5ahZgM28i6GSpD02jI4usJgsNpLmHwrwePdpnbZ9wn65amlYpbOL6lcIVfm/agZo1EGiCQzAV5YqRv+NkoBVoMDHs1YHlw7kKDj0bms6xBKPH8/CeZ0Y/JcwMMONL1mxztutO9g65p+Gfe8dZ4/+70= 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 1773749090748317.0828598823698; Tue, 17 Mar 2026 05:04:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w2T9M-0000AM-93; Tue, 17 Mar 2026 08:03:54 -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 1w2T8e-0008T2-Pk for qemu-devel@nongnu.org; Tue, 17 Mar 2026 08:03:12 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w2T8d-0001VJ-8N for qemu-devel@nongnu.org; Tue, 17 Mar 2026 08:03:08 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-4852f8ac7e9so67515555e9.1 for ; Tue, 17 Mar 2026 05:03:06 -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-48557a74228sm118143125e9.18.2026.03.17.05.03.04 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 17 Mar 2026 05:03:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773748985; x=1774353785; 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=T0HxmPJnGmE7FQY9r6fCQKIQrTNRChdRwpx8XRwLBNY=; b=RvF1Vg2t+n79phkOmVmPASjLzbhGYliNPDIAtfTBn4rkangrVdPrlE0kRHLFgm6vUL q3/pf7TU11aTua/llRvuT/3buZ/p9Rue+LL5/5zjHouek+a8+F4NlYF/t5ctfBLGMOPB fzgxsz91CsvnpNAOGliA79CVdPC/6LuxT7PKprc7NQlEAWTlF4YEdH/V5Tt0rmYhM4LF IvaVxrnNjti5F5O8OHqGFV8sICuvt2ddan/h/Un4JCt7Y7ydaBkYfRtJ63mLsiSNNki2 j77K1OCBpz7EMpS18JgcJ7/U+J07wICu4IlxrpT1wtPX1C21a0N9fpsz/VyPCDfVDnRG QgqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773748985; x=1774353785; 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=T0HxmPJnGmE7FQY9r6fCQKIQrTNRChdRwpx8XRwLBNY=; b=TCYqtmM6m5akyaArRgaKV6zJDAmFSVzFmDhNjFac1jTtsHjNPPgGiW49kwp7YEVmCj MEX0K3gKEQJoQ7nFGTsxejFk/676RXyLY83Z+9zZBaU8owJNw70ZljZA431FOnAVGNRL 4jdU+Iht5dl2EOP5XrNsU1/EYXy8HVNqWh4pgShGMYNgqyVB4zFThaMK5swx+hkZfwmf 4ZLAARX1na5KdQaLWWSYJrdJs4yhU8nJc5WO9NlkYePAldZeWXzTPLGRgODFGmN+tkWC xAzS9CuvIi1A4e8fH4NoFmHxYY7sufwqm74dEUK0FQl8K9DMH/BF7wPu0WxpvGz8VKqH XxIw== X-Gm-Message-State: AOJu0YyzQybB0xO2xAHLkXxXQtmRoQ7to7lfb/g6yx9Kw1rrHl098di/ 4aVxWMWy2c7qi3KERR3x6/x1PFbSYlb0n9/MorMAXO5Kl4CfIXbvum2bzqF4e/VtVv0KN2NCTWa n0DFXgns= X-Gm-Gg: ATEYQzwdFnzvefpDI6xD1Jye3HlKGCMTuyZEz4kpOUZ3TDUhq6F7FLs27V0SiO+tWoB fy7f1GFHkOt84P6qc8nH1jRHRYOOmqyO+Em+cKHWU5Xurc3pt/dNycugTAcI/zmI6q+itrlM/4w jIrR+HcOPUA5jBLFU+XiGnOrdJFbNYdQO9FvCAgcyUXEdQDegYm2X/38Vx3hQ6Ed0Oqaf/vVkPp 1WmdLuGJCbEWiazboWjjbRmBqYgAl/SviSdCNleObYMus9YhSe4TE9crbFV8Gnuph+rI4P2SQYi 158YoigmLh9BvXCr3GKhfMZlGIMQVL09BBXRS2+85znYkn9OypwxZcRlTUpeirAXCrSNEjK6Tfg MP4Cucx92+X4W9kl+BJ+rVPHKglXfVJjotAlOWjc6hU+mzcLay57bZ+50TSmOucek3gwxbSSqWX gtR5zsC8venrzhZ9Kye24YJVcXZGne6ZrECBVaUUKFLGCRvf+UE1omVpqXziBbcM8mGjB0Zig6G 4T3pLwLBEg= X-Received: by 2002:a05:600c:6287:b0:485:2c61:9457 with SMTP id 5b1f17b1804b1-485566d6e1cmr281959095e9.10.1773748985261; Tue, 17 Mar 2026 05:03:05 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Thomas Huth , Stefan Berger , "Michael S. Tsirkin" , Ani Sinha , Igor Mammedov , Richard Henderson , Marcel Apfelbaum , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 3/5] hw/tpm: Remove CRBState::ppi_enabled field Date: Tue, 17 Mar 2026 13:02:39 +0100 Message-ID: <20260317120241.16320-4-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260317120241.16320-1-philmd@linaro.org> References: <20260317120241.16320-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::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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=unavailable 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: 1773749092225154100 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, and the array itself in commit a861ffef237 ("hw/core/machine: Remove the hw_compat_3_1[] array"). We can safely remove the now unused property. Since CRB devices always use PPI, simplify removing the CRBState::ppi_enabled field. Set the generic TPMIfClass::ppi_enabled so ACPI subsystem can keep checking its availability. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Stefan Berger --- hw/tpm/tpm_crb.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/hw/tpm/tpm_crb.c b/hw/tpm/tpm_crb.c index 8723536f931..02701ab9480 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); @@ -325,6 +319,7 @@ static void tpm_crb_class_init(ObjectClass *klass, cons= t void *data) dc->vmsd =3D &vmstate_tpm_crb; dc->user_creatable =3D true; tc->model =3D TPM_MODEL_TPM_CRB; + tc->ppi_enabled =3D true; tc->get_version =3D tpm_crb_get_version; tc->request_completed =3D tpm_crb_request_completed; =20 --=20 2.53.0 From nobody Mon Apr 6 23:23:28 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=1773749106; cv=none; d=zohomail.com; s=zohoarc; b=m9d0VqKDWTnHWTTlJwSyio8GlDUX4e9B6DzroVEX7wPE+lCRr9rGqOodAZOvVAregCEqB23aBtCN3NevrZ48YLGpg24WrIdAzUGfCJyjV38TwF3wbjhCl1wT941IhD4L2g9ShWrX+J+r+rv7l2w2SBIEB5stMsArvqpoC15XKC4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773749106; 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=J1iBN45/0I325gjkdxYXymOeFIR0ZvQlgHa0U8JXzqg=; b=Pwr6gmP4+0JH9klRgqABBJec4NTtycD8/+gqvArqUvfjbGs5iOUtjTXZQDkLV9tqZjcLlcl02cp34ntg474PIo0JHrg4M8p23PNJ/f+VmlbO7Kg6YkYOUZyvY8VU7eS/JNcow0IGEiqoVZbwJ4mOthEAFSbRApKOUu2za7V6/1E= 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 1773749106872428.2791478812974; Tue, 17 Mar 2026 05:05:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w2T9V-0000Ij-QS; Tue, 17 Mar 2026 08:04:02 -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 1w2T8m-0008UE-V3 for qemu-devel@nongnu.org; Tue, 17 Mar 2026 08:03:22 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w2T8k-0001Vm-Bz for qemu-devel@nongnu.org; Tue, 17 Mar 2026 08:03:16 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-4853e1ce427so64534575e9.3 for ; Tue, 17 Mar 2026 05:03:13 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43b4938854csm8602067f8f.34.2026.03.17.05.03.11 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 17 Mar 2026 05:03:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773748992; x=1774353792; 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=J1iBN45/0I325gjkdxYXymOeFIR0ZvQlgHa0U8JXzqg=; b=XLazJ4VYnd3lFib4L7/a9kYiljz4TbbnnN/1UnpVea+Yb7+O5uPjisyO94Xm7QQEMN HTJvGxfV0xSLr36+15osKxajevkAbieyc0r14V5yiimHcvvdnlErKP2NjT+a5MYZR568 pZzTkxVHB9dNOe6kwav+0+knCFim+G8yRWHBmH6yCn+0caNAVBgQYufVdVGRmUvMpG3P uAN0wjqohPhbG6XoCezF3lGH9IXPNxibXtv1pQuRbdyCkoOcHhIIDN0aplpFZ1UagAMa 2E6NrxhIUtCMAGazIHmFA9f1W7pFsOlveGQYLoK+2zUJ+3+c5TIkb5GSjWDsDbhJuYrs D8Gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773748992; x=1774353792; 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=J1iBN45/0I325gjkdxYXymOeFIR0ZvQlgHa0U8JXzqg=; b=I5FD5mPtI+FTUAj8CXzUHVtIsY5oqR2y5+/hua2zyPUgPVds+ohguV79CcLg3VcyFB zwDoFkEBHUIKKxdQZh5Z3g6mRPvtq4Zvn0YTt/ixGVtHzBzpOahRC36wUJUb4eqELEwo DlrbFFL6L2PFt6Bl7bXilU62/vyhXaxGV8ztImXV0IaSGsH2yZwPVhh75MUcK08eAE4/ 9MvZ4/uq7odZTUKaZ+byylzfi9RzTN9x+SOIAYcnjoAt0ML9halVvgqKoGaslqHL31Gn yT0NnYjCxl4+G4+pDy2sNMZT4AMOZSSslNB+ve8c6dS74zS3tbu4chG0Qezi6toJjVyM 3IVA== X-Gm-Message-State: AOJu0YyE+hIOXapyU2cmefkYhM9Hi4QFw0cGBM5/caI1VuAQfz7qXp3l JhBvU9EefHIC1/inGyWQN729l1/Y1P9Pw5qEjpyXR38QVoGk183VwekYes/UGjrwVb+K1wJ5N2T ae9i4g0o= X-Gm-Gg: ATEYQzz+EQcA1Yj0WSCQbQplqf078hGkBsok5O5t7k7TMJtGrE/2YVT1lqSYaHxnbtx wdEsy/S/N3qR7DwK4b6VJE7zzUK1G3IeSOGlf7we8Y/z9zVLvaqZ87a3W2/7+FjlyVsXyi+PHpn VZVqIXFEP/xpatyQKVyzvdO6jhEiadnHjneehOSTQWUbA98wKe2+zDlDT1mMgz2CAioYHR18t5H Wb4ytHag3agzRMd/+ycL3XQKUWfkjJGOSO6bZK0qdbqVHHGEdRZ0HJ+pZ6Mnmnu65vr7c7macYZ MPPVMr+hPmut7gA2ek2vRT1VicEBTNsJ6CRXFtHMIdLvjBDg92bwExfvdFwq9NSA6KQLkpAkYUw FDW5kglazCoLECPzS2rnQ6ocgse+wW1uGIbIXNaTQX87KHDQaq3kOj51PHi9c5wlg8wP9ePA3TI hRoGziStmzRErAeh7Q1IOJAAJcqRofSN49JdJd6dlBIvtqg54O8hraEnLsjKQTheltKQjC475q X-Received: by 2002:a05:600c:1f8d:b0:485:4278:24fb with SMTP id 5b1f17b1804b1-48556711dfcmr281363735e9.32.1773748992117; Tue, 17 Mar 2026 05:03:12 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Thomas Huth , Stefan Berger , "Michael S. Tsirkin" , Ani Sinha , Igor Mammedov , Richard Henderson , Marcel Apfelbaum , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 4/5] hw/tpm: Propagate @ppi_enabled to tpm_tis_reset() and remove in TPMState Date: Tue, 17 Mar 2026 13:02:40 +0100 Message-ID: <20260317120241.16320-5-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260317120241.16320-1-philmd@linaro.org> References: <20260317120241.16320-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::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.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: 1773749108425154100 Of TMP devices using FIFO mode, only the ISA variant has PPI, and call tpm_ppi_init() to initialize the PPI state. Propagate @ppi_enabled to tpm_tis_reset() so it only resets the PPI part when requested (ISA case) otherwise the PPI is in uninitialized state. Remove the now unused TPMState::ppi_enabled field. Set the generic TPMIfClass::ppi_enabled so ACPI subsystem can keep checking its availability. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Stefan Berger --- hw/tpm/tpm_tis.h | 3 +-- hw/tpm/tpm_tis_common.c | 4 ++-- hw/tpm/tpm_tis_i2c.c | 2 +- hw/tpm/tpm_tis_isa.c | 10 ++++------ hw/tpm/tpm_tis_sysbus.c | 2 +- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/hw/tpm/tpm_tis.h b/hw/tpm/tpm_tis.h index 184632ff66b..1531620bf9d 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 @@ -83,7 +82,7 @@ extern const VMStateDescription vmstate_locty; extern const MemoryRegionOps tpm_tis_memory_ops; =20 int tpm_tis_pre_save(TPMState *s); -void tpm_tis_reset(TPMState *s); +void tpm_tis_reset(TPMState *s, bool ppi_enabled); 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); diff --git a/hw/tpm/tpm_tis_common.c b/hw/tpm/tpm_tis_common.c index f594b15b8ab..a134d5c2059 100644 --- a/hw/tpm/tpm_tis_common.c +++ b/hw/tpm/tpm_tis_common.c @@ -813,7 +813,7 @@ enum TPMVersion tpm_tis_get_tpm_version(TPMState *s) * This function is called when the machine starts, resets or due to * S3 resume. */ -void tpm_tis_reset(TPMState *s) +void tpm_tis_reset(TPMState *s, bool ppi_enabled) { int c; =20 @@ -821,7 +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) { + if (ppi_enabled) { tpm_ppi_reset(&s->ppi); } tpm_backend_reset(s->be_driver); diff --git a/hw/tpm/tpm_tis_i2c.c b/hw/tpm/tpm_tis_i2c.c index 9f13e0ec120..b4f258c7bcb 100644 --- a/hw/tpm/tpm_tis_i2c.c +++ b/hw/tpm/tpm_tis_i2c.c @@ -523,7 +523,7 @@ static void tpm_tis_i2c_reset(DeviceState *dev) i2cst->csum_enable =3D 0; i2cst->loc_sel =3D 0x00; =20 - return tpm_tis_reset(s); + return tpm_tis_reset(s, false); } =20 static void tpm_tis_i2c_class_init(ObjectClass *klass, const void *data) diff --git a/hw/tpm/tpm_tis_isa.c b/hw/tpm/tpm_tis_isa.c index 61e95434f5b..1ca403241de 100644 --- a/hw/tpm/tpm_tis_isa.c +++ b/hw/tpm/tpm_tis_isa.c @@ -88,13 +88,12 @@ static void tpm_tis_isa_reset(DeviceState *dev) TPMStateISA *isadev =3D TPM_TIS_ISA(dev); TPMState *s =3D &isadev->state; =20 - return tpm_tis_reset(s); + return tpm_tis_reset(s, true); } =20 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) @@ -175,6 +172,7 @@ static void tpm_tis_isa_class_init(ObjectClass *klass, = const void *data) device_class_set_props(dc, tpm_tis_isa_properties); dc->vmsd =3D &vmstate_tpm_tis_isa; tc->model =3D TPM_MODEL_TPM_TIS; + tc->ppi_enabled =3D true; dc->realize =3D tpm_tis_isa_realizefn; device_class_set_legacy_reset(dc, tpm_tis_isa_reset); tc->request_completed =3D tpm_tis_isa_request_completed; diff --git a/hw/tpm/tpm_tis_sysbus.c b/hw/tpm/tpm_tis_sysbus.c index e9372e73163..dd30344d5ac 100644 --- a/hw/tpm/tpm_tis_sysbus.c +++ b/hw/tpm/tpm_tis_sysbus.c @@ -87,7 +87,7 @@ static void tpm_tis_sysbus_reset(DeviceState *dev) TPMStateSysBus *sbdev =3D TPM_TIS_SYSBUS(dev); TPMState *s =3D &sbdev->state; =20 - return tpm_tis_reset(s); + return tpm_tis_reset(s, false); } =20 static const Property tpm_tis_sysbus_properties[] =3D { --=20 2.53.0 From nobody Mon Apr 6 23:23:28 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=1773749169; cv=none; d=zohomail.com; s=zohoarc; b=LygYvOHchV+QLwUVqjuiZOjhJ7YnkWBIomCdVeCsLbx9aUyHX8NRB528/gR7NbvpkdZMEWbUuyweyFQ9RCN48FIwx5lM47XexU7fAn/h0yX1S3XFl8hLP+gUMpDHlYlT4FymN9GOdPNvtv+zV1hzTAv6omE8cDk4WMezpjppMtg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773749169; 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=edjJ3hkKxyqQdGrTaKvvXfJRX41bmdlovs8WuMQ2HOU=; b=KvIZmHBj96p6RtuFG6p62E7Ne2l/dgL6kdAqGwP+/L69D2pDK5BEISilybB271CY1k0mHzfNCdUOgR5MlP1sc9k9uZ7eCTL3oJEkFXW2fHVwX3FDSNYlL9uadUvBt6tCDrdmhyLKzyYjl6dCmDCvzIDca4aE6xo8FCk9tWEnKTg= 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 1773749169028270.4404102503321; Tue, 17 Mar 2026 05:06:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w2TBF-0001XJ-8E; Tue, 17 Mar 2026 08:05: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 1w2T8v-00005n-IS for qemu-devel@nongnu.org; Tue, 17 Mar 2026 08:03:29 -0400 Received: from mail-ej1-x632.google.com ([2a00:1450:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w2T8s-0001WR-IB for qemu-devel@nongnu.org; Tue, 17 Mar 2026 08:03:25 -0400 Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-b97c44417ffso220492866b.2 for ; Tue, 17 Mar 2026 05:03:20 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43b41dd93c0sm18105870f8f.10.2026.03.17.05.03.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 17 Mar 2026 05:03:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773748999; x=1774353799; 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=edjJ3hkKxyqQdGrTaKvvXfJRX41bmdlovs8WuMQ2HOU=; b=ql8b3iiE6WsoGP8TgfQrZ2Hp92bRNDFbt5UMbhL3bikysuvu0Z30PqsJbH9MhmpavT 9BV7wjeW6jg2FqUEPLdpj/oAMn5k1sugIb/C/7HG0xlxChqitxMBY8nJXE++SOUpJNfK tF3TNib57zwetvgT0gicKZnqtm1VnDMZ/Oe9lqG8ZFROkDQCkED4MLP1L19l6DCl5vgY hfMMuO3vouhQduZfS84z3fl/9qJLcqmbAL1Tgrday/ru/VMzBlfcsUgHcEeY3mRFA3Th LkOU21d1Kbm14F03HfEjFuXN6O2klsPcLMkYfEnmzOizdgkUD8O+UENIDkQciPYoH2l3 Kg5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773748999; x=1774353799; 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=edjJ3hkKxyqQdGrTaKvvXfJRX41bmdlovs8WuMQ2HOU=; b=Sc4BwYZyfPAZxWyvO+X9w6attYy2Odw4tsCpEnTZ9aEDY0HVfYX6C67/ZIyEceBsPm Uw8P7IS09Ra6TpXZ/XGGj21cfikbVSZyPbXOsyUFXyIi1QcGKTwGNRS5HtTnOeEwXUcc TKu3WlPYqlodo4V8RbkLbnepO5weeVQcuGrwa8HV2Kvfy4YRbkDDtb3rdkTaKzwZySm4 iZ7G3BjpzUCDs8luyIBp8VF/uQ4XFuhUSL9xxCj+az8HDI5Ci4xS/CvbJnfR43QWGu1P VKNrhz6Sb7ugPDTuadmJzeM3xQbLV7pVjB+YyBIn6Ckk0CSOr9l7UKawwR7Jx5b+TMEb b5Lg== X-Gm-Message-State: AOJu0Yy8MRu/9lTyPad4CcqtdFf73+G9/B9cy1NRnOyXt+O4x3uPo/Bc EdXl8QQTiWevi6XR1mKa6FqYeb+9gbKIOTWYsB5Gqg43wjbrrV5yl4BdayGk6+MNlc25d55spIO xyTy33aY= X-Gm-Gg: ATEYQzzx9atMTelYpjlmwHB6RFRAkVvaLyW4PCS4YBqedprlGrtJC805A9hrdLajtIm mo8ouhFEM8DxbkIF0IbJ8E1UstikVOQmcAjmPNHdoHeuBOhtKDImzvGIxfFpLrTQSvuYtYWaqbL Mnfy99kiXKOIMbA6ohC3LsMvnmKvm46G9e9BPyvpX67z0IEJTNUTr1NwqDBMDkpKLUREDV6ByHK c3HWfWN6PAd+7m5uck1ex94Ox86x4uobLDDg8CxGHlY7AScIul+EHhy8pw7D/9hXj75fQtacgGY S8+vtM44jalKBOw3b6ULR27Ubii/KblEV3kCiZhmvk2Vb5C2ODNkuhRIqwhCV+S9NOutJ1aYdKy i2RRy9DiKHo4V1/e2bo/qYL4QWApLVLM+5Q/x3z7YCJNF4/jlrqTb5JHcB5bqDmwnS/hoTpVi1G czOwFh+r9hgWXrM6VN6NOcM0bzwGM6EW9juAT2Vbky12Qggt++QhpnQEzEFCHpzK09FpKgSDic X-Received: by 2002:a17:907:a44:b0:b96:ecec:2386 with SMTP id a640c23a62f3a-b97650b702cmr1104302666b.26.1773748999059; Tue, 17 Mar 2026 05:03:19 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Thomas Huth , Stefan Berger , "Michael S. Tsirkin" , Ani Sinha , Igor Mammedov , Richard Henderson , Marcel Apfelbaum , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 5/5] hw/tpm: Simplify tpm_ppi_enabled() Date: Tue, 17 Mar 2026 13:02:41 +0100 Message-ID: <20260317120241.16320-6-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260317120241.16320-1-philmd@linaro.org> References: <20260317120241.16320-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::632; envelope-from=philmd@linaro.org; helo=mail-ej1-x632.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: 1773749170293158500 TPM instances don't expose any "ppi" property anymore, remove that dead code. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Stefan Berger --- include/system/tpm.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/include/system/tpm.h b/include/system/tpm.h index 9458ad6668a..874068d19a9 100644 --- a/include/system/tpm.h +++ b/include/system/tpm.h @@ -13,7 +13,6 @@ #define QEMU_TPM_H =20 #include "qapi/qapi-types-tpm.h" -#include "qapi/error.h" #include "qom/object.h" =20 #ifdef CONFIG_TPM @@ -85,10 +84,7 @@ static inline bool tpm_ppi_enabled(TPMIf *ti) if (!ti) { return false; } - if (TPM_IF_GET_CLASS(ti)->ppi_enabled) { - return true; - } - return object_property_get_bool(OBJECT(ti), "ppi", &error_abort); + return TPM_IF_GET_CLASS(ti)->ppi_enabled; } =20 #else /* CONFIG_TPM */ --=20 2.53.0