usb: chipidea: need to mask INT_STATUS when write otgsc

Peter Chen · gregkh · commit 5332ff1fb63c · 2014-01-13T15:55:19.000-08:00
For otgsc, both enable bits and status bits are in it. So we need
to make sure the status bits are not be cleared when write enable
bits. It can fix one bug that we plug in/out Micro AB cable fast,
and sometimes, the IDIS will be cleared wrongly when handle last
ID interrupt (ID 0-&gt;1), so the current interrupt will not occur.

For stable tree: 3.12+

Cc: stable@vger.kernel.org
Signed-off-by: Peter Chen &lt;peter.chen@freescale.com&gt;
Signed-off-by: Greg Kroah-Hartman &lt;gregkh@linuxfoundation.org&gt;
diff --git a/drivers/usb/chipidea/otg.h b/drivers/usb/chipidea/otg.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Freescale Semiconductor, Inc.
+ * Copyright (C) 2013-2014 Freescale Semiconductor, Inc.
  *
  * Author: Peter Chen
  *
@@ -19,12 +19,12 @@ static inline void ci_clear_otg_interrupt(struct ci_hdrc *ci, u32 bits)
 
 static inline void ci_enable_otg_interrupt(struct ci_hdrc *ci, u32 bits)
 {
-	hw_write(ci, OP_OTGSC, bits, bits);
+	hw_write(ci, OP_OTGSC, bits | OTGSC_INT_STATUS_BITS, bits);
 }
 
 static inline void ci_disable_otg_interrupt(struct ci_hdrc *ci, u32 bits)
 {
-	hw_write(ci, OP_OTGSC, bits, 0);
+	hw_write(ci, OP_OTGSC, bits | OTGSC_INT_STATUS_BITS, 0);
 }
 
 int ci_hdrc_otg_init(struct ci_hdrc *ci);

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (C) 2013 Freescale Semiconductor, Inc.`
	`2`	`+ * Copyright (C) 2013-2014 Freescale Semiconductor, Inc.`
`3`	`3`	`*`
`4`	`4`	`* Author: Peter Chen`
`5`	`5`	`*`
`@@ -19,12 +19,12 @@ static inline void ci_clear_otg_interrupt(struct ci_hdrc *ci, u32 bits)`
`19`	`19`
`20`	`20`	`static inline void ci_enable_otg_interrupt(struct ci_hdrc *ci, u32 bits)`
`21`	`21`	`{`
`22`		`- hw_write(ci, OP_OTGSC, bits, bits);`
	`22`	`+ hw_write(ci, OP_OTGSC, bits \| OTGSC_INT_STATUS_BITS, bits);`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`static inline void ci_disable_otg_interrupt(struct ci_hdrc *ci, u32 bits)`
`26`	`26`	`{`
`27`		`- hw_write(ci, OP_OTGSC, bits, 0);`
	`27`	`+ hw_write(ci, OP_OTGSC, bits \| OTGSC_INT_STATUS_BITS, 0);`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`int ci_hdrc_otg_init(struct ci_hdrc *ci);`