From nobody Mon Jun 12 11:04:46 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qfpjp5jwQz4cjlq; Mon, 12 Jun 2023 11:04:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qfpjp3XvZz3Mn9; Mon, 12 Jun 2023 11:04:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686567886; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NVAiVN3mWEq3JnhnwEd7IAOujHaLjfK+BUccOVvd5M0=; b=Ykz3+hQn96op/VJdAcUaqC0IzvEvZn3uJZFfezVhZ+y53l0XYVrdg2XZD0DHPOsRv0zOF5 BwKhkfo+VGUCcGKi5B/ic+JAxzIAu3gvg8IPU6c3/mIr9aPLrdr4qtJQa6RYVYLkagsNKY Axg8aQ0vdiZElfEbFRUHVAvwtp4DP+HKXvUbM5Bp28iiaRYhTLrTWoAscSFJ+IwoS3r8bO TYZT4/yqT/1bXHSqfRck8ODxx7Ei+rSxgn6mEKUYp8mJbK8aTJ6pEE/KDREXjvkzTZ/tG1 poqIhHCLuHrAXpTtuRza8WXyOs7UB0e7+9r8oYBR1tC2ZP07veE3eKTU+paTMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686567886; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NVAiVN3mWEq3JnhnwEd7IAOujHaLjfK+BUccOVvd5M0=; b=CgxuyHNYCIq0cAeVvfWpmt1Y08DPu+5gtC4eiFukGlxkKF7edTFW1bpWgC3eg0f2Ylb8I0 UsZSO8ssiaIfhcFYNqSx7pYrqTETqWuk5TIUmpRaZHiO0tKsOni4SbcEOD3pGKsOzfH9fP 3tICQxQX4SYCzW2QZKJjq0VQtzL2idPVA+IYMHoMDIi8uwT35ti+zJRNIYrP4HiQhdPFON 5egRTBgyPYyJZ+SI4RAQbzSNUQ2Nt9tt9zwPPVwdmadWQHxkrxP0+CQhb+w3VWl6fQIOQs oFcpnEhlxWIoc535NtYphyX5RkincSSq7ubssk/PmRphVam53B13MR1V/+ukiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686567886; a=rsa-sha256; cv=none; b=c7hBMvBjgr7A5Vdl/uHnF0sOoPM7lKD1DJnniIJV2yrJqV2IHl7XtvaMEjWWeX7hrJdV1P RTjpfFpjljol7K3hpJelUcSF1/nI97rJHgGLzkudq1IyWgJHqIvqfWnw1HPC+6lTCb2P2H Q6+ok15EoQ+rJi6go9EoG0Aq8fo4MFhJ4XYILUXDRY7RL4cb+y4a6dC7ADHaqPePlBSPQx 8IhWr4HnpHd1F/ZvDDvwGr0ysuA3bJHbJHBZjW4UKwEyOyx2uw7FQ+4UypAVbDJgoz4RR5 6eIsVZk+KPR9jO5qY7S8dHGypcl+gjOKLf5AmdWapB8AoIXDawrfX4WvO02qqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Qfpjp2fgXzd8x; Mon, 12 Jun 2023 11:04:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35CB4kd2017326; Mon, 12 Jun 2023 11:04:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35CB4kIf017325; Mon, 12 Jun 2023 11:04:46 GMT (envelope-from git) Date: Mon, 12 Jun 2023 11:04:46 GMT Message-Id: <202306121104.35CB4kIf017325@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: dece4f2d875a - main - bhyve: register TPM device as ACPI device List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dece4f2d875a3964e1d6438dafa108dda8a7a1d0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=dece4f2d875a3964e1d6438dafa108dda8a7a1d0 commit dece4f2d875a3964e1d6438dafa108dda8a7a1d0 Author: Corvin Köhne AuthorDate: 2023-05-15 11:24:14 +0000 Commit: Corvin Köhne CommitDate: 2023-06-12 11:04:37 +0000 bhyve: register TPM device as ACPI device The TPM device is an ACPI device with some custom ACPI tables. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D40453 --- usr.sbin/bhyve/tpm_device.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/usr.sbin/bhyve/tpm_device.c b/usr.sbin/bhyve/tpm_device.c index 77fd1ccf6a52..56df6ab0e30c 100644 --- a/usr.sbin/bhyve/tpm_device.c +++ b/usr.sbin/bhyve/tpm_device.c @@ -13,11 +13,21 @@ #include #include +#include "acpi_device.h" #include "config.h" #include "tpm_device.h" +#define TPM_ACPI_DEVICE_NAME "TPM" +#define TPM_ACPI_HARDWARE_ID "MSFT0101" + struct tpm_device { struct vmctx *vm_ctx; + struct acpi_device *acpi_dev; +}; + +static const struct acpi_device_emul tpm_acpi_device_emul = { + .name = TPM_ACPI_DEVICE_NAME, + .hid = TPM_ACPI_HARDWARE_ID, }; void @@ -26,6 +36,7 @@ tpm_device_destroy(struct tpm_device *const dev) if (dev == NULL) return; + acpi_device_destroy(dev->acpi_dev); free(dev); } @@ -57,6 +68,11 @@ tpm_device_create(struct tpm_device **const new_dev, struct vmctx *const vm_ctx, dev->vm_ctx = vm_ctx; + error = acpi_device_create(&dev->acpi_dev, dev, dev->vm_ctx, + &tpm_acpi_device_emul); + if (error) + goto err_out; + *new_dev = dev; return (0);