From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 1 Apr 2024 15:02:18 +0000 (+0200)
Subject: Merge 6.9-rc2 into usb-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5bab5dc780c9ed0c69fc2f828015532acf4a7848;p=linux.git

Merge 6.9-rc2 into usb-next

We need the USB fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

5bab5dc780c9ed0c69fc2f828015532acf4a7848
diff --cc drivers/usb/core/hub.c
index 1dcae5db85b21,9446660e231bb..e9fec90ed6f8e
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@@ -1805,9 -1814,9 +1814,9 @@@ static void hub_disconnect(struct usb_i
  	if (hub->quirk_disable_autosuspend)
  		usb_autopm_put_interface(intf);
  
 -	onboard_hub_destroy_pdevs(&hub->onboard_hub_devs);
 +	onboard_dev_destroy_pdevs(&hub->onboard_devs);
  
- 	kref_put(&hub->kref, hub_release);
+ 	hub_put(hub);
  }
  
  static bool hub_descriptor_is_sane(struct usb_host_interface *desc)
diff --cc drivers/usb/dwc2/hcd.c
index cc75a70629104,dd5b1c5691e11..cb54390e7de48
--- a/drivers/usb/dwc2/hcd.c
+++ b/drivers/usb/dwc2/hcd.c
@@@ -5614,16 -5631,13 +5636,18 @@@ int dwc2_host_exit_hibernation(struct d
  	dwc2_writel(hsotg, gr->gusbcfg, GUSBCFG);
  	dwc2_writel(hsotg, hr->hcfg, HCFG);
  
 +	/* Reset ULPI latch */
 +	gpwrdn = dwc2_readl(hsotg, GPWRDN);
 +	gpwrdn &= ~GPWRDN_ULPI_LATCH_EN_DURING_HIB_ENTRY;
 +	dwc2_writel(hsotg, gpwrdn, GPWRDN);
 +
  	/* De-assert Wakeup Logic */
- 	gpwrdn = dwc2_readl(hsotg, GPWRDN);
- 	gpwrdn &= ~GPWRDN_PMUACTV;
- 	dwc2_writel(hsotg, gpwrdn, GPWRDN);
- 	udelay(10);
+ 	if (!(rem_wakeup && hsotg->hw_params.snpsid >= DWC2_CORE_REV_4_30a)) {
+ 		gpwrdn = dwc2_readl(hsotg, GPWRDN);
+ 		gpwrdn &= ~GPWRDN_PMUACTV;
+ 		dwc2_writel(hsotg, gpwrdn, GPWRDN);
+ 		udelay(10);
+ 	}
  
  	hprt0 = hr->hprt0;
  	hprt0 |= HPRT0_PWR;