write in 30M

hc

2024-02-20 ea08eeccae9297f7aabd2ef7f0c2517ac4549acc

 kernel/drivers/usb/dwc2/core_intr.c
..
..
@@ -288,14 +288,9 @@
288
288
 
289
289
 	/*
290
290
 	 * Need to schedule a work, as there are possible DELAY function calls.
291
-	 * Release lock before scheduling workq as it holds spinlock during
292
-	 * scheduling.
293
291
 	 */
294
-	if (hsotg->wq_otg) {
295
-		spin_unlock(&hsotg->lock);
292
+	if (hsotg->wq_otg)
296
293
 		queue_work(hsotg->wq_otg, &hsotg->wf_otg);
297
-		spin_lock(&hsotg->lock);
298
-	}
299
294
 }
300
295
 
301
296
 /**
..
..
@@ -404,7 +399,6 @@
404
399
 static void dwc2_handle_wakeup_detected_intr(struct dwc2_hsotg *hsotg)
405
400
 {
406
401
 	int ret;
407
-	struct device_node *np = hsotg->dev->of_node;
408
402
 
409
403
 	/* Clear interrupt */
410
404
 	dwc2_writel(hsotg, GINTSTS_WKUPINT, GINTSTS);
..
..
@@ -449,15 +443,15 @@
449
443
 			dwc2_writel(hsotg, pcgcctl, PCGCTL);
450
444
 
451
445
 			/*
452
-			 * It is a quirk in Rockchip RK3288, causing by
453
-			 * a hardware bug. This will propagate out and
454
-			 * eventually we'll re-enumerate the device.
455
-			 * Not great but the best we can do.
446
+			 * If we've got this quirk then the PHY is stuck upon
447
+			 * wakeup.  Assert reset.  This will propagate out and
448
+			 * eventually we'll re-enumerate the device.  Not great
449
+			 * but the best we can do.  We can't call phy_reset()
450
+			 * at interrupt time but there's no hurry, so we'll
451
+			 * schedule it for later.
456
452
 			 */
457
-			if (of_device_is_compatible(np, "rockchip,rk3288-usb")) {
458
-				/* FIXME: wkp_timer might run early than phy_rst_work */
459
-				schedule_work(&hsotg->phy_rst_work);
460
-			}
453
+			if (hsotg->reset_phy_on_wake)
454
+				dwc2_host_schedule_phy_reset(hsotg);
461
455
 
462
456
 			mod_timer(&hsotg->wkp_timer,
463
457
 				  jiffies + msecs_to_jiffies(71));