From nobody Mon Jan 03 16:01:39 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 EE9551925E34; Mon, 3 Jan 2022 16:01:41 +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 4JSL8h26B9z4XM7; Mon, 3 Jan 2022 16:01:40 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 6732E31A; Mon, 3 Jan 2022 16:01:39 +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 203G1dZg039407; Mon, 3 Jan 2022 16:01:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 203G1drS039406; Mon, 3 Jan 2022 16:01:39 GMT (envelope-from git) Date: Mon, 3 Jan 2022 16:01:39 GMT Message-Id: <202201031601.203G1drS039406@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 9fe79f2f2b22 - main - bhyve: dynamically register FwCtl ports 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9fe79f2f2b22ea068e5acb2af23d130a13d2ab06 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641225700; 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=Gcv54AACzTFeIXtDCScabRVn6B6jcC+PspsIQTMOrv4=; b=eNNq8toRfORoXZQZx6YwBQVIZ6KGlpB0fydpz8qfq8Hn4NNJeSLJDyiK9yRwPsWJavkhFA kTMEcr+bQOQgKlAQWz8NqPxPZ+COoeBEwi7yNZaNl7nrwV6MO+jyZnrDEmb+sRMkrXPQNc jCX/vHsPa/w5ZpPIJQZvKr/4WZ0GFMyyYZm7Ce7lT65I15BNxPx6FpadXDjt3dOiNWEJvr vJmWf/ZUF79VGcDw5K8Q94plKyoTA6y+J8bq6xMRUf5GaTOgHCBEbldGeotte8ii4R9moz G+ChBjgkDGUNmualzjAghlH4b17KVFe3We5hB1bZpRe2ObQIDXZoRBKJJxFA9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641225700; a=rsa-sha256; cv=none; b=SbPEIoxJvzyr3PYeD4awEBt/Q4AOzNWfBR4XTSlq3khIlr4BEpEtnDO/A2R6oXLCQtvKjU glQbAOEiEr3SyFdJUDQ9rbcGo+0noRqF3s97ogbLLyEZe1Z8Kdz5lKv8G0aPKSk1iqXgDJ gCdKKQFIVPHWlhSMBuKooyEGbMm5SoWzRqhKPDSD2uMijhxz0fG22ev9dfREBTmjicsrRI LNe7AxVpU5pNAXxv8LD9FuljWh8s3PY+ajBr2OYTegkKqvoWcig7twzjoKE0HieASiEHW8 BYiDwEbY3HSCyMjFVFT0NdwmXIYzkKgsG0Um2ctDhHZ29LV2HmpVjiDI+oh8MA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=9fe79f2f2b22ea068e5acb2af23d130a13d2ab06 commit 9fe79f2f2b22ea068e5acb2af23d130a13d2ab06 Author: Corvin Köhne AuthorDate: 2022-01-03 13:20:38 +0000 Commit: Emmanuel Vadot CommitDate: 2022-01-03 15:32:55 +0000 bhyve: dynamically register FwCtl ports Qemu's FwCfg uses the same ports as Bhyve's FwCtl. Static allocated ports wouldn't allow to switch between Qemu's FwCfg and Bhyve's FwCtl. Reviewed by: markj MFC after: 2 weeks Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D33496 --- usr.sbin/bhyve/fwctl.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyve/fwctl.c b/usr.sbin/bhyve/fwctl.c index 8faae30989e6..f0f9aa3affc0 100644 --- a/usr.sbin/bhyve/fwctl.c +++ b/usr.sbin/bhyve/fwctl.c @@ -540,12 +540,32 @@ fwctl_handler(struct vmctx *ctx, int vcpu, int in, int port, int bytes, return (0); } -INOUT_PORT(fwctl_wreg, FWCTL_OUT, IOPORT_F_INOUT, fwctl_handler); -INOUT_PORT(fwctl_rreg, FWCTL_IN, IOPORT_F_IN, fwctl_handler); void fwctl_init(void) { + struct inout_port iop; + int error; + + bzero(&iop, sizeof(iop)); + iop.name = "fwctl_wreg"; + iop.port = FWCTL_OUT; + iop.size = 1; + iop.flags = IOPORT_F_INOUT; + iop.handler = fwctl_handler; + + error = register_inout(&iop); + assert(error == 0); + + bzero(&iop, sizeof(iop)); + iop.name = "fwctl_rreg"; + iop.port = FWCTL_IN; + iop.size = 1; + iop.flags = IOPORT_F_IN; + iop.handler = fwctl_handler; + + error = register_inout(&iop); + assert(error == 0); ops[OP_GET_LEN] = &fgetlen_info; ops[OP_GET] = &fgetval_info;