From nobody Wed Oct 4 16:54:15 2023 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 4S114S4TG9z4wHCm; Wed, 4 Oct 2023 16:54:16 +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 4S114S2rYMz3DMq; Wed, 4 Oct 2023 16:54:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696438456; 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=S2UNEDC3uaM89fhmz8S2/c8u7mxkvLFKMy8QOaHnsTs=; b=g+dQ2MUa8FzJmVvWA+ejINI0rwRh+HVowOwEdvJhZhhH3QIICp2gOkOngYSYGUMZmO8N4s GIMQvZMukXdsWn7ej0AhdkXgcYcFdcsQr14zjm1mukUQy5RYuABLiXf93lN1snQNqQQRgt fBYukO/CrO1ntxWS2AmskQykq4JjvKJ7H9aA567thqPKxqz1k2/6OEhmQ9dUvsNB82IIeN bffUs5Ccw1ndec5hCyLBm96A2MpHqPYC/swcAVn1fInPhZreG4nOpcHN80UqQX3XZTSYfT jzqOSNtfnR9wclt8+lKtpzHNEDBNqomli81W9BiNg2XI4zivCYqEbYmEmvIKJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696438456; a=rsa-sha256; cv=none; b=xD4P7O+fu+lXJXLgV2K6775gzbREBA7KlRQAishK3KCg6aPraD9C/0e8hZ3MvyouCv3pH6 C3bO95qcZeN4WFoST4c/+D9vWN8rCnC+DHDzJC2/NC0KbFFWYOJ4PyRouHL0ww6CeFL7x4 6AevmNnniRI9RZyD51+2UZAyQX7mteH9LhoK3mcheZMFLaYOKIduiFT92vlOmFPjmi2b8Y 0JwKLUG8qKpb5iKyPlIHnwUpOyF+cKPGnTWPmcqvv0E19VFESZL8YJn5LUy2OdWKHUf1S8 1UXbExRuoxI37kuTIO2gZKMka7QHHOhJLWqzz/9vN0cjU7sqpBmwc5zOqv6nJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696438456; 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=S2UNEDC3uaM89fhmz8S2/c8u7mxkvLFKMy8QOaHnsTs=; b=C8XXglLzDKhHnVcEO2ei8LK4DVWAcaesejBua3aTLYC9uPmgXmHzA0Oqgk8deot1VKB/sO L6AbOzrseyAzO0XRpEujq9RE2KBRqyLNuYpGjEcd9kPpi9T2CBzd8lUy1A6dR+v6SJKgcw Y4OIYsEFqQXpsMdyVLDDqF+kcDEyBlJz0CkFB3swBCx//NbU1k66tDpdU7VVcv6jga0rj6 xTevK1rpTwtufH+ZgmOk0JKmGsL+5cX3v5OpjMWI8nBRLOSnoz8w0iuaeaVM4vtB0Csx7t nWBP5GROZbRc4qFzy4FP3dHzwitwDLPpXli/9b49ylc2F1VhvQ/TPiGIpGjUFA== 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 4S114R5wgqzlxP; Wed, 4 Oct 2023 16:54:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 394GsF78038364; Wed, 4 Oct 2023 16:54:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 394GsFw4038361; Wed, 4 Oct 2023 16:54:15 GMT (envelope-from git) Date: Wed, 4 Oct 2023 16:54:15 GMT Message-Id: <202310041654.394GsFw4038361@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 83b003fbe965 - main - bhyve: Build the HPET ACPI table on amd64 only 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 83b003fbe965869124706b4a80b212734152356d Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=83b003fbe965869124706b4a80b212734152356d commit 83b003fbe965869124706b4a80b212734152356d Author: Mark Johnston AuthorDate: 2023-10-04 16:28:28 +0000 Commit: Mark Johnston CommitDate: 2023-10-04 16:53:17 +0000 bhyve: Build the HPET ACPI table on amd64 only There is no HPET on arm64 and vm_get_hpet_capabilities() is not implemented there. Move the vm_get_hpet_capabilities() call into build_hpet(): I cannot see a downside, and doing so eliminates a global variable and reduces the amount of code that needs to be conditionally compiled. No functional change intended. Reviewed by: corvink, jhb MFC after: 1 week Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D40990 --- usr.sbin/bhyve/acpi.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/usr.sbin/bhyve/acpi.c b/usr.sbin/bhyve/acpi.c index 4a3233291b7a..050e1a0ab75f 100644 --- a/usr.sbin/bhyve/acpi.c +++ b/usr.sbin/bhyve/acpi.c @@ -71,7 +71,6 @@ static int basl_keep_temps; static int basl_verbose_iasl; static int basl_ncpu; -static uint32_t hpet_capabilities; /* * Contains the full pathname of the template to be passed @@ -218,6 +217,7 @@ basl_fwrite_dsdt(FILE *fp) pci_write_dsdt(); +#ifdef __amd64__ dsdt_line(""); dsdt_line(" Scope (_SB.PC00)"); dsdt_line(" {"); @@ -233,6 +233,7 @@ basl_fwrite_dsdt(FILE *fp) dsdt_line(" })"); dsdt_line(" }"); dsdt_line(" }"); +#endif vmgenc_write_dsdt(); @@ -530,11 +531,18 @@ build_fadt(struct vmctx *const ctx) return (0); } +#ifdef __amd64__ static int build_hpet(struct vmctx *const ctx) { ACPI_TABLE_HPET hpet; struct basl_table *table; + uint32_t hpet_capabilities; + int err; + + err = vm_get_hpet_capabilities(ctx, &hpet_capabilities); + if (err != 0) + return (err); BASL_EXEC(basl_table_create(&table, ctx, ACPI_SIG_HPET, BASL_TABLE_ALIGNMENT)); @@ -551,6 +559,7 @@ build_hpet(struct vmctx *const ctx) return (0); } +#endif static int build_madt(struct vmctx *const ctx) @@ -720,14 +729,8 @@ build_spcr(struct vmctx *const ctx) int acpi_build(struct vmctx *ctx, int ncpu) { - int err; - basl_ncpu = ncpu; - err = vm_get_hpet_capabilities(ctx, &hpet_capabilities); - if (err != 0) - return (err); - /* * For debug, allow the user to have iasl compiler output sent * to stdout rather than /dev/null @@ -756,7 +759,9 @@ acpi_build(struct vmctx *ctx, int ncpu) BASL_EXEC(build_rsdp(ctx)); BASL_EXEC(build_fadt(ctx)); BASL_EXEC(build_madt(ctx)); +#ifdef __amd64__ BASL_EXEC(build_hpet(ctx)); +#endif BASL_EXEC(build_mcfg(ctx)); BASL_EXEC(build_facs(ctx)); BASL_EXEC(build_spcr(ctx));