Merge "usb: dwc3-msm: Add markers for peripheral bus resume" (59128ed4) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/usb/dwc3/dwc3-msm.c

+13 −0

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@
		#include <linux/extcon.h>
		#include <linux/reset.h>
		#include <linux/clk/qcom.h>
		#include <soc/qcom/boot_stats.h>

		#include "power.h"
		#include "core.h"
		@@ -3085,6 +3086,12 @@ static irqreturn_t msm_dwc3_pwr_irq(int irq, void *data)

		dwc->t_pwr_evt_irq = ktime_get();
		dev_dbg(mdwc->dev, "%s received\n", __func__);

		if (mdwc->drd_state == DRD_STATE_PERIPHERAL_SUSPEND) {
		dev_info(mdwc->dev, "USB Resume start\n");
		place_marker("M - USB device resume started");
		}

		/*
		* When in Low Power Mode, can't read PWR_EVNT_IRQ_STAT_REG to acertain
		* which interrupts have been triggered, as the clocks are disabled.
		@@ -4851,6 +4858,12 @@ static int dwc3_msm_pm_resume(struct device *dev)
		flush_workqueue(mdwc->dwc3_wq);
		atomic_set(&mdwc->pm_suspended, 0);

		if (atomic_read(&dwc->in_lpm) &&
		mdwc->drd_state == DRD_STATE_PERIPHERAL_SUSPEND) {
		dev_info(mdwc->dev, "USB Resume start\n");
		place_marker("M - USB device resume started");
		}

		/* kick in otg state machine */
		queue_work(mdwc->dwc3_wq, &mdwc->resume_work);

+1 −1

Original line number	Diff line number	Diff line
		@@ -2502,7 +2502,7 @@ void composite_resume(struct usb_gadget *gadget)
		/* REVISIT: should we have config level
		* suspend/resume callbacks?
		*/
		INFO(cdev, "USB Resume\n");
		INFO(cdev, "USB Resume end\n");
		place_marker("M - USB device is resumed");
		if (cdev->driver->resume)
		cdev->driver->resume(cdev);