From: John Garry <john.garry@huawei.com>
To: <joro@8bytes.org>, <will@kernel.org>
Cc: <iommu@lists.linux-foundation.org>,
<linux-kernel@vger.kernel.org>, <robin.murphy@arm.com>,
John Garry <john.garry@huawei.com>
Subject: [PATCH v2 2/6] iova: Delete copy_reserved_iova()
Date: Wed, 6 Jan 2021 21:35:07 +0800 [thread overview]
Message-ID: <1609940111-28563-3-git-send-email-john.garry@huawei.com> (raw)
In-Reply-To: <1609940111-28563-1-git-send-email-john.garry@huawei.com>
Since commit c588072bba6b ("iommu/vt-d: Convert intel iommu driver to the
iommu ops"), function copy_reserved_iova() is not referenced, so delete
it.
Signed-off-by: John Garry <john.garry@huawei.com>
---
drivers/iommu/iova.c | 30 ------------------------------
include/linux/iova.h | 6 ------
2 files changed, 36 deletions(-)
diff --git a/drivers/iommu/iova.c b/drivers/iommu/iova.c
index 0a758ec2a1c4..04f0a3ae1c63 100644
--- a/drivers/iommu/iova.c
+++ b/drivers/iommu/iova.c
@@ -710,36 +710,6 @@ reserve_iova(struct iova_domain *iovad,
}
EXPORT_SYMBOL_GPL(reserve_iova);
-/**
- * copy_reserved_iova - copies the reserved between domains
- * @from: - source doamin from where to copy
- * @to: - destination domin where to copy
- * This function copies reserved iova's from one doamin to
- * other.
- */
-void
-copy_reserved_iova(struct iova_domain *from, struct iova_domain *to)
-{
- unsigned long flags;
- struct rb_node *node;
-
- spin_lock_irqsave(&from->iova_rbtree_lock, flags);
- for (node = rb_first(&from->rbroot); node; node = rb_next(node)) {
- struct iova *iova = rb_entry(node, struct iova, node);
- struct iova *new_iova;
-
- if (iova->pfn_lo == IOVA_ANCHOR)
- continue;
-
- new_iova = reserve_iova(to, iova->pfn_lo, iova->pfn_hi);
- if (!new_iova)
- pr_err("Reserve iova range %lx@%lx failed\n",
- iova->pfn_lo, iova->pfn_lo);
- }
- spin_unlock_irqrestore(&from->iova_rbtree_lock, flags);
-}
-EXPORT_SYMBOL_GPL(copy_reserved_iova);
-
/*
* Magazine caches for IOVA ranges. For an introduction to magazines,
* see the USENIX 2001 paper "Magazines and Vmem: Extending the Slab
diff --git a/include/linux/iova.h b/include/linux/iova.h
index 2b76e0be1c5b..c834c01c0a5b 100644
--- a/include/linux/iova.h
+++ b/include/linux/iova.h
@@ -150,7 +150,6 @@ unsigned long alloc_iova_fast(struct iova_domain *iovad, unsigned long size,
unsigned long limit_pfn, bool flush_rcache);
struct iova *reserve_iova(struct iova_domain *iovad, unsigned long pfn_lo,
unsigned long pfn_hi);
-void copy_reserved_iova(struct iova_domain *from, struct iova_domain *to);
void init_iova_domain(struct iova_domain *iovad, unsigned long granule,
unsigned long start_pfn);
int init_iova_flush_queue(struct iova_domain *iovad,
@@ -211,11 +210,6 @@ static inline struct iova *reserve_iova(struct iova_domain *iovad,
return NULL;
}
-static inline void copy_reserved_iova(struct iova_domain *from,
- struct iova_domain *to)
-{
-}
-
static inline void init_iova_domain(struct iova_domain *iovad,
unsigned long granule,
unsigned long start_pfn)
--
2.26.2
next prev parent reply other threads:[~2021-01-06 13:39 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-06 13:35 [PATCH v2 0/6] IOMMU: Some more IOVA and core code tidy-up John Garry
2021-01-06 13:35 ` [PATCH v2 1/6] iova: Make has_iova_flush_queue() private John Garry
2021-01-06 13:35 ` John Garry [this message]
2021-01-06 13:35 ` [PATCH v2 3/6] iova: Stop exporting some more functions John Garry
2021-01-06 13:35 ` [PATCH v2 4/6] iommu: Stop exporting iommu_map_sg_atomic() John Garry
2021-01-06 13:35 ` [PATCH v2 5/6] iommu: Delete iommu_domain_window_disable() John Garry
2021-01-06 13:35 ` [PATCH v2 6/6] iommu: Delete iommu_dev_has_feature() John Garry
2021-01-07 1:18 ` Lu Baolu
2021-01-07 9:13 ` John Garry
2021-01-09 9:09 ` Christoph Hellwig
2021-01-18 11:21 ` [PATCH v2 0/6] IOMMU: Some more IOVA and core code tidy-up Will Deacon
2021-01-27 11:29 ` Joerg Roedel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1609940111-28563-3-git-send-email-john.garry@huawei.com \
--to=john.garry@huawei.com \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robin.murphy@arm.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).