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>,
	"Luis R. Rodriguez" <mcgrof@qca.qualcomm.com>,
	"John W. Linville" <linville@tuxdriver.com>
Subject: [PATCH 30/50] wireless: ath9k: spin_lock in complete() cleanup
Date: Thu, 11 Jul 2013 17:05:53 +0800	[thread overview]
Message-ID: <1373533573-12272-31-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: "Luis R. Rodriguez" <mcgrof@qca.qualcomm.com>
Cc: "John W. Linville" <linville@tuxdriver.com>
Cc: linux-wireless@vger.kernel.org
Cc: netdev@vger.kernel.org
Signed-off-by: Ming Lei <ming.lei@canonical.com>
---
 drivers/net/wireless/ath/ath9k/hif_usb.c      |   29 ++++++++++++++-----------
 drivers/net/wireless/ath/ath9k/htc_drv_txrx.c |    9 ++++----
 drivers/net/wireless/ath/ath9k/wmi.c          |   11 +++++-----
 3 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c
index 9e582e1..9d5e15a 100644
--- a/drivers/net/wireless/ath/ath9k/hif_usb.c
+++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
@@ -136,6 +136,7 @@ static void hif_usb_mgmt_cb(struct urb *urb)
 	struct cmd_buf *cmd = (struct cmd_buf *)urb->context;
 	struct hif_device_usb *hif_dev;
 	bool txok = true;
+	unsigned long flags;
 
 	if (!cmd || !cmd->skb || !cmd->hif_dev)
 		return;
@@ -155,14 +156,14 @@ static void hif_usb_mgmt_cb(struct urb *urb)
 		 * If the URBs are being flushed, no need to complete
 		 * this packet.
 		 */
-		spin_lock(&hif_dev->tx.tx_lock);
+		spin_lock_irqsave(&hif_dev->tx.tx_lock, flags);
 		if (hif_dev->tx.flags & HIF_USB_TX_FLUSH) {
-			spin_unlock(&hif_dev->tx.tx_lock);
+			spin_unlock_irqrestore(&hif_dev->tx.tx_lock, flags);
 			dev_kfree_skb_any(cmd->skb);
 			kfree(cmd);
 			return;
 		}
-		spin_unlock(&hif_dev->tx.tx_lock);
+		spin_unlock_irqrestore(&hif_dev->tx.tx_lock, flags);
 
 		break;
 	default:
@@ -253,6 +254,7 @@ static void hif_usb_tx_cb(struct urb *urb)
 	struct tx_buf *tx_buf = (struct tx_buf *) urb->context;
 	struct hif_device_usb *hif_dev;
 	bool txok = true;
+	unsigned long flags;
 
 	if (!tx_buf || !tx_buf->hif_dev)
 		return;
@@ -272,13 +274,13 @@ static void hif_usb_tx_cb(struct urb *urb)
 		 * If the URBs are being flushed, no need to add this
 		 * URB to the free list.
 		 */
-		spin_lock(&hif_dev->tx.tx_lock);
+		spin_lock_irqsave(&hif_dev->tx.tx_lock, flags);
 		if (hif_dev->tx.flags & HIF_USB_TX_FLUSH) {
-			spin_unlock(&hif_dev->tx.tx_lock);
+			spin_unlock_irqrestore(&hif_dev->tx.tx_lock, flags);
 			ath9k_skb_queue_purge(hif_dev, &tx_buf->skb_queue);
 			return;
 		}
-		spin_unlock(&hif_dev->tx.tx_lock);
+		spin_unlock_irqrestore(&hif_dev->tx.tx_lock, flags);
 
 		break;
 	default:
@@ -293,13 +295,13 @@ static void hif_usb_tx_cb(struct urb *urb)
 	__skb_queue_head_init(&tx_buf->skb_queue);
 
 	/* Add this TX buffer to the free list */
-	spin_lock(&hif_dev->tx.tx_lock);
+	spin_lock_irqsave(&hif_dev->tx.tx_lock, flags);
 	list_move_tail(&tx_buf->list, &hif_dev->tx.tx_buf);
 	hif_dev->tx.tx_buf_cnt++;
 	if (!(hif_dev->tx.flags & HIF_USB_TX_STOP))
 		__hif_usb_tx(hif_dev); /* Check for pending SKBs */
 	TX_STAT_INC(buf_completed);
-	spin_unlock(&hif_dev->tx.tx_lock);
+	spin_unlock_irqrestore(&hif_dev->tx.tx_lock, flags);
 }
 
 /* TX lock has to be taken */
@@ -530,8 +532,9 @@ static void ath9k_hif_usb_rx_stream(struct hif_device_usb *hif_dev,
 	int rx_remain_len, rx_pkt_len;
 	u16 pool_index = 0;
 	u8 *ptr;
+	unsigned long flags;
 
-	spin_lock(&hif_dev->rx_lock);
+	spin_lock_irqsave(&hif_dev->rx_lock, flags);
 
 	rx_remain_len = hif_dev->rx_remain_len;
 	rx_pkt_len = hif_dev->rx_transfer_len;
@@ -559,7 +562,7 @@ static void ath9k_hif_usb_rx_stream(struct hif_device_usb *hif_dev,
 		}
 	}
 
-	spin_unlock(&hif_dev->rx_lock);
+	spin_unlock_irqrestore(&hif_dev->rx_lock, flags);
 
 	while (index < len) {
 		u16 pkt_len;
@@ -585,7 +588,7 @@ static void ath9k_hif_usb_rx_stream(struct hif_device_usb *hif_dev,
 		index = index + 4 + pkt_len + pad_len;
 
 		if (index > MAX_RX_BUF_SIZE) {
-			spin_lock(&hif_dev->rx_lock);
+			spin_lock_irqsave(&hif_dev->rx_lock, flags);
 			hif_dev->rx_remain_len = index - MAX_RX_BUF_SIZE;
 			hif_dev->rx_transfer_len =
 				MAX_RX_BUF_SIZE - chk_idx - 4;
@@ -595,7 +598,7 @@ static void ath9k_hif_usb_rx_stream(struct hif_device_usb *hif_dev,
 			if (!nskb) {
 				dev_err(&hif_dev->udev->dev,
 					"ath9k_htc: RX memory allocation error\n");
-				spin_unlock(&hif_dev->rx_lock);
+				spin_unlock_irqrestore(&hif_dev->rx_lock, flags);
 				goto err;
 			}
 			skb_reserve(nskb, 32);
@@ -606,7 +609,7 @@ static void ath9k_hif_usb_rx_stream(struct hif_device_usb *hif_dev,
 
 			/* Record the buffer pointer */
 			hif_dev->remain_skb = nskb;
-			spin_unlock(&hif_dev->rx_lock);
+			spin_unlock_irqrestore(&hif_dev->rx_lock, flags);
 		} else {
 			nskb = __dev_alloc_skb(pkt_len + 32, GFP_ATOMIC);
 			if (!nskb) {
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
index e602c95..a6f34f8 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
@@ -1156,25 +1156,26 @@ void ath9k_htc_rxep(void *drv_priv, struct sk_buff *skb,
 	struct ath_hw *ah = priv->ah;
 	struct ath_common *common = ath9k_hw_common(ah);
 	struct ath9k_htc_rxbuf *rxbuf = NULL, *tmp_buf = NULL;
+	unsigned long flags;
 
-	spin_lock(&priv->rx.rxbuflock);
+	spin_lock_irqsave(&priv->rx.rxbuflock, flags);
 	list_for_each_entry(tmp_buf, &priv->rx.rxbuf, list) {
 		if (!tmp_buf->in_process) {
 			rxbuf = tmp_buf;
 			break;
 		}
 	}
-	spin_unlock(&priv->rx.rxbuflock);
+	spin_unlock_irqrestore(&priv->rx.rxbuflock, flags);
 
 	if (rxbuf == NULL) {
 		ath_dbg(common, ANY, "No free RX buffer\n");
 		goto err;
 	}
 
-	spin_lock(&priv->rx.rxbuflock);
+	spin_lock_irqsave(&priv->rx.rxbuflock, flags);
 	rxbuf->skb = skb;
 	rxbuf->in_process = true;
-	spin_unlock(&priv->rx.rxbuflock);
+	spin_unlock_irqrestore(&priv->rx.rxbuflock, flags);
 
 	tasklet_schedule(&priv->rx_tasklet);
 	return;
diff --git a/drivers/net/wireless/ath/ath9k/wmi.c b/drivers/net/wireless/ath/ath9k/wmi.c
index 65c8894..101b771 100644
--- a/drivers/net/wireless/ath/ath9k/wmi.c
+++ b/drivers/net/wireless/ath/ath9k/wmi.c
@@ -207,6 +207,7 @@ static void ath9k_wmi_ctrl_rx(void *priv, struct sk_buff *skb,
 	struct wmi *wmi = (struct wmi *) priv;
 	struct wmi_cmd_hdr *hdr;
 	u16 cmd_id;
+	unsigned long flags;
 
 	if (unlikely(wmi->stopped))
 		goto free_skb;
@@ -215,20 +216,20 @@ static void ath9k_wmi_ctrl_rx(void *priv, struct sk_buff *skb,
 	cmd_id = be16_to_cpu(hdr->command_id);
 
 	if (cmd_id & 0x1000) {
-		spin_lock(&wmi->wmi_lock);
+		spin_lock_irqsave(&wmi->wmi_lock, flags);
 		__skb_queue_tail(&wmi->wmi_event_queue, skb);
-		spin_unlock(&wmi->wmi_lock);
+		spin_unlock_irqrestore(&wmi->wmi_lock, flags);
 		tasklet_schedule(&wmi->wmi_event_tasklet);
 		return;
 	}
 
 	/* Check if there has been a timeout. */
-	spin_lock(&wmi->wmi_lock);
+	spin_lock_irqsave(&wmi->wmi_lock, flags);
 	if (cmd_id != wmi->last_cmd_id) {
-		spin_unlock(&wmi->wmi_lock);
+		spin_unlock_irqrestore(&wmi->wmi_lock, flags);
 		goto free_skb;
 	}
-	spin_unlock(&wmi->wmi_lock);
+	spin_unlock_irqrestore(&wmi->wmi_lock, flags);
 
 	/* WMI command response */
 	ath9k_wmi_rsp_callback(wmi, skb);
-- 
1.7.9.5


  parent reply	other threads:[~2013-07-11  9:10 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 ` Ming Lei [this message]
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 ` [PATCH 49/50] staging: ced1401: " Ming Lei
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-31-git-send-email-ming.lei@canonical.com \
    --to=ming.lei@canonical.com \
    --cc=alsa-devel@alsa-project.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=linville@tuxdriver.com \
    --cc=mcgrof@qca.qualcomm.com \
    --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.