GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-29 01:51:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

swiotlb: Update is_swiotlb_active to add a struct device argument

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

Signed-off-by: Claire Chang <tientzu@chromium.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Tested-by: Stefano Stabellini <sstabellini@kernel.org>
Tested-by: Will Deacon <will@kernel.org>
Acked-by: Stefano Stabellini <sstabellini@kernel.org>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
This commit is contained in:
Claire Chang 2021-06-19 11:40:36 +08:00 • committed by Konrad Rzeszutek Wilk
parent 7fd856aa7f
commit 6f2beb268a
6 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/gpu/drm/i915/gem/i915_gem_internal.c
View file

@ -42,7 +42,7 @@ static int i915_gem_object_get_pages_internal(struct drm_i915_gem_object *obj)
max_order = MAX_ORDER; max_order = MAX_ORDER;
#ifdef CONFIG_SWIOTLB #ifdef CONFIG_SWIOTLB
if (is_swiotlb_active()) { if (is_swiotlb_active(obj->base.dev->dev)) {
unsigned int max_segment; unsigned int max_segment;
max_segment = swiotlb_max_segment(); max_segment = swiotlb_max_segment();

2
drivers/gpu/drm/nouveau/nouveau_ttm.c
View file

@ -276,7 +276,7 @@ nouveau_ttm_init(struct nouveau_drm *drm)
} }
#if IS_ENABLED(CONFIG_SWIOTLB) && IS_ENABLED(CONFIG_X86) #if IS_ENABLED(CONFIG_SWIOTLB) && IS_ENABLED(CONFIG_X86)
need_swiotlb = is_swiotlb_active(); need_swiotlb = is_swiotlb_active(dev->dev);
#endif #endif
ret = ttm_device_init(&drm->ttm.bdev, &nouveau_bo_driver, drm->dev->dev, ret = ttm_device_init(&drm->ttm.bdev, &nouveau_bo_driver, drm->dev->dev,

2
drivers/pci/xen-pcifront.c
View file

@ -693,7 +693,7 @@ static int pcifront_connect_and_init_dma(struct pcifront_device *pdev)
spin_unlock(&pcifront_dev_lock); spin_unlock(&pcifront_dev_lock);
if (!err && !is_swiotlb_active()) { if (!err && !is_swiotlb_active(&pdev->xdev->dev)) {
err = pci_xen_swiotlb_init_late(); err = pci_xen_swiotlb_init_late();
if (err) if (err)
dev_err(&pdev->xdev->dev, "Could not setup SWIOTLB!\n"); dev_err(&pdev->xdev->dev, "Could not setup SWIOTLB!\n");

4
include/linux/swiotlb.h
View file

@ -112,7 +112,7 @@ static inline bool is_swiotlb_buffer(struct device *dev, phys_addr_t paddr)
void __init swiotlb_exit(void); void __init swiotlb_exit(void);
unsigned int swiotlb_max_segment(void); unsigned int swiotlb_max_segment(void);
size_t swiotlb_max_mapping_size(struct device *dev); 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); void __init swiotlb_adjust_size(unsigned long size);
#else #else
#define swiotlb_force SWIOTLB_NO_FORCE #define swiotlb_force SWIOTLB_NO_FORCE
@ -132,7 +132,7 @@ static inline size_t swiotlb_max_mapping_size(struct device *dev)
return SIZE_MAX; return SIZE_MAX;
} }
static inline bool is_swiotlb_active(void) static inline bool is_swiotlb_active(struct device *dev)
{ {
return false; return false;
} }

2
kernel/dma/direct.c
View file

@ -495,7 +495,7 @@ int dma_direct_supported(struct device *dev, u64 mask)
size_t dma_direct_max_mapping_size(struct device *dev) size_t dma_direct_max_mapping_size(struct device *dev)
{ {
/* If SWIOTLB is active, use its maximum mapping size */ /* 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)) (dma_addressing_limited(dev) || swiotlb_force == SWIOTLB_FORCE))
return swiotlb_max_mapping_size(dev); return swiotlb_max_mapping_size(dev);
return SIZE_MAX; return SIZE_MAX;

4
kernel/dma/swiotlb.c
View file

@ -662,9 +662,9 @@ size_t swiotlb_max_mapping_size(struct device *dev)
return ((size_t)IO_TLB_SIZE) * IO_TLB_SEGSIZE; return ((size_t)IO_TLB_SIZE) * IO_TLB_SEGSIZE;
} }
bool is_swiotlb_active(void) bool is_swiotlb_active(struct device *dev)
{ {
return io_tlb_default_mem != NULL; return dev->dma_io_tlb_mem != NULL;
} }
EXPORT_SYMBOL_GPL(is_swiotlb_active); EXPORT_SYMBOL_GPL(is_swiotlb_active);