From nobody Wed Sep 04 21:50:44 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 4WzblT2zMMz5VS4r; Wed, 04 Sep 2024 21:50:45 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WzblS6Gndz4gyJ; Wed, 4 Sep 2024 21:50:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725486644; 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=z82VXpWdrQf7LWqHIYs1kgCeRixhBg7CeAm9piSpc9M=; b=Xhxs0TR4TyFIY3VaPtlSMvUUeKOL8j6JzIqlwfwtNpEtD/C7laAqiY74IAAykx3NsdyW+B 9BT7dTQyyqISkHkMTut7TZbE1C0onHl6t+hBB3dvnK6Q3uY+3hKbVe3hp2+cQqw5nuZtZa nNZ0n44Pf0qiSW8Wm0fpNYrTGIet/sO4AhFyzli0YIz4gjARgVbuJHvapWLasokPz0ErZA 4MvArry7gmKb604lexvS/js+kgLzj3woZyEBNiyW34Ktb3X5SYpSJHfOxl668eCbRELLud Sj4PrWPpWU8Ipg1+dOFLJre+n33zetqKnVRKMkeVK9G1hL41pZBGYRagt2bCpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725486644; a=rsa-sha256; cv=none; b=G71vrO2m9oUAZjuYGpSb6pzt3ekNleRJ96iJYiEtvKdNCKpuRKqshQJSi4RFkj631SU3BN +pHYXxJyqsSoV44afiB7IMGMlk6nrolM7DasO6fSez8CDwA+FzajFZdhx9bScgn+QSm/lZ Wjcm/fT9Pty21vHVTz1Dw+rOTcuZWADFc/BZDNzKW9GXciHtqHvxI4SIuEVgdNiOhYCUZU nmkRUG5DKh77B9GbbeGTRL0HMmGv5tz9KuBhgFS8otIPiNQ2DyUn95Ovqs/tocG8qprEs8 Ji1x32zzn6GyxKH+KwXUI9jNmdZ/L4Mj8tu/9TA/uYlWbVZaWw2tTv9WlaLHTg== 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=1725486644; 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=z82VXpWdrQf7LWqHIYs1kgCeRixhBg7CeAm9piSpc9M=; b=NBBrf3tJiSDDkRSnv4H/81ZlvIzz1pYA3mVirQfsKMZ/0mwnFFN50TNTu2C4f6jswIeGcz X550WOr6SiHP9FnmBvdHvjTOWi2H/f67kvVrOJnSRvYD8AaeEz5j1r22vqLaHe6Z29XVCh 1baGM507Jo9SANaTeB2NyCZr2FTJEfzyLh5kBDzSOpGwCc0g3P8WEfaoOVOCwbSG+DkAjJ sl/1DLUowmv7wFHyhXXcEHOW8EC91CwcSjT13m+C/06YEYSZsDIuUbPV7Rs95EQ5UNovuZ RoZFLY6WtortY2AI8BRtCa9GvxXNphJxWC4Pyku7U4yQjYi98voe8OTAiU4khg== 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 4WzblS5WMvzhL4; Wed, 4 Sep 2024 21:50:44 +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 484LoiIM031689; Wed, 4 Sep 2024 21:50:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484LoixC031686; Wed, 4 Sep 2024 21:50:44 GMT (envelope-from git) Date: Wed, 4 Sep 2024 21:50:44 GMT Message-Id: <202409042150.484LoixC031686@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 23145534154c - main - DMAR: rename domain_{alloc,free}_pgtbl to domain_domain_$1_pgtbl 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/main X-Git-Reftype: branch X-Git-Commit: 23145534154c279e3e8cbcd17d155f7ee67d8aa9 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=23145534154c279e3e8cbcd17d155f7ee67d8aa9 commit 23145534154c279e3e8cbcd17d155f7ee67d8aa9 Author: Konstantin Belousov AuthorDate: 2024-06-30 03:52:52 +0000 Commit: Konstantin Belousov CommitDate: 2024-09-04 21:50:18 +0000 DMAR: rename domain_{alloc,free}_pgtbl to domain_domain_$1_pgtbl Sponsored by: Advanced Micro Devices (AMD) Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/x86/iommu/intel_ctx.c | 4 ++-- sys/x86/iommu/intel_dmar.h | 4 ++-- sys/x86/iommu/intel_idpgtbl.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/x86/iommu/intel_ctx.c b/sys/x86/iommu/intel_ctx.c index 03ef196c4cb0..e39d2a136d8a 100644 --- a/sys/x86/iommu/intel_ctx.c +++ b/sys/x86/iommu/intel_ctx.c @@ -423,7 +423,7 @@ dmar_domain_alloc(struct dmar_unit *dmar, bool id_mapped) } domain->iodom.flags |= IOMMU_DOMAIN_IDMAP; } else { - error = domain_alloc_pgtbl(domain); + error = dmar_domain_alloc_pgtbl(domain); if (error != 0) goto fail; /* Disable local apic region access */ @@ -509,7 +509,7 @@ dmar_domain_destroy(struct dmar_domain *domain) if ((domain->iodom.flags & IOMMU_DOMAIN_PGTBL_INITED) != 0) { if (domain->pgtbl_obj != NULL) DMAR_DOMAIN_PGLOCK(domain); - domain_free_pgtbl(domain); + dmar_domain_free_pgtbl(domain); } iommu_domain_fini(iodom); dmar = DOM2DMAR(domain); diff --git a/sys/x86/iommu/intel_dmar.h b/sys/x86/iommu/intel_dmar.h index 8a815d5cfca6..7b4a7900fa25 100644 --- a/sys/x86/iommu/intel_dmar.h +++ b/sys/x86/iommu/intel_dmar.h @@ -240,8 +240,8 @@ vm_object_t domain_get_idmap_pgtbl(struct dmar_domain *domain, void put_idmap_pgtbl(vm_object_t obj); void domain_flush_iotlb_sync(struct dmar_domain *domain, iommu_gaddr_t base, iommu_gaddr_t size); -int domain_alloc_pgtbl(struct dmar_domain *domain); -void domain_free_pgtbl(struct dmar_domain *domain); +int dmar_domain_alloc_pgtbl(struct dmar_domain *domain); +void dmar_domain_free_pgtbl(struct dmar_domain *domain); extern const struct iommu_domain_map_ops dmar_domain_map_ops; int dmar_dev_depth(device_t child); diff --git a/sys/x86/iommu/intel_idpgtbl.c b/sys/x86/iommu/intel_idpgtbl.c index de38a6fece94..eb6a51216dfd 100644 --- a/sys/x86/iommu/intel_idpgtbl.c +++ b/sys/x86/iommu/intel_idpgtbl.c @@ -696,7 +696,7 @@ domain_unmap_buf(struct iommu_domain *iodom, iommu_gaddr_t base, } int -domain_alloc_pgtbl(struct dmar_domain *domain) +dmar_domain_alloc_pgtbl(struct dmar_domain *domain) { vm_page_t m; @@ -718,7 +718,7 @@ domain_alloc_pgtbl(struct dmar_domain *domain) } void -domain_free_pgtbl(struct dmar_domain *domain) +dmar_domain_free_pgtbl(struct dmar_domain *domain) { vm_object_t obj; vm_page_t m;