From nobody Mon Dec 05 07:42:06 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 4NQb9B5531z4jfCp; Mon, 5 Dec 2022 07:42:06 +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 4NQb9B4F8zz4GTk; Mon, 5 Dec 2022 07:42:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670226126; 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=d6vLUs8/hg6jq2ah9K3sdw1Kn5BHFuMWwoJwspkEMcY=; b=rMthrdIzDfSetqMtZhx7BHxXQzGh4hPY/ljWEURTCma3qw1dBakKB1s1zhPj0LRR2Cl2PU 5j3wlD7meYI1OF5Csv+f9gmLLx5dsbwX47in0xSJy8g51BeGEmyujg6dMCWVeduk5yv0TQ 3xdDLJODv7DMoSETSsSSq34uE5Tyr7P+5I0ogGdMQam/iFODnt9Gxm3HlQnh+1ZgVniInW kqb37EP4q4qacV7zsqoBBIhJli1lltyg22qAFLddGTvuwonGB8Rh2YgUmuL68aOiSeaY2I eVtKWygfx3CpR6jlmqKg/2BsIlywrNU18pqzVT/SSz2TwO7FMT+7qi11lcKQ6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670226126; 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=d6vLUs8/hg6jq2ah9K3sdw1Kn5BHFuMWwoJwspkEMcY=; b=wMbrGdC2nYqybLMkfiNAP+l3xbYbCh735+9gcROy+6Fs0cSXb2XVDgVTirF2oeZc9OmAf0 lYlZNigttyFT8cinsX8ykOmZ1quFZrwEvXdQIS/zancRKLNWzKU5rFu4HaOFg4Z1Qbo/Hi NtvWhoiiL3+TeZZuH6RfzKK/0xdk6Iqofac5NRyfiPWYNP7c6EaiobSxhnvpT0QnzoOd5y 0VAjYD+NMwGSP6QcpEkZphuzO0/zfvTUglZV3s3ipUEbKpL5IcDGSItKaAQzh3HzVH5bTU gE9OhoFMdr6MOvc92c7Tv3qQGUP6/TkOXRMgTtpWU50uyZue3EQshO0NpsPgUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670226126; a=rsa-sha256; cv=none; b=F1aE7X1VNXDtB/hg3kGaZdTEf0/ojP4duoRYOsyRr9RtdVdKK59fKaDBbKfOAK+rEXnw3U v3k81ezB0qbbtppmEALuExUG0qCroDj4KJnWlJDaD+QgBw6VlzHTrQSD7YewnzIXwgavNp NoFjYo0urYbmD8eKwwGU9XTevo7l33W8jwAHSufaqfeGbbYw0Q+2j8JE1piK0OEwuwpBNn wlZOMDJSSeVmO7ZBmGy9Z8fRuXlVHX4EFRZOJrz0DFutzYWMwZ5EZyrHkpx/QzFGpYdfLS 1LcpusbQRQKwB6DEB5O7TKta99RLlr1gU2G/TxyPWWplatCiVmSzYOc4W5sykw== 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 4NQb9B3814zq26; Mon, 5 Dec 2022 07:42:06 +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 2B57g65T083072; Mon, 5 Dec 2022 07:42:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B57g612083060; Mon, 5 Dec 2022 07:42:06 GMT (envelope-from git) Date: Mon, 5 Dec 2022 07:42:06 GMT Message-Id: <202212050742.2B57g612083060@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: c0631a2ab4fd - stable/13 - bhyve: build XSDT table by basl 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: c0631a2ab4fd512dd3c305cd3d40292fc32a0e0b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=c0631a2ab4fd512dd3c305cd3d40292fc32a0e0b commit c0631a2ab4fd512dd3c305cd3d40292fc32a0e0b Author: Corvin Köhne AuthorDate: 2022-04-06 09:10:42 +0000 Commit: Corvin Köhne CommitDate: 2022-12-05 07:39:41 +0000 bhyve: build XSDT table by basl Building the XSDT 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/D36999 (cherry picked from commit 4a60470f053dd035df6023457c153d3d86bc7123) --- usr.sbin/bhyve/acpi.c | 65 ++++++++++++++++++++++----------------------------- 1 file changed, 28 insertions(+), 37 deletions(-) diff --git a/usr.sbin/bhyve/acpi.c b/usr.sbin/bhyve/acpi.c index 336454cf4698..b38e167ccf49 100644 --- a/usr.sbin/bhyve/acpi.c +++ b/usr.sbin/bhyve/acpi.c @@ -134,6 +134,8 @@ static FILE *dsdt_fp; static int dsdt_indent_level; static int dsdt_error; +static struct basl_table *xsdt; + struct basl_fio { int fd; FILE *fp; @@ -208,42 +210,6 @@ err_exit: return (errno); } -static int -basl_fwrite_xsdt(FILE *fp) -{ - EFPRINTF(fp, "/*\n"); - EFPRINTF(fp, " * bhyve XSDT template\n"); - EFPRINTF(fp, " */\n"); - EFPRINTF(fp, "[0004]\t\tSignature : \"XSDT\"\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 : \"BVXSDT \"\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 : 00000000%08X\n", - basl_acpi_base + MADT_OFFSET); - EFPRINTF(fp, "[0004]\t\tACPI Table Address 1 : 00000000%08X\n", - basl_acpi_base + FADT_OFFSET); - EFPRINTF(fp, "[0004]\t\tACPI Table Address 2 : 00000000%08X\n", - basl_acpi_base + HPET_OFFSET); - EFPRINTF(fp, "[0004]\t\tACPI Table Address 3 : 00000000%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. */ @@ -642,6 +608,9 @@ 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(xsdt, ACPI_SIG_FADT, + ACPI_XSDT_ENTRY_SIZE)); + return (0); } @@ -662,6 +631,9 @@ 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(xsdt, ACPI_SIG_HPET, + ACPI_XSDT_ENTRY_SIZE)); + return (0); } @@ -735,6 +707,9 @@ 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(xsdt, ACPI_SIG_MADT, + ACPI_XSDT_ENTRY_SIZE)); + return (0); } @@ -758,6 +733,22 @@ build_mcfg(struct vmctx *const ctx) BASL_EXEC(basl_table_append_bytes(table, &mcfg_allocation, sizeof(mcfg_allocation))); + BASL_EXEC(basl_table_append_pointer(xsdt, ACPI_SIG_MCFG, + ACPI_XSDT_ENTRY_SIZE)); + + return (0); +} + +static int +build_xsdt(struct vmctx *const ctx) +{ + BASL_EXEC(basl_table_create(&xsdt, ctx, ACPI_SIG_XSDT, + BASL_TABLE_ALIGNMENT, XSDT_OFFSET)); + + /* Header */ + BASL_EXEC(basl_table_append_header(xsdt, ACPI_SIG_XSDT, 1, 1)); + /* Pointers (added by other build_XXX funcs) */ + return (0); } @@ -800,7 +791,7 @@ acpi_build(struct vmctx *ctx, int ncpu) */ BASL_EXEC(basl_compile(ctx, basl_fwrite_rsdp, 0)); BASL_EXEC(basl_compile(ctx, basl_fwrite_rsdt, RSDT_OFFSET)); - BASL_EXEC(basl_compile(ctx, basl_fwrite_xsdt, XSDT_OFFSET)); + BASL_EXEC(build_xsdt(ctx)); BASL_EXEC(build_fadt(ctx)); BASL_EXEC(build_madt(ctx)); BASL_EXEC(build_hpet(ctx));