Commit 79db2b74 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'stable/for-linus-5.10' of... 

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

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
parents defb53a7 b51e6271

arch/x86/pci/sta2x11-fixup.c

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <asm/iommu.h>



#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

include/linux/swiotlb.h

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ int swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose); 
extern unsigned long swiotlb_nr_tbl(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_default_size(size_t default_size);

extern void __init swiotlb_update_mem_attributes(void);



/*

kernel/dma/swiotlb.c

+2 −4
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ static unsigned int io_tlb_index; 
 * Max segment that we can provide which (if pages are contingous) will

 * 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
@@ -172,9 +172,7 @@ void swiotlb_print_info(void) 
		return;

	}



	pr_info("mapped [mem %#010llx-%#010llx] (%luMB)\n",

	       (unsigned long long)io_tlb_start,

	       (unsigned long long)io_tlb_end,

	pr_info("mapped [mem %pa-%pa] (%luMB)\n", &io_tlb_start, &io_tlb_end,

	       bytes >> 20);

}