Received: by 2002:ac2:5042:0:0:0:0:0 with SMTP id a2csp3219529lfm; Mon, 22 Jun 2020 07:07:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx0Y3SowbqS79y6XUUIhgLSnppV3mzY05wA6jL4mVAfsBnon9HXyOzcFOUShTbzTc/WaaEx X-Received: by 2002:a37:9342:: with SMTP id v63mr14558769qkd.221.1592834832313; Mon, 22 Jun 2020 07:07:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592834832; cv=none; d=google.com; s=arc-20160816; b=M2GBwwyb9oQXqFV8Fc60O3dPorw2VSeizJ//rgV7mVId2Sbt5q2kjTpINUN/C2f4Vn qFs14fgosjk6ZQxAp6OVUoMJXuOFGf99Bi59211WPtKKIVUqJfspfOchhTaZmQXQYNpW 4jdmE1LaRADxQMIiz02zFVP/J82kXD+q1zk/Msh8UPizxhXQqK/U8bYr0hApZ1dqcdNX ad7Ij8hmkWxVISKtwI4KMZE/Zx+qKy/oDcrAsSu/z5lPi5cHgV217SO0tzcdlPC/SA40 5Bsvjq0CvMTf7LkWe8IrRn0ke/FsVPdiPa91oT7r/USlz90eBWi+TsTzPTsLVGoXMyvf q0hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=kvhA5hZROQq5b7fo6lHe5uZjadQELg38ByIgNwsrlf4=; b=0nEdtY38mgC9PlPgyr2n9IffRhAv7bci7R3FPErYY43evbG+rbrJQCm9Lf3FG0Q7Qm fDnW1mQgTGUZLB7IvAok1wIRZmicLUAgH7tpOMFYw7m8cKnnQrTuqlljCc53Xka8ahQX iS7VBU+oUeOkxy2qYuXvgMYUdvJyfKjwJJf4Lw9oq6tW1JKwlKNSc4N4UoM4//95fxbC DxtBVOOXrbTgq08V0TcTSfcR4Weoq+1PIMtB5XUkpH35nS0AAbFP31OxRX98+36bwtyx x2eIDiBkiUg/GEN+RC2KTLxPVrTXONR/4dwIkuC1r7CRd0E/In2CnXIqR4d72nCGz8iq wraQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=VtXiwidz; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p10si6157875qki.294.2020.06.22.07.07.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 22 Jun 2020 07:07:12 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=VtXiwidz; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:34646 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jnN6N-0001d1-JG for alex.bennee@linaro.org; Mon, 22 Jun 2020 10:07:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32782) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jnN67-0001VT-LT for qemu-arm@nongnu.org; Mon, 22 Jun 2020 10:06:55 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:25705 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jnN63-0001Mq-Kz for qemu-arm@nongnu.org; Mon, 22 Jun 2020 10:06:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592834807; 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=kvhA5hZROQq5b7fo6lHe5uZjadQELg38ByIgNwsrlf4=; b=VtXiwidzyf3aEpX4hJq2/0y2zrWIr2zc51ZmiYiVKf1dwt6IDRO8VAGBUK/qaFVFfRBhq8 P6BTVs308VWv37UfnwQxSBC+3EB1r3pmI2a6m/A5Nusr5XHT5wxmP4FlFaoTtqLeSIs+fy Pir0e7aCAEIxTlpjKLIbBz5RPqPvK6o= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-144-R68bomIRPMSwgq-JwEp2pQ-1; Mon, 22 Jun 2020 10:06:43 -0400 X-MC-Unique: R68bomIRPMSwgq-JwEp2pQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 22226BFC1; Mon, 22 Jun 2020 14:06:42 +0000 (UTC) Received: from laptop.redhat.com (ovpn-114-197.ams2.redhat.com [10.36.114.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id D962F27CC9; Mon, 22 Jun 2020 14:06:38 +0000 (UTC) From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, stefanb@linux.ibm.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, peter.maydell@linaro.org, mst@redhat.com, imammedo@redhat.com Subject: [PATCH v7 2/3] arm/acpi: Add the TPM2.0 device under the DSDT Date: Mon, 22 Jun 2020 16:06:19 +0200 Message-Id: <20200622140620.17229-3-eric.auger@redhat.com> In-Reply-To: <20200622140620.17229-1-eric.auger@redhat.com> References: <20200622140620.17229-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=205.139.110.61; envelope-from=eric.auger@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/22 03:17:49 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, lersek@redhat.com, drjones@redhat.com, shannon.zhaosl@gmail.com, marcandre.lureau@redhat.com, philmd@redhat.com, ardb@kernel.org Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: TlOSaofNvzyO In case it is dynamically instantiated, add the TPM 2.0 device object under the DSDT table in the ACPI namespace. Its HID is MSFT0101 while its current resource settings (CRS) property is initialized with the guest physical address and MMIO size of the device. Signed-off-by: Eric Auger Reviewed-by: Stefan Berger Reviewed-by: Igor Mammedov --- v3 -> v4: - check the presence of the tpm in acpi_dsdt_add_tpm as it was done in v2 v2 -> v3: - use SYS_BUS_DEVICE() instead of (SysBusDevice *)object_dynamic_cast(OBJECT()) v1 -> v2: - use memory_region_size - fix mingw compilation issue by casting to uint32_t - added Stefan's R-b --- hw/arm/virt-acpi-build.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index ca31f70f7f..1384a2cf2a 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -46,6 +46,7 @@ #include "hw/pci/pci.h" #include "hw/arm/virt.h" #include "hw/mem/nvdimm.h" +#include "hw/platform-bus.h" #include "sysemu/numa.h" #include "sysemu/reset.h" #include "sysemu/tpm.h" @@ -364,6 +365,38 @@ static void acpi_dsdt_add_power_button(Aml *scope) aml_append(scope, dev); } +static void acpi_dsdt_add_tpm(Aml *scope, VirtMachineState *vms) +{ + PlatformBusDevice *pbus = PLATFORM_BUS_DEVICE(vms->platform_bus_dev); + hwaddr pbus_base = vms->memmap[VIRT_PLATFORM_BUS].base; + SysBusDevice *sbdev = SYS_BUS_DEVICE(tpm_find()); + MemoryRegion *sbdev_mr; + hwaddr tpm_base; + + if (!sbdev) { + 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); + + Aml *dev = aml_device("TPM0"); + aml_append(dev, aml_name_decl("_HID", aml_string("MSFT0101"))); + aml_append(dev, aml_name_decl("_UID", aml_int(0))); + + Aml *crs = aml_resource_template(); + aml_append(crs, + aml_memory32_fixed(tpm_base, + (uint32_t)memory_region_size(sbdev_mr), + AML_READ_WRITE)); + aml_append(dev, aml_name_decl("_CRS", crs)); + aml_append(scope, dev); +} + static void build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) { @@ -762,6 +795,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) } acpi_dsdt_add_power_button(scope); + acpi_dsdt_add_tpm(scope, vms); aml_append(dsdt, scope); -- 2.20.1