Commit 05ee7741 authored by Petr Tesarik's avatar Petr Tesarik Committed by Christoph Hellwig
Browse files

swiotlb: make io_tlb_default_mem local to swiotlb.c 



SWIOTLB implementation details should not be exposed to the rest of the
kernel. This will allow to make changes to the implementation without
modifying non-swiotlb code.

To avoid breaking existing users, provide helper functions for the few
required fields.

As a bonus, using a helper function to initialize struct device allows to
get rid of an #ifdef in driver core.

Signed-off-by: default avatarPetr Tesarik <petr.tesarik.ext@huawei.com>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 0c6874a6

arch/mips/pci/pci-octeon.c

+1 −1
Original line number Diff line number Diff line
@@ -664,7 +664,7 @@ static int __init octeon_pci_setup(void) 


		/* BAR1 movable regions contiguous to cover the swiotlb */

		octeon_bar1_pci_phys =

			io_tlb_default_mem.start & ~((1ull << 22) - 1);

			default_swiotlb_base() & ~((1ull << 22) - 1);



		for (index = 0; index < 32; index++) {

			union cvmx_pci_bar1_indexx bar1_index;

drivers/base/core.c

+1 −3
Original line number Diff line number Diff line
@@ -3108,9 +3108,7 @@ void device_initialize(struct device *dev) 
    defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU_ALL)

	dev->dma_coherent = dma_default_coherent;

#endif

#ifdef CONFIG_SWIOTLB

	dev->dma_io_tlb_mem = &io_tlb_default_mem;

#endif

	swiotlb_dev_init(dev);

}

EXPORT_SYMBOL_GPL(device_initialize);

drivers/xen/swiotlb-xen.c

+1 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ xen_swiotlb_sync_sg_for_device(struct device *dev, struct scatterlist *sgl, 
static int

xen_swiotlb_dma_supported(struct device *hwdev, u64 mask)

{

	return xen_phys_to_dma(hwdev, io_tlb_default_mem.end - 1) <= mask;

	return xen_phys_to_dma(hwdev, default_swiotlb_limit()) <= mask;

}



const struct dma_map_ops xen_swiotlb_dma_ops = {

include/linux/swiotlb.h

+24 −1
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ struct io_tlb_mem { 
	atomic_long_t used_hiwater;

#endif

};

extern struct io_tlb_mem io_tlb_default_mem;



static inline bool is_swiotlb_buffer(struct device *dev, phys_addr_t paddr)

{
@@ -128,13 +127,22 @@ static inline bool is_swiotlb_force_bounce(struct device *dev) 


void swiotlb_init(bool addressing_limited, unsigned int flags);

void __init swiotlb_exit(void);

void swiotlb_dev_init(struct device *dev);

size_t swiotlb_max_mapping_size(struct device *dev);

bool is_swiotlb_allocated(void);

bool is_swiotlb_active(struct device *dev);

void __init swiotlb_adjust_size(unsigned long size);

phys_addr_t default_swiotlb_base(void);

phys_addr_t default_swiotlb_limit(void);

#else

static inline void swiotlb_init(bool addressing_limited, unsigned int flags)

{

}



static inline void swiotlb_dev_init(struct device *dev)

{

}



static inline bool is_swiotlb_buffer(struct device *dev, phys_addr_t paddr)

{

	return false;
@@ -151,6 +159,11 @@ static inline size_t swiotlb_max_mapping_size(struct device *dev) 
	return SIZE_MAX;

}



static inline bool is_swiotlb_allocated(void)

{

	return false;

}



static inline bool is_swiotlb_active(struct device *dev)

{

	return false;
@@ -159,6 +172,16 @@ static inline bool is_swiotlb_active(struct device *dev) 
static inline void swiotlb_adjust_size(unsigned long size)

{

}



static inline phys_addr_t default_swiotlb_base(void)

{

	return 0;

}



static inline phys_addr_t default_swiotlb_limit(void)

{

	return 0;

}

#endif /* CONFIG_SWIOTLB */



extern void swiotlb_print_info(void);

kernel/dma/swiotlb.c

+38 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ struct io_tlb_slot { 
static bool swiotlb_force_bounce;

static bool swiotlb_force_disable;



struct io_tlb_mem io_tlb_default_mem;

static struct io_tlb_mem io_tlb_default_mem;



static unsigned long default_nslabs = IO_TLB_DEFAULT_SIZE >> IO_TLB_SHIFT;

static unsigned long default_nareas;
@@ -489,6 +489,15 @@ void __init swiotlb_exit(void) 
	memset(mem, 0, sizeof(*mem));

}



/**

 * swiotlb_dev_init() - initialize swiotlb fields in &struct device

 * @dev:	Device to be initialized.

 */

void swiotlb_dev_init(struct device *dev)

{

	dev->dma_io_tlb_mem = &io_tlb_default_mem;

}



/*

 * Return the offset into a iotlb slot required to keep the device happy.

 */
@@ -953,6 +962,14 @@ size_t swiotlb_max_mapping_size(struct device *dev) 
	return ((size_t)IO_TLB_SIZE) * IO_TLB_SEGSIZE - min_align;

}



/**

 * is_swiotlb_allocated() - check if the default software IO TLB is initialized

 */

bool is_swiotlb_allocated(void)

{

	return io_tlb_default_mem.nslabs;

}



bool is_swiotlb_active(struct device *dev)

{

	struct io_tlb_mem *mem = dev->dma_io_tlb_mem;
@@ -960,6 +977,26 @@ bool is_swiotlb_active(struct device *dev) 
	return mem && mem->nslabs;

}



/**

 * default_swiotlb_base() - get the base address of the default SWIOTLB

 *

 * Get the lowest physical address used by the default software IO TLB pool.

 */

phys_addr_t default_swiotlb_base(void)

{

	return io_tlb_default_mem.start;

}



/**

 * default_swiotlb_limit() - get the address limit of the default SWIOTLB

 *

 * Get the highest physical address used by the default software IO TLB pool.

 */

phys_addr_t default_swiotlb_limit(void)

{

	return io_tlb_default_mem.end - 1;

}



#ifdef CONFIG_DEBUG_FS



static int io_tlb_used_get(void *data, u64 *val)