diff options
| author | mmel <mmel@FreeBSD.org> | 2016-10-15 08:31:46 +0000 |
|---|---|---|
| committer | mmel <mmel@FreeBSD.org> | 2016-10-15 08:31:46 +0000 |
| commit | cfa4fa33706521379e50777d0783ae5d4f9e283b (patch) | |
| tree | cd93f31a1a8fd5a21d9fd535fd33b81412c04da2 /sys/arm/arm | |
| parent | 0e78b9280074f680f7f40174394f41db9700fb1d (diff) | |
| download | FreeBSD-src-cfa4fa33706521379e50777d0783ae5d4f9e283b.zip FreeBSD-src-cfa4fa33706521379e50777d0783ae5d4f9e283b.tar.gz | |
MFC r306759:
ARM: Remove ARMv4 #defines from busdma_machdep-v6.c, it's ARMv6 specific
file. Consistently use BUSDMA_DCACHE_ALIGN for cache line alignment.
Diffstat (limited to 'sys/arm/arm')
| -rw-r--r-- | sys/arm/arm/busdma_machdep-v6.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/arm/arm/busdma_machdep-v6.c b/sys/arm/arm/busdma_machdep-v6.c index fe446b9..0a1331f 100644 --- a/sys/arm/arm/busdma_machdep-v6.c +++ b/sys/arm/arm/busdma_machdep-v6.c @@ -61,13 +61,8 @@ __FBSDID("$FreeBSD$"); #include <machine/cpu-v6.h> #include <machine/md_var.h> -#if __ARM_ARCH < 6 -#define BUSDMA_DCACHE_ALIGN arm_dcache_align -#define BUSDMA_DCACHE_MASK arm_dcache_align_mask -#else #define BUSDMA_DCACHE_ALIGN cpuinfo.dcache_line_size #define BUSDMA_DCACHE_MASK cpuinfo.dcache_line_mask -#endif #define MAX_BPAGES 64 #define MAX_DMA_SEGMENTS 4096 @@ -340,7 +335,7 @@ cacheline_bounce(bus_dmamap_t map, bus_addr_t addr, bus_size_t size) if (map->flags & (DMAMAP_DMAMEM_ALLOC | DMAMAP_COHERENT | DMAMAP_MBUF)) return (0); - return ((addr | size) & arm_dcache_align_mask); + return ((addr | size) & BUSDMA_DCACHE_MASK); } /* |
