mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
swiotlb: Defer swiotlb init printing, export swiotlb_print_info()
This enables us to avoid printing swiotlb memory info when we initialize swiotlb. After swiotlb initialization, we could find that we don't need swiotlb. This patch removes the code to print swiotlb memory info in swiotlb_init() and exports the function to do that. Signed-off-by: FUJITA Tomonori <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] LKML-Reference: <[email protected]> [ -v2: merge up conflict ] Signed-off-by: Ingo Molnar <[email protected]>
This commit is contained in:
parent
5740afdb68
commit
ad32e8cb86
6 changed files with 15 additions and 15 deletions
|
|
@ -123,8 +123,9 @@ static dma_addr_t swiotlb_virt_to_bus(struct device *hwdev,
|
|||
return phys_to_dma(hwdev, virt_to_phys(address));
|
||||
}
|
||||
|
||||
static void swiotlb_print_info(unsigned long bytes)
|
||||
void swiotlb_print_info(void)
|
||||
{
|
||||
unsigned long bytes = io_tlb_nslabs << IO_TLB_SHIFT;
|
||||
phys_addr_t pstart, pend;
|
||||
|
||||
pstart = virt_to_phys(io_tlb_start);
|
||||
|
|
@ -142,7 +143,7 @@ static void swiotlb_print_info(unsigned long bytes)
|
|||
* structures for the software IO TLB used to implement the DMA API.
|
||||
*/
|
||||
void __init
|
||||
swiotlb_init_with_default_size(size_t default_size)
|
||||
swiotlb_init_with_default_size(size_t default_size, int verbose)
|
||||
{
|
||||
unsigned long i, bytes;
|
||||
|
||||
|
|
@ -178,14 +179,14 @@ swiotlb_init_with_default_size(size_t default_size)
|
|||
io_tlb_overflow_buffer = alloc_bootmem_low(io_tlb_overflow);
|
||||
if (!io_tlb_overflow_buffer)
|
||||
panic("Cannot allocate SWIOTLB overflow buffer!\n");
|
||||
|
||||
swiotlb_print_info(bytes);
|
||||
if (verbose)
|
||||
swiotlb_print_info();
|
||||
}
|
||||
|
||||
void __init
|
||||
swiotlb_init(void)
|
||||
swiotlb_init(int verbose)
|
||||
{
|
||||
swiotlb_init_with_default_size(64 * (1<<20)); /* default to 64MB */
|
||||
swiotlb_init_with_default_size(64 * (1<<20), verbose); /* default to 64MB */
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -262,7 +263,7 @@ swiotlb_late_init_with_default_size(size_t default_size)
|
|||
if (!io_tlb_overflow_buffer)
|
||||
goto cleanup4;
|
||||
|
||||
swiotlb_print_info(bytes);
|
||||
swiotlb_print_info();
|
||||
|
||||
late_alloc = 1;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue