Message ID | 20231029060404.71196-9-j@getutm.app |
---|---|
State | New |
Headers | show |
Series | tpm: introduce TPM CRB SysBus device | expand |
On 10/29/23 02:03, Joelle van Dyne wrote: > Signed-off-by: Joelle van Dyne <j@getutm.app> Reviewed-by: Stefan Berger <stefanb@linux.ibm.com> > --- > hw/loongarch/virt.c | 7 +++++++ > hw/loongarch/Kconfig | 1 + > 2 files changed, 8 insertions(+) > > diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c > index 4b7dc67a2d..feed0f8bbf 100644 > --- a/hw/loongarch/virt.c > +++ b/hw/loongarch/virt.c > @@ -1004,6 +1004,13 @@ static void loongarch_machine_device_plug_cb(HotplugHandler *hotplug_dev, > } else if (memhp_type_supported(dev)) { > virt_mem_plug(hotplug_dev, dev, errp); > } > + > +#ifdef CONFIG_TPM > + if (object_dynamic_cast(OBJECT(dev), TYPE_TPM_IF)) { > + tpm_sysbus_plug(TPM_IF(dev), OBJECT(lams->platform_bus_dev), > + VIRT_PLATFORM_BUS_BASEADDRESS); > + } > +#endif > } > > static HotplugHandler *virt_machine_get_hotplug_handler(MachineState *machine, > diff --git a/hw/loongarch/Kconfig b/hw/loongarch/Kconfig > index 5727efed6d..25da190ffc 100644 > --- a/hw/loongarch/Kconfig > +++ b/hw/loongarch/Kconfig > @@ -5,6 +5,7 @@ config LOONGARCH_VIRT > imply VIRTIO_VGA > imply PCI_DEVICES > imply NVDIMM > + imply TPM_TIS_SYSBUS > select SERIAL > select VIRTIO_PCI > select PLATFORM_BUS
diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c index 4b7dc67a2d..feed0f8bbf 100644 --- a/hw/loongarch/virt.c +++ b/hw/loongarch/virt.c @@ -1004,6 +1004,13 @@ static void loongarch_machine_device_plug_cb(HotplugHandler *hotplug_dev, } else if (memhp_type_supported(dev)) { virt_mem_plug(hotplug_dev, dev, errp); } + +#ifdef CONFIG_TPM + if (object_dynamic_cast(OBJECT(dev), TYPE_TPM_IF)) { + tpm_sysbus_plug(TPM_IF(dev), OBJECT(lams->platform_bus_dev), + VIRT_PLATFORM_BUS_BASEADDRESS); + } +#endif } static HotplugHandler *virt_machine_get_hotplug_handler(MachineState *machine, diff --git a/hw/loongarch/Kconfig b/hw/loongarch/Kconfig index 5727efed6d..25da190ffc 100644 --- a/hw/loongarch/Kconfig +++ b/hw/loongarch/Kconfig @@ -5,6 +5,7 @@ config LOONGARCH_VIRT imply VIRTIO_VGA imply PCI_DEVICES imply NVDIMM + imply TPM_TIS_SYSBUS select SERIAL select VIRTIO_PCI select PLATFORM_BUS
Signed-off-by: Joelle van Dyne <j@getutm.app> --- hw/loongarch/virt.c | 7 +++++++ hw/loongarch/Kconfig | 1 + 2 files changed, 8 insertions(+)