Commit 7d63fb3a authored by Kees Cook's avatar Kees Cook Committed by Christoph Hellwig

swiotlb: clean up reporting

This removes needless use of '%p', and refactors the printk calls to
use pr_*() helpers instead.
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Reviewed-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent d27fb99f
...@@ -17,6 +17,8 @@ ...@@ -17,6 +17,8 @@
* 08/12/11 beckyb Add highmem support * 08/12/11 beckyb Add highmem support
*/ */
#define pr_fmt(fmt) "software IO TLB: " fmt
#include <linux/cache.h> #include <linux/cache.h>
#include <linux/dma-direct.h> #include <linux/dma-direct.h>
#include <linux/mm.h> #include <linux/mm.h>
...@@ -162,20 +164,16 @@ static bool no_iotlb_memory; ...@@ -162,20 +164,16 @@ static bool no_iotlb_memory;
void swiotlb_print_info(void) void swiotlb_print_info(void)
{ {
unsigned long bytes = io_tlb_nslabs << IO_TLB_SHIFT; unsigned long bytes = io_tlb_nslabs << IO_TLB_SHIFT;
unsigned char *vstart, *vend;
if (no_iotlb_memory) { if (no_iotlb_memory) {
pr_warn("software IO TLB: No low mem\n"); pr_warn("No low mem\n");
return; return;
} }
vstart = phys_to_virt(io_tlb_start); pr_info("mapped [mem %#010llx-%#010llx] (%luMB)\n",
vend = phys_to_virt(io_tlb_end);
printk(KERN_INFO "software IO TLB [mem %#010llx-%#010llx] (%luMB) mapped at [%p-%p]\n",
(unsigned long long)io_tlb_start, (unsigned long long)io_tlb_start,
(unsigned long long)io_tlb_end, (unsigned long long)io_tlb_end,
bytes >> 20, vstart, vend - 1); bytes >> 20);
} }
/* /*
...@@ -275,7 +273,7 @@ swiotlb_init(int verbose) ...@@ -275,7 +273,7 @@ swiotlb_init(int verbose)
if (io_tlb_start) if (io_tlb_start)
memblock_free_early(io_tlb_start, memblock_free_early(io_tlb_start,
PAGE_ALIGN(io_tlb_nslabs << IO_TLB_SHIFT)); PAGE_ALIGN(io_tlb_nslabs << IO_TLB_SHIFT));
pr_warn("Cannot allocate SWIOTLB buffer"); pr_warn("Cannot allocate buffer");
no_iotlb_memory = true; no_iotlb_memory = true;
} }
...@@ -317,8 +315,8 @@ swiotlb_late_init_with_default_size(size_t default_size) ...@@ -317,8 +315,8 @@ swiotlb_late_init_with_default_size(size_t default_size)
return -ENOMEM; return -ENOMEM;
} }
if (order != get_order(bytes)) { if (order != get_order(bytes)) {
printk(KERN_WARNING "Warning: only able to allocate %ld MB " pr_warn("only able to allocate %ld MB\n",
"for software IO TLB\n", (PAGE_SIZE << order) >> 20); (PAGE_SIZE << order) >> 20);
io_tlb_nslabs = SLABS_PER_PAGE << order; io_tlb_nslabs = SLABS_PER_PAGE << order;
} }
rc = swiotlb_late_init_with_tbl(vstart, io_tlb_nslabs); rc = swiotlb_late_init_with_tbl(vstart, io_tlb_nslabs);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment