From nobody Wed Apr 10 15:19:17 2024 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 4VF61f1504z5HHKM; Wed, 10 Apr 2024 15:19:18 +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 4VF61d6lSDz4nGd; Wed, 10 Apr 2024 15:19:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712762357; 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=BNxHdGZoiOlsvy87fduxj2cZN+MuQTH9deVzsoJ//X8=; b=ec3IasUvBZTMhIjW5OZpfJxDmewVsPuuF411IY+Gujl3I9kdeO7Bbqti3X55Y7CHB7Fz4C Wnb28CVuzLGfeukqXUWjYdZ5ABA64VVOCgvgWY0ticUb2KT3X44bLggpj6KdUWveHwtYi7 cJYfC/e+nAxx6Dbp+zvUQ4VTK0m7nUA5gTPVkwuhTXw62pHcWvPALnoYhK5ewF9bijLvvS fi6UIPRo++lyAl+CQ2sHtD/q0JwsLYmdW4+d66QmHp346aWq/G8h3WJxaDp/ORgTZP+D6v HHlU28g+9rSQDUcKY1rjDvQotvgIg9Nml6lJ2LMht6PCRGAoyH63hAZcSM3lIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712762357; a=rsa-sha256; cv=none; b=xHVt8D+/Xf27RLePFaRntZLcdqHqY8eThIP0CS5pzpWA8T5DRxEDnXmuZ1HXoy+NXEgddy w5qQwpbX7HwyfOzq9bWoh68xjaEB7iA5exS9fomNkraEbycc3CM1BZSs9Slpf/tw/5DPG5 fZcb9rfLvZyrxaw2S4354yDYPd0Vf4ZNKYrMZbH7ik68yG46Vloqr9fkWhkcBb2zdJjIin 5rb8ByJohwOr8C+0QV5uiSU8uFsLeZtn9Ifk1ocJCV3rtse4qnxdlV+IibJf5HJe5Jzzmh /wpB41u1lHmqSulh4o5HHKzbl9BCXv/I+2mYQVGYv6bkl8nloyvnjrvySUnyDQ== 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=1712762357; 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=BNxHdGZoiOlsvy87fduxj2cZN+MuQTH9deVzsoJ//X8=; b=nf1kXc8Jl/GkQHovkU6HMjY05MccDonIC7b5IoO8hcCvZTcnniJMDl9pydE7au4RDCgwho X9K1WcJg0sNsYGh9XPnpiZ/XonX5pGzdU6+3Aoj/m5Ac5tMjlD+Pv6TXpeHGEuvO0D4bRm IPPWlR2XKoVSCC1EYPcunHTfymT+eGRcFyoLWevnjT+FG5f+FvX4PKQH0n2Q5IC8HSAlm9 qd67gMxlBvIpfNDgmZp1kzE3c6LMM05kxx/L7kdHmPpfS8xhnWyYzmlm2d8ApO6+2rNvH1 n7uJ0K1B6PuSQGtqLpGUUUyLTzXO1kTUWqTu9zh4Dpa9n7sA/QhitkA/Vqy7gw== 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 4VF61d6Mzpzj7H; Wed, 10 Apr 2024 15:19:17 +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 43AFJHiT093371; Wed, 10 Apr 2024 15:19:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43AFJHtq093368; Wed, 10 Apr 2024 15:19:17 GMT (envelope-from git) Date: Wed, 10 Apr 2024 15:19:17 GMT Message-Id: <202404101519.43AFJHtq093368@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: dc6a00f2e424 - main - bhyve: Use vm_raise_msi() instead of vm_lapic_msi() 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: dev-commits-src-main+owner@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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dc6a00f2e4242521cb7099f95f87686b35b98231 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=dc6a00f2e4242521cb7099f95f87686b35b98231 commit dc6a00f2e4242521cb7099f95f87686b35b98231 Author: Mark Johnston AuthorDate: 2024-04-03 17:43:35 +0000 Commit: Mark Johnston CommitDate: 2024-04-10 15:17:56 +0000 bhyve: Use vm_raise_msi() instead of vm_lapic_msi() No functional change intended. Reviewed by: corvink, jhb MFC after: 2 weeks Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D41740 --- usr.sbin/bhyve/pci_emul.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/usr.sbin/bhyve/pci_emul.c b/usr.sbin/bhyve/pci_emul.c index 2da97e0a522f..f2c9c4c9b6e7 100644 --- a/usr.sbin/bhyve/pci_emul.c +++ b/usr.sbin/bhyve/pci_emul.c @@ -1952,7 +1952,8 @@ pci_generate_msix(struct pci_devinst *pi, int index) mte = &pi->pi_msix.table[index]; if ((mte->vector_control & PCIM_MSIX_VCTRL_MASK) == 0) { /* XXX Set PBA bit if interrupt is disabled */ - vm_lapic_msi(pi->pi_vmctx, mte->addr, mte->msg_data); + vm_raise_msi(pi->pi_vmctx, mte->addr, mte->msg_data, + pi->pi_bus, pi->pi_slot, pi->pi_func); } } @@ -1961,8 +1962,9 @@ pci_generate_msi(struct pci_devinst *pi, int index) { if (pci_msi_enabled(pi) && index < pci_msi_maxmsgnum(pi)) { - vm_lapic_msi(pi->pi_vmctx, pi->pi_msi.addr, - pi->pi_msi.msg_data + index); + vm_raise_msi(pi->pi_vmctx, pi->pi_msi.addr, + pi->pi_msi.msg_data + index, + pi->pi_bus, pi->pi_slot, pi->pi_func); } }