From owner-svn-src-head@freebsd.org  Thu Oct  6 13:53:18 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 81C4BBE9BF6;
 Thu,  6 Oct 2016 13:53:18 +0000 (UTC)
 (envelope-from mmel@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 521F6D7E;
 Thu,  6 Oct 2016 13:53:18 +0000 (UTC)
 (envelope-from mmel@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u96DrHnw007178;
 Thu, 6 Oct 2016 13:53:17 GMT (envelope-from mmel@FreeBSD.org)
Received: (from mmel@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u96DrHiQ007177;
 Thu, 6 Oct 2016 13:53:17 GMT (envelope-from mmel@FreeBSD.org)
Message-Id: <201610061353.u96DrHiQ007177@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mmel set sender to
 mmel@FreeBSD.org using -f
From: Michal Meloun <mmel@FreeBSD.org>
Date: Thu, 6 Oct 2016 13:53:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r306759 - head/sys/arm/arm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Oct 2016 13:53:18 -0000

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);
 }
 
 /*