xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'stable/for-linus-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb

Browse Source 
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
This commit is contained in:
Linus Torvalds
2020-10-14 12:00:02 -07:00
parent defb53a7c7 b51e627158
commit 79db2b74aa
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/pci/sta2x11-fixup.c
View File

@@ -15,7 +15,6 @@
#include <asm/iommu.h> #include <asm/iommu.h>
#define STA2X11_SWIOTLB_SIZE (4*1024*1024) #define STA2X11_SWIOTLB_SIZE (4*1024*1024)
extern int swiotlb_late_init_with_default_size(size_t default_size);
/* /*
* We build a list of bus numbers that are under the ConneXt. The * We build a list of bus numbers that are under the ConneXt. The

1
include/linux/swiotlb.h
View File

@@ -34,6 +34,7 @@ int swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose);
extern unsigned long swiotlb_nr_tbl(void); extern unsigned long swiotlb_nr_tbl(void);
unsigned long swiotlb_size_or_default(void); unsigned long swiotlb_size_or_default(void);
extern int swiotlb_late_init_with_tbl(char *tlb, unsigned long nslabs); extern int swiotlb_late_init_with_tbl(char *tlb, unsigned long nslabs);
extern int swiotlb_late_init_with_default_size(size_t default_size);
extern void __init swiotlb_update_mem_attributes(void); extern void __init swiotlb_update_mem_attributes(void);
/* /*

6
kernel/dma/swiotlb.c
View File

@@ -93,7 +93,7 @@ static unsigned int io_tlb_index;
* Max segment that we can provide which (if pages are contingous) will * Max segment that we can provide which (if pages are contingous) will
* not be bounced (unless SWIOTLB_FORCE is set). * not be bounced (unless SWIOTLB_FORCE is set).
*/ */
unsigned int max_segment; static unsigned int max_segment;
/* /*
* We need to save away the original address corresponding to a mapped entry * We need to save away the original address corresponding to a mapped entry
@@ -172,9 +172,7 @@ void swiotlb_print_info(void)
return; return;
} }
pr_info("mapped [mem %#010llx-%#010llx] (%luMB)\n", pr_info("mapped [mem %pa-%pa] (%luMB)\n", &io_tlb_start, &io_tlb_end,
(unsigned long long)io_tlb_start,
(unsigned long long)io_tlb_end,
bytes >> 20); bytes >> 20);
} }