diff mbox

[3.13.y-ckt,27/56] usb: dwc3: gadget: Fix incorrect DEPCMD and DGCMD status macros

Message ID 1436370037-25874-28-git-send-email-kamal@canonical.com
State New
Headers show

Commit Message

Kamal Mostafa July 8, 2015, 3:40 p.m. UTC 
3.13.11-ckt23 -stable review patch.  If anyone has any objections, please let me know.

------------------

From: Subbaraya Sundeep Bhatta <subbaraya.sundeep.bhatta@xilinx.com>

commit 459e210c4fd034d20077bcec31fec9472a700fe9 upstream.

Fixed the incorrect macro definitions correctly as per databook.

Signed-off-by: Subbaraya Sundeep Bhatta <sbhatta@xilinx.com>
Fixes: b09bb64239c8 (usb: dwc3: gadget: implement Global Command support)
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
---
 drivers/usb/dwc3/core.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Felipe Balbi July 10, 2015, 7:51 p.m. UTC | #1 
On Wed, Jul 08, 2015 at 08:40:08AM -0700, Kamal Mostafa wrote:
> 3.13.11-ckt23 -stable review patch.  If anyone has any objections, please let me know.
> 
> ------------------
> 
> From: Subbaraya Sundeep Bhatta <subbaraya.sundeep.bhatta@xilinx.com>
> 
> commit 459e210c4fd034d20077bcec31fec9472a700fe9 upstream.
> 
> Fixed the incorrect macro definitions correctly as per databook.
> 
> Signed-off-by: Subbaraya Sundeep Bhatta <sbhatta@xilinx.com>
> Fixes: b09bb64239c8 (usb: dwc3: gadget: implement Global Command support)
> Signed-off-by: Felipe Balbi <balbi@ti.com>
> Signed-off-by: Kamal Mostafa <kamal@canonical.com>

Just a head's up: this might have uncovered an IP bug which we're
discussing with Synopsys. We might need another patch backported to
workaorund the IP bug.
Kamal Mostafa July 13, 2015, 7:30 p.m. UTC | #2 
On Fri, 2015-07-10 at 14:51 -0500, Felipe Balbi wrote:
> On Wed, Jul 08, 2015 at 08:40:08AM -0700, Kamal Mostafa wrote:
> > 3.13.11-ckt23 -stable review patch.  If anyone has any objections, please let me know.
> > 
> > ------------------
> > 
> > From: Subbaraya Sundeep Bhatta <subbaraya.sundeep.bhatta@xilinx.com>
> > 
> > commit 459e210c4fd034d20077bcec31fec9472a700fe9 upstream.
> > 
> > Fixed the incorrect macro definitions correctly as per databook.
> > 
> > Signed-off-by: Subbaraya Sundeep Bhatta <sbhatta@xilinx.com>
> > Fixes: b09bb64239c8 (usb: dwc3: gadget: implement Global Command support)
> > Signed-off-by: Felipe Balbi <balbi@ti.com>
> > Signed-off-by: Kamal Mostafa <kamal@canonical.com>
> 
> Just a head's up: this might have uncovered an IP bug which we're
> discussing with Synopsys. We might need another patch backported to
> workaorund the IP bug.
> 

I'm dropping this patch from 3.13-stable pending resolution of that
issue.  Thanks for the heads-up, Felipe.

 -Kamal
diff mbox

Patch

diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
index 9e8b28d..99cb6a5 100644
--- a/drivers/usb/dwc3/core.h
+++ b/drivers/usb/dwc3/core.h
@@ -303,7 +303,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)
 
@@ -319,7 +319,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)