git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From e19852d0bfecbc80976b1423cf2af87ca514a58c Mon Sep 17 00:00:00 2001
   2 From: Xu Yang <xu.yang_2@nxp.com>
   3 Date: Mon, 9 Dec 2024 19:14:23 +0800
   4 Subject: usb: host: xhci-plat: set skip_phy_initialization if software node has XHCI_SKIP_PHY_INIT property
   5
   6 From: Xu Yang <xu.yang_2@nxp.com>
   7
   8 commit e19852d0bfecbc80976b1423cf2af87ca514a58c upstream.
   9
  10 The source of quirk XHCI_SKIP_PHY_INIT comes from xhci_plat_priv.quirks or
  11 software node property. This will set skip_phy_initialization if software
  12 node also has XHCI_SKIP_PHY_INIT property.
  13
  14 Fixes: a6cd2b3fa894 ("usb: host: xhci-plat: Parse xhci-missing_cas_quirk and apply quirk")
  15 Cc: stable <stable@kernel.org>
  16 Signed-off-by: Xu Yang <xu.yang_2@nxp.com>
  17 Link: https://lore.kernel.org/r/20241209111423.4085548-1-xu.yang_2@nxp.com
  18 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  19 ---
  20  drivers/usb/host/xhci-plat.c | 3 ++-
  21  1 file changed, 2 insertions(+), 1 deletion(-)
  22
  23 diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
  24 index e6c9006bd568..db109b570c5c 100644
  25 --- a/drivers/usb/host/xhci-plat.c
  26 +++ b/drivers/usb/host/xhci-plat.c
  27 @@ -290,7 +290,8 @@ int xhci_plat_probe(struct platform_device *pdev, struct device *sysdev, const s
  28
  29         hcd->tpl_support = of_usb_host_tpl_support(sysdev->of_node);
  30
  31 -       if (priv && (priv->quirks & XHCI_SKIP_PHY_INIT))
  32 +       if ((priv && (priv->quirks & XHCI_SKIP_PHY_INIT)) ||
  33 +           (xhci->quirks & XHCI_SKIP_PHY_INIT))
  34                 hcd->skip_phy_initialization = 1;
  35
  36         if (priv && (priv->quirks & XHCI_SG_TRB_CACHE_SIZE_QUIRK))
  37 --
  38 2.48.0
  39