Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f21ffe9f6da6d3a69c518b7345c198d48d941c34

Authored by Konrad Rzeszutek Wilk
Committed by Dave Airlie
1 parent bcdd6b2fd6
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

swiotlb: Expose swiotlb_nr_tlb function to modules 

As a mechanism to detect whether SWIOTLB is enabled or not.
We also fix the spelling - it was swioltb instead of
swiotlb.

CC: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
[v1: Ripped out swiotlb_enabled]
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

Showing 3 changed files with 5 additions and 4 deletions Side-by-side Diff

drivers/xen/swiotlb-xen.c
Diff comments   View file @ f21ffe9
... ... @@ -153,7 +153,7 @@
153 153 char *m = NULL;
154 154 unsigned int repeat = 3;
155 155  
156   - nr_tbl = swioltb_nr_tbl();
  156 + nr_tbl = swiotlb_nr_tbl();
157 157 if (nr_tbl)
158 158 xen_io_tlb_nslabs = nr_tbl;
159 159 else {
include/linux/swiotlb.h
Diff comments   View file @ f21ffe9
... ... @@ -24,7 +24,7 @@
24 24  
25 25 extern void swiotlb_init(int verbose);
26 26 extern void swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose);
27   -extern unsigned long swioltb_nr_tbl(void);
  27 +extern unsigned long swiotlb_nr_tbl(void);
28 28  
29 29 /*
30 30 * Enumeration for sync targets
... ... @@ -110,11 +110,11 @@
110 110 __setup("swiotlb=", setup_io_tlb_npages);
111 111 /* make io_tlb_overflow tunable too? */
112 112  
113   -unsigned long swioltb_nr_tbl(void)
  113 +unsigned long swiotlb_nr_tbl(void)
114 114 {
115 115 return io_tlb_nslabs;
116 116 }
117   -
  117 +EXPORT_SYMBOL_GPL(swiotlb_nr_tbl);
118 118 /* Note that this doesn't work with highmem page */
119 119 static dma_addr_t swiotlb_virt_to_bus(struct device *hwdev,
120 120 volatile void *address)
... ... @@ -321,6 +321,7 @@
321 321 free_bootmem_late(__pa(io_tlb_start),
322 322 PAGE_ALIGN(io_tlb_nslabs << IO_TLB_SHIFT));
323 323 }
  324 + io_tlb_nslabs = 0;
324 325 }
325 326  
326 327 static int is_swiotlb_buffer(phys_addr_t paddr)