From: "Arend van Spriel" <arend@broadcom.com>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: linux-wireless@vger.kernel.org, "Arend van Spriel" <arend@broadcom.com>
Subject: [PATCH 01/12] brcmfmac: use irq safe spinlock in brcmf_sdbrcm_txdata()
Date: Sat, 10 Aug 2013 12:27:19 +0200 [thread overview]
Message-ID: <1376130450-29746-2-git-send-email-arend@broadcom.com> (raw)
In-Reply-To: <1376130450-29746-1-git-send-email-arend@broadcom.com>
Firmware-signalling needs transmit to firmware to be atomic and
uses a spinlock with irq disabled. Therefor, brcmf_sdbrcm_txdata()
should not use spin_unlock_bh() as it would enable the interrupts.
Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
---
drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 6 +++++-
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 5 +++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
index 080395f..9249b6d 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
@@ -36,7 +36,11 @@ struct brcmf_bus_dcmd {
*
* @init: prepare for communication with dongle.
* @stop: clear pending frames, disable data flow.
- * @txdata: send a data frame to the dongle (callee disposes skb).
+ * @txdata: send a data frame to the dongle. When the data
+ * has been transferred, the common driver must be
+ * notified using brcmf_txcomplete(). The common
+ * driver calls this function with interrupts
+ * disabled.
* @txctl: transmit a control request message to dongle.
* @rxctl: receive a control response message from dongle.
* @gettxq: obtain a reference of bus transmit queue (optional).
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
index 2641119..5cbce1d 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
@@ -2276,6 +2276,7 @@ static int brcmf_sdbrcm_bus_txdata(struct device *dev, struct sk_buff *pkt)
struct brcmf_bus *bus_if = dev_get_drvdata(dev);
struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv.sdio;
struct brcmf_sdio *bus = sdiodev->bus;
+ ulong flags;
brcmf_dbg(TRACE, "Enter\n");
@@ -2293,7 +2294,7 @@ static int brcmf_sdbrcm_bus_txdata(struct device *dev, struct sk_buff *pkt)
bus->sdcnt.fcqueued++;
/* Priority based enq */
- spin_lock_bh(&bus->txqlock);
+ spin_lock_irqsave(&bus->txqlock, flags);
if (!brcmf_c_prec_enq(bus->sdiodev->dev, &bus->txq, pkt, prec)) {
skb_pull(pkt, SDPCM_HDRLEN);
brcmf_txcomplete(bus->sdiodev->dev, pkt, false);
@@ -2307,7 +2308,7 @@ static int brcmf_sdbrcm_bus_txdata(struct device *dev, struct sk_buff *pkt)
bus->txoff = true;
brcmf_txflowblock(bus->sdiodev->dev, true);
}
- spin_unlock_bh(&bus->txqlock);
+ spin_unlock_irqrestore(&bus->txqlock, flags);
#ifdef DEBUG
if (pktq_plen(&bus->txq, prec) > qcount[prec])
--
1.8.1.3
next prev parent reply other threads:[~2013-08-10 10:27 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-10 10:27 [PATCH 00/12] brcm80211: new functionality and some cleanup fixes Arend van Spriel
2013-08-10 10:27 ` Arend van Spriel [this message]
2013-08-10 10:27 ` [PATCH 02/12] brcmfmac: .txdata() bus callback should not call brcmf_txcomplete() Arend van Spriel
2013-08-10 10:27 ` [PATCH 03/12] brcmfmac: add AMPDU reordering functionality Arend van Spriel
2013-08-10 10:27 ` [PATCH 04/12] brcmfmac: always use worker thread for tx data Arend van Spriel
2013-08-10 10:27 ` [PATCH 05/12] brcmfmac: no fws locking outside fws module Arend van Spriel
2013-08-10 10:27 ` [PATCH 06/12] brcmfmac: ignore IF event if firmware indicates it Arend van Spriel
2013-08-10 10:27 ` [PATCH 07/12] brcmfmac: add support for manual TDLS operations Arend van Spriel
2013-08-10 10:27 ` [PATCH 08/12] brcmfmac: abstract tx packet processing functions Arend van Spriel
2013-08-10 10:27 ` [PATCH 09/12] brcmfmac: remove align from brcmf_bus structure Arend van Spriel
2013-08-10 10:27 ` [PATCH 10/12] brcmfmac: streamline sdio bus header code Arend van Spriel
2013-08-10 10:27 ` [PATCH 11/12] brcmfmac: use configurable sdio bus header length for tx packet Arend van Spriel
2013-08-10 10:27 ` [PATCH 12/12] brcmsmac: support 4313iPA Arend van Spriel
2013-08-11 12:48 ` Jonas Gorski
2013-08-12 10:10 ` Arend van Spriel
2013-08-12 10:22 ` David Herrmann
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=1376130450-29746-2-git-send-email-arend@broadcom.com \
--to=arend@broadcom.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox