From nobody Tue Feb 28 10:14:13 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 4PQtWT5D45z3vH05; Tue, 28 Feb 2023 10:14:13 +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 4PQtWT4kvNz3r7h; Tue, 28 Feb 2023 10:14:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677579253; 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=i+BP2ocuDQIyAHE7TIyLCWU4MaRzxHi/j6ERyBUJhL0=; b=DHcYl+v0oL1xamXffj4TiHstivuCDBC7LOy0xldezyOIyjjsifMJkVHbQ17/TuL2MaE7p3 BFkcB3xUDXr0ZyeSaBUNY1LokbjChfOt9xYRLLt8Cg7ilu5C5RXXgla0ewlI8aATPhFIlT WVxztWWld/S6YMPIllEUT0CL+QvCwGz1hvT5gxC38rTvFqd03p8o+rQNOy0BQauKN+fR+s QFOsqBm8/EyRkgGp2jJWiBfjvvPVFGsjjPt46EA8mKijDfN/ptp4CyRNfswCczoe8Tgsll HJzDJeNl4ru+kMtoV6IGshwbwJX4a8wYQYZTkZNSuJ2Q/9p2o3WwXTcj4IHzMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677579253; 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=i+BP2ocuDQIyAHE7TIyLCWU4MaRzxHi/j6ERyBUJhL0=; b=fOPR9J8s6jv1zgek1c8F9M6FCal13IdR4RQS5xAMVkelggVz+YWCaiiHYWqNrcuQApIfVa kCYL9RGUdM4kq7lRsi25AAn0S+rmHjJYtp82dszMX2dtCoe+oJDFrlHOqe2m0uiM+sbKwJ r3ugHO4eUYibkW4EZsPzCyZ4i9Wt252jxLJB+smKRllbW5UGRuzrQTPKSRxrrS4nnsFTvP GOa23c0h1822K4YDvysHboQsIiFP9nACaAkRcttnW1ofk7QO2CR3pmh5HR0qKELFzVR7l/ gUKoA5H0F5HGEaj3v58jgornR/wGN0SVnTSXNIgJL7VEcLVcmCxCcAkQUJCrKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677579253; a=rsa-sha256; cv=none; b=WoYjYZoVHWZU1HkD7xMkjQPS/4H/azE0lcTtDRhujPpShU1JK3jvkjUm8O6l7QzLHuaJBJ 9S+1FJW8zLtQzBNNFJWptyjqGhSiQ5c/owJ0BO65Pr779VJQmsyKxcByYQc8LLKeK+IazV H36u/CshWrkF+N4L/SE8at1H49td1gl5H8UdIcPQBVE4BjVwUOov1Tt9R4xILo4LH3MMYw fLoMO8idi0Xdmna5w0ZfzFyp/EEO7ENuJ9QSGeOLORheuH7oyH0Phj01GOuagDV5f0WU/l ZB/Ixf6FTLx7FjeYIVKqJcpU7N1NTCPktGKgij8ORxqgz3M8qAIqeurNv2wG2g== 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 4PQtWT3f7Fz13jl; Tue, 28 Feb 2023 10:14:13 +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 31SAEDpe013820; Tue, 28 Feb 2023 10:14:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SAEDvN013819; Tue, 28 Feb 2023 10:14:13 GMT (envelope-from git) Date: Tue, 28 Feb 2023 10:14:13 GMT Message-Id: <202302281014.31SAEDvN013819@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: bd8366500e15 - stable/13 - bhyve: add emulation for the qemu fwcfg selector port 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: bd8366500e15e6aa840e80d21661d5f3bf4d835e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=bd8366500e15e6aa840e80d21661d5f3bf4d835e commit bd8366500e15e6aa840e80d21661d5f3bf4d835e Author: Corvin Köhne AuthorDate: 2021-08-11 07:59:16 +0000 Commit: Corvin Köhne CommitDate: 2023-02-28 10:04:36 +0000 bhyve: add emulation for the qemu fwcfg selector port The selector port is used to select the desired fwcfg item. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D38332 (cherry picked from commit 151d8131a817e7a6a629e9bb7fde4d7a158e5211) --- usr.sbin/bhyve/qemu_fwcfg.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/usr.sbin/bhyve/qemu_fwcfg.c b/usr.sbin/bhyve/qemu_fwcfg.c index 5d3070abf285..dec3fa83c493 100644 --- a/usr.sbin/bhyve/qemu_fwcfg.c +++ b/usr.sbin/bhyve/qemu_fwcfg.c @@ -29,8 +29,33 @@ #define QEMU_FWCFG_DATA_PORT_FLAGS \ IOPORT_F_INOUT /* QEMU v2.4+ ignores writes */ +#define QEMU_FWCFG_ARCHITECTURE_MASK 0x0001 +#define QEMU_FWCFG_INDEX_MASK 0x3FFF + +#define QEMU_FWCFG_SELECT_READ 0 +#define QEMU_FWCFG_SELECT_WRITE 1 + +#define QEMU_FWCFG_ARCHITECTURE_GENERIC 0 +#define QEMU_FWCFG_ARCHITECTURE_SPECIFIC 1 + +#pragma pack(1) + +union qemu_fwcfg_selector { + struct { + uint16_t index : 14; + uint16_t writeable : 1; + uint16_t architecture : 1; + }; + uint16_t bits; +}; + +#pragma pack() + struct qemu_fwcfg_softc { struct acpi_device *acpi_dev; + + uint32_t data_offset; + union qemu_fwcfg_selector selector; }; static struct qemu_fwcfg_softc fwcfg_sc; @@ -40,6 +65,20 @@ qemu_fwcfg_selector_port_handler(struct vmctx *const ctx __unused, const int in, const int port __unused, const int bytes, uint32_t *const eax, void *const arg __unused) { + if (bytes != sizeof(uint16_t)) { + warnx("%s: invalid size (%d) of IO port access", __func__, + bytes); + return (-1); + } + + if (in) { + *eax = htole16(fwcfg_sc.selector.bits); + return (0); + } + + fwcfg_sc.data_offset = 0; + fwcfg_sc.selector.bits = le16toh(*eax); + return (0); }