From nobody Mon Nov 04 14:46:31 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 4XhvRr2tPDz5c9W0; Mon, 04 Nov 2024 14:46:32 +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 4XhvRr0wZ3z4Wlw; Mon, 4 Nov 2024 14:46:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730731592; 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=wAdF9pEq75lPCLbAQjdEt23LDT3JPjHrUKjUiom9sJo=; b=MV0t3hPWIcWcGiiH9fpVCUPGwaF8U8Pkz1ORYnaZCa0cSTnwNYKLBpNQc+WiJdejNhG7xv 5lPnDP0MjGyDNg2zwQh4DwAvYSID11FDsloqPS2Sqju72rSa1PCTsgDNhnVETXfj6aK1Zz j6uL4p1DUC5mANuHZ3fvECMF4zckZ06vBLyibCim8T8qSO7yp1mBMbbS3BE48qkLK6vngE rlgObIGI7cqqnWTAY1SYh8pfh5/8O+FCitGw9HkMPAlqBtREh+Gba3lkmaTLcbxN5WnrIP 3UNV/nfGrAtfM3Kn5gTOdqoCMVGKoDPQ0KhXzPd8CABH8Tu50hAYZjjXMIKyzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730731592; 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=wAdF9pEq75lPCLbAQjdEt23LDT3JPjHrUKjUiom9sJo=; b=mVXJnI2JNnaYX9CZ9YgkFAsDNtEtwQhNfITNLc3WmCzbMvB8oLhEJ0z0TyGhtDhCZNXr/w 5vkqO7fYZExGgYnge5JloFyqeajqfVnA17r7jI4FfEDYg4KewqjbBPX8unLs19xU7leWDH p21mv4zipSHsqOlKT9OM+tZLx0/+IcU/2pGkvDcE7Q9pSX9Y7w9Cweah5MK4tzw+cwsrem U6oz5y/2XrwTvW7AprtanNqCB2tEh0lWK7F8P6d/HwDJrJo22+cQGIqE8EeS+JTthAEcjq 2MEHqf5MgsoRb9ZW8wntMCQEvTx9y7BYULD451s4oTbEMF0X35ib7t0h8AbkuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730731592; a=rsa-sha256; cv=none; b=NsEhF4eTtPSL3N/AFkLAGxZISx7rLwYzVycY0calHaRjaZcoCBKjH+oxukEeOUi5WODTKP WZK6i9BrlzEZkfwI89hJglsQEIspCS73bpeYyK1VJPvMUVGllCRRfBGl/CR7T7BoJnJW1u 2HbBdDS3bH4MxChQUJ1XQcrIEWSQrpxO2U2EQFvsgPscmFYgKLk3M+7byEbZM2xGIp6HLk 1T3xtZlDP+UJOmqR3/uFdgamXwXXuMowx+GhGiBb5+OF/JpHWVtPJB10wbDvllOUKGyU29 rpCLrlawOEkJ2GeqjSKSeZhOXfl5vEZM2AVZTG07Hsn0NIxL8Uaii2JLHSolBQ== 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 4XhvRq6LfPzdCh; Mon, 4 Nov 2024 14:46:31 +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 4A4EkVfC040425; Mon, 4 Nov 2024 14:46:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A4EkVxI040422; Mon, 4 Nov 2024 14:46:31 GMT (envelope-from git) Date: Mon, 4 Nov 2024 14:46:31 GMT Message-Id: <202411041446.4A4EkVxI040422@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: f95acbd89d59 - main - vmm: Rename the amdiommu driver to amdviiommu 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: f95acbd89d594b5932197679d94d2ba23c1d0331 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f95acbd89d594b5932197679d94d2ba23c1d0331 commit f95acbd89d594b5932197679d94d2ba23c1d0331 Author: Mark Johnston AuthorDate: 2024-11-04 14:44:19 +0000 Commit: Mark Johnston CommitDate: 2024-11-04 14:45:57 +0000 vmm: Rename the amdiommu driver to amdviiommu To avoid a conflict with the new amdiommu driver imported recently. Fixes: 0f5116d7efe3 ("AMD IOMMU driver") Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D47415 --- 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 69432498a5c2..5f5822a667b5 100644 --- a/sys/amd64/vmm/amd/amdiommu.c +++ b/sys/amd64/vmm/amd/amdviiommu.c @@ -40,36 +40,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; @@ -99,7 +99,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"); @@ -107,7 +107,7 @@ amdiommu_attach(device_t dev) } static int -amdiommu_detach(device_t dev) +amdviiommu_detach(device_t dev) { return (0); @@ -117,7 +117,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); @@ -158,7 +158,7 @@ fail: static int ivhd_teardown_intr(device_t dev) { - struct amdiommu_softc *sc; + struct amdviiommu_softc *sc; sc = device_get_softc(dev); @@ -176,5 +176,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 47504a053c34..15454b345934 100644 --- a/sys/modules/vmm/Makefile +++ b/sys/modules/vmm/Makefile @@ -107,7 +107,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 \