From nobody Mon Feb 9 19:05:38 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1623766895; cv=none; d=zohomail.com; s=zohoarc; b=hx1veHShGsbpQFd0elFqUov7zkKKWPcFKMvGLxskdjWIznMFWTXQovFJYeO4hMmV779Bbjjve48+LE16djWqwlbfjoYJ5YyH5EP2B+4G1G9rhA9k7QBrC0w7MNDSf74L/9yGLdAPZS6XAJtbNHAp/+lzEeXZ1Y3cu6Oa38RGHHs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623766895; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=1/ujT/H+jsCDhMHDnxsFjIbcqBjOv5SGrl9Ow17b7os=; b=TfKyeh5tAS/PTwCwxCp3r7Yy66uLC9wpBqWpl5ss4B7SqLQ8u57RiKnoP6UBCXhyD0r5ZHkkleOatqn4MPpnyb4uq/UQbCOrv32dbHn4q5JXVhon8KqrHRnzExsBTTm1EfTTVK6i1OFopePnFYNtC93nLP/5NpQCPeCwu4FkpR4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1623766895260157.4880793117718; Tue, 15 Jun 2021 07:21:35 -0700 (PDT) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-292-g58b0d-wPZiLMZdzUjH0rA-1; Tue, 15 Jun 2021 10:21:33 -0400 Received: by mail-wr1-f69.google.com with SMTP id n4-20020a5d42040000b0290119fef97609so8662603wrq.18 for ; Tue, 15 Jun 2021 07:21:32 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id r3sm15286035wmq.8.2021.06.15.07.21.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 07:21:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623766894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1/ujT/H+jsCDhMHDnxsFjIbcqBjOv5SGrl9Ow17b7os=; b=RE9OU+6wp9rn680lhib3hIQXNZV6HXlqS2i/rZHigP/f5Gb61TIPNvDgmFKkeO2R6pkDd+ vwGw9/wkAwtK+gQrp6uUIh65rOMh99mp9xWecLNSdUpTcI5a9fpM7gDFI09mp3TBEedi+V pYNHE5eCp+TrMZsqAgGS6T/102P6BLk= X-MC-Unique: g58b0d-wPZiLMZdzUjH0rA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1/ujT/H+jsCDhMHDnxsFjIbcqBjOv5SGrl9Ow17b7os=; b=l+mLSETZvKDz87+xNnHsHuC0uQ5eT3E3jD8qz48ILrjOpoGHst/cbocRLHqYd/jTzM ydZXD6CAHUSHDqpfqgCb6J0F6uda0eeW6PuwytwIS0+AehzWCFuyYgVkx/ANXC9jzA9N LNHjNWYi8jJTkd1EPwxPmA243Xhgqyed5z9J4C2oxYD67bvsO6tUmU6A2JK+0CSgn7CY nzrmZR1KvD+dsAXOl0KiXL4+S9vN+fG9lIwfz3DfyW3FZ/r1vHmeULyVNS37xWhAbwX/ n1FyYw10wQ7J9i/wYBHQ4EWuIJhaE4u0EkvY5gOrhdz5xmzyIZiD/3b9Vjrg2tzAg/+9 ioUg== X-Gm-Message-State: AOAM530qUkdEc5zDa6MySX+AfGrh81hH81D1czQKsoFJLpIamI2UszkX dSz9F7IEqWoDJdavBpoq7ENMqQg7Z+nbARmgXA3RU22sXR5AFJK7hVb1aZpsQDGNPZMXGNRf8YN 6cB3kK0QErngpUQ== X-Received: by 2002:adf:8b91:: with SMTP id o17mr25268018wra.385.1623766891932; Tue, 15 Jun 2021 07:21:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9Nr+byIDbGXXdj+92CbAwO/GPEkHWzAmI5vYjPCXokzFTyVAP92qU2pwXx8DN3AmlwcGs7A== X-Received: by 2002:adf:8b91:: with SMTP id o17mr25267997wra.385.1623766891807; Tue, 15 Jun 2021 07:21:31 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Stefan Berger , Stefan Berger , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 2/5] arm: Eliminate all TPM related code if CONFIG_TPM is not set Date: Tue, 15 Jun 2021 16:21:18 +0200 Message-Id: <20210615142121.2127692-3-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210615142121.2127692-1-philmd@redhat.com> References: <20210615142121.2127692-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) From: Stefan Berger Peter Maydell Signed-off-by: Stefan Berger Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210614191335.1968807-3-stefanb@linux.ibm.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/sysbus-fdt.c | 4 ++++ hw/arm/virt-acpi-build.c | 6 ++++++ hw/arm/virt.c | 2 ++ 3 files changed, 12 insertions(+) diff --git a/hw/arm/sysbus-fdt.c b/hw/arm/sysbus-fdt.c index 6b6906f4cfc..48c5fe9bf18 100644 --- a/hw/arm/sysbus-fdt.c +++ b/hw/arm/sysbus-fdt.c @@ -437,6 +437,7 @@ static bool vfio_platform_match(SysBusDevice *sbdev, =20 #endif /* CONFIG_LINUX */ =20 +#ifdef CONFIG_TPM /* * add_tpm_tis_fdt_node: Create a DT node for TPM TIS * @@ -467,6 +468,7 @@ static int add_tpm_tis_fdt_node(SysBusDevice *sbdev, vo= id *opaque) g_free(nodename); return 0; } +#endif =20 static int no_fdt_node(SysBusDevice *sbdev, void *opaque) { @@ -488,7 +490,9 @@ static const BindingEntry bindings[] =3D { TYPE_BINDING(TYPE_VFIO_AMD_XGBE, add_amd_xgbe_fdt_node), VFIO_PLATFORM_BINDING("amd,xgbe-seattle-v1a", add_amd_xgbe_fdt_node), #endif +#ifdef CONFIG_TPM TYPE_BINDING(TYPE_TPM_TIS_SYSBUS, add_tpm_tis_fdt_node), +#endif TYPE_BINDING(TYPE_RAMFB_DEVICE, no_fdt_node), TYPE_BINDING("", NULL), /* last element */ }; diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 60fe2e65a76..f1024843ddb 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -205,6 +205,7 @@ static void acpi_dsdt_add_gpio(Aml *scope, const MemMap= Entry *gpio_memmap, aml_append(scope, dev); } =20 +#ifdef CONFIG_TPM static void acpi_dsdt_add_tpm(Aml *scope, VirtMachineState *vms) { PlatformBusDevice *pbus =3D PLATFORM_BUS_DEVICE(vms->platform_bus_dev); @@ -236,6 +237,7 @@ static void acpi_dsdt_add_tpm(Aml *scope, VirtMachineSt= ate *vms) aml_append(dev, aml_name_decl("_CRS", crs)); aml_append(scope, dev); } +#endif =20 static void build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) @@ -642,7 +644,9 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, Virt= MachineState *vms) } =20 acpi_dsdt_add_power_button(scope); +#ifdef CONFIG_TPM acpi_dsdt_add_tpm(scope, vms); +#endif =20 aml_append(dsdt, scope); =20 @@ -745,11 +749,13 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuild= Tables *tables) build_iort(tables_blob, tables->linker, vms); } =20 +#ifdef CONFIG_TPM if (tpm_get_version(tpm_find()) =3D=3D TPM_VERSION_2_0) { acpi_add_table(table_offsets, tables_blob); build_tpm2(tables_blob, tables->linker, tables->tcpalog, vms->oem_= id, vms->oem_table_id); } +#endif =20 /* XSDT is pointed to by RSDP */ xsdt =3D tables_blob->len; diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 840758666d4..9122e22ee0c 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2599,7 +2599,9 @@ static void virt_machine_class_init(ObjectClass *oc, = void *data) machine_class_allow_dynamic_sysbus_dev(mc, TYPE_VFIO_AMD_XGBE); machine_class_allow_dynamic_sysbus_dev(mc, TYPE_RAMFB_DEVICE); machine_class_allow_dynamic_sysbus_dev(mc, TYPE_VFIO_PLATFORM); +#ifdef CONFIG_TPM machine_class_allow_dynamic_sysbus_dev(mc, TYPE_TPM_TIS_SYSBUS); +#endif mc->block_default_type =3D IF_VIRTIO; mc->no_cdrom =3D 1; mc->pci_allow_0_address =3D true; --=20 2.31.1