Commit 0d5ffd9a authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

swiotlb: rename swiotlb_late_init_with_default_size 



swiotlb_late_init_with_default_size is an overly verbose name that
doesn't even catch what the function is doing, given that the size is
not just a default but the actual requested size.

Rename it to swiotlb_init_late.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Reviewed-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tested-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
parent a2daa27c

arch/x86/pci/sta2x11-fixup.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static void sta2x11_new_instance(struct pci_dev *pdev) 
		int size = STA2X11_SWIOTLB_SIZE;

		/* First instance: register your own swiotlb area */

		dev_info(&pdev->dev, "Using SWIOTLB (size %i)\n", size);

		if (swiotlb_late_init_with_default_size(size))

		if (swiotlb_init_late(size))

			dev_emerg(&pdev->dev, "init swiotlb failed\n");

	}

	list_add(&instance->list, &sta2x11_instance_list);

include/linux/swiotlb.h

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ extern void swiotlb_init(int verbose); 
int swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose);

unsigned long swiotlb_size_or_default(void);

extern int swiotlb_late_init_with_tbl(char *tlb, unsigned long nslabs);

extern int swiotlb_late_init_with_default_size(size_t default_size);

int swiotlb_init_late(size_t size);

extern void __init swiotlb_update_mem_attributes(void);



phys_addr_t swiotlb_tbl_map_single(struct device *hwdev, phys_addr_t phys,

kernel/dma/swiotlb.c

+2 −4
Original line number Diff line number Diff line
@@ -281,11 +281,9 @@ swiotlb_init(int verbose) 
 * initialize the swiotlb later using the slab allocator if needed.

 * This should be just like above, but with some error catching.

 */

int

swiotlb_late_init_with_default_size(size_t default_size)

int swiotlb_init_late(size_t size)

{

	unsigned long nslabs =

		ALIGN(default_size >> IO_TLB_SHIFT, IO_TLB_SEGSIZE);

	unsigned long nslabs = ALIGN(size >> IO_TLB_SHIFT, IO_TLB_SEGSIZE);

	unsigned long bytes;

	unsigned char *vstart = NULL;

	unsigned int order;