Skip to contentSkip to conversation

Patch "usb: musb: Fix DMA desired mode for Mentor DMA engine" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Oct 4, 2016

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

usb: musb: Fix DMA desired mode for Mentor DMA engine

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
usb-musb-fix-dma-desired-mode-for-mentor-dma-engine.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From bba40e6948b94cba71965285fbac31bd078c024a Mon Sep 17 00:00:00 2001

From: Cristian Birsan <[email protected]>
Date: Thu, 11 Feb 2016 08:58:17 -0700
Subject: usb: musb: Fix DMA desired mode for Mentor DMA engine

From: Cristian Birsan <[email protected]>

commit bba40e6948b94cba71965285fbac31bd078c024a upstream.

Commit 754fe4a92c07 ("usb: musb: Remove ifdefs for TX DMA for musb_host.c") introduces a problem setting the desired channel mode for the Mentor DMA engine.

There is a case where an address is incorrectly assigned to the DMA channel desired mode when it should instead be assigned the actual mode value. This results in the value of channel->desired_mode not being correct.

---
 drivers/usb/musb/musb_host.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/musb/musb_host.c +1 -1
@@ -661,7 +661,7 @@ static int musb_tx_dma_set_mode_mentor(s
 		csr &= ~(MUSB_TXCSR_AUTOSET | MUSB_TXCSR_DMAMODE);
 		csr |= MUSB_TXCSR_DMAENAB; /* against programmer's guide */
 	}
-	channel->desired_mode = mode;
+	channel->desired_mode = *mode;
 	musb_writew(epio, MUSB_TXCSR, csr);
 
 	return 0;

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/usb-musb-fix-dma-for-host-mode.patch queue-4.4/usb-musb-fix-dma-desired-mode-for-mentor-dma-engine.patch