diff mbox series

[2/3] usb: xhci-mtk: fix UAS issue by XHCI_BROKEN_STREAMS quirk

Message ID 20201216115125.5886-2-chunfeng.yun@mediatek.com
State New
Headers show
Series [1/3] dt-bindings: usb: mtk-xhci: add a new property for broken streams | expand

Commit Message

Chunfeng Yun (云春峰) Dec. 16, 2020, 11:51 a.m. UTC 
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 <chunfeng.yun@mediatek.com>

---
 drivers/usb/host/xhci-mtk.c | 7 ++++++-
 drivers/usb/host/xhci-mtk.h | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

-- 
2.18.0

Comments

Nicolas Boichat Dec. 16, 2020, 12:28 p.m. UTC | #1 
On Wed, Dec 16, 2020 at 7:53 PM Chunfeng Yun <chunfeng.yun@mediatek.com> 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 <chunfeng.yun@mediatek.com>
> ---
>  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?

(IMHO usb3-lpm-capable detection should also be done in the same way)

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
Chunfeng Yun (云春峰) Dec. 17, 2020, 2:19 a.m. UTC | #2 
On Wed, 2020-12-16 at 20:28 +0800, Nicolas Boichat wrote:
> On Wed, Dec 16, 2020 at 7:53 PM Chunfeng Yun <chunfeng.yun@mediatek.com> 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 <chunfeng.yun@mediatek.com>

> > ---

> >  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
Nicolas Boichat Dec. 17, 2020, 3:32 a.m. UTC | #3 
On Thu, Dec 17, 2020 at 10:19 AM Chunfeng Yun <chunfeng.yun@mediatek.com> wrote:
>
> On Wed, 2020-12-16 at 20:28 +0800, Nicolas Boichat wrote:
> > On Wed, Dec 16, 2020 at 7:53 PM Chunfeng Yun <chunfeng.yun@mediatek.com> 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 <chunfeng.yun@mediatek.com>
> > > ---
> > >  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.

It can, we do this regularly for many other components. One example:
https://elixir.bootlin.com/linux/latest/source/drivers/i2c/busses/i2c-mt65xx.c#L402

> 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.

Understand, it's just different approaches, there seems to be
precedent (at least in this driver/binding) for using properties, so
I'll let the USB maintainers speak up ,-)

>
> 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
>
Rob Herring Dec. 21, 2020, 7:35 p.m. UTC | #4 
On Thu, Dec 17, 2020 at 02:23:50PM +0800, Chunfeng Yun wrote:
> On Thu, 2020-12-17 at 11:32 +0800, Nicolas Boichat wrote:
> > On Thu, Dec 17, 2020 at 10:19 AM Chunfeng Yun <chunfeng.yun@mediatek.com> wrote:
> > >
> > > On Wed, 2020-12-16 at 20:28 +0800, Nicolas Boichat wrote:
> > > > On Wed, Dec 16, 2020 at 7:53 PM Chunfeng Yun <chunfeng.yun@mediatek.com> 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 <chunfeng.yun@mediatek.com>
> > > > > ---
> > > > >  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.
> > 
> > It can, we do this regularly for many other components. One example:
> > https://elixir.bootlin.com/linux/latest/source/drivers/i2c/busses/i2c-mt65xx.c#L402
> > 
> Got it. Indeed works when add compatible private data.
> 
> Due to many SoCs supports USB and not upstream, I'd prefer to avoid
> adding new compatible in driver when support new SoCs, and leave the
> code as simple as possible.

No. The problem is adding new fixes requires updating the DT. That would 
be fine if you knew all possible issues and quirks up front. You may for 
some, but you won't catch them all.

Save DT properties for per board quirks/features, not per SoC ones.

> 
> > > 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 tend to agree, but am more tolerable of standard USB features than 
specific IP block quirks.

Rob
Chunfeng Yun (云春峰) Dec. 24, 2020, 7:18 a.m. UTC | #5 
On Wed, 2020-12-16 at 19:43 -0800, Rosen Penev wrote:
> On Wed, Dec 16, 2020 at 6:29 PM Chunfeng Yun <chunfeng.yun@mediatek.com> wrote:

> >

> > On Wed, 2020-12-16 at 20:28 +0800, Nicolas Boichat wrote:

> > > On Wed, Dec 16, 2020 at 7:53 PM Chunfeng Yun <chunfeng.yun@mediatek.com> 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 <chunfeng.yun@mediatek.com>

> > > > ---

> > > >  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.

> I'm guessing this also applies to mt7621?

Yes, mt7621 doesn't support bulk stream

> >

> > >

> > > (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-arm-kernel mailing list

> > linux-arm-kernel@lists.infradead.org

> > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Chunfeng Yun (云春峰) Dec. 25, 2020, 6:12 a.m. UTC | #6 
On Mon, 2020-12-21 at 12:35 -0700, Rob Herring wrote:
> On Thu, Dec 17, 2020 at 02:23:50PM +0800, Chunfeng Yun wrote:

> > On Thu, 2020-12-17 at 11:32 +0800, Nicolas Boichat wrote:

> > > On Thu, Dec 17, 2020 at 10:19 AM Chunfeng Yun <chunfeng.yun@mediatek.com> wrote:

> > > >

> > > > On Wed, 2020-12-16 at 20:28 +0800, Nicolas Boichat wrote:

> > > > > On Wed, Dec 16, 2020 at 7:53 PM Chunfeng Yun <chunfeng.yun@mediatek.com> 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 <chunfeng.yun@mediatek.com>

> > > > > > ---

> > > > > >  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.

> > > 

> > > It can, we do this regularly for many other components. One example:

> > > https://elixir.bootlin.com/linux/latest/source/drivers/i2c/busses/i2c-mt65xx.c#L402

> > > 

> > Got it. Indeed works when add compatible private data.

> > 

> > Due to many SoCs supports USB and not upstream, I'd prefer to avoid

> > adding new compatible in driver when support new SoCs, and leave the

> > code as simple as possible.

> 

> No. The problem is adding new fixes requires updating the DT. That would 

> be fine if you knew all possible issues and quirks up front. You may for 

> some, but you won't catch them all.

Yes.
But all SoCs use the generic compatible "mediatek,mtk-xhci" except
mtk8173. as following:
compatible = "mediatek,mt<SoC>-xhci", "mediatek,mtk-xhci";

It may be a little messy when the driver fill many compatibles after
supporting several tens or hundreds SoCs.

I'll think about it again. 
> 

> Save DT properties for per board quirks/features, not per SoC ones.

This is for USB IP quirks/feature, not board or SoC

Thanks

> 

> > 

> > > > 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 tend to agree, but am more tolerable of standard USB features than 

> specific IP block quirks.

> 

> Rob
Chunfeng Yun (云春峰) Feb. 1, 2021, 1:47 a.m. UTC | #7 
On Sun, 2021-01-31 at 15:13 +0100, Matthias Brugger wrote:
> 

> On 24/12/2020 08:18, Chunfeng Yun wrote:

> > On Wed, 2020-12-16 at 19:43 -0800, Rosen Penev wrote:

> >> On Wed, Dec 16, 2020 at 6:29 PM Chunfeng Yun <chunfeng.yun@mediatek.com> wrote:

> >>>

> >>> On Wed, 2020-12-16 at 20:28 +0800, Nicolas Boichat wrote:

> >>>> On Wed, Dec 16, 2020 at 7:53 PM Chunfeng Yun <chunfeng.yun@mediatek.com> wrote:

> [...]

> >>>>>         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.

> >> I'm guessing this also applies to mt7621?

> > Yes, mt7621 doesn't support bulk stream

> > 

> 

> Then please provide patches to the DTSI for all SoCs that have this problem.

> Either as a follow-up or as part of this series, if you need to resubmit.

Ok, I'll send new version, and also try other way to fix it without add
property in DTS, thanks

> 

> Regards,

> Matthias
diff mbox series

Patch

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");
 	/* 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;