d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge r234561 from busdma_machdep.c to ARMv6 version of busdma:

Browse Source 
Interrupts must be disabled while handling a partial cache line flush,
as otherwise the interrupt handling code may modify data in the non-DMA
part of the cache line while we have it stashed away in the temporary
stack buffer, then we end up restoring a stale value.

PR:             160431
Submitted by:   Ian Lepore
This commit is contained in:
Oleksandr Tymoshenko 2012-12-31 21:00:38 +00:00
parent 3d4ff5e9f0
commit 28009afbb4
1 changed files with 33 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
sys/arm/arm/busdma_machdep-v6.c
View File

@ -1347,35 +1347,49 @@ _bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map, bus_dmasync_op_t op)
while (sl != NULL) {
/* write back the unaligned portions */
vm_paddr_t physaddr;
register_t s = 0;
buf = sl->vaddr;
len = sl->datacount;
physaddr = sl->busaddr;
bbuf = buf & ~arm_dcache_align_mask;
ebuf = buf + len;
physaddr = physaddr & ~arm_dcache_align_mask;
unalign = buf & arm_dcache_align_mask;
if (unalign) {
memcpy(_tmp_cl, (void *)bbuf, unalign);
len += unalign; /* inv entire cache line */
if ((buf & arm_dcache_align_mask) ||
(ebuf & arm_dcache_align_mask)) {
s = intr_disable();
unalign = buf & arm_dcache_align_mask;
if (unalign) {
memcpy(_tmp_cl, (void *)bbuf, unalign);
len += unalign; /* inv entire cache line */
}
unalign = ebuf & arm_dcache_align_mask;
if (unalign) {
unalign = arm_dcache_align - unalign;
memcpy(_tmp_clend, (void *)ebuf, unalign);
len += unalign; /* inv entire cache line */
}
}
unalign = ebuf & arm_dcache_align_mask;
if (unalign) {
unalign = arm_dcache_align - unalign;
memcpy(_tmp_clend, (void *)ebuf, unalign);
len += unalign; /* inv entire cache line */
}
/* inv are cache length aligned */
/* inv are cache length aligned */
cpu_dcache_inv_range(bbuf, len);
l2cache_inv_range(bbuf, physaddr, len);
unalign = (vm_offset_t)buf & arm_dcache_align_mask;
if (unalign) {
memcpy((void *)bbuf, _tmp_cl, unalign);
}
unalign = ebuf & arm_dcache_align_mask;
if (unalign) {
unalign = arm_dcache_align - unalign;
memcpy((void *)ebuf, _tmp_clend, unalign);
if ((buf & arm_dcache_align_mask) ||
(ebuf & arm_dcache_align_mask)) {
unalign = (vm_offset_t)buf & arm_dcache_align_mask;
if (unalign)
memcpy((void *)bbuf, _tmp_cl, unalign);
unalign = ebuf & arm_dcache_align_mask;
if (unalign)
memcpy((void *)ebuf, _tmp_clend,
arm_dcache_align - unalign);
intr_restore(s);
}
sl = STAILQ_NEXT(sl, slinks);
}