Commit 29a5118e authored by Johan Hovold's avatar Johan Hovold Committed by Jialin Zhang
Browse files

usb: dwc3: disable USB core PHY management 

stable inclusion
from stable-v5.10.142
commit 06a84bda0a0876dc0ba358e47ff51e5e658ed374
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I6CSFH

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=06a84bda0a0876dc0ba358e47ff51e5e658ed374



--------------------------------

commit 6000b8d9 upstream.

The dwc3 driver manages its PHYs itself so the USB core PHY management
needs to be disabled.

Use the struct xhci_plat_priv hack added by commits 46034a99 ("usb:
host: xhci-plat: add platform data support") and f768e718 ("usb:
host: xhci-plat: add priv quirk for skip PHY initialization") to
propagate the setting for now.

Fixes: 4e88d4c0 ("usb: add a flag to skip PHY initialization to struct usb_hcd")
Fixes: 178a0bce ("usb: core: hcd: integrate the PHY wrapper into the HCD core")
Tested-by: default avatarMatthias Kaehlcke <mka@chromium.org>
Cc: stable <stable@kernel.org>
Reviewed-by: default avatarMatthias Kaehlcke <mka@chromium.org>
Signed-off-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20220825131836.19769-1-johan+linaro@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
[ johan: adjust context to 5.15 ]
Signed-off-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Reviewed-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 7e8e1eea

drivers/usb/dwc3/host.c

+10 −0
Original line number Diff line number Diff line
@@ -10,8 +10,13 @@ 
#include <linux/acpi.h>

#include <linux/platform_device.h>



#include "../host/xhci-plat.h"

#include "core.h"



static const struct xhci_plat_priv dwc3_xhci_plat_priv = {

	.quirks = XHCI_SKIP_PHY_INIT,

};



static int dwc3_host_get_irq(struct dwc3 *dwc)

{

	struct platform_device	*dwc3_pdev = to_platform_device(dwc->dev);
@@ -87,6 +92,11 @@ int dwc3_host_init(struct dwc3 *dwc) 
		goto err;

	}



	ret = platform_device_add_data(xhci, &dwc3_xhci_plat_priv,

					sizeof(dwc3_xhci_plat_priv));

	if (ret)

		goto err;



	memset(props, 0, sizeof(struct property_entry) * ARRAY_SIZE(props));



	if (dwc->usb3_lpm_capable)