From nobody Sun Jul 26 12:31:36 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1781787311; cv=none; d=zohomail.com; s=zohoarc; b=n9GB+TO5REbjBfetNWnX+10weNf1koA8Gyj4vlyE8iwvrICL6ZN6DC9WmfpGsOCQodAVxc10WtvBcHPntnauxP3MGUD44wPT6KFAV1H6/HMmIt4m+HiXHpLN3nm4+KRM4Xjv4HtwZZXOtepLa0D88KTL8Rem7YKlvSzgVB1Xnxc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1781787311; h=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=q8V6oosldVkwdbhJtONeAJrAbQFwuyqm/fwmCeMxuFE=; b=iXpSE/X9iKY5g5j1euv+bhtyH3HbptQfuwmHsgs86kK/UzryIP6QiNfS8qfA/dDVdi5qymjNAjt8u5k4RcZpQkHfCHacJuXX7B4ZgQBFwvlhuZryb59PafuXpI/cX2FD1YpvnfQhSUe6B30Q6mWjESZzFIy8scgtluuVi9zXabY= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 178178731176197.03426908316703; Thu, 18 Jun 2026 05:55:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1waCGp-0002o0-3v; Thu, 18 Jun 2026 08:54:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1waCGm-0002n1-TU for qemu-devel@nongnu.org; Thu, 18 Jun 2026 08:54:56 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1waCGl-0004er-Am for qemu-devel@nongnu.org; Thu, 18 Jun 2026 08:54:56 -0400 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-530-2gGtNTu8OsO-Zs5wDCQSrQ-1; Thu, 18 Jun 2026 08:54:51 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E7301180266F; Thu, 18 Jun 2026 12:54:49 +0000 (UTC) Received: from mbawa-thinkpadt14gen5.bengluru.csb (headnet05.pony-001.prod.iad2.dc.redhat.com [10.2.32.117]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C289F1956087; Thu, 18 Jun 2026 12:54:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1781787294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=q8V6oosldVkwdbhJtONeAJrAbQFwuyqm/fwmCeMxuFE=; b=Ap/bWVjcLynQ01zfPRoFoXSNUYTOUlkWeVGj85axFql7/BNsRqrjuadqtV0Ay2GzSXBdSu nwfqlcRJXehb6opu9S9GofA2Rx7I0sGw4rlXkpX/sG8t6qWrEOYVhjmsR50pLPh6XBunkv ftYVjhveteXnpIdJy8GqCpI3AWwJotc= X-MC-Unique: 2gGtNTu8OsO-Zs5wDCQSrQ-1 X-Mimecast-MFC-AGG-ID: 2gGtNTu8OsO-Zs5wDCQSrQ_1781787290 From: Mohammadfaiz Bawa To: Stefan Berger , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Cc: qemu-devel@nongnu.org, Zhao Liu Subject: [PATCH 1/2] hw/tpm: gate PPI support on tpm-tis-device behind a device property Date: Thu, 18 Jun 2026 18:24:41 +0530 Message-ID: <20260618125442.641532-2-mbawa@redhat.com> In-Reply-To: <20260618125442.641532-1-mbawa@redhat.com> References: <20260618125442.641532-1-mbawa@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=mbawa@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-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 @redhat.com) X-ZM-MESSAGEID: 1781787314661158500 Content-Type: text/plain; charset="utf-8" Add a "ppi" boolean property (default: true) to tpm-tis-device. When ppi=3Doff the RAMBlock is never registered and the migration stream omits "tpm-ppi", restoring backward compatibility. When disabled, realizefn initializes the region with zero size so the platform bus skips it and ACPI PPI tables are omitted. Fixes: 46cd2c1050f0 ("hw/tpm: add PPI support to tpm-tis-device for ARM64 v= irt") Signed-off-by: Mohammadfaiz Bawa --- hw/tpm/tpm_tis.h | 1 + hw/tpm/tpm_tis_sysbus.c | 16 +++++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/hw/tpm/tpm_tis.h b/hw/tpm/tpm_tis.h index 1531620bf9..6ac9804050 100644 --- a/hw/tpm/tpm_tis.h +++ b/hw/tpm/tpm_tis.h @@ -76,6 +76,7 @@ typedef struct TPMState { size_t be_buffer_size; =20 TPMPPI ppi; + bool ppi_enabled; } TPMState; =20 extern const VMStateDescription vmstate_locty; diff --git a/hw/tpm/tpm_tis_sysbus.c b/hw/tpm/tpm_tis_sysbus.c index 16bb17874b..54691ac272 100644 --- a/hw/tpm/tpm_tis_sysbus.c +++ b/hw/tpm/tpm_tis_sysbus.c @@ -94,6 +94,7 @@ static void tpm_tis_sysbus_reset(DeviceState *dev) static const Property tpm_tis_sysbus_properties[] =3D { DEFINE_PROP_UINT32("irq", TPMStateSysBus, state.irq_num, TPM_TIS_IRQ), DEFINE_PROP_TPMBE("tpmdev", TPMStateSysBus, state.be_driver), + DEFINE_PROP_BOOL("ppi", TPMStateSysBus, state.ppi_enabled, true), }; =20 static void tpm_tis_sysbus_initfn(Object *obj) @@ -122,14 +123,19 @@ static void tpm_tis_sysbus_realizefn(DeviceState *dev= , Error **errp) return; } =20 - s->ppi.buf =3D qemu_memalign(host_page_size, - ROUND_UP(TPM_PPI_ADDR_SIZE, host_page_size)= ); memory_region_init_io(&s->mmio, OBJECT(dev), &tpm_tis_memory_ops, s, "tpm-tis-mmio", TPM_TIS_NUM_LOCALITIES << TPM_TIS_LOCALITY_SHIFT= ); - memory_region_init_ram_device_ptr(&s->ppi.ram, OBJECT(dev), "tpm-ppi", - TPM_PPI_ADDR_SIZE, s->ppi.buf); - vmstate_register_ram(&s->ppi.ram, dev); + + if (s->ppi_enabled) { + s->ppi.buf =3D qemu_memalign(host_page_size, + ROUND_UP(TPM_PPI_ADDR_SIZE, host_page_s= ize)); + memory_region_init_ram_device_ptr(&s->ppi.ram, OBJECT(dev), "tpm-p= pi", + TPM_PPI_ADDR_SIZE, s->ppi.buf); + vmstate_register_ram(&s->ppi.ram, dev); + } else { + memory_region_init(&s->ppi.ram, OBJECT(dev), "tpm-ppi", 0); + } } =20 static void tpm_tis_sysbus_class_init(ObjectClass *klass, const void *data) --=20 2.54.0 From nobody Sun Jul 26 12:31:36 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1781787316; cv=none; d=zohomail.com; s=zohoarc; b=guZejuCm3eqmBw/mKztE34guQRQyZHtCNQCuDQU7t81lGNP4sCbBiKdcBmFWzV5golik+/Yhg8lBUNmayvqbQbi3Pf8Jm4AAJRRmRqxFo9MmeaWPfV0G9X21Pz7vl+bVDpXgIIW5BGJHEhwpKtdCaX1W2gL4w+l7l7mTORFKywg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1781787316; h=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=gQ2HpR0WFgqm8qJgydfubSQlOn0F80nDU3NQ+9sYN1k=; b=NM3ufaLhZqjiIy5gALkntK+AJBxHpd88xnDmUzV/KE+2LBiFxxJwnU7KmcI6knjobvX0gDH+e89nFCMtfLBQ3VXVuGZEID4l0jdYpcok66bW2Lhf9P2ar3QYcDt7yTi06uC7BC+3vLUn3mBLZObtP62XgJpCbd070H9q/qqFYao= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1781787316516343.8938091523015; Thu, 18 Jun 2026 05:55:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1waCGs-0002oL-I5; Thu, 18 Jun 2026 08:55:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1waCGr-0002o4-HW for qemu-devel@nongnu.org; Thu, 18 Jun 2026 08:55:01 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1waCGq-0004ln-7Y for qemu-devel@nongnu.org; Thu, 18 Jun 2026 08:55:01 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-391-TRbDBkV2ONSK72AHABP-yQ-1; Thu, 18 Jun 2026 08:54:54 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B38511956064; Thu, 18 Jun 2026 12:54:52 +0000 (UTC) Received: from mbawa-thinkpadt14gen5.bengluru.csb (headnet05.pony-001.prod.iad2.dc.redhat.com [10.2.32.117]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 84F441956087; Thu, 18 Jun 2026 12:54:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1781787299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gQ2HpR0WFgqm8qJgydfubSQlOn0F80nDU3NQ+9sYN1k=; b=LI6EGqSB9blCshCjli10Xq3+jAAqUBJHeFKdoZ2YbNcvNfDlBf1GvXZfisPihT93lBgjoU S+N9MA0L7eKCCTFQGAZefbSvWXHwJ/jVGhF6ZAa6659dh/yguJs83gmwGPhmB0aE7AybqR sflcjSrzvVhItChUlqgoJveRM+pDzaA= X-MC-Unique: TRbDBkV2ONSK72AHABP-yQ-1 X-Mimecast-MFC-AGG-ID: TRbDBkV2ONSK72AHABP-yQ_1781787293 From: Mohammadfaiz Bawa To: Stefan Berger , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Cc: qemu-devel@nongnu.org, Zhao Liu Subject: [PATCH 2/2] hw/core/machine: disable tpm-tis-device PPI for machine type <= 11.0 Date: Thu, 18 Jun 2026 18:24:42 +0530 Message-ID: <20260618125442.641532-3-mbawa@redhat.com> In-Reply-To: <20260618125442.641532-1-mbawa@redhat.com> References: <20260618125442.641532-1-mbawa@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=mbawa@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 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: 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 @redhat.com) X-ZM-MESSAGEID: 1781787317584158500 Content-Type: text/plain; charset="utf-8" Set ppi=3Doff in hw_compat_11_0[] so that older machine types do not register the "tpm-ppi" RAMBlock, restoring backward migration. Signed-off-by: Mohammadfaiz Bawa --- hw/core/machine.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/core/machine.c b/hw/core/machine.c index 9a10e45aab..92cf5e1ca1 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -44,6 +44,7 @@ GlobalProperty hw_compat_11_0[] =3D { { "chardev-vc", "encoding", "cp437" }, { "tpm-crb", "cap-chunk", "off" }, { "tpm-crb", "x-allow-chunk-migration", "off" }, + { "tpm-tis-device", "ppi", "off" }, { TYPE_ARM_SMMUV3, "ats", "off" }, { TYPE_ARM_SMMUV3, "ril", "on" }, { TYPE_ARM_SMMUV3, "ssidsize", "0" }, --=20 2.54.0