mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 18:39:59 +00:00
sparc: Make sparc64 use scalable lib/iommu-common.c functions
In iperf experiments running linux as the Tx side (TCP client) with 10 threads results in a severe performance drop when TSO is disabled, indicating a weakness in the software that can be avoided by using the scalable IOMMU arena DMA allocation. Baseline numbers before this patch: with default settings (TSO enabled) : 9-9.5 Gbps Disable TSO using ethtool- drops badly: 2-3 Gbps. After this patch, iperf client with 10 threads, can give a throughput of at least 8.5 Gbps, even when TSO is disabled. Signed-off-by: Sowmini Varadhan <sowmini.varadhan@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
10b88a4b17
commit
f1600e549b
4 changed files with 159 additions and 235 deletions
|
@ -16,6 +16,7 @@
|
||||||
#define IOPTE_WRITE 0x0000000000000002UL
|
#define IOPTE_WRITE 0x0000000000000002UL
|
||||||
|
|
||||||
#define IOMMU_NUM_CTXS 4096
|
#define IOMMU_NUM_CTXS 4096
|
||||||
|
#include <linux/iommu-common.h>
|
||||||
|
|
||||||
struct iommu_arena {
|
struct iommu_arena {
|
||||||
unsigned long *map;
|
unsigned long *map;
|
||||||
|
@ -24,11 +25,10 @@ struct iommu_arena {
|
||||||
};
|
};
|
||||||
|
|
||||||
struct iommu {
|
struct iommu {
|
||||||
|
struct iommu_table tbl;
|
||||||
spinlock_t lock;
|
spinlock_t lock;
|
||||||
struct iommu_arena arena;
|
u32 dma_addr_mask;
|
||||||
void (*flush_all)(struct iommu *);
|
|
||||||
iopte_t *page_table;
|
iopte_t *page_table;
|
||||||
u32 page_table_map_base;
|
|
||||||
unsigned long iommu_control;
|
unsigned long iommu_control;
|
||||||
unsigned long iommu_tsbbase;
|
unsigned long iommu_tsbbase;
|
||||||
unsigned long iommu_flush;
|
unsigned long iommu_flush;
|
||||||
|
@ -40,7 +40,6 @@ struct iommu {
|
||||||
unsigned long dummy_page_pa;
|
unsigned long dummy_page_pa;
|
||||||
unsigned long ctx_lowest_free;
|
unsigned long ctx_lowest_free;
|
||||||
DECLARE_BITMAP(ctx_bitmap, IOMMU_NUM_CTXS);
|
DECLARE_BITMAP(ctx_bitmap, IOMMU_NUM_CTXS);
|
||||||
u32 dma_addr_mask;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
struct strbuf {
|
struct strbuf {
|
||||||
|
|
|
@ -13,11 +13,15 @@
|
||||||
#include <linux/errno.h>
|
#include <linux/errno.h>
|
||||||
#include <linux/iommu-helper.h>
|
#include <linux/iommu-helper.h>
|
||||||
#include <linux/bitmap.h>
|
#include <linux/bitmap.h>
|
||||||
|
#include <linux/hash.h>
|
||||||
|
#include <linux/iommu-common.h>
|
||||||
|
|
||||||
#ifdef CONFIG_PCI
|
#ifdef CONFIG_PCI
|
||||||
#include <linux/pci.h>
|
#include <linux/pci.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
static DEFINE_PER_CPU(unsigned int, iommu_pool_hash);
|
||||||
|
|
||||||
#include <asm/iommu.h>
|
#include <asm/iommu.h>
|
||||||
|
|
||||||
#include "iommu_common.h"
|
#include "iommu_common.h"
|
||||||
|
@ -45,8 +49,9 @@
|
||||||
"i" (ASI_PHYS_BYPASS_EC_E))
|
"i" (ASI_PHYS_BYPASS_EC_E))
|
||||||
|
|
||||||
/* Must be invoked under the IOMMU lock. */
|
/* Must be invoked under the IOMMU lock. */
|
||||||
static void iommu_flushall(struct iommu *iommu)
|
static void iommu_flushall(struct iommu_table *iommu_table)
|
||||||
{
|
{
|
||||||
|
struct iommu *iommu = container_of(iommu_table, struct iommu, tbl);
|
||||||
if (iommu->iommu_flushinv) {
|
if (iommu->iommu_flushinv) {
|
||||||
iommu_write(iommu->iommu_flushinv, ~(u64)0);
|
iommu_write(iommu->iommu_flushinv, ~(u64)0);
|
||||||
} else {
|
} else {
|
||||||
|
@ -87,93 +92,22 @@ static inline void iopte_make_dummy(struct iommu *iommu, iopte_t *iopte)
|
||||||
iopte_val(*iopte) = val;
|
iopte_val(*iopte) = val;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Based almost entirely upon the ppc64 iommu allocator. If you use the 'handle'
|
static struct iommu_tbl_ops iommu_sparc_ops = {
|
||||||
* facility it must all be done in one pass while under the iommu lock.
|
.reset = iommu_flushall
|
||||||
*
|
};
|
||||||
* On sun4u platforms, we only flush the IOMMU once every time we've passed
|
|
||||||
* over the entire page table doing allocations. Therefore we only ever advance
|
static void setup_iommu_pool_hash(void)
|
||||||
* the hint and cannot backtrack it.
|
|
||||||
*/
|
|
||||||
unsigned long iommu_range_alloc(struct device *dev,
|
|
||||||
struct iommu *iommu,
|
|
||||||
unsigned long npages,
|
|
||||||
unsigned long *handle)
|
|
||||||
{
|
{
|
||||||
unsigned long n, end, start, limit, boundary_size;
|
unsigned int i;
|
||||||
struct iommu_arena *arena = &iommu->arena;
|
static bool do_once;
|
||||||
int pass = 0;
|
|
||||||
|
|
||||||
/* This allocator was derived from x86_64's bit string search */
|
if (do_once)
|
||||||
|
return;
|
||||||
/* Sanity check */
|
do_once = true;
|
||||||
if (unlikely(npages == 0)) {
|
for_each_possible_cpu(i)
|
||||||
if (printk_ratelimit())
|
per_cpu(iommu_pool_hash, i) = hash_32(i, IOMMU_POOL_HASHBITS);
|
||||||
WARN_ON(1);
|
|
||||||
return DMA_ERROR_CODE;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (handle && *handle)
|
|
||||||
start = *handle;
|
|
||||||
else
|
|
||||||
start = arena->hint;
|
|
||||||
|
|
||||||
limit = arena->limit;
|
|
||||||
|
|
||||||
/* The case below can happen if we have a small segment appended
|
|
||||||
* to a large, or when the previous alloc was at the very end of
|
|
||||||
* the available space. If so, go back to the beginning and flush.
|
|
||||||
*/
|
|
||||||
if (start >= limit) {
|
|
||||||
start = 0;
|
|
||||||
if (iommu->flush_all)
|
|
||||||
iommu->flush_all(iommu);
|
|
||||||
}
|
|
||||||
|
|
||||||
again:
|
|
||||||
|
|
||||||
if (dev)
|
|
||||||
boundary_size = ALIGN(dma_get_seg_boundary(dev) + 1,
|
|
||||||
1 << IO_PAGE_SHIFT);
|
|
||||||
else
|
|
||||||
boundary_size = ALIGN(1UL << 32, 1 << IO_PAGE_SHIFT);
|
|
||||||
|
|
||||||
n = iommu_area_alloc(arena->map, limit, start, npages,
|
|
||||||
iommu->page_table_map_base >> IO_PAGE_SHIFT,
|
|
||||||
boundary_size >> IO_PAGE_SHIFT, 0);
|
|
||||||
if (n == -1) {
|
|
||||||
if (likely(pass < 1)) {
|
|
||||||
/* First failure, rescan from the beginning. */
|
|
||||||
start = 0;
|
|
||||||
if (iommu->flush_all)
|
|
||||||
iommu->flush_all(iommu);
|
|
||||||
pass++;
|
|
||||||
goto again;
|
|
||||||
} else {
|
|
||||||
/* Second failure, give up */
|
|
||||||
return DMA_ERROR_CODE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
end = n + npages;
|
|
||||||
|
|
||||||
arena->hint = end;
|
|
||||||
|
|
||||||
/* Update handle for SG allocations */
|
|
||||||
if (handle)
|
|
||||||
*handle = end;
|
|
||||||
|
|
||||||
return n;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void iommu_range_free(struct iommu *iommu, dma_addr_t dma_addr, unsigned long npages)
|
|
||||||
{
|
|
||||||
struct iommu_arena *arena = &iommu->arena;
|
|
||||||
unsigned long entry;
|
|
||||||
|
|
||||||
entry = (dma_addr - iommu->page_table_map_base) >> IO_PAGE_SHIFT;
|
|
||||||
|
|
||||||
bitmap_clear(arena->map, entry, npages);
|
|
||||||
}
|
|
||||||
|
|
||||||
int iommu_table_init(struct iommu *iommu, int tsbsize,
|
int iommu_table_init(struct iommu *iommu, int tsbsize,
|
||||||
u32 dma_offset, u32 dma_addr_mask,
|
u32 dma_offset, u32 dma_addr_mask,
|
||||||
|
@ -187,22 +121,22 @@ int iommu_table_init(struct iommu *iommu, int tsbsize,
|
||||||
/* Setup initial software IOMMU state. */
|
/* Setup initial software IOMMU state. */
|
||||||
spin_lock_init(&iommu->lock);
|
spin_lock_init(&iommu->lock);
|
||||||
iommu->ctx_lowest_free = 1;
|
iommu->ctx_lowest_free = 1;
|
||||||
iommu->page_table_map_base = dma_offset;
|
iommu->tbl.page_table_map_base = dma_offset;
|
||||||
iommu->dma_addr_mask = dma_addr_mask;
|
iommu->dma_addr_mask = dma_addr_mask;
|
||||||
|
|
||||||
/* Allocate and initialize the free area map. */
|
/* Allocate and initialize the free area map. */
|
||||||
sz = num_tsb_entries / 8;
|
sz = num_tsb_entries / 8;
|
||||||
sz = (sz + 7UL) & ~7UL;
|
sz = (sz + 7UL) & ~7UL;
|
||||||
iommu->arena.map = kmalloc_node(sz, GFP_KERNEL, numa_node);
|
iommu->tbl.map = kmalloc_node(sz, GFP_KERNEL, numa_node);
|
||||||
if (!iommu->arena.map) {
|
if (!iommu->tbl.map)
|
||||||
printk(KERN_ERR "IOMMU: Error, kmalloc(arena.map) failed.\n");
|
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
memset(iommu->tbl.map, 0, sz);
|
||||||
memset(iommu->arena.map, 0, sz);
|
|
||||||
iommu->arena.limit = num_tsb_entries;
|
|
||||||
|
|
||||||
if (tlb_type != hypervisor)
|
if (tlb_type != hypervisor)
|
||||||
iommu->flush_all = iommu_flushall;
|
iommu_sparc_ops.reset = NULL; /* not needed on on sun4v */
|
||||||
|
|
||||||
|
setup_iommu_pool_hash();
|
||||||
|
iommu_tbl_pool_init(&iommu->tbl, num_tsb_entries, IO_PAGE_SHIFT,
|
||||||
|
&iommu_sparc_ops, false, 1);
|
||||||
|
|
||||||
/* Allocate and initialize the dummy page which we
|
/* Allocate and initialize the dummy page which we
|
||||||
* set inactive IO PTEs to point to.
|
* set inactive IO PTEs to point to.
|
||||||
|
@ -235,18 +169,20 @@ int iommu_table_init(struct iommu *iommu, int tsbsize,
|
||||||
iommu->dummy_page = 0UL;
|
iommu->dummy_page = 0UL;
|
||||||
|
|
||||||
out_free_map:
|
out_free_map:
|
||||||
kfree(iommu->arena.map);
|
kfree(iommu->tbl.map);
|
||||||
iommu->arena.map = NULL;
|
iommu->tbl.map = NULL;
|
||||||
|
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline iopte_t *alloc_npages(struct device *dev, struct iommu *iommu,
|
static inline iopte_t *alloc_npages(struct device *dev,
|
||||||
|
struct iommu *iommu,
|
||||||
unsigned long npages)
|
unsigned long npages)
|
||||||
{
|
{
|
||||||
unsigned long entry;
|
unsigned long entry;
|
||||||
|
|
||||||
entry = iommu_range_alloc(dev, iommu, npages, NULL);
|
entry = iommu_tbl_range_alloc(dev, &iommu->tbl, npages, NULL,
|
||||||
|
__this_cpu_read(iommu_pool_hash));
|
||||||
if (unlikely(entry == DMA_ERROR_CODE))
|
if (unlikely(entry == DMA_ERROR_CODE))
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
|
@ -284,7 +220,7 @@ static void *dma_4u_alloc_coherent(struct device *dev, size_t size,
|
||||||
dma_addr_t *dma_addrp, gfp_t gfp,
|
dma_addr_t *dma_addrp, gfp_t gfp,
|
||||||
struct dma_attrs *attrs)
|
struct dma_attrs *attrs)
|
||||||
{
|
{
|
||||||
unsigned long flags, order, first_page;
|
unsigned long order, first_page;
|
||||||
struct iommu *iommu;
|
struct iommu *iommu;
|
||||||
struct page *page;
|
struct page *page;
|
||||||
int npages, nid;
|
int npages, nid;
|
||||||
|
@ -306,16 +242,14 @@ static void *dma_4u_alloc_coherent(struct device *dev, size_t size,
|
||||||
|
|
||||||
iommu = dev->archdata.iommu;
|
iommu = dev->archdata.iommu;
|
||||||
|
|
||||||
spin_lock_irqsave(&iommu->lock, flags);
|
|
||||||
iopte = alloc_npages(dev, iommu, size >> IO_PAGE_SHIFT);
|
iopte = alloc_npages(dev, iommu, size >> IO_PAGE_SHIFT);
|
||||||
spin_unlock_irqrestore(&iommu->lock, flags);
|
|
||||||
|
|
||||||
if (unlikely(iopte == NULL)) {
|
if (unlikely(iopte == NULL)) {
|
||||||
free_pages(first_page, order);
|
free_pages(first_page, order);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
*dma_addrp = (iommu->page_table_map_base +
|
*dma_addrp = (iommu->tbl.page_table_map_base +
|
||||||
((iopte - iommu->page_table) << IO_PAGE_SHIFT));
|
((iopte - iommu->page_table) << IO_PAGE_SHIFT));
|
||||||
ret = (void *) first_page;
|
ret = (void *) first_page;
|
||||||
npages = size >> IO_PAGE_SHIFT;
|
npages = size >> IO_PAGE_SHIFT;
|
||||||
|
@ -336,16 +270,12 @@ static void dma_4u_free_coherent(struct device *dev, size_t size,
|
||||||
struct dma_attrs *attrs)
|
struct dma_attrs *attrs)
|
||||||
{
|
{
|
||||||
struct iommu *iommu;
|
struct iommu *iommu;
|
||||||
unsigned long flags, order, npages;
|
unsigned long order, npages;
|
||||||
|
|
||||||
npages = IO_PAGE_ALIGN(size) >> IO_PAGE_SHIFT;
|
npages = IO_PAGE_ALIGN(size) >> IO_PAGE_SHIFT;
|
||||||
iommu = dev->archdata.iommu;
|
iommu = dev->archdata.iommu;
|
||||||
|
|
||||||
spin_lock_irqsave(&iommu->lock, flags);
|
iommu_tbl_range_free(&iommu->tbl, dvma, npages, false, NULL);
|
||||||
|
|
||||||
iommu_range_free(iommu, dvma, npages);
|
|
||||||
|
|
||||||
spin_unlock_irqrestore(&iommu->lock, flags);
|
|
||||||
|
|
||||||
order = get_order(size);
|
order = get_order(size);
|
||||||
if (order < 10)
|
if (order < 10)
|
||||||
|
@ -375,8 +305,8 @@ static dma_addr_t dma_4u_map_page(struct device *dev, struct page *page,
|
||||||
npages = IO_PAGE_ALIGN(oaddr + sz) - (oaddr & IO_PAGE_MASK);
|
npages = IO_PAGE_ALIGN(oaddr + sz) - (oaddr & IO_PAGE_MASK);
|
||||||
npages >>= IO_PAGE_SHIFT;
|
npages >>= IO_PAGE_SHIFT;
|
||||||
|
|
||||||
spin_lock_irqsave(&iommu->lock, flags);
|
|
||||||
base = alloc_npages(dev, iommu, npages);
|
base = alloc_npages(dev, iommu, npages);
|
||||||
|
spin_lock_irqsave(&iommu->lock, flags);
|
||||||
ctx = 0;
|
ctx = 0;
|
||||||
if (iommu->iommu_ctxflush)
|
if (iommu->iommu_ctxflush)
|
||||||
ctx = iommu_alloc_ctx(iommu);
|
ctx = iommu_alloc_ctx(iommu);
|
||||||
|
@ -385,7 +315,7 @@ static dma_addr_t dma_4u_map_page(struct device *dev, struct page *page,
|
||||||
if (unlikely(!base))
|
if (unlikely(!base))
|
||||||
goto bad;
|
goto bad;
|
||||||
|
|
||||||
bus_addr = (iommu->page_table_map_base +
|
bus_addr = (iommu->tbl.page_table_map_base +
|
||||||
((base - iommu->page_table) << IO_PAGE_SHIFT));
|
((base - iommu->page_table) << IO_PAGE_SHIFT));
|
||||||
ret = bus_addr | (oaddr & ~IO_PAGE_MASK);
|
ret = bus_addr | (oaddr & ~IO_PAGE_MASK);
|
||||||
base_paddr = __pa(oaddr & IO_PAGE_MASK);
|
base_paddr = __pa(oaddr & IO_PAGE_MASK);
|
||||||
|
@ -496,7 +426,7 @@ static void dma_4u_unmap_page(struct device *dev, dma_addr_t bus_addr,
|
||||||
npages = IO_PAGE_ALIGN(bus_addr + sz) - (bus_addr & IO_PAGE_MASK);
|
npages = IO_PAGE_ALIGN(bus_addr + sz) - (bus_addr & IO_PAGE_MASK);
|
||||||
npages >>= IO_PAGE_SHIFT;
|
npages >>= IO_PAGE_SHIFT;
|
||||||
base = iommu->page_table +
|
base = iommu->page_table +
|
||||||
((bus_addr - iommu->page_table_map_base) >> IO_PAGE_SHIFT);
|
((bus_addr - iommu->tbl.page_table_map_base) >> IO_PAGE_SHIFT);
|
||||||
bus_addr &= IO_PAGE_MASK;
|
bus_addr &= IO_PAGE_MASK;
|
||||||
|
|
||||||
spin_lock_irqsave(&iommu->lock, flags);
|
spin_lock_irqsave(&iommu->lock, flags);
|
||||||
|
@ -515,11 +445,11 @@ static void dma_4u_unmap_page(struct device *dev, dma_addr_t bus_addr,
|
||||||
for (i = 0; i < npages; i++)
|
for (i = 0; i < npages; i++)
|
||||||
iopte_make_dummy(iommu, base + i);
|
iopte_make_dummy(iommu, base + i);
|
||||||
|
|
||||||
iommu_range_free(iommu, bus_addr, npages);
|
|
||||||
|
|
||||||
iommu_free_ctx(iommu, ctx);
|
iommu_free_ctx(iommu, ctx);
|
||||||
|
|
||||||
spin_unlock_irqrestore(&iommu->lock, flags);
|
spin_unlock_irqrestore(&iommu->lock, flags);
|
||||||
|
|
||||||
|
iommu_tbl_range_free(&iommu->tbl, bus_addr, npages,
|
||||||
|
false, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int dma_4u_map_sg(struct device *dev, struct scatterlist *sglist,
|
static int dma_4u_map_sg(struct device *dev, struct scatterlist *sglist,
|
||||||
|
@ -567,7 +497,7 @@ static int dma_4u_map_sg(struct device *dev, struct scatterlist *sglist,
|
||||||
max_seg_size = dma_get_max_seg_size(dev);
|
max_seg_size = dma_get_max_seg_size(dev);
|
||||||
seg_boundary_size = ALIGN(dma_get_seg_boundary(dev) + 1,
|
seg_boundary_size = ALIGN(dma_get_seg_boundary(dev) + 1,
|
||||||
IO_PAGE_SIZE) >> IO_PAGE_SHIFT;
|
IO_PAGE_SIZE) >> IO_PAGE_SHIFT;
|
||||||
base_shift = iommu->page_table_map_base >> IO_PAGE_SHIFT;
|
base_shift = iommu->tbl.page_table_map_base >> IO_PAGE_SHIFT;
|
||||||
for_each_sg(sglist, s, nelems, i) {
|
for_each_sg(sglist, s, nelems, i) {
|
||||||
unsigned long paddr, npages, entry, out_entry = 0, slen;
|
unsigned long paddr, npages, entry, out_entry = 0, slen;
|
||||||
iopte_t *base;
|
iopte_t *base;
|
||||||
|
@ -581,7 +511,8 @@ static int dma_4u_map_sg(struct device *dev, struct scatterlist *sglist,
|
||||||
/* Allocate iommu entries for that segment */
|
/* Allocate iommu entries for that segment */
|
||||||
paddr = (unsigned long) SG_ENT_PHYS_ADDRESS(s);
|
paddr = (unsigned long) SG_ENT_PHYS_ADDRESS(s);
|
||||||
npages = iommu_num_pages(paddr, slen, IO_PAGE_SIZE);
|
npages = iommu_num_pages(paddr, slen, IO_PAGE_SIZE);
|
||||||
entry = iommu_range_alloc(dev, iommu, npages, &handle);
|
entry = iommu_tbl_range_alloc(dev, &iommu->tbl, npages, &handle,
|
||||||
|
__this_cpu_read(iommu_pool_hash));
|
||||||
|
|
||||||
/* Handle failure */
|
/* Handle failure */
|
||||||
if (unlikely(entry == DMA_ERROR_CODE)) {
|
if (unlikely(entry == DMA_ERROR_CODE)) {
|
||||||
|
@ -594,7 +525,7 @@ static int dma_4u_map_sg(struct device *dev, struct scatterlist *sglist,
|
||||||
base = iommu->page_table + entry;
|
base = iommu->page_table + entry;
|
||||||
|
|
||||||
/* Convert entry to a dma_addr_t */
|
/* Convert entry to a dma_addr_t */
|
||||||
dma_addr = iommu->page_table_map_base +
|
dma_addr = iommu->tbl.page_table_map_base +
|
||||||
(entry << IO_PAGE_SHIFT);
|
(entry << IO_PAGE_SHIFT);
|
||||||
dma_addr |= (s->offset & ~IO_PAGE_MASK);
|
dma_addr |= (s->offset & ~IO_PAGE_MASK);
|
||||||
|
|
||||||
|
@ -654,15 +585,17 @@ static int dma_4u_map_sg(struct device *dev, struct scatterlist *sglist,
|
||||||
vaddr = s->dma_address & IO_PAGE_MASK;
|
vaddr = s->dma_address & IO_PAGE_MASK;
|
||||||
npages = iommu_num_pages(s->dma_address, s->dma_length,
|
npages = iommu_num_pages(s->dma_address, s->dma_length,
|
||||||
IO_PAGE_SIZE);
|
IO_PAGE_SIZE);
|
||||||
iommu_range_free(iommu, vaddr, npages);
|
|
||||||
|
|
||||||
entry = (vaddr - iommu->page_table_map_base)
|
entry = (vaddr - iommu->tbl.page_table_map_base)
|
||||||
>> IO_PAGE_SHIFT;
|
>> IO_PAGE_SHIFT;
|
||||||
base = iommu->page_table + entry;
|
base = iommu->page_table + entry;
|
||||||
|
|
||||||
for (j = 0; j < npages; j++)
|
for (j = 0; j < npages; j++)
|
||||||
iopte_make_dummy(iommu, base + j);
|
iopte_make_dummy(iommu, base + j);
|
||||||
|
|
||||||
|
iommu_tbl_range_free(&iommu->tbl, vaddr, npages,
|
||||||
|
false, NULL);
|
||||||
|
|
||||||
s->dma_address = DMA_ERROR_CODE;
|
s->dma_address = DMA_ERROR_CODE;
|
||||||
s->dma_length = 0;
|
s->dma_length = 0;
|
||||||
}
|
}
|
||||||
|
@ -677,17 +610,19 @@ static int dma_4u_map_sg(struct device *dev, struct scatterlist *sglist,
|
||||||
/* If contexts are being used, they are the same in all of the mappings
|
/* If contexts are being used, they are the same in all of the mappings
|
||||||
* we make for a particular SG.
|
* we make for a particular SG.
|
||||||
*/
|
*/
|
||||||
static unsigned long fetch_sg_ctx(struct iommu *iommu, struct scatterlist *sg)
|
static unsigned long fetch_sg_ctx(struct iommu *iommu,
|
||||||
|
struct scatterlist *sg)
|
||||||
{
|
{
|
||||||
unsigned long ctx = 0;
|
unsigned long ctx = 0;
|
||||||
|
|
||||||
if (iommu->iommu_ctxflush) {
|
if (iommu->iommu_ctxflush) {
|
||||||
iopte_t *base;
|
iopte_t *base;
|
||||||
u32 bus_addr;
|
u32 bus_addr;
|
||||||
|
struct iommu_table *tbl = &iommu->tbl;
|
||||||
|
|
||||||
bus_addr = sg->dma_address & IO_PAGE_MASK;
|
bus_addr = sg->dma_address & IO_PAGE_MASK;
|
||||||
base = iommu->page_table +
|
base = iommu->page_table +
|
||||||
((bus_addr - iommu->page_table_map_base) >> IO_PAGE_SHIFT);
|
((bus_addr - tbl->page_table_map_base) >> IO_PAGE_SHIFT);
|
||||||
|
|
||||||
ctx = (iopte_val(*base) & IOPTE_CONTEXT) >> 47UL;
|
ctx = (iopte_val(*base) & IOPTE_CONTEXT) >> 47UL;
|
||||||
}
|
}
|
||||||
|
@ -723,9 +658,8 @@ static void dma_4u_unmap_sg(struct device *dev, struct scatterlist *sglist,
|
||||||
if (!len)
|
if (!len)
|
||||||
break;
|
break;
|
||||||
npages = iommu_num_pages(dma_handle, len, IO_PAGE_SIZE);
|
npages = iommu_num_pages(dma_handle, len, IO_PAGE_SIZE);
|
||||||
iommu_range_free(iommu, dma_handle, npages);
|
|
||||||
|
|
||||||
entry = ((dma_handle - iommu->page_table_map_base)
|
entry = ((dma_handle - iommu->tbl.page_table_map_base)
|
||||||
>> IO_PAGE_SHIFT);
|
>> IO_PAGE_SHIFT);
|
||||||
base = iommu->page_table + entry;
|
base = iommu->page_table + entry;
|
||||||
|
|
||||||
|
@ -737,6 +671,8 @@ static void dma_4u_unmap_sg(struct device *dev, struct scatterlist *sglist,
|
||||||
for (i = 0; i < npages; i++)
|
for (i = 0; i < npages; i++)
|
||||||
iopte_make_dummy(iommu, base + i);
|
iopte_make_dummy(iommu, base + i);
|
||||||
|
|
||||||
|
iommu_tbl_range_free(&iommu->tbl, dma_handle, npages, false,
|
||||||
|
NULL);
|
||||||
sg = sg_next(sg);
|
sg = sg_next(sg);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -770,9 +706,10 @@ static void dma_4u_sync_single_for_cpu(struct device *dev,
|
||||||
if (iommu->iommu_ctxflush &&
|
if (iommu->iommu_ctxflush &&
|
||||||
strbuf->strbuf_ctxflush) {
|
strbuf->strbuf_ctxflush) {
|
||||||
iopte_t *iopte;
|
iopte_t *iopte;
|
||||||
|
struct iommu_table *tbl = &iommu->tbl;
|
||||||
|
|
||||||
iopte = iommu->page_table +
|
iopte = iommu->page_table +
|
||||||
((bus_addr - iommu->page_table_map_base)>>IO_PAGE_SHIFT);
|
((bus_addr - tbl->page_table_map_base)>>IO_PAGE_SHIFT);
|
||||||
ctx = (iopte_val(*iopte) & IOPTE_CONTEXT) >> 47UL;
|
ctx = (iopte_val(*iopte) & IOPTE_CONTEXT) >> 47UL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -805,9 +742,10 @@ static void dma_4u_sync_sg_for_cpu(struct device *dev,
|
||||||
if (iommu->iommu_ctxflush &&
|
if (iommu->iommu_ctxflush &&
|
||||||
strbuf->strbuf_ctxflush) {
|
strbuf->strbuf_ctxflush) {
|
||||||
iopte_t *iopte;
|
iopte_t *iopte;
|
||||||
|
struct iommu_table *tbl = &iommu->tbl;
|
||||||
|
|
||||||
iopte = iommu->page_table +
|
iopte = iommu->page_table + ((sglist[0].dma_address -
|
||||||
((sglist[0].dma_address - iommu->page_table_map_base) >> IO_PAGE_SHIFT);
|
tbl->page_table_map_base) >> IO_PAGE_SHIFT);
|
||||||
ctx = (iopte_val(*iopte) & IOPTE_CONTEXT) >> 47UL;
|
ctx = (iopte_val(*iopte) & IOPTE_CONTEXT) >> 47UL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -48,12 +48,4 @@ static inline int is_span_boundary(unsigned long entry,
|
||||||
return iommu_is_span_boundary(entry, nr, shift, boundary_size);
|
return iommu_is_span_boundary(entry, nr, shift, boundary_size);
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned long iommu_range_alloc(struct device *dev,
|
|
||||||
struct iommu *iommu,
|
|
||||||
unsigned long npages,
|
|
||||||
unsigned long *handle);
|
|
||||||
void iommu_range_free(struct iommu *iommu,
|
|
||||||
dma_addr_t dma_addr,
|
|
||||||
unsigned long npages);
|
|
||||||
|
|
||||||
#endif /* _IOMMU_COMMON_H */
|
#endif /* _IOMMU_COMMON_H */
|
||||||
|
|
|
@ -15,6 +15,8 @@
|
||||||
#include <linux/export.h>
|
#include <linux/export.h>
|
||||||
#include <linux/log2.h>
|
#include <linux/log2.h>
|
||||||
#include <linux/of_device.h>
|
#include <linux/of_device.h>
|
||||||
|
#include <linux/hash.h>
|
||||||
|
#include <linux/iommu-common.h>
|
||||||
|
|
||||||
#include <asm/iommu.h>
|
#include <asm/iommu.h>
|
||||||
#include <asm/irq.h>
|
#include <asm/irq.h>
|
||||||
|
@ -28,6 +30,7 @@
|
||||||
|
|
||||||
#define DRIVER_NAME "pci_sun4v"
|
#define DRIVER_NAME "pci_sun4v"
|
||||||
#define PFX DRIVER_NAME ": "
|
#define PFX DRIVER_NAME ": "
|
||||||
|
static DEFINE_PER_CPU(unsigned int, iommu_pool_hash);
|
||||||
|
|
||||||
static unsigned long vpci_major = 1;
|
static unsigned long vpci_major = 1;
|
||||||
static unsigned long vpci_minor = 1;
|
static unsigned long vpci_minor = 1;
|
||||||
|
@ -155,14 +158,13 @@ static void *dma_4v_alloc_coherent(struct device *dev, size_t size,
|
||||||
|
|
||||||
iommu = dev->archdata.iommu;
|
iommu = dev->archdata.iommu;
|
||||||
|
|
||||||
spin_lock_irqsave(&iommu->lock, flags);
|
entry = iommu_tbl_range_alloc(dev, &iommu->tbl, npages, NULL,
|
||||||
entry = iommu_range_alloc(dev, iommu, npages, NULL);
|
__this_cpu_read(iommu_pool_hash));
|
||||||
spin_unlock_irqrestore(&iommu->lock, flags);
|
|
||||||
|
|
||||||
if (unlikely(entry == DMA_ERROR_CODE))
|
if (unlikely(entry == DMA_ERROR_CODE))
|
||||||
goto range_alloc_fail;
|
goto range_alloc_fail;
|
||||||
|
|
||||||
*dma_addrp = (iommu->page_table_map_base +
|
*dma_addrp = (iommu->tbl.page_table_map_base +
|
||||||
(entry << IO_PAGE_SHIFT));
|
(entry << IO_PAGE_SHIFT));
|
||||||
ret = (void *) first_page;
|
ret = (void *) first_page;
|
||||||
first_page = __pa(first_page);
|
first_page = __pa(first_page);
|
||||||
|
@ -188,45 +190,46 @@ static void *dma_4v_alloc_coherent(struct device *dev, size_t size,
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
iommu_map_fail:
|
iommu_map_fail:
|
||||||
/* Interrupts are disabled. */
|
iommu_tbl_range_free(&iommu->tbl, *dma_addrp, npages, false, NULL);
|
||||||
spin_lock(&iommu->lock);
|
|
||||||
iommu_range_free(iommu, *dma_addrp, npages);
|
|
||||||
spin_unlock_irqrestore(&iommu->lock, flags);
|
|
||||||
|
|
||||||
range_alloc_fail:
|
range_alloc_fail:
|
||||||
free_pages(first_page, order);
|
free_pages(first_page, order);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void dma_4v_iommu_demap(void *demap_arg, unsigned long entry,
|
||||||
|
unsigned long npages)
|
||||||
|
{
|
||||||
|
u32 devhandle = *(u32 *)demap_arg;
|
||||||
|
unsigned long num, flags;
|
||||||
|
|
||||||
|
local_irq_save(flags);
|
||||||
|
do {
|
||||||
|
num = pci_sun4v_iommu_demap(devhandle,
|
||||||
|
HV_PCI_TSBID(0, entry),
|
||||||
|
npages);
|
||||||
|
|
||||||
|
entry += num;
|
||||||
|
npages -= num;
|
||||||
|
} while (npages != 0);
|
||||||
|
local_irq_restore(flags);
|
||||||
|
}
|
||||||
|
|
||||||
static void dma_4v_free_coherent(struct device *dev, size_t size, void *cpu,
|
static void dma_4v_free_coherent(struct device *dev, size_t size, void *cpu,
|
||||||
dma_addr_t dvma, struct dma_attrs *attrs)
|
dma_addr_t dvma, struct dma_attrs *attrs)
|
||||||
{
|
{
|
||||||
struct pci_pbm_info *pbm;
|
struct pci_pbm_info *pbm;
|
||||||
struct iommu *iommu;
|
struct iommu *iommu;
|
||||||
unsigned long flags, order, npages, entry;
|
unsigned long order, npages, entry;
|
||||||
u32 devhandle;
|
u32 devhandle;
|
||||||
|
|
||||||
npages = IO_PAGE_ALIGN(size) >> IO_PAGE_SHIFT;
|
npages = IO_PAGE_ALIGN(size) >> IO_PAGE_SHIFT;
|
||||||
iommu = dev->archdata.iommu;
|
iommu = dev->archdata.iommu;
|
||||||
pbm = dev->archdata.host_controller;
|
pbm = dev->archdata.host_controller;
|
||||||
devhandle = pbm->devhandle;
|
devhandle = pbm->devhandle;
|
||||||
entry = ((dvma - iommu->page_table_map_base) >> IO_PAGE_SHIFT);
|
entry = ((dvma - iommu->tbl.page_table_map_base) >> IO_PAGE_SHIFT);
|
||||||
|
dma_4v_iommu_demap(&devhandle, entry, npages);
|
||||||
spin_lock_irqsave(&iommu->lock, flags);
|
iommu_tbl_range_free(&iommu->tbl, dvma, npages, false, NULL);
|
||||||
|
|
||||||
iommu_range_free(iommu, dvma, npages);
|
|
||||||
|
|
||||||
do {
|
|
||||||
unsigned long num;
|
|
||||||
|
|
||||||
num = pci_sun4v_iommu_demap(devhandle, HV_PCI_TSBID(0, entry),
|
|
||||||
npages);
|
|
||||||
entry += num;
|
|
||||||
npages -= num;
|
|
||||||
} while (npages != 0);
|
|
||||||
|
|
||||||
spin_unlock_irqrestore(&iommu->lock, flags);
|
|
||||||
|
|
||||||
order = get_order(size);
|
order = get_order(size);
|
||||||
if (order < 10)
|
if (order < 10)
|
||||||
free_pages((unsigned long)cpu, order);
|
free_pages((unsigned long)cpu, order);
|
||||||
|
@ -253,14 +256,13 @@ static dma_addr_t dma_4v_map_page(struct device *dev, struct page *page,
|
||||||
npages = IO_PAGE_ALIGN(oaddr + sz) - (oaddr & IO_PAGE_MASK);
|
npages = IO_PAGE_ALIGN(oaddr + sz) - (oaddr & IO_PAGE_MASK);
|
||||||
npages >>= IO_PAGE_SHIFT;
|
npages >>= IO_PAGE_SHIFT;
|
||||||
|
|
||||||
spin_lock_irqsave(&iommu->lock, flags);
|
entry = iommu_tbl_range_alloc(dev, &iommu->tbl, npages, NULL,
|
||||||
entry = iommu_range_alloc(dev, iommu, npages, NULL);
|
__this_cpu_read(iommu_pool_hash));
|
||||||
spin_unlock_irqrestore(&iommu->lock, flags);
|
|
||||||
|
|
||||||
if (unlikely(entry == DMA_ERROR_CODE))
|
if (unlikely(entry == DMA_ERROR_CODE))
|
||||||
goto bad;
|
goto bad;
|
||||||
|
|
||||||
bus_addr = (iommu->page_table_map_base +
|
bus_addr = (iommu->tbl.page_table_map_base +
|
||||||
(entry << IO_PAGE_SHIFT));
|
(entry << IO_PAGE_SHIFT));
|
||||||
ret = bus_addr | (oaddr & ~IO_PAGE_MASK);
|
ret = bus_addr | (oaddr & ~IO_PAGE_MASK);
|
||||||
base_paddr = __pa(oaddr & IO_PAGE_MASK);
|
base_paddr = __pa(oaddr & IO_PAGE_MASK);
|
||||||
|
@ -290,11 +292,7 @@ static dma_addr_t dma_4v_map_page(struct device *dev, struct page *page,
|
||||||
return DMA_ERROR_CODE;
|
return DMA_ERROR_CODE;
|
||||||
|
|
||||||
iommu_map_fail:
|
iommu_map_fail:
|
||||||
/* Interrupts are disabled. */
|
iommu_tbl_range_free(&iommu->tbl, bus_addr, npages, false, NULL);
|
||||||
spin_lock(&iommu->lock);
|
|
||||||
iommu_range_free(iommu, bus_addr, npages);
|
|
||||||
spin_unlock_irqrestore(&iommu->lock, flags);
|
|
||||||
|
|
||||||
return DMA_ERROR_CODE;
|
return DMA_ERROR_CODE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -304,7 +302,7 @@ static void dma_4v_unmap_page(struct device *dev, dma_addr_t bus_addr,
|
||||||
{
|
{
|
||||||
struct pci_pbm_info *pbm;
|
struct pci_pbm_info *pbm;
|
||||||
struct iommu *iommu;
|
struct iommu *iommu;
|
||||||
unsigned long flags, npages;
|
unsigned long npages;
|
||||||
long entry;
|
long entry;
|
||||||
u32 devhandle;
|
u32 devhandle;
|
||||||
|
|
||||||
|
@ -321,22 +319,9 @@ static void dma_4v_unmap_page(struct device *dev, dma_addr_t bus_addr,
|
||||||
npages = IO_PAGE_ALIGN(bus_addr + sz) - (bus_addr & IO_PAGE_MASK);
|
npages = IO_PAGE_ALIGN(bus_addr + sz) - (bus_addr & IO_PAGE_MASK);
|
||||||
npages >>= IO_PAGE_SHIFT;
|
npages >>= IO_PAGE_SHIFT;
|
||||||
bus_addr &= IO_PAGE_MASK;
|
bus_addr &= IO_PAGE_MASK;
|
||||||
|
entry = (bus_addr - iommu->tbl.page_table_map_base) >> IO_PAGE_SHIFT;
|
||||||
spin_lock_irqsave(&iommu->lock, flags);
|
dma_4v_iommu_demap(&devhandle, entry, npages);
|
||||||
|
iommu_tbl_range_free(&iommu->tbl, bus_addr, npages, false, NULL);
|
||||||
iommu_range_free(iommu, bus_addr, npages);
|
|
||||||
|
|
||||||
entry = (bus_addr - iommu->page_table_map_base) >> IO_PAGE_SHIFT;
|
|
||||||
do {
|
|
||||||
unsigned long num;
|
|
||||||
|
|
||||||
num = pci_sun4v_iommu_demap(devhandle, HV_PCI_TSBID(0, entry),
|
|
||||||
npages);
|
|
||||||
entry += num;
|
|
||||||
npages -= num;
|
|
||||||
} while (npages != 0);
|
|
||||||
|
|
||||||
spin_unlock_irqrestore(&iommu->lock, flags);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int dma_4v_map_sg(struct device *dev, struct scatterlist *sglist,
|
static int dma_4v_map_sg(struct device *dev, struct scatterlist *sglist,
|
||||||
|
@ -371,14 +356,14 @@ static int dma_4v_map_sg(struct device *dev, struct scatterlist *sglist,
|
||||||
/* Init first segment length for backout at failure */
|
/* Init first segment length for backout at failure */
|
||||||
outs->dma_length = 0;
|
outs->dma_length = 0;
|
||||||
|
|
||||||
spin_lock_irqsave(&iommu->lock, flags);
|
local_irq_save(flags);
|
||||||
|
|
||||||
iommu_batch_start(dev, prot, ~0UL);
|
iommu_batch_start(dev, prot, ~0UL);
|
||||||
|
|
||||||
max_seg_size = dma_get_max_seg_size(dev);
|
max_seg_size = dma_get_max_seg_size(dev);
|
||||||
seg_boundary_size = ALIGN(dma_get_seg_boundary(dev) + 1,
|
seg_boundary_size = ALIGN(dma_get_seg_boundary(dev) + 1,
|
||||||
IO_PAGE_SIZE) >> IO_PAGE_SHIFT;
|
IO_PAGE_SIZE) >> IO_PAGE_SHIFT;
|
||||||
base_shift = iommu->page_table_map_base >> IO_PAGE_SHIFT;
|
base_shift = iommu->tbl.page_table_map_base >> IO_PAGE_SHIFT;
|
||||||
for_each_sg(sglist, s, nelems, i) {
|
for_each_sg(sglist, s, nelems, i) {
|
||||||
unsigned long paddr, npages, entry, out_entry = 0, slen;
|
unsigned long paddr, npages, entry, out_entry = 0, slen;
|
||||||
|
|
||||||
|
@ -391,7 +376,8 @@ static int dma_4v_map_sg(struct device *dev, struct scatterlist *sglist,
|
||||||
/* Allocate iommu entries for that segment */
|
/* Allocate iommu entries for that segment */
|
||||||
paddr = (unsigned long) SG_ENT_PHYS_ADDRESS(s);
|
paddr = (unsigned long) SG_ENT_PHYS_ADDRESS(s);
|
||||||
npages = iommu_num_pages(paddr, slen, IO_PAGE_SIZE);
|
npages = iommu_num_pages(paddr, slen, IO_PAGE_SIZE);
|
||||||
entry = iommu_range_alloc(dev, iommu, npages, &handle);
|
entry = iommu_tbl_range_alloc(dev, &iommu->tbl, npages, &handle,
|
||||||
|
__this_cpu_read(iommu_pool_hash));
|
||||||
|
|
||||||
/* Handle failure */
|
/* Handle failure */
|
||||||
if (unlikely(entry == DMA_ERROR_CODE)) {
|
if (unlikely(entry == DMA_ERROR_CODE)) {
|
||||||
|
@ -404,7 +390,7 @@ static int dma_4v_map_sg(struct device *dev, struct scatterlist *sglist,
|
||||||
iommu_batch_new_entry(entry);
|
iommu_batch_new_entry(entry);
|
||||||
|
|
||||||
/* Convert entry to a dma_addr_t */
|
/* Convert entry to a dma_addr_t */
|
||||||
dma_addr = iommu->page_table_map_base +
|
dma_addr = iommu->tbl.page_table_map_base +
|
||||||
(entry << IO_PAGE_SHIFT);
|
(entry << IO_PAGE_SHIFT);
|
||||||
dma_addr |= (s->offset & ~IO_PAGE_MASK);
|
dma_addr |= (s->offset & ~IO_PAGE_MASK);
|
||||||
|
|
||||||
|
@ -451,7 +437,7 @@ static int dma_4v_map_sg(struct device *dev, struct scatterlist *sglist,
|
||||||
if (unlikely(err < 0L))
|
if (unlikely(err < 0L))
|
||||||
goto iommu_map_failed;
|
goto iommu_map_failed;
|
||||||
|
|
||||||
spin_unlock_irqrestore(&iommu->lock, flags);
|
local_irq_restore(flags);
|
||||||
|
|
||||||
if (outcount < incount) {
|
if (outcount < incount) {
|
||||||
outs = sg_next(outs);
|
outs = sg_next(outs);
|
||||||
|
@ -469,7 +455,8 @@ static int dma_4v_map_sg(struct device *dev, struct scatterlist *sglist,
|
||||||
vaddr = s->dma_address & IO_PAGE_MASK;
|
vaddr = s->dma_address & IO_PAGE_MASK;
|
||||||
npages = iommu_num_pages(s->dma_address, s->dma_length,
|
npages = iommu_num_pages(s->dma_address, s->dma_length,
|
||||||
IO_PAGE_SIZE);
|
IO_PAGE_SIZE);
|
||||||
iommu_range_free(iommu, vaddr, npages);
|
iommu_tbl_range_free(&iommu->tbl, vaddr, npages,
|
||||||
|
false, NULL);
|
||||||
/* XXX demap? XXX */
|
/* XXX demap? XXX */
|
||||||
s->dma_address = DMA_ERROR_CODE;
|
s->dma_address = DMA_ERROR_CODE;
|
||||||
s->dma_length = 0;
|
s->dma_length = 0;
|
||||||
|
@ -477,7 +464,7 @@ static int dma_4v_map_sg(struct device *dev, struct scatterlist *sglist,
|
||||||
if (s == outs)
|
if (s == outs)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
spin_unlock_irqrestore(&iommu->lock, flags);
|
local_irq_restore(flags);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -489,7 +476,7 @@ static void dma_4v_unmap_sg(struct device *dev, struct scatterlist *sglist,
|
||||||
struct pci_pbm_info *pbm;
|
struct pci_pbm_info *pbm;
|
||||||
struct scatterlist *sg;
|
struct scatterlist *sg;
|
||||||
struct iommu *iommu;
|
struct iommu *iommu;
|
||||||
unsigned long flags;
|
unsigned long flags, entry;
|
||||||
u32 devhandle;
|
u32 devhandle;
|
||||||
|
|
||||||
BUG_ON(direction == DMA_NONE);
|
BUG_ON(direction == DMA_NONE);
|
||||||
|
@ -498,33 +485,27 @@ static void dma_4v_unmap_sg(struct device *dev, struct scatterlist *sglist,
|
||||||
pbm = dev->archdata.host_controller;
|
pbm = dev->archdata.host_controller;
|
||||||
devhandle = pbm->devhandle;
|
devhandle = pbm->devhandle;
|
||||||
|
|
||||||
spin_lock_irqsave(&iommu->lock, flags);
|
local_irq_save(flags);
|
||||||
|
|
||||||
sg = sglist;
|
sg = sglist;
|
||||||
while (nelems--) {
|
while (nelems--) {
|
||||||
dma_addr_t dma_handle = sg->dma_address;
|
dma_addr_t dma_handle = sg->dma_address;
|
||||||
unsigned int len = sg->dma_length;
|
unsigned int len = sg->dma_length;
|
||||||
unsigned long npages, entry;
|
unsigned long npages;
|
||||||
|
struct iommu_table *tbl = &iommu->tbl;
|
||||||
|
unsigned long shift = IO_PAGE_SHIFT;
|
||||||
|
|
||||||
if (!len)
|
if (!len)
|
||||||
break;
|
break;
|
||||||
npages = iommu_num_pages(dma_handle, len, IO_PAGE_SIZE);
|
npages = iommu_num_pages(dma_handle, len, IO_PAGE_SIZE);
|
||||||
iommu_range_free(iommu, dma_handle, npages);
|
entry = ((dma_handle - tbl->page_table_map_base) >> shift);
|
||||||
|
dma_4v_iommu_demap(&devhandle, entry, npages);
|
||||||
entry = ((dma_handle - iommu->page_table_map_base) >> IO_PAGE_SHIFT);
|
iommu_tbl_range_free(&iommu->tbl, dma_handle, npages,
|
||||||
while (npages) {
|
false, NULL);
|
||||||
unsigned long num;
|
|
||||||
|
|
||||||
num = pci_sun4v_iommu_demap(devhandle, HV_PCI_TSBID(0, entry),
|
|
||||||
npages);
|
|
||||||
entry += num;
|
|
||||||
npages -= num;
|
|
||||||
}
|
|
||||||
|
|
||||||
sg = sg_next(sg);
|
sg = sg_next(sg);
|
||||||
}
|
}
|
||||||
|
|
||||||
spin_unlock_irqrestore(&iommu->lock, flags);
|
local_irq_restore(flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct dma_map_ops sun4v_dma_ops = {
|
static struct dma_map_ops sun4v_dma_ops = {
|
||||||
|
@ -536,6 +517,8 @@ static struct dma_map_ops sun4v_dma_ops = {
|
||||||
.unmap_sg = dma_4v_unmap_sg,
|
.unmap_sg = dma_4v_unmap_sg,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static struct iommu_tbl_ops dma_4v_iommu_ops;
|
||||||
|
|
||||||
static void pci_sun4v_scan_bus(struct pci_pbm_info *pbm, struct device *parent)
|
static void pci_sun4v_scan_bus(struct pci_pbm_info *pbm, struct device *parent)
|
||||||
{
|
{
|
||||||
struct property *prop;
|
struct property *prop;
|
||||||
|
@ -550,30 +533,33 @@ static void pci_sun4v_scan_bus(struct pci_pbm_info *pbm, struct device *parent)
|
||||||
}
|
}
|
||||||
|
|
||||||
static unsigned long probe_existing_entries(struct pci_pbm_info *pbm,
|
static unsigned long probe_existing_entries(struct pci_pbm_info *pbm,
|
||||||
struct iommu *iommu)
|
struct iommu_table *iommu)
|
||||||
{
|
{
|
||||||
struct iommu_arena *arena = &iommu->arena;
|
struct iommu_pool *pool;
|
||||||
unsigned long i, cnt = 0;
|
unsigned long i, pool_nr, cnt = 0;
|
||||||
u32 devhandle;
|
u32 devhandle;
|
||||||
|
|
||||||
devhandle = pbm->devhandle;
|
devhandle = pbm->devhandle;
|
||||||
for (i = 0; i < arena->limit; i++) {
|
for (pool_nr = 0; pool_nr < iommu->nr_pools; pool_nr++) {
|
||||||
unsigned long ret, io_attrs, ra;
|
pool = &(iommu->arena_pool[pool_nr]);
|
||||||
|
for (i = pool->start; i <= pool->end; i++) {
|
||||||
|
unsigned long ret, io_attrs, ra;
|
||||||
|
|
||||||
ret = pci_sun4v_iommu_getmap(devhandle,
|
ret = pci_sun4v_iommu_getmap(devhandle,
|
||||||
HV_PCI_TSBID(0, i),
|
HV_PCI_TSBID(0, i),
|
||||||
&io_attrs, &ra);
|
&io_attrs, &ra);
|
||||||
if (ret == HV_EOK) {
|
if (ret == HV_EOK) {
|
||||||
if (page_in_phys_avail(ra)) {
|
if (page_in_phys_avail(ra)) {
|
||||||
pci_sun4v_iommu_demap(devhandle,
|
pci_sun4v_iommu_demap(devhandle,
|
||||||
HV_PCI_TSBID(0, i), 1);
|
HV_PCI_TSBID(0,
|
||||||
} else {
|
i), 1);
|
||||||
cnt++;
|
} else {
|
||||||
__set_bit(i, arena->map);
|
cnt++;
|
||||||
|
__set_bit(i, iommu->map);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return cnt;
|
return cnt;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -601,22 +587,22 @@ static int pci_sun4v_iommu_init(struct pci_pbm_info *pbm)
|
||||||
dma_offset = vdma[0];
|
dma_offset = vdma[0];
|
||||||
|
|
||||||
/* Setup initial software IOMMU state. */
|
/* Setup initial software IOMMU state. */
|
||||||
spin_lock_init(&iommu->lock);
|
|
||||||
iommu->ctx_lowest_free = 1;
|
iommu->ctx_lowest_free = 1;
|
||||||
iommu->page_table_map_base = dma_offset;
|
iommu->tbl.page_table_map_base = dma_offset;
|
||||||
iommu->dma_addr_mask = dma_mask;
|
iommu->dma_addr_mask = dma_mask;
|
||||||
|
|
||||||
/* Allocate and initialize the free area map. */
|
/* Allocate and initialize the free area map. */
|
||||||
sz = (num_tsb_entries + 7) / 8;
|
sz = (num_tsb_entries + 7) / 8;
|
||||||
sz = (sz + 7UL) & ~7UL;
|
sz = (sz + 7UL) & ~7UL;
|
||||||
iommu->arena.map = kzalloc(sz, GFP_KERNEL);
|
iommu->tbl.map = kzalloc(sz, GFP_KERNEL);
|
||||||
if (!iommu->arena.map) {
|
if (!iommu->tbl.map) {
|
||||||
printk(KERN_ERR PFX "Error, kmalloc(arena.map) failed.\n");
|
printk(KERN_ERR PFX "Error, kmalloc(arena.map) failed.\n");
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
iommu->arena.limit = num_tsb_entries;
|
iommu_tbl_pool_init(&iommu->tbl, num_tsb_entries, IO_PAGE_SHIFT,
|
||||||
|
&dma_4v_iommu_ops, false /* no large_pool */,
|
||||||
sz = probe_existing_entries(pbm, iommu);
|
0 /* default npools */);
|
||||||
|
sz = probe_existing_entries(pbm, &iommu->tbl);
|
||||||
if (sz)
|
if (sz)
|
||||||
printk("%s: Imported %lu TSB entries from OBP\n",
|
printk("%s: Imported %lu TSB entries from OBP\n",
|
||||||
pbm->name, sz);
|
pbm->name, sz);
|
||||||
|
@ -1015,8 +1001,17 @@ static struct platform_driver pci_sun4v_driver = {
|
||||||
.probe = pci_sun4v_probe,
|
.probe = pci_sun4v_probe,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static void setup_iommu_pool_hash(void)
|
||||||
|
{
|
||||||
|
unsigned int i;
|
||||||
|
|
||||||
|
for_each_possible_cpu(i)
|
||||||
|
per_cpu(iommu_pool_hash, i) = hash_32(i, IOMMU_POOL_HASHBITS);
|
||||||
|
}
|
||||||
|
|
||||||
static int __init pci_sun4v_init(void)
|
static int __init pci_sun4v_init(void)
|
||||||
{
|
{
|
||||||
|
setup_iommu_pool_hash();
|
||||||
return platform_driver_register(&pci_sun4v_driver);
|
return platform_driver_register(&pci_sun4v_driver);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue