Commit 6f26ebb7 authored by Jack Pham's avatar Jack Pham Committed by Greg Kroah-Hartman
Browse files

usb: dwc3: gadget: Rename EOPF event macros to Suspend 



The device event corresponding to End of Periodic Frame is only
found on older IP revisions (2.10a and prior, according to a
cursory SNPS databook search).  On revisions 2.30a and newer,
including DWC3.1, the same event value and corresponding DEVTEN
bit were repurposed to indicate that the link has gone into
suspend state (U3 or L2/L1).

EOPF events had never been enabled before in this driver, and
going forward we expect current and future DWC3-based devices
won't likely to be using such old DWC3 IP revisions either.
Hence rather than keeping the deprecated EOPF macro names let's
rename them to indicate their usage for suspend events.

Acked-by: default avatarFelipe Balbi <balbi@kernel.org>
Signed-off-by: default avatarJack Pham <jackp@codeaurora.org>
Link: https://lore.kernel.org/r/20210428090111.3370-2-jackp@codeaurora.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d1d90dd2

drivers/usb/dwc3/core.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -57,7 +57,7 @@ 
#define DWC3_DEVICE_EVENT_LINK_STATUS_CHANGE	3

#define DWC3_DEVICE_EVENT_LINK_STATUS_CHANGE	3

#define DWC3_DEVICE_EVENT_WAKEUP		4

#define DWC3_DEVICE_EVENT_WAKEUP		4

#define DWC3_DEVICE_EVENT_HIBER_REQ		5

#define DWC3_DEVICE_EVENT_HIBER_REQ		5

#define DWC3_DEVICE_EVENT_EOPF			6

#define DWC3_DEVICE_EVENT_SUSPEND		6

#define DWC3_DEVICE_EVENT_SOF			7

#define DWC3_DEVICE_EVENT_SOF			7

#define DWC3_DEVICE_EVENT_ERRATIC_ERROR		9

#define DWC3_DEVICE_EVENT_ERRATIC_ERROR		9

#define DWC3_DEVICE_EVENT_CMD_CMPL		10

#define DWC3_DEVICE_EVENT_CMD_CMPL		10
@@ -460,7 +460,7 @@ 
#define DWC3_DEVTEN_CMDCMPLTEN		BIT(10)

#define DWC3_DEVTEN_CMDCMPLTEN		BIT(10)

#define DWC3_DEVTEN_ERRTICERREN		BIT(9)

#define DWC3_DEVTEN_ERRTICERREN		BIT(9)

#define DWC3_DEVTEN_SOFEN		BIT(7)

#define DWC3_DEVTEN_SOFEN		BIT(7)

#define DWC3_DEVTEN_EOPFEN		BIT(6)

#define DWC3_DEVTEN_U3L2L1SUSPEN	BIT(6)

#define DWC3_DEVTEN_HIBERNATIONREQEVTEN	BIT(5)

#define DWC3_DEVTEN_HIBERNATIONREQEVTEN	BIT(5)

#define DWC3_DEVTEN_WKUPEVTEN		BIT(4)

#define DWC3_DEVTEN_WKUPEVTEN		BIT(4)

#define DWC3_DEVTEN_ULSTCNGEN		BIT(3)

#define DWC3_DEVTEN_ULSTCNGEN		BIT(3)
@@ -1375,7 +1375,7 @@ struct dwc3_event_depevt { 
 *	3	- ULStChng

 *	3	- ULStChng

 *	4	- WkUpEvt

 *	4	- WkUpEvt

 *	5	- Reserved

 *	5	- Reserved

 *	6	- EOPF

 *	6	- Suspend (EOPF on revisions 2.10a and prior)

 *	7	- SOF

 *	7	- SOF

 *	8	- Reserved

 *	8	- Reserved

 *	9	- ErrticErr

 *	9	- ErrticErr

drivers/usb/dwc3/debug.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -221,8 +221,8 @@ static inline const char *dwc3_gadget_event_string(char *str, size_t size, 
		snprintf(str, size, "WakeUp [%s]",

		snprintf(str, size, "WakeUp [%s]",

				dwc3_gadget_link_string(state));

				dwc3_gadget_link_string(state));

		break;

		break;

	case DWC3_DEVICE_EVENT_EOPF:

	case DWC3_DEVICE_EVENT_SUSPEND:

		snprintf(str, size, "End-Of-Frame [%s]",

		snprintf(str, size, "Suspend [%s]",

				dwc3_gadget_link_string(state));

				dwc3_gadget_link_string(state));

		break;

		break;

	case DWC3_DEVICE_EVENT_SOF:

	case DWC3_DEVICE_EVENT_SOF:
@@ -353,8 +353,8 @@ static inline const char *dwc3_gadget_event_type_string(u8 event) 
		return "Wake-Up";

		return "Wake-Up";

	case DWC3_DEVICE_EVENT_HIBER_REQ:

	case DWC3_DEVICE_EVENT_HIBER_REQ:

		return "Hibernation";

		return "Hibernation";

	case DWC3_DEVICE_EVENT_EOPF:

	case DWC3_DEVICE_EVENT_SUSPEND:

		return "End of Periodic Frame";

		return "Suspend";

	case DWC3_DEVICE_EVENT_SOF:

	case DWC3_DEVICE_EVENT_SOF:

		return "Start of Frame";

		return "Start of Frame";

	case DWC3_DEVICE_EVENT_ERRATIC_ERROR:

	case DWC3_DEVICE_EVENT_ERRATIC_ERROR:

drivers/usb/dwc3/gadget.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -2325,7 +2325,7 @@ static void dwc3_gadget_enable_irq(struct dwc3 *dwc) 




	/* On 2.30a and above this bit enables U3/L2-L1 Suspend Events */

	/* On 2.30a and above this bit enables U3/L2-L1 Suspend Events */

	if (!DWC3_VER_IS_PRIOR(DWC3, 230A))

	if (!DWC3_VER_IS_PRIOR(DWC3, 230A))

		reg |= DWC3_DEVTEN_EOPFEN;

		reg |= DWC3_DEVTEN_U3L2L1SUSPEN;





	dwc3_writel(dwc->regs, DWC3_DEVTEN, reg);

	dwc3_writel(dwc->regs, DWC3_DEVTEN, reg);

}

}
@@ -3744,7 +3744,7 @@ static void dwc3_gadget_interrupt(struct dwc3 *dwc, 
	case DWC3_DEVICE_EVENT_LINK_STATUS_CHANGE:

	case DWC3_DEVICE_EVENT_LINK_STATUS_CHANGE:

		dwc3_gadget_linksts_change_interrupt(dwc, event->event_info);

		dwc3_gadget_linksts_change_interrupt(dwc, event->event_info);

		break;

		break;

	case DWC3_DEVICE_EVENT_EOPF:

	case DWC3_DEVICE_EVENT_SUSPEND:

		/* It changed to be suspend event for version 2.30a and above */

		/* It changed to be suspend event for version 2.30a and above */

		if (!DWC3_VER_IS_PRIOR(DWC3, 230A)) {

		if (!DWC3_VER_IS_PRIOR(DWC3, 230A)) {

			/*

			/*