From nobody Mon Dec 5 07:41:57 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 4NQb914WN2z4jfCR; Mon, 5 Dec 2022 07:41:57 +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 4NQb91442Zz4FcT; Mon, 5 Dec 2022 07:41:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670226117; 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=a4kZMM9zSeUzaKsk+ZWQjmecLq8ocGFNadeMELDzuOc=; b=D4navPLTZq4iYL756kjnm1FAPuT8XSJKRciuS6riOZAQ1mVI/o4FKxPXLU5pMSf5eWsD73 GzbNU4yXJiEaZRWos/HXXM3W7UzAccBTtGhm6PAzc9aNLHEqPBqQJxV3z2U/tL2Ka8v9oA EwbD0/KhaVEwnWCdyVBKNCxwEBkpbbPhnSRoIs+HN1RmLQ6SZZK5zHIJn8+OF85kuKPigf 13ZgaKjJBcq25SZHsIOD5KYqq7XbkmosXCgAmlsYa9h1SLTe/Y2Ud3zPE8JLDxVtKVovxr R4xalzE95RGlf98ZOLQ7IMr8GBYgF/A2jGBcMTILbrdtgvZN9LRqxVssTPH1hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670226117; 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=a4kZMM9zSeUzaKsk+ZWQjmecLq8ocGFNadeMELDzuOc=; b=f++BtyJ++D2woUuj/s0Elz0+5ah7nCTortc40SYgSZS6BqUXP5eltSA/5OukajiQJ9q6ew aSrWp5aVVLLNhgondDnKz6IUTH/eGaPuK6dWoDGTSsQkZ0xEnWGzzVp0zcZsPx0fpfPRun iYTIGug1p3E4weAAYKAbEGXEV0zIG3Rq+rewM1zmQROzYBNYQ8CjCFWBNXhVGy3XiYbjuQ 7KzELF/CLRY//vdJVTfzaj/QC+K5REPXU0BIkt6kmpwjdx8RBHfgpdlgIizeh7zppUnHp3 QIsbue/T8N0HlpyIenc3fEuXsR7kFVIsNmg63DbpPVUIVaJ/Lo1R+tyjy2DSEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670226117; a=rsa-sha256; cv=none; b=LR6gp/jwniCQTD17XfSN1VfhPia4DPrlFqEHaYHx4eR5CE0SvFLch20aif2EdsSzJKKCGS ABMiFpeNVYqlaKJ+St8O2+WjnBkS4NpIo0SHCjtDKVWpiSAgbc2hlSJIJxlqFyBU+0ziOi xxMMkggDgGphHjG9URhPvWlHM5xpJQbocgwkyzjk0BFTGl6tyeb0Ok0wwRnUTM7ZWwN77H JylsXvPRgbqn8iRwenKkanP4BFf6XNS4UQc3HdOKPg8zA+evje/k92YnMZEnJE5SUeMB4a jzWAFxVNEks8wf2vdhX11nzbmhyntYfOWtPpIKJwrKm/r4AcYQpH1JtZT47IJQ== 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 4NQb9136wYzpsk; Mon, 5 Dec 2022 07:41:57 +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 2B57fv36082758; Mon, 5 Dec 2022 07:41:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B57fv4B082757; Mon, 5 Dec 2022 07:41:57 GMT (envelope-from git) Date: Mon, 5 Dec 2022 07:41:57 GMT Message-Id: <202212050741.2B57fv4B082757@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: dd298db84a83 - stable/13 - bhyve: build FACS 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: dd298db84a83b51639cc400295b013f98b4b4a7d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=dd298db84a83b51639cc400295b013f98b4b4a7d commit dd298db84a83b51639cc400295b013f98b4b4a7d Author: Corvin Köhne AuthorDate: 2022-04-06 09:10:41 +0000 Commit: Corvin Köhne CommitDate: 2022-12-05 07:39:32 +0000 bhyve: build FACS table by basl Building the FACS 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/D36994 (cherry picked from commit bdbb1da75a8ca10efff8c56e4ecd6944fdfd3268) --- usr.sbin/bhyve/acpi.c | 50 ++++++++++++++++++++------------------------------ 1 file changed, 20 insertions(+), 30 deletions(-) diff --git a/usr.sbin/bhyve/acpi.c b/usr.sbin/bhyve/acpi.c index b6c9bb20eca3..c1318b42030c 100644 --- a/usr.sbin/bhyve/acpi.c +++ b/usr.sbin/bhyve/acpi.c @@ -58,6 +58,7 @@ __FBSDID("$FreeBSD$"); #include +#include #include #include @@ -619,35 +620,6 @@ err_exit: return (errno); } -static int -basl_fwrite_facs(FILE *fp) -{ - EFPRINTF(fp, "/*\n"); - EFPRINTF(fp, " * bhyve FACS template\n"); - EFPRINTF(fp, " */\n"); - EFPRINTF(fp, "[0004]\t\tSignature : \"FACS\"\n"); - EFPRINTF(fp, "[0004]\t\tLength : 00000040\n"); - EFPRINTF(fp, "[0004]\t\tHardware Signature : 00000000\n"); - EFPRINTF(fp, "[0004]\t\t32 Firmware Waking Vector : 00000000\n"); - EFPRINTF(fp, "[0004]\t\tGlobal Lock : 00000000\n"); - EFPRINTF(fp, "[0004]\t\tFlags (decoded below) : 00000000\n"); - EFPRINTF(fp, "\t\t\tS4BIOS Support Present : 0\n"); - EFPRINTF(fp, "\t\t\t64-bit Wake Supported (V2) : 0\n"); - EFPRINTF(fp, - "[0008]\t\t64 Firmware Waking Vector : 0000000000000000\n"); - EFPRINTF(fp, "[0001]\t\tVersion : 02\n"); - EFPRINTF(fp, "[0003]\t\tReserved : 000000\n"); - EFPRINTF(fp, "[0004]\t\tOspmFlags (decoded below) : 00000000\n"); - EFPRINTF(fp, "\t\t\t64-bit Wake Env Required (V2) : 0\n"); - - EFFLUSH(fp); - - return (0); - -err_exit: - return (errno); -} - /* * Helper routines for writing to the DSDT from other modules. */ @@ -960,6 +932,24 @@ build_dsdt(struct vmctx *const ctx) return (0); } +static int +build_facs(struct vmctx *const ctx) +{ + ACPI_TABLE_FACS facs; + struct basl_table *table; + + BASL_EXEC(basl_table_create(&table, ctx, ACPI_SIG_FACS, + BASL_TABLE_ALIGNMENT_FACS, FACS_OFFSET)); + + memset(&facs, 0, sizeof(facs)); + memcpy(facs.Signature, ACPI_SIG_FACS, ACPI_NAMESEG_SIZE); + facs.Length = sizeof(facs); + facs.Version = htole32(2); + BASL_EXEC(basl_table_append_bytes(table, &facs, sizeof(facs))); + + return (0); +} + int acpi_build(struct vmctx *ctx, int ncpu) { @@ -1000,7 +990,7 @@ acpi_build(struct vmctx *ctx, int ncpu) BASL_EXEC(basl_compile(ctx, basl_fwrite_fadt, FADT_OFFSET)); BASL_EXEC(basl_compile(ctx, basl_fwrite_hpet, HPET_OFFSET)); BASL_EXEC(basl_compile(ctx, basl_fwrite_mcfg, MCFG_OFFSET)); - BASL_EXEC(basl_compile(ctx, basl_fwrite_facs, FACS_OFFSET)); + BASL_EXEC(build_facs(ctx)); BASL_EXEC(build_dsdt(ctx)); BASL_EXEC(basl_finish());