All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ming Lei <ming.lei@canonical.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-usb@vger.kernel.org, Oliver Neukum <oliver@neukum.org>,
	Alan Stern <stern@rowland.harvard.edu>,
	linux-input@vger.kernel.org, linux-bluetooth@vger.kernel.org,
	netdev@vger.kernel.org, linux-wireless@vger.kernel.org,
	linux-media@vger.kernel.org, alsa-devel@alsa-project.org,
	Ming Lei <ming.lei@canonical.com>,
	devel@driverdev.osuosl.org
Subject: [PATCH 49/50] staging: ced1401: spin_lock in complete() cleanup
Date: Thu, 11 Jul 2013 17:06:12 +0800	[thread overview]
Message-ID: <1373533573-12272-50-git-send-email-ming.lei@canonical.com> (raw)
In-Reply-To: <1373533573-12272-1-git-send-email-ming.lei@canonical.com>

Complete() will be run with interrupt enabled, so change to
spin_lock_irqsave().

Cc: devel@driverdev.osuosl.org
Signed-off-by: Ming Lei <ming.lei@canonical.com>
---
 drivers/staging/ced1401/usb1401.c |   35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/drivers/staging/ced1401/usb1401.c b/drivers/staging/ced1401/usb1401.c
index 97c55f9..70d2f43 100644
--- a/drivers/staging/ced1401/usb1401.c
+++ b/drivers/staging/ced1401/usb1401.c
@@ -265,6 +265,7 @@ static void ced_writechar_callback(struct urb *pUrb)
 {
 	DEVICE_EXTENSION *pdx = pUrb->context;
 	int nGot = pUrb->actual_length;	/*  what we transferred */
+	unsigned long flags;
 
 	if (pUrb->status) {	/*  sync/async unlink faults aren't errors */
 		if (!
@@ -275,24 +276,24 @@ static void ced_writechar_callback(struct urb *pUrb)
 				__func__, pUrb->status);
 		}
 
-		spin_lock(&pdx->err_lock);
+		spin_lock_irqsave(&pdx->err_lock, flags);
 		pdx->errors = pUrb->status;
-		spin_unlock(&pdx->err_lock);
+		spin_unlock_irqrestore(&pdx->err_lock, flags);
 		nGot = 0;	/*   and tidy up again if so */
 
-		spin_lock(&pdx->charOutLock);	/*  already at irq level */
+		spin_lock_irqsave(&pdx->charOutLock, flags);	/*  already at irq level */
 		pdx->dwOutBuffGet = 0;	/*  Reset the output buffer */
 		pdx->dwOutBuffPut = 0;
 		pdx->dwNumOutput = 0;	/*  Clear the char count */
 		pdx->bPipeError[0] = 1;	/*  Flag an error for later */
 		pdx->bSendCharsPending = false;	/*  Allow other threads again */
-		spin_unlock(&pdx->charOutLock);	/*  already at irq level */
+		spin_unlock_irqrestore(&pdx->charOutLock, flags);	/*  already at irq level */
 		dev_dbg(&pdx->interface->dev,
 			"%s - char out done, 0 chars sent", __func__);
 	} else {
 		dev_dbg(&pdx->interface->dev,
 			"%s - char out done, %d chars sent", __func__, nGot);
-		spin_lock(&pdx->charOutLock);	/*  already at irq level */
+		spin_lock_irqsave(&pdx->charOutLock, flags);	/*  already at irq level */
 		pdx->dwNumOutput -= nGot;	/*  Now adjust the char send buffer */
 		pdx->dwOutBuffGet += nGot;	/*  to match what we did */
 		if (pdx->dwOutBuffGet >= OUTBUF_SZ)	/*  Can't do this any earlier as data could be overwritten */
@@ -305,7 +306,7 @@ static void ced_writechar_callback(struct urb *pUrb)
 			unsigned int dwCount = pdx->dwNumOutput;	/*  maximum to send */
 			if ((pdx->dwOutBuffGet + dwCount) > OUTBUF_SZ)	/*  does it cross buffer end? */
 				dwCount = OUTBUF_SZ - pdx->dwOutBuffGet;
-			spin_unlock(&pdx->charOutLock);	/*  we are done with stuff that changes */
+			spin_unlock_irqrestore(&pdx->charOutLock, flags);	/*  we are done with stuff that changes */
 			memcpy(pdx->pCoherCharOut, pDat, dwCount);	/*  copy output data to the buffer */
 			usb_fill_bulk_urb(pdx->pUrbCharOut, pdx->udev,
 					  usb_sndbulkpipe(pdx->udev,
@@ -318,7 +319,7 @@ static void ced_writechar_callback(struct urb *pUrb)
 			iReturn = usb_submit_urb(pdx->pUrbCharOut, GFP_ATOMIC);
 			dev_dbg(&pdx->interface->dev, "%s n=%d>%s<", __func__,
 				dwCount, pDat);
-			spin_lock(&pdx->charOutLock);	/*  grab lock for errors */
+			spin_lock_irqsave(&pdx->charOutLock, flags);	/*  grab lock for errors */
 			if (iReturn) {
 				pdx->bPipeError[nPipe] = 1;	/*  Flag an error to be handled later */
 				pdx->bSendCharsPending = false;	/*  Allow other threads again */
@@ -329,7 +330,7 @@ static void ced_writechar_callback(struct urb *pUrb)
 			}
 		} else
 			pdx->bSendCharsPending = false;	/*  Allow other threads again */
-		spin_unlock(&pdx->charOutLock);	/*  already at irq level */
+		spin_unlock_irqrestore(&pdx->charOutLock, flags);	/*  already at irq level */
 	}
 }
 
@@ -505,8 +506,9 @@ static void staged_callback(struct urb *pUrb)
 	unsigned int nGot = pUrb->actual_length;	/*  what we transferred */
 	bool bCancel = false;
 	bool bRestartCharInput;	/*  used at the end */
+	unsigned long flags;
 
-	spin_lock(&pdx->stagedLock);	/*  stop ReadWriteMem() action while this routine is running */
+	spin_lock_irqsave(&pdx->stagedLock, flags);	/*  stop ReadWriteMem() action while this routine is running */
 	pdx->bStagedUrbPending = false;	/*  clear the flag for staged IRP pending */
 
 	if (pUrb->status) {	/*  sync/async unlink faults aren't errors */
@@ -679,7 +681,7 @@ static void staged_callback(struct urb *pUrb)
 	bRestartCharInput = !bCancel && (pdx->dwDMAFlag == MODE_CHAR)
 	    && !pdx->bXFerWaiting;
 
-	spin_unlock(&pdx->stagedLock);	/*  Finally release the lock again */
+	spin_unlock_irqrestore(&pdx->stagedLock, flags);	/*  Finally release the lock again */
 
 	/*  This is not correct as dwDMAFlag is protected by the staged lock, but it is treated */
 	/*  in Allowi as if it were protected by the char lock. In any case, most systems will */
@@ -1093,6 +1095,7 @@ static void ced_readchar_callback(struct urb *pUrb)
 {
 	DEVICE_EXTENSION *pdx = pUrb->context;
 	int nGot = pUrb->actual_length;	/*  what we transferred */
+	unsigned long flags;
 
 	if (pUrb->status) {	/*  Do we have a problem to handle? */
 		int nPipe = pdx->nPipes == 4 ? 1 : 0;	/*  The pipe number to use for error */
@@ -1108,19 +1111,19 @@ static void ced_readchar_callback(struct urb *pUrb)
 				"%s - 0 chars pUrb->status=%d (shutdown?)",
 				__func__, pUrb->status);
 
-		spin_lock(&pdx->err_lock);
+		spin_lock_irqsave(&pdx->err_lock, flags);
 		pdx->errors = pUrb->status;
-		spin_unlock(&pdx->err_lock);
+		spin_unlock_irqrestore(&pdx->err_lock, flags);
 		nGot = 0;	/*   and tidy up again if so */
 
-		spin_lock(&pdx->charInLock);	/*  already at irq level */
+		spin_lock_irqsave(&pdx->charInLock, flags);	/*  already at irq level */
 		pdx->bPipeError[nPipe] = 1;	/*  Flag an error for later */
 	} else {
 		if ((nGot > 1) && ((pdx->pCoherCharIn[0] & 0x7f) == 0x1b)) {	/*  Esc sequence? */
 			Handle1401Esc(pdx, &pdx->pCoherCharIn[1], nGot - 1);	/*  handle it */
-			spin_lock(&pdx->charInLock);	/*  already at irq level */
+			spin_lock_irqsave(&pdx->charInLock, flags);	/*  already at irq level */
 		} else {
-			spin_lock(&pdx->charInLock);	/*  already at irq level */
+			spin_lock_irqsave(&pdx->charInLock, flags);	/*  already at irq level */
 			if (nGot > 0) {
 				unsigned int i;
 				if (nGot < INBUF_SZ) {
@@ -1147,7 +1150,7 @@ static void ced_readchar_callback(struct urb *pUrb)
 	}
 
 	pdx->bReadCharsPending = false;	/*  No longer have a pending read */
-	spin_unlock(&pdx->charInLock);	/*  already at irq level */
+	spin_unlock_irqrestore(&pdx->charInLock, flags);	/*  already at irq level */
 
 	Allowi(pdx);	/*  see if we can do the next one */
 }
-- 
1.7.9.5


  parent reply	other threads:[~2013-07-11  9:13 UTC|newest]

Thread overview: 86+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-11  9:05 [PATCH 00/50] USB: cleanup spin_lock in URB->complete() Ming Lei
2013-07-11  9:05 ` [PATCH 01/50] USB: devio: spin_lock in complete() cleanup Ming Lei
2013-07-11  9:05 ` [PATCH 02/50] USB: cdc-wdm: " Ming Lei
2013-07-11  9:05   ` Ming Lei
2013-07-11  9:05 ` [PATCH 03/50] USB: usblp: " Ming Lei
2013-07-11  9:05 ` [PATCH 04/50] USB: adutux: " Ming Lei
2013-07-11  9:05 ` [PATCH 05/50] USB: misc: uss720: " Ming Lei
2013-07-11 12:15   ` Sergei Shtylyov
2013-07-11 12:15     ` Sergei Shtylyov
2013-07-11  9:05 ` [PATCH 06/50] USB: iowarrior: " Ming Lei
2013-07-11  9:05 ` [PATCH 07/50] USB: ldusb: " Ming Lei
2013-07-11  9:05   ` Ming Lei
2013-07-11  9:05 ` [PATCH 08/50] USB: legousbtower: " Ming Lei
2013-07-11 12:18   ` Sergei Shtylyov
2013-07-11 12:18     ` Sergei Shtylyov
2013-07-11 12:36     ` Oliver Neukum
2013-07-11 13:47       ` Sergei Shtylyov
2013-07-11 12:42     ` Ming Lei
2013-07-11 12:42       ` Ming Lei
2013-07-11  9:05 ` [PATCH 09/50] USB: usbtest: " Ming Lei
2013-07-11  9:05 ` [PATCH 10/50] USB: serial: cyberjack: " Ming Lei
2013-07-11  9:05 ` [PATCH 11/50] USB: serial: digi_acceleportldusb: " Ming Lei
2013-07-11  9:05 ` [PATCH 12/50] USB: serial: io_edgeport: " Ming Lei
2013-07-11  9:05 ` [PATCH 13/50] USB: serial: io_ti: " Ming Lei
2013-07-11  9:05 ` [PATCH 14/50] USB: serial: mos7720: " Ming Lei
2013-07-11  9:05   ` Ming Lei
2013-07-11  9:05 ` [PATCH 15/50] USB: serial: mos77840: " Ming Lei
2013-07-11  9:05 ` [PATCH 16/50] USB: serial: quatech2: " Ming Lei
2013-07-11  9:05 ` [PATCH 17/50] USB: serial: sierra: " Ming Lei
2013-07-11 13:02   ` Sergei Shtylyov
2013-07-11  9:05 ` [PATCH 18/50] USB: serial: symbolserial: " Ming Lei
2013-07-11  9:05 ` [PATCH 19/50] USB: serial: ti_usb_3410_5052: " Ming Lei
2013-07-11  9:05 ` [PATCH 20/50] USB: serial: usb_wwan: " Ming Lei
2013-07-11  9:05   ` Ming Lei
2013-07-11  9:05 ` [PATCH 21/50] hid: usbhid: " Ming Lei
2013-07-11  9:05 ` [PATCH 22/50] BT: btusb: " Ming Lei
2013-07-11  9:05 ` [PATCH 23/50] BT: bfusb: read_lock " Ming Lei
2013-07-11  9:05 ` [PATCH 24/50] input: cm109: spin_lock " Ming Lei
2013-07-11  9:05 ` [PATCH 25/50] ISDN: hfcsusb: " Ming Lei
2013-07-11  9:05 ` [PATCH 26/50] USBNET: cdc-phonet: " Ming Lei
2013-07-11  9:05   ` Ming Lei
2013-07-11  9:05 ` [PATCH 27/50] USBNET: hso: " Ming Lei
2013-07-11  9:05   ` Ming Lei
2013-07-11  9:05 ` [PATCH 28/50] USBNET: kaweth: " Ming Lei
2013-07-11  9:05   ` Ming Lei
2013-07-11  9:05 ` [PATCH 29/50] USBNET: rtl8150: " Ming Lei
2013-07-11  9:05   ` Ming Lei
2013-07-11  9:05 ` [PATCH 30/50] wireless: ath9k: " Ming Lei
2013-07-11  9:05 ` [PATCH 31/50] wireless: zd1211rw: " Ming Lei
2013-07-11  9:05 ` [PATCH 32/50] wireless: ath: carl9170: " Ming Lei
2013-07-11  9:05 ` [PATCH 33/50] wireless: libertas: " Ming Lei
2013-07-11  9:05 ` [PATCH 34/50] wireless: libertas_tf: " Ming Lei
2013-07-11  9:05 ` [PATCH 35/50] media: usb: cx231xx: " Ming Lei
2013-07-26 14:28   ` Hans Verkuil
2013-07-27  9:34     ` Ming Lei
2013-07-11  9:05 ` [PATCH 36/50] media: usb: em28xx: " Ming Lei
2013-07-11 12:42   ` Devin Heitmueller
2013-07-11  9:06 ` [PATCH 37/50] media: usb: sn9x102: " Ming Lei
2013-07-11  9:06 ` [PATCH 38/50] media: usb: tlg2300: " Ming Lei
2013-07-11  9:06 ` [PATCH 39/50] media: usb: tm6000: " Ming Lei
2013-07-11  9:06 ` [PATCH 40/50] media: dvb-core: " Ming Lei
2013-07-11  9:06 ` [PATCH 41/50] media: usb: em28xx: make sure irq disabled before acquiring lock Ming Lei
2013-07-11  9:06 ` [PATCH 42/50] media: usb: tlg2300: spin_lock in complete() cleanup Ming Lei
2013-07-11 13:13   ` Sergei Shtylyov
2013-07-11  9:06 ` [PATCH 43/50] sound: usb: midi: " Ming Lei
2013-07-11  9:06 ` [PATCH 44/50] sound: usb: caiaq: " Ming Lei
2013-07-11 13:12   ` Sergei Shtylyov
2013-07-11 14:06   ` Daniel Mack
2013-07-11  9:06 ` [PATCH 45/50] sound: usb: usx2y: " Ming Lei
2013-07-11 13:08   ` Sergei Shtylyov
2013-07-11 13:50     ` Takashi Iwai
2013-07-11 13:50       ` Takashi Iwai
2013-07-11 14:13       ` Ming Lei
2013-07-11 14:34         ` Takashi Iwai
2013-07-11 14:34           ` Takashi Iwai
2013-07-11 14:52           ` Ming Lei
2013-07-11  9:06 ` [PATCH 46/50] Sound: usb: ua101: " Ming Lei
2013-07-11  9:06   ` Ming Lei
2013-07-11 13:10   ` Sergei Shtylyov
2013-07-11  9:06 ` [PATCH 47/50] staging: btmtk_usb: " Ming Lei
2013-07-11  9:06   ` Ming Lei
2013-07-11  9:06 ` [PATCH 48/50] staging: bcm: " Ming Lei
2013-07-11  9:06 ` Ming Lei [this message]
2013-07-11  9:06 ` [PATCH 50/50] staging: vt6656: " Ming Lei
2013-07-14 13:17 ` [PATCH 00/50] USB: cleanup spin_lock in URB->complete() Andy Walls
2013-07-14 14:33   ` Ming Lei

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1373533573-12272-50-git-send-email-ming.lei@canonical.com \
    --to=ming.lei@canonical.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-bluetooth@vger.kernel.org \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=oliver@neukum.org \
    --cc=stern@rowland.harvard.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.