git: 63440d34ad65 - stable/13 - x86/iommu: Eliminate redundant wrappers

The branch stable/13 has been updated by dougm:

URL: https://cgit.FreeBSD.org/src/commit/?id=63440d34ad65dfb22394e63d9827671c5804b279

commit 63440d34ad65dfb22394e63d9827671c5804b279
Author:     Alan Cox <alc@FreeBSD.org>
AuthorDate: 2022-07-16 04:25:11 +0000
Commit:     Doug Moore <dougm@FreeBSD.org>
CommitDate: 2022-08-08 03:17:28 +0000

    x86/iommu: Eliminate redundant wrappers
    
    Reviewed by:    kib
    MFC after:      2 weeks
    Differential Revision:  https://reviews.freebsd.org/D35832
    
    (cherry picked from commit da55f86c61462b119fd1306d12411989d6610650)
---
 sys/x86/iommu/intel_ctx.c  | 26 ++++----------------------
 sys/x86/iommu/intel_dmar.h |  3 ---
 2 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/sys/x86/iommu/intel_ctx.c b/sys/x86/iommu/intel_ctx.c
index 34730306000b..b3573712de32 100644
--- a/sys/x86/iommu/intel_ctx.c
+++ b/sys/x86/iommu/intel_ctx.c
@@ -864,7 +864,7 @@ dmar_domain_free_entry(struct iommu_map_entry *entry, bool free)
 }
 
 void
-dmar_domain_unload_entry(struct iommu_map_entry *entry, bool free)
+iommu_domain_unload_entry(struct iommu_map_entry *entry, bool free)
 {
 	struct dmar_domain *domain;
 	struct dmar_unit *unit;
@@ -898,15 +898,15 @@ dmar_domain_unload_emit_wait(struct dmar_domain *domain,
 }
 
 void
-dmar_domain_unload(struct dmar_domain *domain,
+iommu_domain_unload(struct iommu_domain *iodom,
     struct iommu_map_entries_tailq *entries, bool cansleep)
 {
+	struct dmar_domain *domain;
 	struct dmar_unit *unit;
-	struct iommu_domain *iodom;
 	struct iommu_map_entry *entry, *entry1;
 	int error __diagused;
 
-	iodom = DOM2IODOM(domain);
+	domain = IODOM2DOM(iodom);
 	unit = DOM2DMAR(domain);
 
 	TAILQ_FOREACH_SAFE(entry, entries, dmamap_link, entry1) {
@@ -971,21 +971,3 @@ iommu_free_ctx(struct iommu_ctx *context)
 
 	dmar_free_ctx(ctx);
 }
-
-void
-iommu_domain_unload_entry(struct iommu_map_entry *entry, bool free)
-{
-
-	dmar_domain_unload_entry(entry, free);
-}
-
-void
-iommu_domain_unload(struct iommu_domain *iodom,
-    struct iommu_map_entries_tailq *entries, bool cansleep)
-{
-	struct dmar_domain *domain;
-
-	domain = IODOM2DOM(iodom);
-
-	dmar_domain_unload(domain, entries, cansleep);
-}
diff --git a/sys/x86/iommu/intel_dmar.h b/sys/x86/iommu/intel_dmar.h
index 0ad94dbf4123..e49f96bf93e1 100644
--- a/sys/x86/iommu/intel_dmar.h
+++ b/sys/x86/iommu/intel_dmar.h
@@ -276,9 +276,6 @@ int dmar_move_ctx_to_domain(struct dmar_domain *domain, struct dmar_ctx *ctx);
 void dmar_free_ctx_locked(struct dmar_unit *dmar, struct dmar_ctx *ctx);
 void dmar_free_ctx(struct dmar_ctx *ctx);
 struct dmar_ctx *dmar_find_ctx_locked(struct dmar_unit *dmar, uint16_t rid);
-void dmar_domain_unload_entry(struct iommu_map_entry *entry, bool free);
-void dmar_domain_unload(struct dmar_domain *domain,
-    struct iommu_map_entries_tailq *entries, bool cansleep);
 void dmar_domain_free_entry(struct iommu_map_entry *entry, bool free);
 
 void dmar_dev_parse_rmrr(struct dmar_domain *domain, int dev_domain,