Skip to content

Commit

Permalink
swiotlb: clean up reporting
Browse files Browse the repository at this point in the history
This removes needless use of '%p', and refactors the printk calls to
use pr_*() helpers instead.

Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
  • Loading branch information
Kees Cook authored and Christoph Hellwig committed Jul 25, 2018
1 parent d27fb99 commit 7d63fb3
Showing 1 changed file with 8 additions and 10 deletions.
18 changes: 8 additions & 10 deletions kernel/dma/swiotlb.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
* 08/12/11 beckyb Add highmem support
*/

#define pr_fmt(fmt) "software IO TLB: " fmt

#include <linux/cache.h>
#include <linux/dma-direct.h>
#include <linux/mm.h>
Expand Down Expand Up @@ -162,20 +164,16 @@ static bool no_iotlb_memory;
void swiotlb_print_info(void)
{
unsigned long bytes = io_tlb_nslabs << IO_TLB_SHIFT;
unsigned char *vstart, *vend;

if (no_iotlb_memory) {
pr_warn("software IO TLB: No low mem\n");
pr_warn("No low mem\n");
return;
}

vstart = phys_to_virt(io_tlb_start);
vend = phys_to_virt(io_tlb_end);

printk(KERN_INFO "software IO TLB [mem %#010llx-%#010llx] (%luMB) mapped at [%p-%p]\n",
pr_info("mapped [mem %#010llx-%#010llx] (%luMB)\n",
(unsigned long long)io_tlb_start,
(unsigned long long)io_tlb_end,
bytes >> 20, vstart, vend - 1);
bytes >> 20);
}

/*
Expand Down Expand Up @@ -275,7 +273,7 @@ swiotlb_init(int verbose)
if (io_tlb_start)
memblock_free_early(io_tlb_start,
PAGE_ALIGN(io_tlb_nslabs << IO_TLB_SHIFT));
pr_warn("Cannot allocate SWIOTLB buffer");
pr_warn("Cannot allocate buffer");
no_iotlb_memory = true;
}

Expand Down Expand Up @@ -317,8 +315,8 @@ swiotlb_late_init_with_default_size(size_t default_size)
return -ENOMEM;
}
if (order != get_order(bytes)) {
printk(KERN_WARNING "Warning: only able to allocate %ld MB "
"for software IO TLB\n", (PAGE_SIZE << order) >> 20);
pr_warn("only able to allocate %ld MB\n",
(PAGE_SIZE << order) >> 20);
io_tlb_nslabs = SLABS_PER_PAGE << order;
}
rc = swiotlb_late_init_with_tbl(vstart, io_tlb_nslabs);
Expand Down

0 comments on commit 7d63fb3

Please sign in to comment.