From nobody Wed Nov 30 10:08:22 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 4NMZfG2Vgtz4jVyr; Wed, 30 Nov 2022 10:08:22 +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 4NMZfG21BNz4Kxh; Wed, 30 Nov 2022 10:08:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669802902; 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=bGDZqOO0+AUVcL+SxjXEF7a17iz9OOSqcxVIm5fmnAg=; b=SesXQWevLt0j7Ep/zJAFDTgkvjPJCRImkk5QfvAcm2O09YSY54t3e2iSubmM60qvB7smko Tq/xGt/jKAjZIaPecxMg6i5luemcopJOVv4BAvNGYhMAEmAPsP+YbG3W/jqbaDXfOl0mI4 NHp0C6Raq9FY3UKbbLT+d9p+O9MWaC33LpRuZlgZ+ie06BFDLljovnzkUnfpf+KIIUhUn2 h/pqInLh4QcDjQN5r2JJkXL9hf2+NPtkVDPlI1tNg3kFTc79124Tz/O454ZiakZOoSphQF 2+SeVhE72w2zh88vN2rAx+uD1rWvw4lfvRjW81XjxOzgacnk8+I0DfGzBCgl7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669802902; 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=bGDZqOO0+AUVcL+SxjXEF7a17iz9OOSqcxVIm5fmnAg=; b=i3f8MBHAKVP9ZbnBR3/NrZ8UUqEWwfj41CLYgS/A8uRCCisIioLgRWWiXfADOXAVMMyskY Dfehl4MeqIm9cStz/A3x0f16onJupZy25CrobrxXoqJtgiMi9CxXI9mQPgQCCYgKXQFOty oqwjOnT74wgwfU4hWF44PQFKwDjJICq0BJiJYPtP57E0NKJHQ6HyKGq1wcEWk4UV/zxegV vRp8J3rMM5Wi85kvhJWCzAXberb1orSwGMv4bLoqplmldpg9nS2fqZC3zAtgcrTjdGx9SM JKKrUvW/xSlaZ803mdZUrFO78+XCmmslYdm6DR//FUdCFUUFXJzjlEKa4UcjSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669802902; a=rsa-sha256; cv=none; b=lOj40t/ufoo6tB30wT81yQ16Q0br0mygoOaNxxImueA6i8rnGqCjQVGwhTyjZ8E6uE3ZkR gUzKzO9agDVSEuaVeR27SfZpoW3wHtCZ5yggLnmQzj0bsNXzKNS5ztPUh37O6kkLvhFgII zKBoYIC8Rm7p1t2s9YlWsfFEaQtVEJqDeiZRZrkRRR1AEeLoE9Y2sUiwEPNHszwFBU9Dog JY17fQ0GpOtaHxbxWtO8OiOAn216pcC2XQpqxbwFvn28YA3+JaHvQUnldcRvT7u3wbGBLF z63TsRP3rf21wSZ+VvOESAQNDNeG7BA4GofIZthdyJQPPCoBfaNIZlfxS8uAkg== 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 4NMZfG15SbzsFZ; Wed, 30 Nov 2022 10:08:22 +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 2AUA8MOc050828; Wed, 30 Nov 2022 10:08:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AUA8McA050827; Wed, 30 Nov 2022 10:08:22 GMT (envelope-from git) Date: Wed, 30 Nov 2022 10:08:22 GMT Message-Id: <202211301008.2AUA8McA050827@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: 818d66e29bcb - stable/13 - bhyve: add basl support for common table header 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 818d66e29bcba89419f48a0441a70365c962614b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=818d66e29bcba89419f48a0441a70365c962614b commit 818d66e29bcba89419f48a0441a70365c962614b Author: Corvin Köhne AuthorDate: 2022-04-06 09:10:40 +0000 Commit: Corvin Köhne CommitDate: 2022-11-30 07:03:48 +0000 bhyve: add basl support for common table header Most ACPI tables are using the same header. Make it easy to create this header by creating a function for it. 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/D36992 (cherry picked from commit 2fb0f352b977aeb34650081e51454b0b637c5ace) --- usr.sbin/bhyve/basl.c | 36 ++++++++++++++++++++++++++++++++++++ usr.sbin/bhyve/basl.h | 3 +++ 2 files changed, 39 insertions(+) diff --git a/usr.sbin/bhyve/basl.c b/usr.sbin/bhyve/basl.c index 1da0a7028f57..e8724b857381 100644 --- a/usr.sbin/bhyve/basl.c +++ b/usr.sbin/bhyve/basl.c @@ -446,6 +446,42 @@ basl_table_append_gas(struct basl_table *const table, const uint8_t space_id, return (basl_table_append_bytes(table, &gas_le, sizeof(gas_le))); } +int +basl_table_append_header(struct basl_table *const table, + const uint8_t signature[ACPI_NAMESEG_SIZE], const uint8_t revision, + const uint32_t oem_revision) +{ + ACPI_TABLE_HEADER header_le; + /* + 1 is required for the null terminator */ + char oem_table_id[ACPI_OEM_TABLE_ID_SIZE + 1]; + + assert(table != NULL); + assert(table->len == 0); + + memcpy(header_le.Signature, signature, ACPI_NAMESEG_SIZE); + header_le.Length = 0; /* patched by basl_finish */ + header_le.Revision = revision; + header_le.Checksum = 0; /* patched by basl_finish */ + memcpy(header_le.OemId, "BHYVE ", ACPI_OEM_ID_SIZE); + snprintf(oem_table_id, ACPI_OEM_TABLE_ID_SIZE, "BV%.4s ", signature); + memcpy(header_le.OemTableId, oem_table_id, + sizeof(header_le.OemTableId)); + header_le.OemRevision = htole32(oem_revision); + memcpy(header_le.AslCompilerId, "BASL", ACPI_NAMESEG_SIZE); + header_le.AslCompilerRevision = htole32(0x20220504); + + BASL_EXEC( + basl_table_append_bytes(table, &header_le, sizeof(header_le))); + + BASL_EXEC(basl_table_add_length(table, + offsetof(ACPI_TABLE_HEADER, Length), sizeof(header_le.Length))); + BASL_EXEC(basl_table_add_checksum(table, + offsetof(ACPI_TABLE_HEADER, Checksum), 0, + BASL_TABLE_CHECKSUM_LEN_FULL_TABLE)); + + return (0); +} + 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 978b2722acf9..aab4a16a63f5 100644 --- a/usr.sbin/bhyve/basl.h +++ b/usr.sbin/bhyve/basl.h @@ -46,6 +46,9 @@ int basl_table_append_checksum(struct basl_table *table, uint32_t start, 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_header(struct basl_table *table, + const uint8_t signature[ACPI_NAMESEG_SIZE], uint8_t revision, + uint32_t oem_revision); int basl_table_append_int(struct basl_table *table, uint64_t val, uint8_t size); int basl_table_append_length(struct basl_table *table, uint8_t size); int basl_table_append_pointer(struct basl_table *table,