From nobody Tue Dec 6 11:58:53 2022 X-Original-To: dev-commits-src-main@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 4NRJq23Fcsz4jTvl; Tue, 6 Dec 2022 11:58:54 +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 4NRJq22Nb8z3P5w; Tue, 6 Dec 2022 11:58:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670327934; 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=OtEs3W30j/pKM43Y5dtpWrF8xR9mXOjNiGSwAtu9dcg=; b=QX9W9Y5xHmztSeta/+0R0jUn+2kmSCqTqzimuQaPd7Nvp8Cme5urNwHsQNHskh69GpmJmL 93j5kXq9trfN09GaTXUUQaFeIVX5ET9LIeZSRxYIdxyQ7SfdLUVgIMq0PSQd7JlcamJTw9 oB6mDcLv28QjB3o/MmzPnuwNsEa+LNXYyKgCFcSOkVkEs82z4dugSzUARqdjRt1N1RDHdT ADUTG1WMKE/fbDxzNu1nhtkLThLWIEaHJY/oUJkbMJ0YdLLAo/Qye82T+T5sSnii8OEE0O WUkFQuWVmlzR20FdAlDp13+u34C0BKXUcf0gVrYLbSwjCcH9njxb1U2BDjhLug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670327934; 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=OtEs3W30j/pKM43Y5dtpWrF8xR9mXOjNiGSwAtu9dcg=; b=CVxToBniB6Vr2blpNSIKqNlWbBsTfMJcbZaydINor9ODSRBiNH0XzaUwhjSUzwVsstr5wt huufEFQO6P/zXcMdKamrSkphuVf0SGOAD/j/JrT+NlKJGCGs3AV87JMjzwscfauN+iFOVA 2cyA/y02I+38PsPjQUGJyQwS157wo/s5Gs6TmOFhS10a/yP03q8cEGs8AZNPwtFlfNvlSa +INgBJ60vMyHzS4XINjGnBT0nixqTzmI0uYdHzzbXRbJMcSGoZabaOKxYD5wYxxBcLpkht RU1qvtDmiOQrJdQgswVh7Es1aRTF/WOO059VaqDtiQlHNpBkKDU05/01TeSUjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670327934; a=rsa-sha256; cv=none; b=ONhRPfs0Dyw7o629EcOvSY6RgU8GYWYc7mn1LW4yYunO3K1Nc0qioiGTNEbhAD0NTCIAka lI+2FKjNp2HPahxp4JCB9ly8EBc0+BqtWf848YcFC6pVsqGW80rynQgmJo2OglHNLMggn2 yuanEtPqJTH0/QVZpWzaPrVfuTPHABxuiN1PjA7cohNL5SZnnj4utDlMjWYIWBw1roC81/ ezv4NON1C+ooT26MProIxwIJjDc8HxNf53tIst8JyfuLERXe9RKOf3t7sWHZwXRwLqiSkm DqDkykx+UBK9hmp9zzPE6Ri/lndBoaYrUprqXXUBUf6CiTC/NWx2AGFWBLtv7A== 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 4NRJq21CVVzbsF; Tue, 6 Dec 2022 11:58:54 +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 2B6BwrJG092132; Tue, 6 Dec 2022 11:58:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B6Bwro3092131; Tue, 6 Dec 2022 11:58:53 GMT (envelope-from git) Date: Tue, 6 Dec 2022 11:58:53 GMT Message-Id: <202212061158.2B6Bwro3092131@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: b972e7cbb4f9 - main - bhyve: build SPCR ACPI table List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: b972e7cbb4f9f44ab77be24857c674c0733785cf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=b972e7cbb4f9f44ab77be24857c674c0733785cf commit b972e7cbb4f9f44ab77be24857c674c0733785cf Author: Corvin Köhne AuthorDate: 2022-11-30 14:46:19 +0000 Commit: Corvin Köhne CommitDate: 2022-12-06 11:58:27 +0000 bhyve: build SPCR ACPI table OVMF ships some static ACPI tables. This worked in the past but won't work in the future when we support devices like tpms. They require a TPM ACPI table. So, we have to dynamically create ACPI tables depending on the bhyve configuration. Bhyve has much more information about the system than OVMF. Therefore, it's easier for bhyve to build up some ACPI tables. For that reason, it would be much better to use the ACPI tables provided by bhyve instead of building some tables by OVMF. At the moment, OVMF always creates a SPCR table. Maybe someone depends on it. So, we have to build it by bhyve too before we can patch OVMF to install the tables provided by bhyve. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D37591 --- usr.sbin/bhyve/acpi.c | 32 ++++++++++++++++++++++++++++++++ usr.sbin/bhyve/basl.h | 23 +++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/usr.sbin/bhyve/acpi.c b/usr.sbin/bhyve/acpi.c index d8d021f4bb81..bdb0e97076ad 100644 --- a/usr.sbin/bhyve/acpi.c +++ b/usr.sbin/bhyve/acpi.c @@ -692,6 +692,37 @@ build_rsdt(struct vmctx *const ctx) return (0); } +static int +build_spcr(struct vmctx *const ctx) +{ + ACPI_TABLE_SPCR spcr; + struct basl_table *table; + + BASL_EXEC(basl_table_create(&table, ctx, ACPI_SIG_SPCR, + BASL_TABLE_ALIGNMENT)); + + memset(&spcr, 0, sizeof(spcr)); + BASL_EXEC(basl_table_append_header(table, ACPI_SIG_SPCR, 1, 1)); + spcr.InterfaceType = ACPI_DBG2_16550_COMPATIBLE; + basl_fill_gas(&spcr.SerialPort, ACPI_ADR_SPACE_SYSTEM_IO, 8, 0, + ACPI_GAS_ACCESS_WIDTH_LEGACY, 0x3F8); + spcr.InterruptType = ACPI_SPCR_INTERRUPT_TYPE_8259; + spcr.PcInterrupt = 4; + spcr.BaudRate = ACPI_SPCR_BAUD_RATE_115200; + spcr.Parity = ACPI_SPCR_PARITY_NO_PARITY; + spcr.StopBits = ACPI_SPCR_STOP_BITS_1; + spcr.FlowControl = 3; /* RTS/CTS | DCD */ + spcr.TerminalType = ACPI_SPCR_TERMINAL_TYPE_VT_UTF8; + BASL_EXEC(basl_table_append_content(table, &spcr, sizeof(spcr))); + + BASL_EXEC(basl_table_append_pointer(rsdt, ACPI_SIG_SPCR, + ACPI_RSDT_ENTRY_SIZE)); + BASL_EXEC(basl_table_append_pointer(xsdt, ACPI_SIG_SPCR, + ACPI_XSDT_ENTRY_SIZE)); + + return (0); +} + static int build_xsdt(struct vmctx *const ctx) { @@ -749,6 +780,7 @@ acpi_build(struct vmctx *ctx, int ncpu) BASL_EXEC(build_hpet(ctx)); BASL_EXEC(build_mcfg(ctx)); BASL_EXEC(build_facs(ctx)); + BASL_EXEC(build_spcr(ctx)); BASL_EXEC(build_dsdt(ctx)); BASL_EXEC(basl_finish()); diff --git a/usr.sbin/bhyve/basl.h b/usr.sbin/bhyve/basl.h index 78beba1bcad1..c7fdd783a9d5 100644 --- a/usr.sbin/bhyve/basl.h +++ b/usr.sbin/bhyve/basl.h @@ -18,6 +18,29 @@ #define ACPI_GAS_ACCESS_WIDTH_DWORD 3 #define ACPI_GAS_ACCESS_WIDTH_QWORD 4 +#define ACPI_SPCR_INTERRUPT_TYPE_8259 0x1 +#define ACPI_SPCR_INTERRUPT_TYPE_APIC 0x2 +#define ACPI_SPCR_INTERRUPT_TYPE_SAPIC 0x4 +#define ACPI_SPCR_INTERRUPT_TYPE_GIC 0x8 + +#define ACPI_SPCR_BAUD_RATE_9600 3 +#define ACPI_SPCR_BAUD_RATE_19200 4 +#define ACPI_SPCR_BAUD_RATE_57600 6 +#define ACPI_SPCR_BAUD_RATE_115200 7 + +#define ACPI_SPCR_PARITY_NO_PARITY 0 + +#define ACPI_SPCR_STOP_BITS_1 1 + +#define ACPI_SPCR_FLOW_CONTROL_DCD 0x1 +#define ACPI_SPCR_FLOW_CONTROL_RTS_CTS 0x2 +#define ACPI_SPCR_FLOW_CONTROL_XON_XOFF 0x4 + +#define ACPI_SPCR_TERMINAL_TYPE_VT100 0 +#define ACPI_SPCR_TERMINAL_TYPE_VT100_PLUS 1 +#define ACPI_SPCR_TERMINAL_TYPE_VT_UTF8 2 +#define ACPI_SPCR_TERMINAL_TYPE_ANSI 3 + #define BHYVE_ACPI_BASE 0xf2400 #define BASL_TABLE_ALIGNMENT 0x10