Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c873dfa0 authored by Kees Cook's avatar Kees Cook Committed by Greg Kroah-Hartman
Browse files

swiotlb: clean up reporting 



commit 7d63fb3af87aa67aa7d24466e792f9d7c57d8e79 upstream.

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>
[bwh: Backported to 4.4:
 - Adjust filename
 - Remove "swiotlb: " prefix from an additional log message]
Signed-off-by: default avatarBen Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0d547583

lib/swiotlb.c

+9 −11
Original line number Diff line number Diff line
@@ -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-mapping.h>

#include <linux/mm.h>
@@ -143,20 +145,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);

}



int __init swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose)
@@ -230,7 +228,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;

}
@@ -272,8 +270,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);
@@ -680,7 +678,7 @@ swiotlb_alloc_coherent(struct device *hwdev, size_t size, 
	return ret;



err_warn:

	pr_warn("swiotlb: coherent allocation failed for device %s size=%zu\n",

	pr_warn("coherent allocation failed for device %s size=%zu\n",

		dev_name(hwdev), size);

	dump_stack();