Skip to contentSkip to conversation

usb: dwc3: Fix incorrect DEPCMD and DGCMD status macros

PATCH Superseded Subbaraya Sundeep Bhatta 2 participants 3 messages May 14, 2015

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 usb: dwc3: Fix incorrect DEPCMD and DGCMD status macros

Modified DEPCMD and DGCMD status checking macros as per databook.

---
 drivers/usb/dwc3/core.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/usb/dwc3/core.h +2 -2
index fdab715..60acc5c9 100644
@@ -339,7 +339,7 @@
 #define DWC3_DGCMD_SET_ENDPOINT_NRDY	0x0c
 #define DWC3_DGCMD_RUN_SOC_BUS_LOOPBACK	0x10
 
-#define DWC3_DGCMD_STATUS(n)		(((n) >> 15) & 1)
+#define DWC3_DGCMD_STATUS(n)		(((n) >> 12) & 1)
 #define DWC3_DGCMD_CMDACT		(1 << 10)
 #define DWC3_DGCMD_CMDIOC		(1 << 8)
 
@@ -355,7 +355,7 @@
 #define DWC3_DEPCMD_PARAM_SHIFT		16
 #define DWC3_DEPCMD_PARAM(x)		((x) << DWC3_DEPCMD_PARAM_SHIFT)
 #define DWC3_DEPCMD_GET_RSC_IDX(x)	(((x) >> DWC3_DEPCMD_PARAM_SHIFT) & 0x7f)
-#define DWC3_DEPCMD_STATUS(x)		(((x) >> 15) & 1)
+#define DWC3_DEPCMD_STATUS(x)		(((x) >> 12) & 0x0F)
 #define DWC3_DEPCMD_HIPRI_FORCERM	(1 << 11)
 #define DWC3_DEPCMD_CMDACT		(1 << 10)
 #define DWC3_DEPCMD_CMDIOC		(1 << 8)
Signature · 1 line
1.7.4
#2 lore raw

PATCH 2/2 usb: dwc3: gadget: return error when DEPCMD or DGCMD fails

In reply to Subbaraya Sundeep Bhatta

When sending DEPCMD or DGCMD command fails return error to caller.

---
 drivers/usb/dwc3/gadget.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
drivers/usb/dwc3/gadget.c +4 -0
index 8946c32..55b5edc 100644
@@ -291,6 +291,8 @@ int dwc3_send_gadget_generic_command(struct dwc3 *dwc, unsigned cmd, u32 param)
 			dwc3_trace(trace_dwc3_gadget,
 					"Command Complete --> %d",
 					DWC3_DGCMD_STATUS(reg));
+			if (DWC3_DGCMD_STATUS(reg))
+				return -EINVAL;
 			return 0;
 		}
 
@@ -328,6 +330,8 @@ int dwc3_send_gadget_ep_cmd(struct dwc3 *dwc, unsigned ep,
 			dwc3_trace(trace_dwc3_gadget,
 					"Command Complete --> %d",
 					DWC3_DEPCMD_STATUS(reg));
+			if (DWC3_DEPCMD_STATUS(reg))
+				return -EINVAL;
 			return 0;
 		}
 
Signature · 1 line
1.7.4