From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2EAD4C1B0D8 for ; Thu, 17 Dec 2020 02:26:23 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D36AD23718 for ; Thu, 17 Dec 2020 02:26:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D36AD23718 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Date:To:From: Subject:Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=X2J7NZ6ms0LDPnwU2+mh/IJmDAwm9RtTglz79NgFNDo=; b=dezZvnR0BFGx2CqtZ/UPmQ+od o5oUVYe/EGWEo9+OJw37fv3Fn1s8iWAAK3nzUCHRqFOxOcPV6whP30GZPpfMjklW6CgpNgUD2o+Ws Q/2PGNSS5MULjV9nWHx/K0JGHGjVywD1RUppyqhGPgOzjzMndES2QEGvrCr7poTMhRn4H0ji+vNlj U1g8VlDs3Wg09vya+xDuWd1tz72Zpb/cnKZZcfh3vbHYCYCQ1ywyHSNNp8+156g6/L7T28i/B8MPb 9CJ61DunTFS+CZayU1l0OmlbweYK1x742K5e+nMOGzFbr8XTyzYePX2SUCAFUNmXxn0MoctYhxKIE sxzLd0awQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kpizb-0002Dy-HL; Thu, 17 Dec 2020 02:26:11 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kpizX-0002Ce-22; Thu, 17 Dec 2020 02:26:10 +0000 X-UUID: f69667f015f2433ebecf9ec2eb3c3689-20201216 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=sI/OBSMnUSmpUsrYV0tpYoTI7F39Re/i+rNgT7WIngc=; b=KvXv+jrGv++0o+9mtQVHiyMojFDniM0TS4QEOs08nbkuzeZod0pnqf+JnxkuouutsnNiTqqo5iW0Av6kzSzAf6G8JH93K631daLT+3v3Jc3bUtQCJAagPh5l9/SXH1dfQLvOESh1zWGaAPAcQlxeCBX92SYwxCWkeVQmIhTu5yc=; X-UUID: f69667f015f2433ebecf9ec2eb3c3689-20201216 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 3113839; Wed, 16 Dec 2020 18:26:00 -0800 Received: from MTKMBS31N1.mediatek.inc (172.27.4.69) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 16 Dec 2020 18:19:20 -0800 Received: from MTKCAS36.mediatek.inc (172.27.4.186) by MTKMBS31N1.mediatek.inc (172.27.4.69) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 17 Dec 2020 10:19:14 +0800 Received: from [10.17.3.153] (10.17.3.153) by MTKCAS36.mediatek.inc (172.27.4.170) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 17 Dec 2020 10:19:16 +0800 Message-ID: <1608171557.23328.53.camel@mhfsdcap03> Subject: Re: [PATCH 2/3] usb: xhci-mtk: fix UAS issue by XHCI_BROKEN_STREAMS quirk From: Chunfeng Yun To: Nicolas Boichat Date: Thu, 17 Dec 2020 10:19:17 +0800 In-Reply-To: References: <20201216115125.5886-1-chunfeng.yun@mediatek.com> <20201216115125.5886-2-chunfeng.yun@mediatek.com> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-TM-SNTS-SMTP: 258AB31D0E0EDB8FD5AE2C67A085C1DEC82486880D7B9BDEC48198D85D9153E92000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201216_212607_345709_3E21BFD5 X-CRM114-Status: GOOD ( 28.81 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Devicetree List , Mathias Nyman , Greg Kroah-Hartman , linux-usb@vger.kernel.org, lkml , Rob Herring , "moderated list:ARM/Mediatek SoC support" , Hsin-Yi Wang , Matthias Brugger , Ikjoon Jang , linux-arm Mailing List Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org On Wed, 2020-12-16 at 20:28 +0800, Nicolas Boichat wrote: > On Wed, Dec 16, 2020 at 7:53 PM Chunfeng Yun wrote: > > > > The 0.96 xHCI controller on some platforms does not support > > bulk stream even HCCPARAMS says supporting, due to MaxPSASize > > is set a non-zero default value by mistake, here use > > XHCI_BROKEN_STREAMS quirk to fix it. > > > > Fixes: 94a631d91ad3 ("usb: xhci-mtk: check hcc_params after adding primary hcd") > > Signed-off-by: Chunfeng Yun > > --- > > drivers/usb/host/xhci-mtk.c | 7 ++++++- > > drivers/usb/host/xhci-mtk.h | 1 + > > 2 files changed, 7 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/usb/host/xhci-mtk.c b/drivers/usb/host/xhci-mtk.c > > index 8f321f39ab96..08dab974d847 100644 > > --- a/drivers/usb/host/xhci-mtk.c > > +++ b/drivers/usb/host/xhci-mtk.c > > @@ -395,6 +395,9 @@ static void xhci_mtk_quirks(struct device *dev, struct xhci_hcd *xhci) > > xhci->quirks |= XHCI_SPURIOUS_SUCCESS; > > if (mtk->lpm_support) > > xhci->quirks |= XHCI_LPM_SUPPORT; > > + > > + if (mtk->broken_streams) > > + xhci->quirks |= XHCI_BROKEN_STREAMS; > > } > > > > /* called during probe() after chip reset completes */ > > @@ -460,6 +463,8 @@ static int xhci_mtk_probe(struct platform_device *pdev) > > return ret; > > > > mtk->lpm_support = of_property_read_bool(node, "usb3-lpm-capable"); > > + mtk->broken_streams = > > + of_property_read_bool(node, "mediatek,broken_streams_quirk"); > > Would it be better to add a data field to struct of_device_id > mtk_xhci_of_match, and enable this quirk on mediatek,mt8173-xhci only? This is the common issue for all SoCs (before 2016.06) with 0.96 xHCI when the controller don't support bulk stream. If enable this quirk only for mt8173, then for other SoCs, the compatible need include "mediatek,mt8173-xhci" in dts, this may be not flexible for some cases, e.g. a new SoC has the broken stream as mt8173, but also has another different quirk, the way you suggested will not handle it. And I plan to remove "mediatek,mt8173-xhci" in mtk_xhci_of_match after converting the binding to YMAL. > > (IMHO usb3-lpm-capable detection should also be done in the same way) I prefer to provide a property for common issues, and use the way you suggested for the issue only happened at a specific SoC. Thank you > > Thanks, > > > /* optional property, ignore the error if it does not exist */ > > of_property_read_u32(node, "mediatek,u3p-dis-msk", > > &mtk->u3p_dis_msk); > > @@ -546,7 +551,7 @@ static int xhci_mtk_probe(struct platform_device *pdev) > > if (ret) > > goto put_usb3_hcd; > > > > - if (HCC_MAX_PSA(xhci->hcc_params) >= 4) > > + if (!mtk->broken_streams && HCC_MAX_PSA(xhci->hcc_params) >= 4) > > xhci->shared_hcd->can_do_streams = 1; > > > > ret = usb_add_hcd(xhci->shared_hcd, irq, IRQF_SHARED); > > diff --git a/drivers/usb/host/xhci-mtk.h b/drivers/usb/host/xhci-mtk.h > > index a93cfe817904..86aa4978915e 100644 > > --- a/drivers/usb/host/xhci-mtk.h > > +++ b/drivers/usb/host/xhci-mtk.h > > @@ -147,6 +147,7 @@ struct xhci_hcd_mtk { > > struct phy **phys; > > int num_phys; > > bool lpm_support; > > + bool broken_streams; > > /* usb remote wakeup */ > > bool uwk_en; > > struct regmap *uwk; > > -- > > 2.18.0 _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek