Skip to contentSkip to conversation

Patch "usb: renesas_usbhs: fix the BCLR setting condition for non-DCP pipe" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Oct 9, 2017

Subsystems (2)
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: renesas_usbhs: fix the BCLR setting condition for non-DCP pipe

to the 4.9-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-renesas_usbhs-fix-the-bclr-setting-condition-for-non-dcp-pipe.patch
and it can be found in the queue-4.9 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 6124607acc88fffeaadf3aacfeb3cc1304c87387 Mon Sep 17 00:00:00 2001

From: Yoshihiro Shimoda <[email protected]>
Date: Wed, 27 Sep 2017 18:47:12 +0900
Subject: usb: renesas_usbhs: fix the BCLR setting condition for non-DCP pipe

From: Yoshihiro Shimoda <[email protected]>

commit 6124607acc88fffeaadf3aacfeb3cc1304c87387 upstream.

This patch fixes an issue that the driver sets the BCLR bit of {C,Dn}FIFOCTR register to 1 even when it's non-DCP pipe and the FRDY bit of {C,Dn}FIFOCTR register is set to 1.

Fixes e8d548d54968 ("usb: renesas_usbhs: fifo became independent from pipe.")
---
 drivers/usb/renesas_usbhs/fifo.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/usb/renesas_usbhs/fifo.c +8 -2
@@ -285,11 +285,17 @@ static void usbhsf_fifo_clear(struct usb
 			      struct usbhs_fifo *fifo)
 {
 	struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe);
+	int ret = 0;
 
 	if (!usbhs_pipe_is_dcp(pipe))
-		usbhsf_fifo_barrier(priv, fifo);
+		ret = usbhsf_fifo_barrier(priv, fifo);
 
-	usbhs_write(priv, fifo->ctr, BCLR);
+	/*
+	 * if non-DCP pipe, this driver should set BCLR when
+	 * usbhsf_fifo_barrier() returns 0.
+	 */
+	if (!ret)
+		usbhs_write(priv, fifo->ctr, BCLR);
 }
 
 static int usbhsf_fifo_rcv_len(struct usbhs_priv *priv,

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

queue-4.9/usb-gadget-udc-renesas_usb3-fix-return-value-of-usb3_write_pipe.patch queue-4.9/usb-gadget-udc-renesas_usb3-fix-pn_rammap.pn_mpkt-value.patch queue-4.9/usb-renesas_usbhs-fix-usbhsf_fifo_clear-for-rx-direction.patch queue-4.9/usb-gadget-udc-renesas_usb3-fix-for-no-data-control-transfer.patch queue-4.9/usb-renesas_usbhs-fix-the-bclr-setting-condition-for-non-dcp-pipe.patch