shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 21:07:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

BACKPORT: FROMGIT: 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>
(cherry picked from commit 6f2beb268a swiotlb/devel/for-linus-5.15)
[willdeacon@: Fixed up additional users in DRM drivers]
Signed-off-by: Will Deacon <willdeacon@google.com>
Bug: 190591509
Change-Id: I012c18cc394cec8f6fe60fea7f26974e2cd876db
This commit is contained in:
Claire Chang
2021-06-19 11:40:36 +08:00
committed by Will Deacon
parent e72b3d790e
commit 684337b8f3
8 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
View File

@@ -1357,7 +1357,7 @@ static int amdgpu_ttm_tt_populate(struct ttm_bo_device *bdev,
}
#ifdef CONFIG_SWIOTLB
if (adev->need_swiotlb && is_swiotlb_active()) {
if (adev->need_swiotlb && is_swiotlb_active(adev->dev)) {
return ttm_dma_populate(&gtt->ttm, adev->dev, ctx);
}
#endif
@@ -1401,7 +1401,7 @@ static void amdgpu_ttm_tt_unpopulate(struct ttm_bo_device *bdev, struct ttm_tt *
adev = amdgpu_ttm_adev(bdev);
#ifdef CONFIG_SWIOTLB
if (adev->need_swiotlb && is_swiotlb_active()) {
if (adev->need_swiotlb && is_swiotlb_active(adev->dev)) {
ttm_dma_unpopulate(&gtt->ttm, adev->dev);
return;
}
@@ -2589,7 +2589,7 @@ int amdgpu_ttm_debugfs_init(struct amdgpu_device *adev)
count = ARRAY_SIZE(amdgpu_ttm_debugfs_list);
#ifdef CONFIG_SWIOTLB
if (!(adev->need_swiotlb && is_swiotlb_active()))
if (!(adev->need_swiotlb && is_swiotlb_active(adev->dev)))
--count;
#endif

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;
#ifdef CONFIG_SWIOTLB
if (is_swiotlb_active()) {
if (is_swiotlb_active(obj->base.dev->dev)) {
unsigned int max_segment;
max_segment = swiotlb_max_segment();

4
drivers/gpu/drm/nouveau/nouveau_bo.c
View File

@@ -1328,7 +1328,7 @@ nouveau_ttm_tt_populate(struct ttm_bo_device *bdev,
#endif
#if IS_ENABLED(CONFIG_SWIOTLB) && IS_ENABLED(CONFIG_X86)
if (is_swiotlb_active()) {
if (is_swiotlb_active(dev)) {
return ttm_dma_populate((void *)ttm, dev, ctx);
}
#endif
@@ -1358,7 +1358,7 @@ nouveau_ttm_tt_unpopulate(struct ttm_bo_device *bdev,
#endif
#if IS_ENABLED(CONFIG_SWIOTLB) && IS_ENABLED(CONFIG_X86)
if (is_swiotlb_active()) {
if (is_swiotlb_active(dev)) {
ttm_dma_unpopulate((void *)ttm, dev);
return;
}

6
drivers/gpu/drm/radeon/radeon_ttm.c
View File

@@ -658,7 +658,7 @@ static int radeon_ttm_tt_populate(struct ttm_bo_device *bdev,
#endif
#ifdef CONFIG_SWIOTLB
if (rdev->need_swiotlb && is_swiotlb_active()) {
if (rdev->need_swiotlb && is_swiotlb_active(rdev->dev)) {
return ttm_dma_populate(&gtt->ttm, rdev->dev, ctx);
}
#endif
@@ -689,7 +689,7 @@ static void radeon_ttm_tt_unpopulate(struct ttm_bo_device *bdev, struct ttm_tt *
#endif
#ifdef CONFIG_SWIOTLB
if (rdev->need_swiotlb && is_swiotlb_active()) {
if (rdev->need_swiotlb && is_swiotlb_active(rdev->dev)) {
ttm_dma_unpopulate(&gtt->ttm, rdev->dev);
return;
}
@@ -1100,7 +1100,7 @@ static int radeon_ttm_debugfs_init(struct radeon_device *rdev)
count = ARRAY_SIZE(radeon_ttm_debugfs_list);
#ifdef CONFIG_SWIOTLB
if (!(rdev->need_swiotlb && is_swiotlb_active()))
if (!(rdev->need_swiotlb && is_swiotlb_active(rdev->dev)))
--count;
#endif

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);
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");

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);
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;
}

2
kernel/dma/direct.c
View File

@@ -498,7 +498,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;

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;
}
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);