Pull swiotlb updates from Konrad Rzeszutek Wilk: "Minor enhancement of using %p to print phys_addr_r and also compiler warnings" * 'stable/for-linus-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb: swiotlb: Mark max_segment with static keyword swiotlb: Declare swiotlb_late_init_with_default_size() in header swiotlb: Use %pa to print phys_addr_t variables
Unified · Split
| @@ -15,7 +15,6 @@ · 14 unmodified lines | |||
| 15 | #include <asm/iommu.h> | 15 | #include <asm/iommu.h> |
| 16 | 16 | ||
| 17 | #define STA2X11_SWIOTLB_SIZE (4*1024*1024) | 17 | #define STA2X11_SWIOTLB_SIZE (4*1024*1024) |
| 18 | extern int swiotlb_late_init_with_default_size(size_t default_size); | ||
| 19 | 18 | ||
| 20 | /* | 19 | /* |
| 21 | * We build a list of bus numbers that are under the ConneXt. The | 20 | * We build a list of bus numbers that are under the ConneXt. The |
| @@ -34,6 +34,7 @@ int swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose); · 33 unmodified lines | |||
| 34 | extern unsigned long swiotlb_nr_tbl(void); | 34 | extern unsigned long swiotlb_nr_tbl(void); |
| 35 | unsigned long swiotlb_size_or_default(void); | 35 | unsigned long swiotlb_size_or_default(void); |
| 36 | extern int swiotlb_late_init_with_tbl(char *tlb, unsigned long nslabs); | 36 | extern int swiotlb_late_init_with_tbl(char *tlb, unsigned long nslabs); |
| 37 | extern int swiotlb_late_init_with_default_size(size_t default_size); | ||
| 37 | extern void __init swiotlb_update_mem_attributes(void); | 38 | extern void __init swiotlb_update_mem_attributes(void); |
| 38 | 39 | ||
| 39 | /* | 40 | /* |
| @@ -93,7 +93,7 @@ static unsigned int io_tlb_index; · 92 unmodified lines | |||
| 93 | * Max segment that we can provide which (if pages are contingous) will | 93 | * Max segment that we can provide which (if pages are contingous) will |
| 94 | * not be bounced (unless SWIOTLB_FORCE is set). | 94 | * not be bounced (unless SWIOTLB_FORCE is set). |
| 95 | */ | 95 | */ |
| 96 | unsigned int max_segment; | 96 | static unsigned int max_segment; |
| 97 | 97 | ||
| 98 | /* | 98 | /* |
| 99 | * We need to save away the original address corresponding to a mapped entry | 99 | * We need to save away the original address corresponding to a mapped entry |
| @@ -172,9 +172,7 @@ void swiotlb_print_info(void) · 72 unmodified lines | |||
| 172 | return; | 172 | return; |
| 173 | } | 173 | } |
| 174 | 174 | ||
| 175 | pr_info("mapped [mem %#010llx-%#010llx] (%luMB)\n", | 175 | pr_info("mapped [mem %pa-%pa] (%luMB)\n", &io_tlb_start, &io_tlb_end, |
| 176 | (unsigned long long)io_tlb_start, | ||
| 177 | (unsigned long long)io_tlb_end, | ||
| 178 | bytes >> 20); | 176 | bytes >> 20); |
| 179 | } | 177 | } |
| 180 | 178 | ||