D34763.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D34763.diff
View Options

	diff --git a/sys/arm64/arm64/busdma_bounce.c b/sys/arm64/arm64/busdma_bounce.c
	--- a/sys/arm64/arm64/busdma_bounce.c
	+++ b/sys/arm64/arm64/busdma_bounce.c
	@@ -228,6 +228,18 @@

	if ((flags & BUS_DMA_COHERENT) != 0) {
	newtag->bounce_flags \|= BF_COHERENT;
	+ }
	+
	+ if (parent != NULL) {
	+ if ((newtag->common.filter != NULL \|\|
	+ (parent->bounce_flags & BF_COULD_BOUNCE) != 0))
	+ newtag->bounce_flags \|= BF_COULD_BOUNCE;
	+
	+ /* Copy some flags from the parent */
	+ newtag->bounce_flags \|= parent->bounce_flags & BF_COHERENT;
	+ }
	+
	+ if ((newtag->bounce_flags & BF_COHERENT) != 0) {
	newtag->alloc_alignment = newtag->common.alignment;
	newtag->alloc_size = newtag->common.maxsize;
	} else {
	@@ -243,15 +255,6 @@
	dcache_line_size);
	}

	- if (parent != NULL) {
	- if ((newtag->common.filter != NULL \|\|
	- (parent->bounce_flags & BF_COULD_BOUNCE) != 0))
	- newtag->bounce_flags \|= BF_COULD_BOUNCE;
	-
	- /* Copy some flags from the parent */
	- newtag->bounce_flags \|= parent->bounce_flags & BF_COHERENT;
	- }
	-
	if (newtag->common.lowaddr < ptoa((vm_paddr_t)Maxmem) \|\|
	newtag->common.alignment > 1)
	newtag->bounce_flags \|= BF_COULD_BOUNCE;