From nobody Tue Nov 29 13:58:02 2022 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 4NM3nk6dMMz4htnN; Tue, 29 Nov 2022 13:58:02 +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 4NM3nk41mdz4CbD; Tue, 29 Nov 2022 13:58:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669730282; 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=akkSsn72EukOWqWCkjwDWIayXKGybQkAyVw2zSJrKSY=; b=f9w/yCV+85ktsNLiIe3g75bbVDh2Xa2AhmczYYbsgr+I0JBqij8Nf8unds1EniyFUXeEB8 67Avhpzaqn4hNBEoRMRFXTOeCqigcs3NuE9WYxe1z2C+JT8xvxddEfEWA1szVgV67P2a3h PwcW9XZ1aq3zDMHo/vsyuJFgLoGddyNLgxrjtdmOgQzQMVRfpEOhKXVBWX6TIjyrp0/KGx 4P/gW1NtwAZpcxRc7QnLz5Vx9idIAskJnK+g3fA1zoLqAB2gESZ4AksHH8whLqYli7DcTj LkqE8GCeD7nQRJSYUHXFgBNpmkazeaOvXDglTsLbBaM+F0foPko+rEsOPpwWZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669730282; 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=akkSsn72EukOWqWCkjwDWIayXKGybQkAyVw2zSJrKSY=; b=NdSmAgLgFCIupE8qkMqPiQd6vpRk9Bep9Kfm8ohYdM7U/PU4IbP/FwsD8DSrutPHbItBie alVthZIgMEU2AEB2ZCXROPtp18UPkJ4DIbvxHYoxfcrRgSmwPrVLEW8A7gpXao4mypd34y Nsmul/sGhyl4BmA9ucfy2MyJESWv5avRyKqeSWXcDCtHkPVEBagBs9S94PMiUimwfeVTPz E3Yx2iPvrsqaDysqRjssuizoUuWOQTI54MGWgWfPz5AnYtR0YiLmDSkci8Dkfg6vpJ8o/j UXmBfP8viJJV3MRrwo5xV7peynxIGQjRVt/plheM7OOoQQEJa2oA4W5GhrjRPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669730282; a=rsa-sha256; cv=none; b=sPzlGNOpkGtHh8d5Q5ukp7ib7KI3R89D6KlKlp0hd5Ny1QIumNOjJFezYbmGDHBWmuQ76d RdUdiRrW0gfZeO3qP6qXeZZSo+szpWEOQst9Fn5slZCDcCn4264VBQ6v6vXFCyiZsZlHwm 9Adu7aoGDXTUte0KXftsSQ7CQf6rPlCcQMbU6lKXp/RnngJpyEzLpKLbImMSZ7piA5OvLN lyOtwLf4eeu59LOn5ptSO8eHxCEd5AXzzw2svGv6axdgSmJiNKsUkW3FPgZH2DGLyR8Lvj 1c7Dz1HJXoWekUyb4+yaAo6vQpcojhEXSgZD18hu3RJU6mUVbk0wYbGq/WBDwg== 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 4NM3nk2mRlzKdm; Tue, 29 Nov 2022 13:58:02 +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 2ATDw2Za029445; Tue, 29 Nov 2022 13:58:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ATDw24O029444; Tue, 29 Nov 2022 13:58:02 GMT (envelope-from git) Date: Tue, 29 Nov 2022 13:58:02 GMT Message-Id: <202211291358.2ATDw24O029444@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: a3d85d0e12be - stable/13 - bhyve: add basl support for generic addresses 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: a3d85d0e12be1331c0c7d6d6ed73ec4bbf54bc36 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=a3d85d0e12be1331c0c7d6d6ed73ec4bbf54bc36 commit a3d85d0e12be1331c0c7d6d6ed73ec4bbf54bc36 Author: Corvin Köhne AuthorDate: 2022-11-04 13:30:53 +0000 Commit: Corvin Köhne CommitDate: 2022-11-29 13:53:50 +0000 bhyve: add basl support for generic addresses In upcoming commits, bhyve will build some ACPI tables by it's own. Therefore, it should be capable of appending GENERIC_ADDRESS structs to ACPI tables. Reviewed by: jhb, markj Approved by: manu (mentor) MFC after: 2 weeks Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D36988 (cherry picked from commit 995374a6553dbdfbdaffbc5f5a5ceff08a437cd7) --- usr.sbin/bhyve/basl.c | 16 ++++++++++++++++ usr.sbin/bhyve/basl.h | 10 ++++++++++ 2 files changed, 26 insertions(+) diff --git a/usr.sbin/bhyve/basl.c b/usr.sbin/bhyve/basl.c index b3a561f51571..7dfeb8d2acb3 100644 --- a/usr.sbin/bhyve/basl.c +++ b/usr.sbin/bhyve/basl.c @@ -156,6 +156,22 @@ basl_table_append_bytes(struct basl_table *const table, const void *const bytes, return (0); } +int +basl_table_append_gas(struct basl_table *const table, const uint8_t space_id, + const uint8_t bit_width, const uint8_t bit_offset, + const uint8_t access_width, const uint64_t address) +{ + ACPI_GENERIC_ADDRESS gas_le = { + .SpaceId = space_id, + .BitWidth = bit_width, + .BitOffset = bit_offset, + .AccessWidth = access_width, + .Address = htole64(address), + }; + + return (basl_table_append_bytes(table, &gas_le, sizeof(gas_le))); +} + int basl_table_append_int(struct basl_table *const table, const uint64_t val, const uint8_t size) diff --git a/usr.sbin/bhyve/basl.h b/usr.sbin/bhyve/basl.h index 3ce33dea63e0..95164e98ed7a 100644 --- a/usr.sbin/bhyve/basl.h +++ b/usr.sbin/bhyve/basl.h @@ -8,6 +8,13 @@ #include +#define ACPI_GAS_ACCESS_WIDTH_LEGACY 0 +#define ACPI_GAS_ACCESS_WIDTH_UNDEFINED 0 +#define ACPI_GAS_ACCESS_WIDTH_BYTE 1 +#define ACPI_GAS_ACCESS_WIDTH_WORD 2 +#define ACPI_GAS_ACCESS_WIDTH_DWORD 3 +#define ACPI_GAS_ACCESS_WIDTH_QWORD 4 + #define BHYVE_ACPI_BASE 0xf2400 #define BASL_TABLE_ALIGNMENT 0x10 @@ -32,6 +39,9 @@ int basl_finish(void); int basl_init(void); int basl_table_append_bytes(struct basl_table *table, const void *bytes, uint32_t len); +int basl_table_append_gas(struct basl_table *table, uint8_t space_id, + uint8_t bit_width, uint8_t bit_offset, uint8_t access_width, + uint64_t address); int basl_table_append_int(struct basl_table *table, uint64_t val, uint8_t size); int basl_table_create(struct basl_table **table, struct vmctx *ctx, const uint8_t *name, uint32_t alignment, uint32_t off);