The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=23145534154c279e3e8cbcd17d155f7ee67d8aa9
commit 23145534154c279e3e8cbcd17d155f7ee67d8aa9 Author: Konstantin Belousov <[email protected]> AuthorDate: 2024-06-30 03:52:52 +0000 Commit: Konstantin Belousov <[email protected]> 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;
