From nobody Fri Apr 28 10:40:20 2023 X-Original-To: dev-commits-src-branches@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 4Q78JP0Cwdz48JsL; Fri, 28 Apr 2023 10:40:21 +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 4Q78JN6FRkz3Grp; Fri, 28 Apr 2023 10:40:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682678420; 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=2xydxxdSTfhP66M6P5zwELw9uFDiznQTz0G4QFOtknU=; b=S8zM5jL15sL0Rt0p114VjWt6HEWBIT7/hpf6Yobd+ydjRWfkgkmcbmTUoOIfBojjJM7O81 MaESE4KMgOn35OwHUMJ42gqDb57f8w593zCrxC9HfHADEx9wJmS/f+Kt4NFTb8CF5viaOP sKZLrA+nSR6jYb/qi0F+/s91GFlz7Q+qKizmlSSQ/JTUJnipy0vhQCeU80w6Mnt63Yrq0G 0efs9AyrOGbaqTGMLZfyOAKBPIpqhnmivwSd9H8ysJueuahIVP6istvEDPIt/E84eZcZch IRan938xx3NB2t0uWPzPZvRze55Eo1HZE1My61z8Kk96GkCTNm7d60hIQ0WeUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682678420; 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=2xydxxdSTfhP66M6P5zwELw9uFDiznQTz0G4QFOtknU=; b=cdxCLiOWPJsoDUYFc8fyXMu/ukHv5i14dnGU4afts7O1QCVFIvs3THOb2huG+P7P484l/o s4rYjaaxRIVAOj+EuBYvMgBWZqfOPxfkcLTgCp3KO4G9UUC2jKymy7o9St9s+WobQRdUiA P9fDDa6zQ8CunqFQPTtHS1njL0lhq9gfnkqaEg6cQyWfUSnOMoVzO3o43M2ZQsbbBN7TFA UNpGEMqSJaWt4zwXQ/2+WwPhkPX+cweS97a1fRLx96fpfrE7RKonbGE/kMrl/W+gppIobc 4bhdxnGaOKQr0sb7NLndf2SJMwSlX7jKAiaidaz9DSOy2w+C8CcVRAga9IHwCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682678420; a=rsa-sha256; cv=none; b=QoZ3gEfOwp+6qilUd+5eNi17ZjWN/OttoyaO1ROiNWNDncqU+kgySzMuUjFgochDd1KnJz DFfi59MBYxpP4Vxj0DMD47wVQM0qzRr/MVmEE/3m7aF84RiL09jwm4o2E4GbEJRE1XSx7U JxEMQ7QCB1UsIJbqF3iai3xVvBs2NPjAr3Jvg5VmaWq6hxQLBG/b2O448ZLj27OM2QOEhz ZTAS/VkuySP6ZCp2EQfBluy4WJR/PlIXpFo+9kXP2oGKfslRxMgIh4I1u+LWWqR8LLe/c9 09+M1ckzJtB8p7nM7TdQR/geavUoSbvKgkRyuTBnUiqCLICZ44/iNGjf561nyA== 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 4Q78JN57VHzwgV; Fri, 28 Apr 2023 10:40:20 +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 33SAeKIC092559; Fri, 28 Apr 2023 10:40:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33SAeKHQ092558; Fri, 28 Apr 2023 10:40:20 GMT (envelope-from git) Date: Fri, 28 Apr 2023 10:40:20 GMT Message-Id: <202304281040.33SAeKHQ092558@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 1c7053169d9d - stable/13 - bhyve: allow device specific DSDT entries List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 1c7053169d9d35b419b4d9ba6116bca83ecd4a68 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=1c7053169d9d35b419b4d9ba6116bca83ecd4a68 commit 1c7053169d9d35b419b4d9ba6116bca83ecd4a68 Author: Corvin Köhne AuthorDate: 2022-07-22 08:11:14 +0000 Commit: Corvin Köhne CommitDate: 2023-04-28 07:28:34 +0000 bhyve: allow device specific DSDT entries This feature will be used by future commits to implement a device specific method (_DSM) for TPM devices. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D39321 (cherry picked from commit e976464a50aceebf97fb3cc6b94058111fc40de1) --- usr.sbin/bhyve/acpi_device.c | 5 +++++ usr.sbin/bhyve/acpi_device.h | 3 +++ 2 files changed, 8 insertions(+) diff --git a/usr.sbin/bhyve/acpi_device.c b/usr.sbin/bhyve/acpi_device.c index dffb73ba9023..51603e138fba 100644 --- a/usr.sbin/bhyve/acpi_device.c +++ b/usr.sbin/bhyve/acpi_device.c @@ -190,6 +190,11 @@ acpi_device_write_dsdt(const struct acpi_device *const dev) BASL_EXEC(acpi_device_write_dsdt_crs(dev)); dsdt_unindent(4); dsdt_line(" })"); + if (dev->emul->write_dsdt != NULL) { + dsdt_indent(3); + BASL_EXEC(dev->emul->write_dsdt(dev)); + dsdt_unindent(3); + } dsdt_line(" }"); dsdt_line(" }"); diff --git a/usr.sbin/bhyve/acpi_device.h b/usr.sbin/bhyve/acpi_device.h index de72ce1e5370..4d734b422ec5 100644 --- a/usr.sbin/bhyve/acpi_device.h +++ b/usr.sbin/bhyve/acpi_device.h @@ -23,12 +23,15 @@ struct acpi_device; * @param hid Used as _HID in the DSDT. * @param build_table Called to build a device specific ACPI table like the TPM2 * table. + * @param write_dsdt Called to append the DSDT with device specific + * information. */ struct acpi_device_emul { const char *name; const char *hid; int (*build_table)(const struct acpi_device *dev); + int (*write_dsdt)(const struct acpi_device *dev); }; /**