History

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

Linus Torvalds committed 6 years ago

Commit 79db2b72 parents defb53a b51e6273 files · +3 −5Browse files

Unified · Split

3 files
  1. arch/x86/pci/sta2x11-fixup.c +0 −1
  2. include/linux/swiotlb.h +1 −0
  3. kernel/dma/swiotlb.c +2 −4
arch/x86/pci/sta2x11-fixup.c+0−1
@@ -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)
18extern 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. The20 * We build a list of bus numbers that are under the ConneXt. The
include/linux/swiotlb.h+1−0
@@ -34,6 +34,7 @@ int swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose); · 33 unmodified lines
34extern unsigned long swiotlb_nr_tbl(void);34extern unsigned long swiotlb_nr_tbl(void);
35unsigned long swiotlb_size_or_default(void);35unsigned long swiotlb_size_or_default(void);
36extern int swiotlb_late_init_with_tbl(char *tlb, unsigned long nslabs);36extern int swiotlb_late_init_with_tbl(char *tlb, unsigned long nslabs);
37extern int swiotlb_late_init_with_default_size(size_t default_size);
37extern void __init swiotlb_update_mem_attributes(void);38extern void __init swiotlb_update_mem_attributes(void);
38 39
39/*40/*
kernel/dma/swiotlb.c+2−4
@@ -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) will93 * 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 */
96unsigned int max_segment;96static unsigned int max_segment;
97 97
98/*98/*
99 * We need to save away the original address corresponding to a mapped entry99 * 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

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t