qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Joelle van Dyne <j@getutm.app>
To: qemu-devel@nongnu.org
Cc: Joelle van Dyne <j@getutm.app>,
	Peter Maydell <peter.maydell@linaro.org>,
	qemu-arm@nongnu.org (open list:Virt)
Subject: [PATCH v2 07/11] hw/arm/virt: add plug handler for TPM on SysBus
Date: Fri, 14 Jul 2023 00:09:23 -0700	[thread overview]
Message-ID: <20230714070931.23476-8-j@getutm.app> (raw)
In-Reply-To: <20230714070931.23476-1-j@getutm.app>

TPM needs to know its own base address in order to generate its DSDT
device entry.

Signed-off-by: Joelle van Dyne <j@getutm.app>
---
 hw/arm/virt.c | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 7d9dbc2663..432148ef47 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -2732,6 +2732,37 @@ static void virt_memory_plug(HotplugHandler *hotplug_dev,
                          dev, &error_abort);
 }
 
+#ifdef CONFIG_TPM
+static void virt_tpm_plug(VirtMachineState *vms, TPMIf *tpmif)
+{
+    PlatformBusDevice *pbus = PLATFORM_BUS_DEVICE(vms->platform_bus_dev);
+    hwaddr pbus_base = vms->memmap[VIRT_PLATFORM_BUS].base;
+    SysBusDevice *sbdev = SYS_BUS_DEVICE(tpmif);
+    MemoryRegion *sbdev_mr;
+    hwaddr tpm_base;
+    uint64_t tpm_size;
+
+    if (!sbdev || !object_dynamic_cast(OBJECT(sbdev), TYPE_SYS_BUS_DEVICE)) {
+        return;
+    }
+
+    tpm_base = platform_bus_get_mmio_addr(pbus, sbdev, 0);
+    assert(tpm_base != -1);
+
+    tpm_base += pbus_base;
+
+    sbdev_mr = sysbus_mmio_get_region(sbdev, 0);
+    tpm_size = memory_region_size(sbdev_mr);
+
+    if (object_property_find(OBJECT(sbdev), "baseaddr")) {
+        object_property_set_uint(OBJECT(sbdev), "baseaddr", tpm_base, NULL);
+    }
+    if (object_property_find(OBJECT(sbdev), "size")) {
+        object_property_set_uint(OBJECT(sbdev), "size", tpm_size, NULL);
+    }
+}
+#endif
+
 static void virt_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev,
                                             DeviceState *dev, Error **errp)
 {
@@ -2803,6 +2834,12 @@ static void virt_machine_device_plug_cb(HotplugHandler *hotplug_dev,
         vms->virtio_iommu_bdf = pci_get_bdf(pdev);
         create_virtio_iommu_dt_bindings(vms);
     }
+
+#ifdef CONFIG_TPM
+    if (object_dynamic_cast(OBJECT(dev), TYPE_TPM_IF)) {
+        virt_tpm_plug(vms, TPM_IF(dev));
+    }
+#endif
 }
 
 static void virt_dimm_unplug_request(HotplugHandler *hotplug_dev,
-- 
2.39.2 (Apple Git-143)



  parent reply	other threads:[~2023-07-14  7:11 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-14  7:09 [PATCH v2 00/11] tpm: introduce TPM CRB SysBus device Joelle van Dyne
2023-07-14  7:09 ` [PATCH v2 01/11] tpm_crb: refactor common code Joelle van Dyne
2023-07-14  7:09 ` [PATCH v2 02/11] tpm_crb: CTRL_RSP_ADDR is 64-bits wide Joelle van Dyne
2023-07-14  7:09 ` [PATCH v2 03/11] tpm_ppi: refactor memory space initialization Joelle van Dyne
2023-07-14  7:09 ` [PATCH v2 04/11] tpm_crb: use a single read-as-mem/write-as-mmio mapping Joelle van Dyne
2023-07-14 12:03   ` Stefan Berger
2023-07-14  7:09 ` [PATCH v2 05/11] tpm_crb: use the ISA bus Joelle van Dyne
2023-07-17 13:46   ` Igor Mammedov
2023-07-18 14:16     ` Stefan Berger
2023-08-01  1:46       ` Joelle van Dyne
2023-10-17 14:24         ` Alexander Graf
2023-07-14  7:09 ` [PATCH v2 06/11] tpm_crb: move ACPI table building to device interface Joelle van Dyne
2023-07-14 17:21   ` Stefan Berger
2023-07-17 13:42     ` Igor Mammedov
2023-08-01  3:02       ` Joelle van Dyne
2023-08-01 19:38         ` Stefan Berger
2023-08-07 10:20           ` Igor Mammedov
2023-07-14  7:09 ` Joelle van Dyne [this message]
2023-07-14 12:11   ` [PATCH v2 07/11] hw/arm/virt: add plug handler for TPM on SysBus Stefan Berger
2023-07-14 17:09     ` Joelle van Dyne
2023-07-17 14:00   ` Igor Mammedov
2023-07-14  7:09 ` [PATCH v2 08/11] hw/loongarch/virt: " Joelle van Dyne
2023-07-20 17:57   ` Stefan Berger
2023-08-03 11:35     ` Stefan Berger
2023-07-14  7:09 ` [PATCH v2 09/11] tpm_tis_sysbus: move DSDT AML generation to device Joelle van Dyne
2023-07-14 16:19   ` Stefan Berger
2023-07-14 17:29     ` Joelle van Dyne
2023-07-14 17:37       ` Stefan Berger
2023-07-14 17:39         ` Joelle van Dyne
2023-07-14 17:43           ` Stefan Berger
2023-07-14 17:46             ` Joelle van Dyne
2023-07-14 18:01               ` Stefan Berger
2023-07-14 18:15                 ` Joelle van Dyne
2023-07-17 14:06       ` Igor Mammedov
2023-07-14  7:09 ` [PATCH v2 10/11] tpm_crb_sysbus: introduce TPM CRB SysBus device Joelle van Dyne
2023-07-14 14:27   ` Stefan Berger
2023-07-14 17:20     ` Joelle van Dyne
2023-07-14 17:52       ` Stefan Berger
2023-07-17 14:23   ` Igor Mammedov
2023-10-29  2:21     ` Joelle van Dyne
2023-07-14  7:09 ` [PATCH v2 11/11] tpm_crb: support restoring older vmstate Joelle van Dyne
2023-07-14 14:05   ` Stefan Berger
2023-07-14 14:51     ` Stefan Berger
2023-07-14 17:04       ` Joelle van Dyne
2023-07-14 18:22         ` Stefan Berger
2023-07-14 18:41           ` Stefan Berger
2023-07-14 18:49             ` Joelle van Dyne
2023-07-14 19:12               ` Stefan Berger
2023-07-14 19:44                 ` Joelle van Dyne
2023-07-14 19:56                   ` Stefan Berger
2023-07-17 14:40                 ` Peter Maydell
2023-07-17 14:33               ` Igor Mammedov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230714070931.23476-8-j@getutm.app \
    --to=j@getutm.app \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).