From nobody Thu Jan 26 22:12:01 2023 X-Original-To: dev-commits-src-branches@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 4P2w0y1cbqz3c8T6; Thu, 26 Jan 2023 22:12:02 +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 4P2w0y0thzz3wDL; Thu, 26 Jan 2023 22:12:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674771122; 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=aqExxwFE4w9sIYTKNVOTpDQoqh6fuEggxiZ2yi5+t9A=; b=tgCLCb89xViqAd/RJFND3CeZ25IDHvoSOys5mWbYnl9zJnEoFROtgSQRVMsBkx4JZ9hodK Sy1LYGHKnG4qxmXLfY8Fob1ZQYP93e3oN2RMdNgKP77C6UUEpd39t6zVTS261CLTef4ATe x8vUfY6bMxvzNpNp1Hs0aK3KSXPKudIWhMJ7I/qN87wNrI+TgeW7nn9SJT0MhKwqmzo4I7 LCuQy+ky/es8QPWuZckKma1VFqW4YUdP83sT0IOP3hmnhXn/KzWdV7Fx6SeZCVMSIyiraL A0M/Y/X+p2uFSImn5nOtcudWIMILAkO1IL9RUpHtKaqLIOlU111GtMOQG54NWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674771122; 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=aqExxwFE4w9sIYTKNVOTpDQoqh6fuEggxiZ2yi5+t9A=; b=SyKqszQllmwd2Nfog2ha+q92kGMfhOusz4qteIx8vrydnXL+IVEdPv6yGCQxYONzOjG7v8 YVAeZD+uf9Ut+tWdYM4Er7N0SqeqecubGPj3BHss5k5UXmXLf8jfal4KCUt6GMvoHQNC5W I0/dbR6RU56p8t2/PZgopD/Jdy4tO1sSTJZKUbEPYQchQ5/cgVBRe6jWiEwvmqBlxsOZe3 VlBfpN0y/NoK5gimAoXqPgGReJLiQL0dxy7E/qV8yav2X0W6dt9zpFyH4/06+aa1GbI6yS 97dMvM0/jO12tDB/A8Pwllia34r+iXUZFCqDRvRdFIY1P+c6EAviYmihFGiVjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674771122; a=rsa-sha256; cv=none; b=bTXtoYEoxQk5lO5R8P1R9tUDFqzFBP6Nomx1RxR26KDEL5SzUm7aFvFsIciHxwfCd9iDXl 5D2RMVxOfTHUvA8xwHfRFgd8PTdCe6mpHM38+jOkSfqOxcFGC5WjJcthCL0zs4Gs34DRRK AXaZq0Pdp7VmwCRts5MgQkdqgzPNJD15DVAgarw0O8NXBk7PaOkAK6x+tBwdYS0ZF4Fwgc gr4qG4CklCRb/m7zhu4XDfWVJksAQeVRCHZGTVhiPD31KH4WeXC3GM29lQUYBD0AHjsujD JBrWDgfBoKsnqtolude5CpB9BdpH8+Kki97GUY+Tsbue377uoz1eOYEmwYO3Tw== 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 4P2w0x6Yl3zm4f; Thu, 26 Jan 2023 22:12:01 +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 30QMC1mi022130; Thu, 26 Jan 2023 22:12:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30QMC1os022129; Thu, 26 Jan 2023 22:12:01 GMT (envelope-from git) Date: Thu, 26 Jan 2023 22:12:01 GMT Message-Id: <202301262212.30QMC1os022129@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 197cb60d7af4 - stable/13 - vmm ppt: Remove unused vcpu arg from MSI setup handlers. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 197cb60d7af4e9bc2ba0b15bda24289111c87fe8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=197cb60d7af4e9bc2ba0b15bda24289111c87fe8 commit 197cb60d7af4e9bc2ba0b15bda24289111c87fe8 Author: John Baldwin AuthorDate: 2022-11-18 18:03:46 +0000 Commit: John Baldwin CommitDate: 2023-01-26 22:02:43 +0000 vmm ppt: Remove unused vcpu arg from MSI setup handlers. Reviewed by: corvink, markj Differential Revision: https://reviews.freebsd.org/D37167 (cherry picked from commit 0cbc39d53d2270fa77255c663a0cfa5ed502ab0a) --- sys/amd64/vmm/io/ppt.c | 4 ++-- sys/amd64/vmm/io/ppt.h | 4 ++-- sys/amd64/vmm/vmm_dev.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/amd64/vmm/io/ppt.c b/sys/amd64/vmm/io/ppt.c index 3782b7b510f6..ea04c3245671 100644 --- a/sys/amd64/vmm/io/ppt.c +++ b/sys/amd64/vmm/io/ppt.c @@ -545,7 +545,7 @@ pptintr(void *arg) } int -ppt_setup_msi(struct vm *vm, int vcpu, int bus, int slot, int func, +ppt_setup_msi(struct vm *vm, int bus, int slot, int func, uint64_t addr, uint64_t msg, int numvec) { int i, rid, flags; @@ -638,7 +638,7 @@ ppt_setup_msi(struct vm *vm, int vcpu, int bus, int slot, int func, } int -ppt_setup_msix(struct vm *vm, int vcpu, int bus, int slot, int func, +ppt_setup_msix(struct vm *vm, int bus, int slot, int func, int idx, uint64_t addr, uint64_t msg, uint32_t vector_control) { struct pptdev *ppt; diff --git a/sys/amd64/vmm/io/ppt.h b/sys/amd64/vmm/io/ppt.h index e6339f57b8ad..e7833c2a73bb 100644 --- a/sys/amd64/vmm/io/ppt.h +++ b/sys/amd64/vmm/io/ppt.h @@ -36,9 +36,9 @@ int ppt_map_mmio(struct vm *vm, int bus, int slot, int func, vm_paddr_t gpa, size_t len, vm_paddr_t hpa); int ppt_unmap_mmio(struct vm *vm, int bus, int slot, int func, vm_paddr_t gpa, size_t len); -int ppt_setup_msi(struct vm *vm, int vcpu, int bus, int slot, int func, +int ppt_setup_msi(struct vm *vm, int bus, int slot, int func, uint64_t addr, uint64_t msg, int numvec); -int ppt_setup_msix(struct vm *vm, int vcpu, int bus, int slot, int func, +int ppt_setup_msix(struct vm *vm, int bus, int slot, int func, int idx, uint64_t addr, uint64_t msg, uint32_t vector_control); int ppt_disable_msix(struct vm *vm, int bus, int slot, int func); int ppt_assigned_devices(struct vm *vm); diff --git a/sys/amd64/vmm/vmm_dev.c b/sys/amd64/vmm/vmm_dev.c index 2f487dbb132e..1d36e190c7a6 100644 --- a/sys/amd64/vmm/vmm_dev.c +++ b/sys/amd64/vmm/vmm_dev.c @@ -540,14 +540,14 @@ vmmdev_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag, } case VM_PPTDEV_MSI: pptmsi = (struct vm_pptdev_msi *)data; - error = ppt_setup_msi(sc->vm, pptmsi->vcpu, + error = ppt_setup_msi(sc->vm, pptmsi->bus, pptmsi->slot, pptmsi->func, pptmsi->addr, pptmsi->msg, pptmsi->numvec); break; case VM_PPTDEV_MSIX: pptmsix = (struct vm_pptdev_msix *)data; - error = ppt_setup_msix(sc->vm, pptmsix->vcpu, + error = ppt_setup_msix(sc->vm, pptmsix->bus, pptmsix->slot, pptmsix->func, pptmsix->idx, pptmsix->addr, pptmsix->msg,