From nobody Mon Feb 9 17:58:53 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=fail(p=quarantine dis=quarantine) header.from=opensource.wdc.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1650353919497922.5259142754506; Tue, 19 Apr 2022 00:38:39 -0700 (PDT) Received: from localhost ([::1]:44950 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ngiRa-0007Q9-Bz for importer@patchew.org; Tue, 19 Apr 2022 03:38:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41424) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nghke-0003yZ-4m for qemu-devel@nongnu.org; Tue, 19 Apr 2022 02:54:16 -0400 Received: from esa3.hgst.iphmx.com ([216.71.153.141]:61796) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nghkc-0004MC-9S for qemu-devel@nongnu.org; Tue, 19 Apr 2022 02:54:15 -0400 Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 19 Apr 2022 14:54:11 +0800 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 18 Apr 2022 23:25:18 -0700 Received: from usg-ed-osssrv.wdc.com ([10.3.10.180]) by uls-op-cesaip02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 18 Apr 2022 23:54:13 -0700 Received: from usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTP id 4KjF043Dxkz1Rwrw for ; Mon, 18 Apr 2022 23:54:12 -0700 (PDT) Received: from usg-ed-osssrv.wdc.com ([127.0.0.1]) by usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id S1v0njbazEsA for ; Mon, 18 Apr 2022 23:54:11 -0700 (PDT) Received: from toolbox.wdc.com (unknown [10.225.165.119]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTPSA id 4KjF006QCNz1SVp3; Mon, 18 Apr 2022 23:54:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1650351252; x=1681887252; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=54LNDcv7kZB26uhwQDpQcWJg6cxn2r4zaQ0u9RhnAYA=; b=YDBkMm6PGx5XEnATs+Prwq378ZuiimJhzgWbJ5o9jatGutv+jhDITm+h 1ZTVO5W6OtQ0kjGHE+AHS217asMby991TYTSQBFWyMe6mkF1YueiZLyDX UuIokhpzwurVsonYIuukt1RL8sdEqGK4dAnBX1XTd4ixDdYse16AVSIM+ q6tMOlrTQfE3Agf3qxF+okjO0dxu5Ms9nWQwHXbOdMSzyBMEoQJOAcs0m oDCoTa196JnmgCJSYjEmO+lmNr6K7U+aZcpjafZwCnVx+c8bSowZpf7xq ZZvMBovngAR8DINHKXmQS9WtdeuCfN5iydDmjIwbfksKpn5hfjvf1wOE5 g==; X-IronPort-AV: E=Sophos;i="5.90,272,1643644800"; d="scan'208";a="203101188" IronPort-SDR: Go6oO2EmAcrwm0l2CDEoedzcVDq/IUZHpJVJaVua3/EpuTfrXSI81zkFwpLUOhJ/lYM1kUs5YY WqZVgOjR90mo9korp1Y7Z0vv3vtvOPK6W5ITApX75iSJviH9T6SPY5nT8hzRpzIRpfryY2NVmY y9w80iGAz5pe6pMQyVZ1jwuPyxB0SqWZ4v1GDsGS9+yp8rq3wNX/jyDWXO2I9zKpOerB3cYILO jmwKr2dBWab15qVMs3lRz8QqrfLHU8eFr/HDqoE/C1p9bI1VW7BN0RNF6vMajjMv4W/KA+FwG4 UUFf4otn4KFY44cRcPWj1E9B IronPort-SDR: yzthSKB1+9RcTCueWBfvmfFsNbtRw1OhvIk1fXOUgnXJqViC349aMFeixgjaO1BU01Ok0ymBI+ ae1zpYk3IdgL9PgfQldfPrVWpe4EqyXIcS6LpnK66oyfnCJLrqmPkQAAUCXS/G0igyY+8Iesia kQd12+JkZN+KNr05fzziALRQlPfcFUK/EHcPT46bHV0/kSyWefIeVz4YOSskCJ1IxkL1BlvSlO LyDcf09e9IadHgR+jApMHvTopoRK8z2HA/33Yy5NCE2lslLKIELJ/4Di0u88m6ZUZiCfYp6M5n 9Mk= WDCIronportException: Internal Authentication-Results: usg-ed-osssrv.wdc.com (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=opensource.wdc.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d= opensource.wdc.com; h=content-transfer-encoding:mime-version :references:in-reply-to:x-mailer:message-id:date:subject:to :from; s=dkim; t=1650351251; x=1652943252; bh=54LNDcv7kZB26uhwQD pQcWJg6cxn2r4zaQ0u9RhnAYA=; b=ajApXSrc+uwOayU6HzLZd4+MJrsGBfYpgk WP0UMD+kMZRvBcO9P9+BxxbctL8PEkliaOA0rW4cAGa681/B6/vsJOiDDbVTucSJ kddVyIqlUFvoOTbexQaVQcZVU2UcFMLGR7SPC4lmnU/+wzz1KQZdwn2N14o4FxP2 FT9xcZf2beLo7HW5TcdBi53pF8+5/Zv2h9ATCs4/ujcshn4nmabG5o2gHFVAb6iS KftrOfaPxhOzPEVxlXzoAGIjbZsLnb+yOX5HWYekATP2E2mii0jcSUOkRDFCpX6k uwkkEjN+umIw/llL3o1OKjy/11BiVIfP4MUD0LB6Aplry8h6VlYw== X-Virus-Scanned: amavisd-new at usg-ed-osssrv.wdc.com From: Alistair Francis To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Cc: Alistair Francis , Bin Meng , alistair23@gmail.com, palmer@dabbelt.com, bmeng.cn@gmail.com Subject: [PATCH v3 6/6] hw/riscv: Enable TPM backends Date: Tue, 19 Apr 2022 16:53:42 +1000 Message-Id: <20220419065342.878415-7-alistair.francis@opensource.wdc.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220419065342.878415-1-alistair.francis@opensource.wdc.com> References: <20220419065342.878415-1-alistair.francis@opensource.wdc.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=lists.gnu.org; Received-SPF: pass client-ip=216.71.153.141; envelope-from=prvs=101f09098=alistair.francis@opensource.wdc.com; helo=esa3.hgst.iphmx.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZM-MESSAGEID: 1650353920355100001 Content-Type: text/plain; charset="utf-8" From: Alistair Francis Imply the TPM sysbus devices. This allows users to add TPM devices to the RISC-V virt board. This was tested by first creating an emulated TPM device: swtpm socket --tpm2 -t -d --tpmstate dir=3D/tmp/tpm \ --ctrl type=3Dunixio,path=3Dswtpm-sock Then launching QEMU with: -chardev socket,id=3Dchrtpm,path=3Dswtpm-sock \ -tpmdev emulator,id=3Dtpm0,chardev=3Dchrtpm \ -device tpm-tis-device,tpmdev=3Dtpm0 The TPM device can be seen in the memory tree and the generated device tree. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/942 Signed-off-by: Alistair Francis Reviewed-by: Edgar E. Iglesias --- hw/riscv/virt.c | 4 ++++ hw/riscv/Kconfig | 1 + 2 files changed, 5 insertions(+) diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 6eed1f4d70..b62fd66a49 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -43,6 +43,7 @@ #include "sysemu/device_tree.h" #include "sysemu/sysemu.h" #include "sysemu/kvm.h" +#include "sysemu/tpm.h" #include "hw/pci/pci.h" #include "hw/pci-host/gpex.h" #include "hw/display/ramfb.h" @@ -1612,6 +1613,9 @@ static void virt_machine_class_init(ObjectClass *oc, = void *data) hc->plug =3D virt_machine_device_plug_cb; =20 machine_class_allow_dynamic_sysbus_dev(mc, TYPE_RAMFB_DEVICE); +#ifdef CONFIG_TPM + machine_class_allow_dynamic_sysbus_dev(mc, TYPE_TPM_TIS_SYSBUS); +#endif =20 object_class_property_add_bool(oc, "aclint", virt_get_aclint, virt_set_aclint); diff --git a/hw/riscv/Kconfig b/hw/riscv/Kconfig index da790f5936..79ff61c464 100644 --- a/hw/riscv/Kconfig +++ b/hw/riscv/Kconfig @@ -34,6 +34,7 @@ config RISCV_VIRT imply PCI_DEVICES imply VIRTIO_VGA imply TEST_DEVICES + imply TPM_TIS_SYSBUS select RISCV_NUMA select GOLDFISH_RTC select MSI_NONBROKEN --=20 2.35.1