| From b6b190101fc647207746da0f0ddfcc8d9fbd7895 Mon Sep 17 00:00:00 2001 |
| From: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> |
| Date: Fri, 22 Aug 2014 20:14:00 +0900 |
| Subject: usb: renesas_usbhs: protect mod->irq_{bemp,brdy}sts by spin lock |
| |
| This patch protects the mod->irq_bempsts and mod->irq_brdysts by |
| spin lock in the usbhs_status_get_each_irq() because other functions |
| will write them during spin lock. Otherwise, the driver will clears |
| the BRDYSTS and/or BEMPSTS wrongly, and then, the transaction will not |
| finish. |
| Also since the driver should use the INTSTS0 and BRDYSTS and BEMPSTS |
| as the same timing, the patch protects them. |
| |
| Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> |
| Signed-off-by: Felipe Balbi <balbi@ti.com> |
| (cherry picked from commit c4d8199ba1a7aa390b06db23f4532e2c1875aefb) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/usb/renesas_usbhs/mod.c | 5 +++++ |
| 1 file changed, 5 insertions(+) |
| |
| diff --git a/drivers/usb/renesas_usbhs/mod.c b/drivers/usb/renesas_usbhs/mod.c |
| index 6a030b931a3b..9a705b15b3a1 100644 |
| --- a/drivers/usb/renesas_usbhs/mod.c |
| +++ b/drivers/usb/renesas_usbhs/mod.c |
| @@ -213,7 +213,10 @@ static int usbhs_status_get_each_irq(struct usbhs_priv *priv, |
| { |
| struct usbhs_mod *mod = usbhs_mod_get_current(priv); |
| u16 intenb0, intenb1; |
| + unsigned long flags; |
| |
| + /******************** spin lock ********************/ |
| + usbhs_lock(priv, flags); |
| state->intsts0 = usbhs_read(priv, INTSTS0); |
| state->intsts1 = usbhs_read(priv, INTSTS1); |
| |
| @@ -229,6 +232,8 @@ static int usbhs_status_get_each_irq(struct usbhs_priv *priv, |
| state->bempsts &= mod->irq_bempsts; |
| state->brdysts &= mod->irq_brdysts; |
| } |
| + usbhs_unlock(priv, flags); |
| + /******************** spin unlock ******************/ |
| |
| /* |
| * Check whether the irq enable registers and the irq status are set |
| -- |
| 2.1.2 |
| |