Patch "usb: dwc2: gadget: Fix GUSBCFG.USBTRDTIM value" has been added to the 4.9-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
usb: dwc2: gadget: Fix GUSBCFG.USBTRDTIM value
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-dwc2-gadget-fix-gusbcfg.usbtrdtim-value.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 foo@baz Mon Jul 3 13:37:32 CEST 2017
From: Amelie Delaunay <[email protected]>
Date: Thu, 12 Jan 2017 16:09:44 +0100
Subject: usb: dwc2: gadget: Fix GUSBCFG.USBTRDTIM value
From: Amelie Delaunay <[email protected]>
[ Upstream commit ca02954ada711b08e5b0d84590a631fd63ed39f9 ]
USBTrdTim must be programmed to 0x5 when phy has a UTMI+ 16-bit wide interface or 0x9 when it has a 8-bit wide interface.
GUSBCFG reset value (Value After Reset: 0x1400) sets USBTrdTim to 0x5. In case of 8-bit UTMI+, without clearing GUSBCFG.USBTRDTIM mask, USBTrdTim results in 0xD (0x5 | 0x9).
That's why we need to clear GUSBCFG.USBTRDTIM mask before setting USBTrdTim value, to ensure USBTrdTim is correctly set in case of 8-bit UTMI+.
--- drivers/usb/dwc2/gadget.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/dwc2/gadget.c +2 -2
@@ -2532,7 +2532,7 @@ void dwc2_hsotg_core_init_disconnected(s/* keep other bits untouched (so e.g. forced modes are not lost) */ usbcfg =dwc2_readl (hsotg->regs +GUSBCFG ); usbcfg &= ~(GUSBCFG_TOUTCAL_MASK |GUSBCFG_PHYIF16 |GUSBCFG_SRPCAP | -GUSBCFG_HNPCAP ); +GUSBCFG_HNPCAP |GUSBCFG_USBTRDTIM_MASK );/* set the PLL on, remove the HNP/SRP and set the PHY */ val = (hsotg->phyif ==GUSBCFG_PHYIF8 ) ?9 :5 ;
@@ -3403,7 +3403,7 @@ static void dwc2_hsotg_init(struct dwc2_/* keep other bits untouched (so e.g. forced modes are not lost) */ usbcfg =dwc2_readl (hsotg->regs +GUSBCFG ); usbcfg &= ~(GUSBCFG_TOUTCAL_MASK |GUSBCFG_PHYIF16 |GUSBCFG_SRPCAP | -GUSBCFG_HNPCAP ); +GUSBCFG_HNPCAP |GUSBCFG_USBTRDTIM_MASK );/* set the PLL on, remove the HNP/SRP and set the PHY */ trdtim = (hsotg->phyif ==GUSBCFG_PHYIF8 ) ?9 :5 ;
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/usb-dwc2-gadget-fix-gusbcfg.usbtrdtim-value.patch