From nobody Wed Apr 10 15:19:18 2024 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 4VF61g1lBXz5HHW9; Wed, 10 Apr 2024 15:19:19 +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 4VF61g0DJVz4nKJ; Wed, 10 Apr 2024 15:19:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712762359; 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=GmzhUz8ww33CGRktSKw+h3MeQvAXd1WbY9x/rldbUrg=; b=m4naRJOdwmz9RB0m5TrCSWqjz2WVgRFcLAhw63pPfycNNB8QaF5th3v4qHJzHnvUbOEEv3 H+3pLsA84QAYmygRwnyWqo/HAUfa6V81NSSEDnizA3jl1tADYGP9b5sEuX1D1gG6fA1umO pFFsequWtEHkzLI5QzIqN5K9R8jaKWGDjaHg2Fpbuz2V/g/NtnboSw48pXjByDii1fm11Z WvX9S+wxO9zS0sc0ZlbyZZxcive0GsDJuD5eTy7vKKtUIFgMJhDI19FGRcB5WPdXzecpkV 0/qYYS2wPR0fvqco/yUMDu0KO7SAukLPbBLd27JPrLLBqJHuuBF39Wi78VZ75g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712762359; a=rsa-sha256; cv=none; b=JxyFWhlqlYY7vcAcnNfV2i8FbMZUZZ+ual3mjSGU0YbM3hcN0HGCgNt0VeSWijQ37eQnXY mntgNypF7Lsf0Uk/p3DsjQSr3ApihfDodx3OR9B2CMf2XF9S/qiqJ54UjR5ihsbbtLYd+N n83Rv/iU+rSxAJE9TtPE1aPhOToJUroJw2qbvTVE1PuPZ7y8/WSOw/F8p9hDYD7wxOjMSL aWvMac6Bz0jARi9dtGU0/VuZq4yBmnC3BbMptghMo+BaWmCiO1ezk39RnyRnPSFe4knpMj YL6Dmw4BkDNBg/qLqtFADEsc1Ec2u8ZdG7QQZVRzzHQRdWhJbSI9SizRA17s4g== 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=1712762359; 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=GmzhUz8ww33CGRktSKw+h3MeQvAXd1WbY9x/rldbUrg=; b=r7N9BO9JrA86faKXbuW65VCDu20rZ8n2mMc4ybp4WOPwWyOQBIWDKl7UyNvB7G0bjhFN7U bCfskfMssm7XdBS7WN3LAdYV7HytMbEya4JW9t9UI/AAZ9bCU4TXfcpnFtFAsZlG78NbO8 hYMCmtOlbFu4VHPLGof+ndkiNaM51ZvgmoScsLpHwnmDEb2LlV8/FfC117k8IHdEWBeKEb J4k1RvEbSXHEmm0trXtjwS0kL8V02KNCMMJrwMa6k73Cwrjm2TMaYBnmAOY2KrXiGR9coA hS70Ef7/fGdXaHvsM9fKK+3q3OyeplMUmw5RHoj+OHysgs0+j7+6+x+EEQD7VQ== 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 4VF61f6vw2zjsw; Wed, 10 Apr 2024 15:19:18 +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 43AFJIJu093425; Wed, 10 Apr 2024 15:19:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43AFJIGd093422; Wed, 10 Apr 2024 15:19:18 GMT (envelope-from git) Date: Wed, 10 Apr 2024 15:19:18 GMT Message-Id: <202404101519.43AFJIGd093422@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: 4bb929cc6d60 - main - bhyve: Partially disable INT#x support in virtio for arm64 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: dev-commits-src-all+owner@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: 4bb929cc6d60aed8910ab02c32a7e1bd3fdfa298 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4bb929cc6d60aed8910ab02c32a7e1bd3fdfa298 commit 4bb929cc6d60aed8910ab02c32a7e1bd3fdfa298 Author: Mark Johnston AuthorDate: 2024-04-03 17:43:48 +0000 Commit: Mark Johnston CommitDate: 2024-04-10 15:17:56 +0000 bhyve: Partially disable INT#x support in virtio for arm64 A FreeBSD guest won't make use of this support and pci_lintr_* is not implemented on arm64. Simply make pci_lintr_*() calls amd64-specific for now. Reviewed by: corvink, jhb MFC after: 2 weeks Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D41741 --- usr.sbin/bhyve/virtio.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/usr.sbin/bhyve/virtio.c b/usr.sbin/bhyve/virtio.c index 26df39ceb5b3..eb09714d4f20 100644 --- a/usr.sbin/bhyve/virtio.c +++ b/usr.sbin/bhyve/virtio.c @@ -114,8 +114,10 @@ vi_reset_dev(struct virtio_softc *vs) vs->vs_negotiated_caps = 0; vs->vs_curq = 0; /* vs->vs_status = 0; -- redundant */ +#ifdef __amd64__ if (vs->vs_isr) pci_lintr_deassert(vs->vs_pi); +#endif vs->vs_isr = 0; vs->vs_msix_cfg_idx = VIRTIO_MSI_NO_VECTOR; } @@ -162,8 +164,11 @@ vi_intr_init(struct virtio_softc *vs, int barnum, int use_msix) /* Only 1 MSI vector for bhyve */ pci_emul_add_msicap(vs->vs_pi, 1); + /* XXX-MJ missing an implementation for arm64 */ +#ifdef __amd64__ /* Legacy interrupts are mandatory for virtio devices */ pci_lintr_request(vs->vs_pi); +#endif return (0); } @@ -651,8 +656,10 @@ bad: case VIRTIO_PCI_ISR: value = vs->vs_isr; vs->vs_isr = 0; /* a read clears this flag */ +#ifdef __amd64__ if (value) pci_lintr_deassert(pi); +#endif break; case VIRTIO_MSI_CONFIG_VECTOR: value = vs->vs_msix_cfg_idx;