From nobody Tue Nov 15 07:28:07 2022 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 4NBHpH6WxCz4hBwN; Tue, 15 Nov 2022 07:28:07 +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 4NBHpH5kTZz3jrl; Tue, 15 Nov 2022 07:28:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668497287; 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=hmwqm8SYyfo4Z8XkyeLO033e5Bayk/d+g/SKZz6lS78=; b=mAEwv5rhnS9tAunZWiKpYI8sQA9zVj9lYHRDy0ToL8uNIqNxkgBEerXJt5NIGxvmx34Tge 1666yrQWua6YKyI4LOdcbBffMPuzFgRvF5ts8kC6vBRwBKwsE9ckc84UfiBakBQ4Ck3TRS IWwHt7eDQ+ZN+rx/GTbl4GXXOZMQxD/CysZ6HOPQsuM+njs2ivPCtuO/QAv1Rp55u2q8qs oCO3pcku+CVm+biVBjrddKly7hkbvaQzX47Jk34hBY2KjGyyHU/Dm+blrxP7UtCmFZTNAZ vAqfQvpNOgYIA+25/9IWDIPnk5UxmbziFES8wlwU96cL91NpV5qoagYL15uHdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668497287; 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=hmwqm8SYyfo4Z8XkyeLO033e5Bayk/d+g/SKZz6lS78=; b=S1/UxDIIUIP9LvkvN7fsqfrja8dJ0tSEqgPMlvYPnYgzjcDrvrFKlHlDJoy8Yr8kF4fLH1 KSZovuGwajF1jM6BDaDmW7IUGQJRfbFzASrGFuBYL3xPm6GujduxnVElVVmrs/zos6KzxW or1JlGXKP2ZO6nTrptoqLN0it6N8+NVkK1RfU0LeA5dlWNwoVpyY5I+8nC6Hway+lF+CvS uaKL06uZs6Z8d2O6dg+HGkKI1+gz9M2b9qKhCGiFrwDnk04KzyQjjCUchrWTJg1Ty17VBY CNmPjlx2Ob7tusrdMMEXLaIMw/Lg3W9p55u6XGOv2GFlAKqiW8MCaqxkswAHDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668497287; a=rsa-sha256; cv=none; b=gsINsZb/JU2mASYGxxjjuda+eRLQuJ3/BEQf6Nl1JlMhrdLUV+rV/E9JY/DYFApcgPVw11 HrcmY6FFxwgCg0T3/XPX9dH2lH5z3vWhcIvbI8sBQ4fUCULiRA0zyy4N3kKxwHANMoqQSv y4vRJJD5/FaunDNUBUyCH3Vddd96VV/Vtdw1OqEUvHS2U0ADd2Gesx1qg4MoPIushIU4q9 qZEPN0hEQuNOKOuaVRzLGVD7UsHQJZ30yMBq5LORWD6T4Ieaf8OtfSNl22U+TDIy2hMfQh 14V6cZgB1as9I2jn+1USSqA9bsMNjcXdQ3P5RjAUEDvGZ7NvNCSTmXbN7Q6yyQ== 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 4NBHpH4rTzzDg2; Tue, 15 Nov 2022 07:28:07 +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 2AF7S742046750; Tue, 15 Nov 2022 07:28:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AF7S7rV046749; Tue, 15 Nov 2022 07:28:07 GMT (envelope-from git) Date: Tue, 15 Nov 2022 07:28:07 GMT Message-Id: <202211150728.2AF7S7rV046749@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: 995374a6553d - main - bhyve: add basl support for generic addresses 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: 995374a6553dbdfbdaffbc5f5a5ceff08a437cd7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=995374a6553dbdfbdaffbc5f5a5ceff08a437cd7 commit 995374a6553dbdfbdaffbc5f5a5ceff08a437cd7 Author: Corvin Köhne AuthorDate: 2022-11-04 13:30:53 +0000 Commit: Corvin Köhne CommitDate: 2022-11-15 07:27:08 +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 --- 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);