hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stable/xen-swiotlb.bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6 

* 'stable/xen-swiotlb.bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6:
  swiotlb: Export swioltb_nr_tbl and utilize it as appropiate.
This commit is contained in:
Linus Torvalds 2011-06-09 12:52:44 -07:00
parent 90494cc567 5f98ecdbce
commit 361932bf84
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/xen/swiotlb-xen.c
View File

@ -147,9 +147,15 @@ void __init xen_swiotlb_init(int verbose)
{ {
unsigned long bytes; unsigned long bytes;
int rc; int rc;
unsigned long nr_tbl;
xen_io_tlb_nslabs = (64 * 1024 * 1024 >> IO_TLB_SHIFT); nr_tbl = swioltb_nr_tbl();
xen_io_tlb_nslabs = ALIGN(xen_io_tlb_nslabs, IO_TLB_SEGSIZE); if (nr_tbl)
xen_io_tlb_nslabs = nr_tbl;
else {
xen_io_tlb_nslabs = (64 * 1024 * 1024 >> IO_TLB_SHIFT);
xen_io_tlb_nslabs = ALIGN(xen_io_tlb_nslabs, IO_TLB_SEGSIZE);
}
bytes = xen_io_tlb_nslabs << IO_TLB_SHIFT; bytes = xen_io_tlb_nslabs << IO_TLB_SHIFT;

1
include/linux/swiotlb.h
View File

@ -24,6 +24,7 @@ extern int swiotlb_force;
extern void swiotlb_init(int verbose); extern void swiotlb_init(int verbose);
extern void swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose); extern void swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose);
extern unsigned long swioltb_nr_tbl(void);
/* /*
* Enumeration for sync targets * Enumeration for sync targets

5
lib/swiotlb.c
View File

@ -110,6 +110,11 @@ setup_io_tlb_npages(char *str)
__setup("swiotlb=", setup_io_tlb_npages); __setup("swiotlb=", setup_io_tlb_npages);
/* make io_tlb_overflow tunable too? */ /* make io_tlb_overflow tunable too? */
unsigned long swioltb_nr_tbl(void)
{
return io_tlb_nslabs;
}
/* Note that this doesn't work with highmem page */ /* Note that this doesn't work with highmem page */
static dma_addr_t swiotlb_virt_to_bus(struct device *hwdev, static dma_addr_t swiotlb_virt_to_bus(struct device *hwdev,
volatile void *address) volatile void *address)