Author: mmel
Date: Thu Oct 6 13:53:17 2016
New Revision: 306759
URL: https://svnweb.freebsd.org/changeset/base/306759
Log:
ARM: Remove ARMv4 #defines from busdma_machdep-v6.c, it's ARMv6
specific file. Consistently use BUSDMA_DCACHE_ALIGN for cache
line alignment.
MFC after: 1 week
Modified:
head/sys/arm/arm/busdma_machdep-v6.c
Modified: head/sys/arm/arm/busdma_machdep-v6.c
==============================================================================
--- head/sys/arm/arm/busdma_machdep-v6.c Thu Oct 6 13:37:46 2016
(r306758)
+++ head/sys/arm/arm/busdma_machdep-v6.c Thu Oct 6 13:53:17 2016
(r306759)
@@ -60,13 +60,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
@@ -331,7 +326,7 @@ cacheline_bounce(bus_dmamap_t map, bus_a
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);
}
/*
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
