From nobody Sat Nov 09 20:19:17 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 4Xm6bV3Dbrz5ccWp; Sat, 09 Nov 2024 20: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xm6bV14rhz4fH4; Sat, 9 Nov 2024 20:19:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731183558; 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=XgwCYZgy99cVa1nFkbO9u8avyvA2basJ29h/8k25d3A=; b=WZcYIYJBKG9aNmhIsOXS18/xrYtrvjzOO4vNNLSDsEQ6N2zYJYbhiI+eaSHQBuFZzTSC7T wn7v6wNrEXQxzQTSzU4CzEHZYj5woW5uEVMJpAv1Nyf4Lg6Vm0gmCOhpQhEpEIw9EkJI2Z JYwUZRx/b/6ZcpiKhGoWRuXHG64Xdi7hPKtX+7tUahs3g+SUIH+OEOy59n4jKnciJeHRjL DFxk9WIHYnv5qb+ynI/EAHtmBjIdUZutiFRw180V/akalozAE0wPgjLZxPDsh7mZ9Iyi74 xz80ZixiGkpQTnx4AiyfTB/2v5DjjnOpTLJPCShmFE1YK4tEFQG6dx9McdY4ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731183558; 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=XgwCYZgy99cVa1nFkbO9u8avyvA2basJ29h/8k25d3A=; b=kVe/mlA4xDH12IPN34/LPuriguFrvVCIzhDjvLi4lolHq9szJ9U8sCK/Pkcglnn7PTtyk0 kHy6XqaLDfEds+SZHb7tJHhRJgVG7UCYaCmwlkbF9tagvYhZwtJanXZ/qu9x/ru8R05Mre PElAwlY0WoYRar9ud7o/F0vip2jeheAoCWf4QBrrYoD1B6zUQQZw9FRRGkrILNeG2UD+EM WPVm9piPTwpO7SFigH0KEZ2bml/LwUOyR+QwscMGNKHA1zyb3NKPHaXPE/83sJlyM8zaiC fEqbPy6SkCR6mNbMyt0PLzqnVQ6HYhxRg3lUjOEC21dbIQg8XihYso9UI7Qd+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731183558; a=rsa-sha256; cv=none; b=pTDu+yZGLKBnfyPlZPlCPXkBDOoXQ3Pl0aNv4M1L8ZIlqu/IDZfcNI9XKdG0/TpFHB3dzS XEYClFowSw/fnNMP9mAhNf3VmdkS2wqbN1VrOcnoDh3pkloyZISu5zmj/c0MiTPJqNM9l7 xo4hoxS67YryB6uX9OULEOAsCPqNMil4Ggvs8hdJzre/Ni8DkUlrtCOd1OszuhtJ6e6OYu 5VI1YYyTDV0v1bYnKjpIrxv7Yz7SXJtu5Px95dCdqHKWN3nSewUC5G/4RyjzGCIWUoyXPL vDp2Y61EH/Ylp5OlrZS4rgmrL4aMCFAQIr/4QQjqvJ2AvBVTT7z5zJ+OD15cdQ== 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 4Xm6bV0Thnz1RBY; Sat, 9 Nov 2024 20:19:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A9KJHm8033619; Sat, 9 Nov 2024 20:19:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A9KJHE7033616; Sat, 9 Nov 2024 20:19:17 GMT (envelope-from git) Date: Sat, 9 Nov 2024 20:19:17 GMT Message-Id: <202411092019.4A9KJHE7033616@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: f5f29d3c1303 - stable/14 - vmm: Rename the amdiommu driver to amdviiommu 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f5f29d3c1303a5558a2bc0c135d4877dba8f7dbf Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f5f29d3c1303a5558a2bc0c135d4877dba8f7dbf commit f5f29d3c1303a5558a2bc0c135d4877dba8f7dbf Author: Mark Johnston AuthorDate: 2024-11-04 14:44:19 +0000 Commit: Konstantin Belousov CommitDate: 2024-11-09 19:31:28 +0000 vmm: Rename the amdiommu driver to amdviiommu (cherry picked from commit f95acbd89d594b5932197679d94d2ba23c1d0331) --- sys/amd64/vmm/amd/{amdiommu.c => amdviiommu.c} | 38 +++++++++++++------------- sys/modules/vmm/Makefile | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/sys/amd64/vmm/amd/amdiommu.c b/sys/amd64/vmm/amd/amdviiommu.c similarity index 85% rename from sys/amd64/vmm/amd/amdiommu.c rename to sys/amd64/vmm/amd/amdviiommu.c index 559a7bc7d953..e9b2dfc3dcbd 100644 --- a/sys/amd64/vmm/amd/amdiommu.c +++ b/sys/amd64/vmm/amd/amdviiommu.c @@ -41,36 +41,36 @@ #include "amdvi_priv.h" #include "ivhd_if.h" -struct amdiommu_softc { +struct amdviiommu_softc { struct resource *event_res; /* Event interrupt resource. */ void *event_tag; /* Event interrupt tag. */ int event_rid; }; -static int amdiommu_probe(device_t); -static int amdiommu_attach(device_t); -static int amdiommu_detach(device_t); +static int amdviiommu_probe(device_t); +static int amdviiommu_attach(device_t); +static int amdviiommu_detach(device_t); static int ivhd_setup_intr(device_t, driver_intr_t, void *, const char *); static int ivhd_teardown_intr(device_t); -static device_method_t amdiommu_methods[] = { +static device_method_t amdviiommu_methods[] = { /* device interface */ - DEVMETHOD(device_probe, amdiommu_probe), - DEVMETHOD(device_attach, amdiommu_attach), - DEVMETHOD(device_detach, amdiommu_detach), + DEVMETHOD(device_probe, amdviiommu_probe), + DEVMETHOD(device_attach, amdviiommu_attach), + DEVMETHOD(device_detach, amdviiommu_detach), DEVMETHOD(ivhd_setup_intr, ivhd_setup_intr), DEVMETHOD(ivhd_teardown_intr, ivhd_teardown_intr), DEVMETHOD_END }; -static driver_t amdiommu_driver = { - "amdiommu", - amdiommu_methods, - sizeof(struct amdiommu_softc), +static driver_t amdviiommu_driver = { + "amdviiommu", + amdviiommu_methods, + sizeof(struct amdviiommu_softc), }; static int -amdiommu_probe(device_t dev) +amdviiommu_probe(device_t dev) { int error; int capoff; @@ -100,7 +100,7 @@ amdiommu_probe(device_t dev) } static int -amdiommu_attach(device_t dev) +amdviiommu_attach(device_t dev) { device_set_desc(dev, "AMD-Vi/IOMMU PCI function"); @@ -108,7 +108,7 @@ amdiommu_attach(device_t dev) } static int -amdiommu_detach(device_t dev) +amdviiommu_detach(device_t dev) { return (0); @@ -118,7 +118,7 @@ static int ivhd_setup_intr(device_t dev, driver_intr_t handler, void *arg, const char *desc) { - struct amdiommu_softc *sc; + struct amdviiommu_softc *sc; int error, msicnt; sc = device_get_softc(dev); @@ -159,7 +159,7 @@ fail: static int ivhd_teardown_intr(device_t dev) { - struct amdiommu_softc *sc; + struct amdviiommu_softc *sc; sc = device_get_softc(dev); @@ -177,5 +177,5 @@ ivhd_teardown_intr(device_t dev) } /* This driver has to be loaded before ivhd */ -DRIVER_MODULE(amdiommu, pci, amdiommu_driver, 0, 0); -MODULE_DEPEND(amdiommu, pci, 1, 1, 1); +DRIVER_MODULE(amdviiommu, pci, amdviiommu_driver, 0, 0); +MODULE_DEPEND(amdviiommu, pci, 1, 1, 1); diff --git a/sys/modules/vmm/Makefile b/sys/modules/vmm/Makefile index 6bb78d055580..48a7dd851032 100644 --- a/sys/modules/vmm/Makefile +++ b/sys/modules/vmm/Makefile @@ -50,7 +50,7 @@ SRCS+= ept.c \ # amd-specific files .PATH: ${SRCTOP}/sys/amd64/vmm/amd SRCS+= vmcb.c \ - amdiommu.c \ + amdviiommu.c \ ivhd_if.c \ ivhd_if.h \ svm.c \