iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iommu/amd: Remove queue_release() function

Browse Source 
We can use queue_ring_free_flushed() instead, so remove this
redundancy.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Joerg Roedel 2017-06-07 14:38:15 +02:00
parent fca6af6a59
commit ac3b708ad4
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/iommu/amd_iommu.c
View File

@ -1859,21 +1859,6 @@ static inline bool queue_ring_full(struct flush_queue *queue)
#define queue_ring_for_each(i, q) \ #define queue_ring_for_each(i, q) \
for (i = (q)->head; i != (q)->tail; i = (i + 1) % FLUSH_QUEUE_SIZE) for (i = (q)->head; i != (q)->tail; i = (i + 1) % FLUSH_QUEUE_SIZE)
static void queue_release(struct dma_ops_domain *dom,
struct flush_queue *queue)
{
unsigned i;
assert_spin_locked(&queue->lock);
queue_ring_for_each(i, queue)
free_iova_fast(&dom->iovad,
queue->entries[i].iova_pfn,
queue->entries[i].pages);
queue->head = queue->tail = 0;
}
static inline unsigned queue_ring_add(struct flush_queue *queue) static inline unsigned queue_ring_add(struct flush_queue *queue)
{ {
unsigned idx = queue->tail; unsigned idx = queue->tail;
@ -1925,12 +1910,15 @@ static void queue_add(struct dma_ops_domain *dom,
queue = get_cpu_ptr(dom->flush_queue); queue = get_cpu_ptr(dom->flush_queue);
spin_lock_irqsave(&queue->lock, flags); spin_lock_irqsave(&queue->lock, flags);
queue_ring_free_flushed(dom, queue); /*
* When ring-queue is full, flush the entries from the IOTLB so
if (queue_ring_full(queue)) { * that we can free all entries with queue_ring_free_flushed()
* below.
*/
if (queue_ring_full(queue))
dma_ops_domain_flush_tlb(dom); dma_ops_domain_flush_tlb(dom);
queue_release(dom, queue);
} queue_ring_free_flushed(dom, queue);
idx = queue_ring_add(queue); idx = queue_ring_add(queue);