Skip to content

Commit 7a360df

Browse files
author
Christoph Hellwig
committed
m68k: don't provide arch_dma_alloc for nommu/coldfire
Coldfire cores configured with a data cache can't provide coherent DMA allocations at all. Instead of returning non-coherent kernel memory in this case, return NULL and fail the allocation. The only driver that used to rely on the previous behavior (fec) has been switched to use non-coherent allocations for this case recently. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Greg Ungerer <gerg@linux-m68k.org> Tested-by: Greg Ungerer <gerg@linux-m68k.org>
1 parent ffd32a9 commit 7a360df

2 files changed

Lines changed: 0 additions & 24 deletions

File tree

arch/m68k/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ config M68K
66
select ARCH_HAS_BINFMT_FLAT
77
select ARCH_HAS_CPU_FINALIZE_INIT if MMU
88
select ARCH_HAS_CURRENT_STACK_POINTER
9-
select ARCH_HAS_DMA_ALLOC if M68K_NONCOHERENT_DMA && COLDFIRE
109
select ARCH_HAS_DMA_PREP_COHERENT if M68K_NONCOHERENT_DMA && !COLDFIRE
1110
select ARCH_HAS_SYNC_DMA_FOR_DEVICE if M68K_NONCOHERENT_DMA
1211
select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS

arch/m68k/kernel/dma.c

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -33,29 +33,6 @@ pgprot_t pgprot_dmacoherent(pgprot_t prot)
3333
}
3434
return prot;
3535
}
36-
#else
37-
void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle,
38-
gfp_t gfp, unsigned long attrs)
39-
{
40-
void *ret;
41-
42-
if (dev == NULL || (*dev->dma_mask < 0xffffffff))
43-
gfp |= GFP_DMA;
44-
ret = (void *)__get_free_pages(gfp, get_order(size));
45-
46-
if (ret != NULL) {
47-
memset(ret, 0, size);
48-
*dma_handle = virt_to_phys(ret);
49-
}
50-
return ret;
51-
}
52-
53-
void arch_dma_free(struct device *dev, size_t size, void *vaddr,
54-
dma_addr_t dma_handle, unsigned long attrs)
55-
{
56-
free_pages((unsigned long)vaddr, get_order(size));
57-
}
58-
5936
#endif /* CONFIG_MMU && !CONFIG_COLDFIRE */
6037

6138
void arch_sync_dma_for_device(phys_addr_t handle, size_t size,

0 commit comments

Comments
 (0)