Author: mmel
Date: Sat Oct 15 08:31:46 2016
New Revision: 307345
URL: https://svnweb.freebsd.org/changeset/base/307345
Log:
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.
Modified:
stable/11/sys/arm/arm/busdma_machdep-v6.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/arm/arm/busdma_machdep-v6.c
==============================================================================
--- stable/11/sys/arm/arm/busdma_machdep-v6.c Sat Oct 15 08:27:54 2016
(r307344)
+++ stable/11/sys/arm/arm/busdma_machdep-v6.c Sat Oct 15 08:31:46 2016
(r307345)
@@ -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_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);
}
/*
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
