From nobody Tue Feb 14 07:29:09 2023 X-Original-To: dev-commits-src-main@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 4PGCWV0zbyz3rL98; Tue, 14 Feb 2023 07:29:10 +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 4PGCWV0Vjlz4Nsp; Tue, 14 Feb 2023 07:29:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676359750; 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=GcTw/GNEQ9aKIV2764G3P9CBnRfaEb7QG6RHQh6dkvg=; b=eM3T3uSCSgdyfBZlrV1Dv14BBgXUNlW7gkakHNi0Aj/pSckFPSqwUnyc/b4Vz6eXFFlQIt hVjVYPYMdgT43rp2uA7nA94c3RB+Ek96R48kNTwXXOceC1US0muy2yqjzis73pDFP3+Lhj Zj8G+jQjzoBi/DHGuwnlURf9GFuX2ECBkLyHSR27A5RMou0n95Hn+gZm6MwKfGDRc/gZyD bspT9fT5597hn5jeifrsRGDYt0JVqziCGqejXCCGbw6//08Q9TVf4WoBFc1WwNwOxuS5Bl Ag5n+CCt7AEm49jodZd2AB/ux+iFv9oABN9UvL8Fabs42Uhxes7rtEEGO9LDgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676359750; 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=GcTw/GNEQ9aKIV2764G3P9CBnRfaEb7QG6RHQh6dkvg=; b=andpN7ttDdgsroGjqRAbR4vSr8wQM9ew0s+jEg/2wwutFyZlp5FZwoFukHquTXAWDIKJN2 4ke3t/WXtAYM8RtT5Bn92ZPyqBmY5bFoC1TA1sj4Y66mpKRT/34S5g61hMIsKCJ2HC+6y1 ub8vHXPhAFZw5a4oBjcOjKU8Jt4zIvsFTAmcQjaknyPNKw6BYLGVS6y67aG/Dq8363MYsU jLUJIlDxTUkMa2R285fbuz0Gt/S09qgqyuNBEy8GnuUgNvkRwBTDm8BatxjxkgpAHk5wzt DHe9YLSVacTPKT33Y8SK+ii32i0kzZcQqoBVTJBUi9wkAlMZnQxWyKTfQZQPMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676359750; a=rsa-sha256; cv=none; b=H4nqFZ5EW2ebaVT6QVkOxnEje/+AY7lSH+wrDqI8MRPOrs3fWyP374pkRQJg949tKH6Iet rZDAdcpxzycW4mezQL2tnU2PdgEXHdLz4nk2X87ejmmFVCBHaF0/eBLbmOkeILhec4FOrU FIw0RUoqezGjfk+X214hE77RNTe0e4uuD2qdg/KM4anZnPfWe2ReWmE45yoD373zDgaccx zfN5wCeGFU3QmLWJYYb7RP2HU5ZfEnpU3S8H9YahLJlK0bU15VHUQeEqhhDM+Shk1SFV54 GeH5RYzMF/Nx5LICyDH94Lbr69h1/UeCWb+3a+HE5UhfVmSg/S/Zn8Dk9o5VZA== 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 4PGCWT6Qjmzr2M; Tue, 14 Feb 2023 07:29:09 +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 31E7T9Gn044008; Tue, 14 Feb 2023 07:29:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31E7T9Z5044007; Tue, 14 Feb 2023 07:29:09 GMT (envelope-from git) Date: Tue, 14 Feb 2023 07:29:09 GMT Message-Id: <202302140729.31E7T9Z5044007@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: 682a522d6122 - main - bhyve: add helper func to write a dsdt entry List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 682a522d61223920f23a202aa57901f38bdfd8dd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=682a522d61223920f23a202aa57901f38bdfd8dd commit 682a522d61223920f23a202aa57901f38bdfd8dd Author: Corvin Köhne AuthorDate: 2021-10-07 13:58:27 +0000 Commit: Corvin Köhne CommitDate: 2023-02-14 07:28:27 +0000 bhyve: add helper func to write a dsdt entry The guest will check the dsdt to detect acpi devices. Therefore, add a helper function to create such a dsdt entry for an acpi device. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D38329 --- usr.sbin/bhyve/acpi_device.c | 46 ++++++++++++++++++++++++++++++++++++++++++++ usr.sbin/bhyve/acpi_device.h | 2 ++ 2 files changed, 48 insertions(+) diff --git a/usr.sbin/bhyve/acpi_device.c b/usr.sbin/bhyve/acpi_device.c index 402e32faa93a..10259006c619 100644 --- a/usr.sbin/bhyve/acpi_device.c +++ b/usr.sbin/bhyve/acpi_device.c @@ -10,6 +10,7 @@ #include +#include #include #include #include @@ -135,3 +136,48 @@ acpi_device_add_res_fixed_memory32(struct acpi_device *const dev, return (0); } + +static void +acpi_device_write_dsdt_crs(const struct acpi_device *const dev) +{ + const struct acpi_resource_list_entry *res; + SLIST_FOREACH(res, &dev->crs, chain) { + switch (res->type) { + case ACPI_RESOURCE_TYPE_FIXED_IO: + dsdt_fixed_ioport(res->data.FixedIo.Address, + res->data.FixedIo.AddressLength); + break; + case ACPI_RESOURCE_TYPE_FIXED_MEMORY32: + dsdt_fixed_mem32(res->data.FixedMemory32.Address, + res->data.FixedMemory32.AddressLength); + break; + default: + assert(0); + break; + } + } +} + +void +acpi_device_write_dsdt(const struct acpi_device *const dev) +{ + if (dev == NULL) { + return; + } + + dsdt_line(""); + dsdt_line(" Scope (\\_SB)"); + dsdt_line(" {"); + dsdt_line(" Device (%s)", dev->name); + dsdt_line(" {"); + dsdt_line(" Name (_HID, \"%s\")", dev->hid); + dsdt_line(" Name (_STA, 0x0F)"); + dsdt_line(" Name (_CRS, ResourceTemplate ()"); + dsdt_line(" {"); + dsdt_indent(4); + acpi_device_write_dsdt_crs(dev); + dsdt_unindent(4); + dsdt_line(" })"); + dsdt_line(" }"); + dsdt_line(" }"); +} diff --git a/usr.sbin/bhyve/acpi_device.h b/usr.sbin/bhyve/acpi_device.h index d9618d7e0a43..5fb3ea18e481 100644 --- a/usr.sbin/bhyve/acpi_device.h +++ b/usr.sbin/bhyve/acpi_device.h @@ -34,3 +34,5 @@ int acpi_device_add_res_fixed_ioport(struct acpi_device *const dev, const UINT16 port, UINT8 length); int acpi_device_add_res_fixed_memory32(struct acpi_device *const dev, const UINT8 write_protected, const UINT32 address, const UINT32 length); + +void acpi_device_write_dsdt(const struct acpi_device *const dev);