From nobody Mon Nov 21 08:31:43 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 4NG0wv4tfkz4j4B4; Mon, 21 Nov 2022 08:31:43 +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 4NG0wv3Nnxz3MMf; Mon, 21 Nov 2022 08:31:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669019503; 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=bJEvxQCoQD5dk+toqa3Hho3FIzfxTMMQObp84bD/vjg=; b=IoLo8u5PtTXbiHZc31Kk+WV9jnaltw6ydVzRe4bA9RPsp6hDGvfVvf69Kxmdz+fkotyeJT VoTi2hcSorasF2n77mumC14I4e29/eF8IvnR8J3rZSPQBbR+3MqGK+UNRgz78nFAZV0czD zGIcVqRHhAeXgvtMSvkqhLS2cMrELfMaar2iPBIBWbv5OvZkY/4GILwjw1YFD14sX2V5Qd HZaJLrYpqzDJkfynEns5vd8CI5WKXOhqP8Or4/HjtQWjO++zlAEiU++ruXooP8JnmJionN A6BGyNE7bpKUsOB7F/q7Ufo7mjNJpJFh8pXm5gvfai/F1d9x3N6U1xTktI2wKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669019503; 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=bJEvxQCoQD5dk+toqa3Hho3FIzfxTMMQObp84bD/vjg=; b=DN+LFOho+uWJW4UZGjIgNdtTl7a3UlcXpbZuB0XVWrk59ELNtC60WpZtU2uKO2E+fojL91 pxuiVzpaNGKR6jpksHgPX9NYLQQCClWHDyCZK/q5teL+AyZQZ201dmLLyuFgSo0EDMFX9G ZqXy/w4jt1c9dUaNTgMa1XWH5pqBrIxI1zNIKqi98KfCaVGG4nljFoNBs55X5HYiKQ9TMI K/etHCG7VmzX98hOwqp/mPaUcptvF9LpCC+etiYqvEW3XoelKY//GHQCPTBfqBtyY3oo69 BzPw8jNDsCPAqJ4ldRtKkw/gCsDS7h5rGlmlQCubS1ZYgZbKbjPqnasTqooDww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669019503; a=rsa-sha256; cv=none; b=JR4KlvALAfr0/NsfoCO1HU7Yc7ykpsSrlTYo0+8yqI0TTxGVtR24bswXi+7PckT4BjMayO Y4LnjVrAObIZl6hU8b9tWk1atiUqIAIlbIrM9aMk6FAF/DsVPZoUxLwYbDjiShtKGN2tPT nZ5IAfThhCSqO5EOFJUO3j3HxIDMWGprjnbIo8TdzCvNe9TXHIOqvQo924lJYFJCmXvVOg qlFnQC5Rp7fu7FE9Tjh9ZZsSuSffSTBQQfAI16LpTAUNEUYjZSB38AD2qDepD1QJtMOR9r eTAxCVqo+3B6lWvedl2n7n77t1aK4nUwRewtUqdfX33bzuMX9VtL/1DrLncKGg== 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 4NG0wv2Tk9zwTh; Mon, 21 Nov 2022 08:31:43 +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 2AL8VhU6026615; Mon, 21 Nov 2022 08:31:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AL8Vhjj026614; Mon, 21 Nov 2022 08:31:43 GMT (envelope-from git) Date: Mon, 21 Nov 2022 08:31:43 GMT Message-Id: <202211210831.2AL8Vhjj026614@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: f3dcdf8be4cc - main - bhyve: build RSDT table by basl 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: f3dcdf8be4cc1cd6878f6e962a749dca372d5982 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=f3dcdf8be4cc1cd6878f6e962a749dca372d5982 commit f3dcdf8be4cc1cd6878f6e962a749dca372d5982 Author: Corvin Köhne AuthorDate: 2022-04-06 09:10:43 +0000 Commit: Corvin Köhne CommitDate: 2022-11-21 08:27:59 +0000 bhyve: build RSDT table by basl Building the RSDT table by basl will allow it to be loaded by qemu's ACPI table loader in the future. Reviewed by: jhb, markj (older version) Approved by: manu (mentor) MFC after: 2 weeks Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D37000 --- usr.sbin/bhyve/acpi.c | 60 ++++++++++++++++++++------------------------------- 1 file changed, 23 insertions(+), 37 deletions(-) diff --git a/usr.sbin/bhyve/acpi.c b/usr.sbin/bhyve/acpi.c index 8cc3b56a199d..13077f12168b 100644 --- a/usr.sbin/bhyve/acpi.c +++ b/usr.sbin/bhyve/acpi.c @@ -134,6 +134,7 @@ static FILE *dsdt_fp; static int dsdt_indent_level; static int dsdt_error; +static struct basl_table *rsdt; static struct basl_table *xsdt; struct basl_fio { @@ -174,42 +175,6 @@ err_exit: return (errno); } -static int -basl_fwrite_rsdt(FILE *fp) -{ - EFPRINTF(fp, "/*\n"); - EFPRINTF(fp, " * bhyve RSDT template\n"); - EFPRINTF(fp, " */\n"); - EFPRINTF(fp, "[0004]\t\tSignature : \"RSDT\"\n"); - EFPRINTF(fp, "[0004]\t\tTable Length : 00000000\n"); - EFPRINTF(fp, "[0001]\t\tRevision : 01\n"); - EFPRINTF(fp, "[0001]\t\tChecksum : 00\n"); - EFPRINTF(fp, "[0006]\t\tOem ID : \"BHYVE \"\n"); - EFPRINTF(fp, "[0008]\t\tOem Table ID : \"BVRSDT \"\n"); - EFPRINTF(fp, "[0004]\t\tOem Revision : 00000001\n"); - /* iasl will fill in the compiler ID/revision fields */ - EFPRINTF(fp, "[0004]\t\tAsl Compiler ID : \"xxxx\"\n"); - EFPRINTF(fp, "[0004]\t\tAsl Compiler Revision : 00000000\n"); - EFPRINTF(fp, "\n"); - - /* Add in pointers to the MADT, FADT and HPET */ - EFPRINTF(fp, "[0004]\t\tACPI Table Address 0 : %08X\n", - basl_acpi_base + MADT_OFFSET); - EFPRINTF(fp, "[0004]\t\tACPI Table Address 1 : %08X\n", - basl_acpi_base + FADT_OFFSET); - EFPRINTF(fp, "[0004]\t\tACPI Table Address 2 : %08X\n", - basl_acpi_base + HPET_OFFSET); - EFPRINTF(fp, "[0004]\t\tACPI Table Address 3 : %08X\n", - basl_acpi_base + MCFG_OFFSET); - - EFFLUSH(fp); - - return (0); - -err_exit: - return (errno); -} - /* * Helper routines for writing to the DSDT from other modules. */ @@ -608,6 +573,8 @@ build_fadt(struct vmctx *const ctx) BASL_EXEC(basl_table_add_pointer(table, ACPI_SIG_DSDT, offsetof(ACPI_TABLE_FADT, XDsdt), sizeof(fadt.XDsdt))); + BASL_EXEC(basl_table_append_pointer(rsdt, ACPI_SIG_FADT, + ACPI_RSDT_ENTRY_SIZE)); BASL_EXEC(basl_table_append_pointer(xsdt, ACPI_SIG_FADT, ACPI_XSDT_ENTRY_SIZE)); @@ -631,6 +598,8 @@ build_hpet(struct vmctx *const ctx) hpet.Flags = ACPI_HPET_PAGE_PROTECT4; BASL_EXEC(basl_table_append_content(table, &hpet, sizeof(hpet))); + BASL_EXEC(basl_table_append_pointer(rsdt, ACPI_SIG_HPET, + ACPI_RSDT_ENTRY_SIZE)); BASL_EXEC(basl_table_append_pointer(xsdt, ACPI_SIG_HPET, ACPI_XSDT_ENTRY_SIZE)); @@ -707,6 +676,8 @@ build_madt(struct vmctx *const ctx) BASL_EXEC(basl_table_append_bytes(table, &madt_lapic_nmi, sizeof(madt_lapic_nmi))); + BASL_EXEC(basl_table_append_pointer(rsdt, ACPI_SIG_MADT, + ACPI_RSDT_ENTRY_SIZE)); BASL_EXEC(basl_table_append_pointer(xsdt, ACPI_SIG_MADT, ACPI_XSDT_ENTRY_SIZE)); @@ -733,12 +704,27 @@ build_mcfg(struct vmctx *const ctx) BASL_EXEC(basl_table_append_bytes(table, &mcfg_allocation, sizeof(mcfg_allocation))); + BASL_EXEC(basl_table_append_pointer(rsdt, ACPI_SIG_MCFG, + ACPI_RSDT_ENTRY_SIZE)); BASL_EXEC(basl_table_append_pointer(xsdt, ACPI_SIG_MCFG, ACPI_XSDT_ENTRY_SIZE)); return (0); } +static int +build_rsdt(struct vmctx *const ctx) +{ + BASL_EXEC(basl_table_create(&rsdt, ctx, ACPI_SIG_RSDT, + BASL_TABLE_ALIGNMENT, RSDT_OFFSET)); + + /* Header */ + BASL_EXEC(basl_table_append_header(rsdt, ACPI_SIG_RSDT, 1, 1)); + /* Pointers (added by other build_XXX funcs) */ + + return (0); +} + static int build_xsdt(struct vmctx *const ctx) { @@ -790,7 +776,7 @@ acpi_build(struct vmctx *ctx, int ncpu) * first table after XSDT. */ BASL_EXEC(basl_compile(ctx, basl_fwrite_rsdp, 0)); - BASL_EXEC(basl_compile(ctx, basl_fwrite_rsdt, RSDT_OFFSET)); + BASL_EXEC(build_rsdt(ctx)); BASL_EXEC(build_xsdt(ctx)); BASL_EXEC(build_fadt(ctx)); BASL_EXEC(build_madt(ctx));