Date: Thu, 20 Aug 2015 19:39:16 +0000 (UTC) From: Ian Lepore <ian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r286969 - head/sys/arm/arm Message-ID: <201508201939.t7KJdG70005443@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ian Date: Thu Aug 20 19:39:15 2015 New Revision: 286969 URL: https://svnweb.freebsd.org/changeset/base/286969 Log: Remove code left over from the armv4 days. On armv4, cache maintenance operations always had to be aligned and sized to cache lines. On armv6 and later, cache maintenance operates on a cache line if any part of the line is referenced in the operation, so we don't need extra code to align the edges of the sync range. 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 Aug 20 19:14:16 2015 (r286968) +++ head/sys/arm/arm/busdma_machdep-v6.c Thu Aug 20 19:39:15 2015 (r286969) @@ -1381,22 +1381,11 @@ _bus_dmamap_sync(bus_dma_tag_t dmat, bus */ if (op & BUS_DMASYNC_POSTREAD) { while (bpage != NULL) { - vm_offset_t startv; - vm_paddr_t startp; - int len; - - startv = bpage->vaddr &~ arm_dcache_align_mask; - startp = bpage->busaddr &~ arm_dcache_align_mask; - len = bpage->datacount; - - if (startv != bpage->vaddr) - len += bpage->vaddr & arm_dcache_align_mask; - if (len & arm_dcache_align_mask) - len = (len - - (len & arm_dcache_align_mask)) + - arm_dcache_align; - l2cache_inv_range(startv, startp, len); - cpu_dcache_inv_range(startv, len); + l2cache_inv_range((vm_offset_t)bpage->vaddr, + (vm_offset_t)bpage->busaddr, + bpage->datacount); + cpu_dcache_inv_range((vm_offset_t)bpage->vaddr, + bpage->datacount); if (bpage->datavaddr != 0) bcopy((void *)bpage->vaddr, (void *)bpage->datavaddr,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508201939.t7KJdG70005443>