Commit 6f2beb26 authored by Claire Chang's avatar Claire Chang Committed by Konrad Rzeszutek Wilk
Browse files

swiotlb: Update is_swiotlb_active to add a struct device argument 



Update is_swiotlb_active to add a struct device argument. This will be
useful later to allow for different pools.

Signed-off-by: default avatarClaire Chang <tientzu@chromium.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Tested-by: default avatarStefano Stabellini <sstabellini@kernel.org>
Tested-by: default avatarWill Deacon <will@kernel.org>
Acked-by: default avatarStefano Stabellini <sstabellini@kernel.org>
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent 7fd856aa

drivers/gpu/drm/i915/gem/i915_gem_internal.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static int i915_gem_object_get_pages_internal(struct drm_i915_gem_object *obj) 


	max_order = MAX_ORDER;

#ifdef CONFIG_SWIOTLB

	if (is_swiotlb_active()) {

	if (is_swiotlb_active(obj->base.dev->dev)) {

		unsigned int max_segment;



		max_segment = swiotlb_max_segment();

drivers/gpu/drm/nouveau/nouveau_ttm.c

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ nouveau_ttm_init(struct nouveau_drm *drm) 
	}



#if IS_ENABLED(CONFIG_SWIOTLB) && IS_ENABLED(CONFIG_X86)

	need_swiotlb = is_swiotlb_active();

	need_swiotlb = is_swiotlb_active(dev->dev);

#endif



	ret = ttm_device_init(&drm->ttm.bdev, &nouveau_bo_driver, drm->dev->dev,

drivers/pci/xen-pcifront.c

+1 −1
Original line number Diff line number Diff line
@@ -693,7 +693,7 @@ static int pcifront_connect_and_init_dma(struct pcifront_device *pdev) 


	spin_unlock(&pcifront_dev_lock);



	if (!err && !is_swiotlb_active()) {

	if (!err && !is_swiotlb_active(&pdev->xdev->dev)) {

		err = pci_xen_swiotlb_init_late();

		if (err)

			dev_err(&pdev->xdev->dev, "Could not setup SWIOTLB!\n");

include/linux/swiotlb.h

+2 −2
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static inline bool is_swiotlb_buffer(struct device *dev, phys_addr_t paddr) 
void __init swiotlb_exit(void);

unsigned int swiotlb_max_segment(void);

size_t swiotlb_max_mapping_size(struct device *dev);

bool is_swiotlb_active(void);

bool is_swiotlb_active(struct device *dev);

void __init swiotlb_adjust_size(unsigned long size);

#else

#define swiotlb_force SWIOTLB_NO_FORCE
@@ -132,7 +132,7 @@ static inline size_t swiotlb_max_mapping_size(struct device *dev) 
	return SIZE_MAX;

}



static inline bool is_swiotlb_active(void)

static inline bool is_swiotlb_active(struct device *dev)

{

	return false;

}

kernel/dma/direct.c

+1 −1
Original line number Diff line number Diff line
@@ -495,7 +495,7 @@ int dma_direct_supported(struct device *dev, u64 mask) 
size_t dma_direct_max_mapping_size(struct device *dev)

{

	/* If SWIOTLB is active, use its maximum mapping size */

	if (is_swiotlb_active() &&

	if (is_swiotlb_active(dev) &&

	    (dma_addressing_limited(dev) || swiotlb_force == SWIOTLB_FORCE))

		return swiotlb_max_mapping_size(dev);

	return SIZE_MAX;