leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

swiotlb: Set dev->dma_io_tlb_mem to the swiotlb pool used

Browse Source 
Always have the pointer to the swiotlb pool used in struct device. This
could help simplify the code for other 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:34 +08:00 committed by Konrad Rzeszutek Wilk
parent 6e675a1c45
commit 69031f5008
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/base/core.c
View File

@ -27,6 +27,7 @@
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/sched/signal.h> #include <linux/sched/signal.h>
#include <linux/sched/mm.h> #include <linux/sched/mm.h>
#include <linux/swiotlb.h>
#include <linux/sysfs.h> #include <linux/sysfs.h>
#include <linux/dma-map-ops.h> /* for dma_default_coherent */ #include <linux/dma-map-ops.h> /* for dma_default_coherent */
@ -2846,6 +2847,9 @@ void device_initialize(struct device *dev)
defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU_ALL) defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU_ALL)
dev->dma_coherent = dma_default_coherent; dev->dma_coherent = dma_default_coherent;
#endif #endif
#ifdef CONFIG_SWIOTLB
dev->dma_io_tlb_mem = io_tlb_default_mem;
#endif
} }
EXPORT_SYMBOL_GPL(device_initialize); EXPORT_SYMBOL_GPL(device_initialize);

4
include/linux/device.h
View File

@ -423,6 +423,7 @@ struct dev_links_info {
* @dma_pools: Dma pools (if dma'ble device). * @dma_pools: Dma pools (if dma'ble device).
* @dma_mem: Internal for coherent mem override. * @dma_mem: Internal for coherent mem override.
* @cma_area: Contiguous memory area for dma allocations * @cma_area: Contiguous memory area for dma allocations
* @dma_io_tlb_mem: Pointer to the swiotlb pool used. Not for driver use.
* @archdata: For arch-specific additions. * @archdata: For arch-specific additions.
* @of_node: Associated device tree node. * @of_node: Associated device tree node.
* @fwnode: Associated device node supplied by platform firmware. * @fwnode: Associated device node supplied by platform firmware.
@ -531,6 +532,9 @@ struct device {
#ifdef CONFIG_DMA_CMA #ifdef CONFIG_DMA_CMA
struct cma *cma_area; /* contiguous memory area for dma struct cma *cma_area; /* contiguous memory area for dma
allocations */ allocations */
#endif
#ifdef CONFIG_SWIOTLB
struct io_tlb_mem *dma_io_tlb_mem;
#endif #endif
/* arch specific additions */ /* arch specific additions */
struct dev_archdata archdata; struct dev_archdata archdata;

8
kernel/dma/swiotlb.c
View File

@ -348,7 +348,7 @@ static unsigned int swiotlb_align_offset(struct device *dev, u64 addr)
static void swiotlb_bounce(struct device *dev, phys_addr_t tlb_addr, size_t size, static void swiotlb_bounce(struct device *dev, phys_addr_t tlb_addr, size_t size,
enum dma_data_direction dir) enum dma_data_direction dir)
{ {
struct io_tlb_mem *mem = io_tlb_default_mem; struct io_tlb_mem *mem = dev->dma_io_tlb_mem;
int index = (tlb_addr - mem->start) >> IO_TLB_SHIFT; int index = (tlb_addr - mem->start) >> IO_TLB_SHIFT;
phys_addr_t orig_addr = mem->slots[index].orig_addr; phys_addr_t orig_addr = mem->slots[index].orig_addr;
size_t alloc_size = mem->slots[index].alloc_size; size_t alloc_size = mem->slots[index].alloc_size;
@ -429,7 +429,7 @@ static unsigned int wrap_index(struct io_tlb_mem *mem, unsigned int index)
static int find_slots(struct device *dev, phys_addr_t orig_addr, static int find_slots(struct device *dev, phys_addr_t orig_addr,
size_t alloc_size) size_t alloc_size)
{ {
struct io_tlb_mem *mem = io_tlb_default_mem; struct io_tlb_mem *mem = dev->dma_io_tlb_mem;
unsigned long boundary_mask = dma_get_seg_boundary(dev); unsigned long boundary_mask = dma_get_seg_boundary(dev);
dma_addr_t tbl_dma_addr = dma_addr_t tbl_dma_addr =
phys_to_dma_unencrypted(dev, mem->start) & boundary_mask; phys_to_dma_unencrypted(dev, mem->start) & boundary_mask;
@ -506,7 +506,7 @@ phys_addr_t swiotlb_tbl_map_single(struct device *dev, phys_addr_t orig_addr,
size_t mapping_size, size_t alloc_size, size_t mapping_size, size_t alloc_size,
enum dma_data_direction dir, unsigned long attrs) enum dma_data_direction dir, unsigned long attrs)
{ {
struct io_tlb_mem *mem = io_tlb_default_mem; struct io_tlb_mem *mem = dev->dma_io_tlb_mem;
unsigned int offset = swiotlb_align_offset(dev, orig_addr); unsigned int offset = swiotlb_align_offset(dev, orig_addr);
unsigned int i; unsigned int i;
int index; int index;
@ -557,7 +557,7 @@ void swiotlb_tbl_unmap_single(struct device *hwdev, phys_addr_t tlb_addr,
size_t mapping_size, enum dma_data_direction dir, size_t mapping_size, enum dma_data_direction dir,
unsigned long attrs) unsigned long attrs)
{ {
struct io_tlb_mem *mem = io_tlb_default_mem; struct io_tlb_mem *mem = hwdev->dma_io_tlb_mem;
unsigned long flags; unsigned long flags;
unsigned int offset = swiotlb_align_offset(hwdev, tlb_addr); unsigned int offset = swiotlb_align_offset(hwdev, tlb_addr);
int index = (tlb_addr - offset - mem->start) >> IO_TLB_SHIFT; int index = (tlb_addr - offset - mem->start) >> IO_TLB_SHIFT;