FAILED: patch "[PATCH] usb: dwc3: gadget: Fix incorrect DEPCMD and DGCMD status" failed to apply to 3.10-stable tree

PATCH [email protected] 1 participant 1 message Jun 19, 2015

Subsystems (3)

Stable branch USB DesignWare USB3 DRD IP driver

lore

Share & tools

lore

[email protected]

author maintainer

2015-06-19 18:29 UTC #0 lore raw

The patch below does not apply to the 3.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 459e210c4fd034d20077bcec31fec9472a700fe9 Mon Sep 17 00:00:00 2001

From: Subbaraya Sundeep Bhatta <[email protected]>
Date: Thu, 21 May 2015 15:46:46 +0530
Subject: [PATCH] usb: dwc3: gadget: Fix incorrect DEPCMD and DGCMD status
macros

Fixed the incorrect macro definitions correctly as per databook.

Signed-off-by Subbaraya Sundeep Bhatta <[email protected]>

Fixes b09bb64239c8 (usb: dwc3: gadget: implement Global Command support)

Cc <[email protected]> #v3.5+

Signed-off-by Felipe Balbi <[email protected]>

drivers/usb/dwc3/core.h +2 -2

index fdab715a0631..c0eafa6fd403 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) & 0x0F)
 #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)

--
To unsubscribe from this list: send the line "unsubscribe stable" in