From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750909AbdALXpU (ORCPT ); Thu, 12 Jan 2017 18:45:20 -0500 Received: from us01smtprelay-2.synopsys.com ([198.182.47.9]:37591 "EHLO smtprelay.synopsys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750794AbdALXpS (ORCPT ); Thu, 12 Jan 2017 18:45:18 -0500 Subject: Re: [PATCH] usb: dwc2: gadget: Fix GUSBCFG.USBTRDTIM value To: Amelie DELAUNAY , John Youn , Greg Kroah-Hartman , Felipe Balbi References: <1484235416-24497-1-git-send-email-amelie.delaunay@st.com> <1484235416-24497-2-git-send-email-amelie.delaunay@st.com> <26c07f46-795b-d561-72ed-0548b63a98d9@st.com> CC: "linux-usb@vger.kernel.org" , "linux-kernel@vger.kernel.org" From: John Youn Message-ID: Date: Thu, 12 Jan 2017 15:45:16 -0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: <26c07f46-795b-d561-72ed-0548b63a98d9@st.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.9.138.255] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 1/12/2017 7:41 AM, Amelie DELAUNAY wrote: > Hi all, > Sorry, I did not see Pengcheng Li patch which is exactly the same: > https://urldefense.proofpoint.com/v2/url?u=https-3A__patchwork.kernel.org_patch_9347979_&d=DgIC-g&c=DPL6_X_6JkXFx7AXWqB0tg&r=U3o8uKoKhWme5_V9D-eeCkB11BFwt4KvWztBgdE9ZpA&m=6VylcKBQDS2RlneASNqb6vUEW48snVAZ1f_mhtzcSaE&s=iYEesI5W2GVN4jBs6pzyRC7Sb0RAng4gpapDsoZQG_s&e= > > Regards > Hi Felipe, Could you take either one? Regards, John > On 01/12/2017 04:36 PM, Amelie Delaunay wrote: >> 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+. >> >> Signed-off-by: Amelie Delaunay >> --- >> drivers/usb/dwc2/gadget.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c >> index c55db4a..86b2076 100644 >> --- a/drivers/usb/dwc2/gadget.c >> +++ b/drivers/usb/dwc2/gadget.c >> @@ -3169,7 +3169,7 @@ void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *hsotg, >> /* 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); >> >> if (hsotg->params.phy_type == DWC2_PHY_TYPE_PARAM_FS && >> (hsotg->params.speed == DWC2_SPEED_PARAM_FULL || >> @@ -4131,7 +4131,7 @@ static void dwc2_hsotg_init(struct dwc2_hsotg *hsotg) >> /* 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; >> >