Skip to content

Commit 9eef8b8

Browse files
author
Christoph Hellwig
committed
arm: implement ->mapping_error
DMA_ERROR_CODE is going to go away, so don't rely on it. Signed-off-by: Christoph Hellwig <hch@lst.de>
1 parent a760088 commit 9eef8b8

File tree

4 files changed

+38
-19
lines changed

4 files changed

+38
-19
lines changed

‎arch/arm/common/dmabounce.c

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
#include <linux/scatterlist.h>
3434

3535
#include <asm/cacheflush.h>
36+
#include <asm/dma-iommu.h>
3637

3738
#undef STATS
3839

@@ -256,7 +257,7 @@ static inline dma_addr_t map_single(struct device *dev, void *ptr, size_t size,
256257
if (buf == NULL) {
257258
dev_err(dev, "%s: unable to map unsafe buffer %p!\n",
258259
__func__, ptr);
259-
return DMA_ERROR_CODE;
260+
return ARM_MAPPING_ERROR;
260261
}
261262

262263
dev_dbg(dev, "%s: unsafe buffer %p (dma=%#x) mapped to %p (dma=%#x)\n",
@@ -326,7 +327,7 @@ static dma_addr_t dmabounce_map_page(struct device *dev, struct page *page,
326327

327328
ret = needs_bounce(dev, dma_addr, size);
328329
if (ret < 0)
329-
return DMA_ERROR_CODE;
330+
return ARM_MAPPING_ERROR;
330331

331332
if (ret == 0) {
332333
arm_dma_ops.sync_single_for_device(dev, dma_addr, size, dir);
@@ -335,7 +336,7 @@ static dma_addr_t dmabounce_map_page(struct device *dev, struct page *page,
335336

336337
if (PageHighMem(page)) {
337338
dev_err(dev, "DMA buffer bouncing of HIGHMEM pages is not supported\n");
338-
return DMA_ERROR_CODE;
339+
return ARM_MAPPING_ERROR;
339340
}
340341

341342
return map_single(dev, page_address(page) + offset, size, dir, attrs);
@@ -452,6 +453,11 @@ static int dmabounce_set_mask(struct device *dev, u64 dma_mask)
452453
return arm_dma_ops.set_dma_mask(dev, dma_mask);
453454
}
454455

456+
static int dmabounce_mapping_error(struct device *dev, dma_addr_t dma_addr)
457+
{
458+
return arm_dma_ops.mapping_error(dev, dma_addr);
459+
}
460+
455461
static const struct dma_map_ops dmabounce_ops = {
456462
.alloc = arm_dma_alloc,
457463
.free = arm_dma_free,
@@ -466,6 +472,7 @@ static const struct dma_map_ops dmabounce_ops = {
466472
.sync_sg_for_cpu = arm_dma_sync_sg_for_cpu,
467473
.sync_sg_for_device = arm_dma_sync_sg_for_device,
468474
.set_dma_mask = dmabounce_set_mask,
475+
.mapping_error = dmabounce_mapping_error,
469476
};
470477

471478
static int dmabounce_init_pool(struct dmabounce_pool *pool, struct device *dev,

‎arch/arm/include/asm/dma-iommu.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
#include <linux/kmemcheck.h>
1010
#include <linux/kref.h>
1111

12+
#define ARM_MAPPING_ERROR (~(dma_addr_t)0x0)
13+
1214
struct dma_iommu_mapping {
1315
/* iommu specific data */
1416
struct iommu_domain *domain;

‎arch/arm/include/asm/dma-mapping.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include <xen/xen.h>
1313
#include <asm/xen/hypervisor.h>
1414

15-
#define DMA_ERROR_CODE (~(dma_addr_t)0x0)
1615
extern const struct dma_map_ops arm_dma_ops;
1716
extern const struct dma_map_ops arm_coherent_dma_ops;
1817

‎arch/arm/mm/dma-mapping.c

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,11 @@ static void arm_dma_sync_single_for_device(struct device *dev,
180180
__dma_page_cpu_to_dev(page, offset, size, dir);
181181
}
182182

183+
static int arm_dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
184+
{
185+
return dma_addr == ARM_MAPPING_ERROR;
186+
}
187+
183188
const struct dma_map_ops arm_dma_ops = {
184189
.alloc = arm_dma_alloc,
185190
.free = arm_dma_free,
@@ -193,6 +198,7 @@ const struct dma_map_ops arm_dma_ops = {
193198
.sync_single_for_device = arm_dma_sync_single_for_device,
194199
.sync_sg_for_cpu = arm_dma_sync_sg_for_cpu,
195200
.sync_sg_for_device = arm_dma_sync_sg_for_device,
201+
.mapping_error = arm_dma_mapping_error,
196202
};
197203
EXPORT_SYMBOL(arm_dma_ops);
198204

@@ -211,6 +217,7 @@ const struct dma_map_ops arm_coherent_dma_ops = {
211217
.get_sgtable = arm_dma_get_sgtable,
212218
.map_page = arm_coherent_dma_map_page,
213219
.map_sg = arm_dma_map_sg,
220+
.mapping_error = arm_dma_mapping_error,
214221
};
215222
EXPORT_SYMBOL(arm_coherent_dma_ops);
216223

@@ -799,7 +806,7 @@ static void *__dma_alloc(struct device *dev, size_t size, dma_addr_t *handle,
799806
gfp &= ~(__GFP_COMP);
800807
args.gfp = gfp;
801808

802-
*handle = DMA_ERROR_CODE;
809+
*handle = ARM_MAPPING_ERROR;
803810
allowblock = gfpflags_allow_blocking(gfp);
804811
cma = allowblock ? dev_get_cma_area(dev) : false;
805812

@@ -1254,15 +1261,15 @@ static inline dma_addr_t __alloc_iova(struct dma_iommu_mapping *mapping,
12541261
if (i == mapping->nr_bitmaps) {
12551262
if (extend_iommu_mapping(mapping)) {
12561263
spin_unlock_irqrestore(&mapping->lock, flags);
1257-
return DMA_ERROR_CODE;
1264+
return ARM_MAPPING_ERROR;
12581265
}
12591266

12601267
start = bitmap_find_next_zero_area(mapping->bitmaps[i],
12611268
mapping->bits, 0, count, align);
12621269

12631270
if (start > mapping->bits) {
12641271
spin_unlock_irqrestore(&mapping->lock, flags);
1265-
return DMA_ERROR_CODE;
1272+
return ARM_MAPPING_ERROR;
12661273
}
12671274

12681275
bitmap_set(mapping->bitmaps[i], start, count);
@@ -1445,7 +1452,7 @@ __iommu_create_mapping(struct device *dev, struct page **pages, size_t size,
14451452
int i;
14461453

14471454
dma_addr = __alloc_iova(mapping, size);
1448-
if (dma_addr == DMA_ERROR_CODE)
1455+
if (dma_addr == ARM_MAPPING_ERROR)
14491456
return dma_addr;
14501457

14511458
iova = dma_addr;
@@ -1472,7 +1479,7 @@ __iommu_create_mapping(struct device *dev, struct page **pages, size_t size,
14721479
fail:
14731480
iommu_unmap(mapping->domain, dma_addr, iova-dma_addr);
14741481
__free_iova(mapping, dma_addr, size);
1475-
return DMA_ERROR_CODE;
1482+
return ARM_MAPPING_ERROR;
14761483
}
14771484

14781485
static int __iommu_remove_mapping(struct device *dev, dma_addr_t iova, size_t size)
@@ -1533,7 +1540,7 @@ static void *__iommu_alloc_simple(struct device *dev, size_t size, gfp_t gfp,
15331540
return NULL;
15341541

15351542
*handle = __iommu_create_mapping(dev, &page, size, attrs);
1536-
if (*handle == DMA_ERROR_CODE)
1543+
if (*handle == ARM_MAPPING_ERROR)
15371544
goto err_mapping;
15381545

15391546
return addr;
@@ -1561,7 +1568,7 @@ static void *__arm_iommu_alloc_attrs(struct device *dev, size_t size,
15611568
struct page **pages;
15621569
void *addr = NULL;
15631570

1564-
*handle = DMA_ERROR_CODE;
1571+
*handle = ARM_MAPPING_ERROR;
15651572
size = PAGE_ALIGN(size);
15661573

15671574
if (coherent_flag == COHERENT || !gfpflags_allow_blocking(gfp))
@@ -1582,7 +1589,7 @@ static void *__arm_iommu_alloc_attrs(struct device *dev, size_t size,
15821589
return NULL;
15831590

15841591
*handle = __iommu_create_mapping(dev, pages, size, attrs);
1585-
if (*handle == DMA_ERROR_CODE)
1592+
if (*handle == ARM_MAPPING_ERROR)
15861593
goto err_buffer;
15871594

15881595
if (attrs & DMA_ATTR_NO_KERNEL_MAPPING)
@@ -1732,10 +1739,10 @@ static int __map_sg_chunk(struct device *dev, struct scatterlist *sg,
17321739
int prot;
17331740

17341741
size = PAGE_ALIGN(size);
1735-
*handle = DMA_ERROR_CODE;
1742+
*handle = ARM_MAPPING_ERROR;
17361743

17371744
iova_base = iova = __alloc_iova(mapping, size);
1738-
if (iova == DMA_ERROR_CODE)
1745+
if (iova == ARM_MAPPING_ERROR)
17391746
return -ENOMEM;
17401747

17411748
for (count = 0, s = sg; count < (size >> PAGE_SHIFT); s = sg_next(s)) {
@@ -1775,7 +1782,7 @@ static int __iommu_map_sg(struct device *dev, struct scatterlist *sg, int nents,
17751782
for (i = 1; i < nents; i++) {
17761783
s = sg_next(s);
17771784

1778-
s->dma_address = DMA_ERROR_CODE;
1785+
s->dma_address = ARM_MAPPING_ERROR;
17791786
s->dma_length = 0;
17801787

17811788
if (s->offset || (size & ~PAGE_MASK) || size + s->length > max) {
@@ -1950,7 +1957,7 @@ static dma_addr_t arm_coherent_iommu_map_page(struct device *dev, struct page *p
19501957
int ret, prot, len = PAGE_ALIGN(size + offset);
19511958

19521959
dma_addr = __alloc_iova(mapping, len);
1953-
if (dma_addr == DMA_ERROR_CODE)
1960+
if (dma_addr == ARM_MAPPING_ERROR)
19541961
return dma_addr;
19551962

19561963
prot = __dma_info_to_prot(dir, attrs);
@@ -1962,7 +1969,7 @@ static dma_addr_t arm_coherent_iommu_map_page(struct device *dev, struct page *p
19621969
return dma_addr + offset;
19631970
fail:
19641971
__free_iova(mapping, dma_addr, len);
1965-
return DMA_ERROR_CODE;
1972+
return ARM_MAPPING_ERROR;
19661973
}
19671974

19681975
/**
@@ -2056,7 +2063,7 @@ static dma_addr_t arm_iommu_map_resource(struct device *dev,
20562063
size_t len = PAGE_ALIGN(size + offset);
20572064

20582065
dma_addr = __alloc_iova(mapping, len);
2059-
if (dma_addr == DMA_ERROR_CODE)
2066+
if (dma_addr == ARM_MAPPING_ERROR)
20602067
return dma_addr;
20612068

20622069
prot = __dma_info_to_prot(dir, attrs) | IOMMU_MMIO;
@@ -2068,7 +2075,7 @@ static dma_addr_t arm_iommu_map_resource(struct device *dev,
20682075
return dma_addr + offset;
20692076
fail:
20702077
__free_iova(mapping, dma_addr, len);
2071-
return DMA_ERROR_CODE;
2078+
return ARM_MAPPING_ERROR;
20722079
}
20732080

20742081
/**
@@ -2140,6 +2147,8 @@ const struct dma_map_ops iommu_ops = {
21402147

21412148
.map_resource = arm_iommu_map_resource,
21422149
.unmap_resource = arm_iommu_unmap_resource,
2150+
2151+
.mapping_error = arm_dma_mapping_error,
21432152
};
21442153

21452154
const struct dma_map_ops iommu_coherent_ops = {
@@ -2156,6 +2165,8 @@ const struct dma_map_ops iommu_coherent_ops = {
21562165

21572166
.map_resource = arm_iommu_map_resource,
21582167
.unmap_resource = arm_iommu_unmap_resource,
2168+
2169+
.mapping_error = arm_dma_mapping_error,
21592170
};
21602171

21612172
/**

0 commit comments

Comments
 (0)