From: "Arend van Spriel" <arend@broadcom.com>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: "Linux Wireless List" <linux-wireless@vger.kernel.org>,
"Arend van Spriel" <arend@broadcom.com>
Subject: [PATCH 07/18] brcmfmac: assure USB dongle firmware is reset upon module unload
Date: Wed, 2 Jan 2013 15:22:40 +0100 [thread overview]
Message-ID: <1357136572-18273-8-git-send-email-arend@broadcom.com> (raw)
In-Reply-To: <1357136572-18273-1-git-send-email-arend@broadcom.com>
Upon unloading the brcmfmac module the USB firmware should be reset
as the device remains powered. The reset assures a known device
state when a new brcmfmac driver load is being done.
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
---
drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 1 +
drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 3 ++-
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c | 11 +++++++++++
drivers/net/wireless/brcm80211/brcmfmac/usb.c | 13 +++++++++++++
4 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
index fd672bf..7245b17 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
@@ -39,6 +39,7 @@
#define BRCMF_C_GET_BSSID 23
#define BRCMF_C_GET_SSID 25
#define BRCMF_C_SET_SSID 26
+#define BRCMF_C_TERMINATED 28
#define BRCMF_C_GET_CHANNEL 29
#define BRCMF_C_SET_CHANNEL 30
#define BRCMF_C_GET_SRL 31
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
index dd38b78..358b54f 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
@@ -154,7 +154,8 @@ static inline void brcmf_rx_packet(struct device *dev, int ifidx,
extern int brcmf_attach(uint bus_hdrlen, struct device *dev);
/* Indication from bus module regarding removal/absence of dongle */
extern void brcmf_detach(struct device *dev);
-
+/* Indication from bus module that dongle should be reset */
+extern void brcmf_dev_reset(struct device *dev);
/* Indication from bus module to change flow-control state */
extern void brcmf_txflowblock(struct device *dev, bool state);
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
index 74a616b..16efcb4 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
@@ -845,6 +845,17 @@ static void brcmf_bus_detach(struct brcmf_pub *drvr)
}
}
+void brcmf_dev_reset(struct device *dev)
+{
+ struct brcmf_bus *bus_if = dev_get_drvdata(dev);
+ struct brcmf_pub *drvr = bus_if->drvr;
+
+ if (drvr == NULL)
+ return;
+
+ brcmf_fil_cmd_int_set(drvr->iflist[0], BRCMF_C_TERMINATED, 1);
+}
+
void brcmf_detach(struct device *dev)
{
int i;
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
index 22eae57..1df8595 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
@@ -1524,10 +1524,23 @@ static void brcmf_release_fw(struct list_head *q)
}
}
+static int brcmf_usb_reset_device(struct device *dev, void *notused)
+{
+ /* device past is the usb interface so we
+ * need to use parent here.
+ */
+ brcmf_dev_reset(dev->parent);
+ return 0;
+}
void brcmf_usb_exit(void)
{
+ struct device_driver *drv = &brcmf_usbdrvr.drvwrap.driver;
+ int ret;
+
brcmf_dbg(USB, "Enter\n");
+ ret = driver_for_each_device(drv, NULL, NULL,
+ brcmf_usb_reset_device);
usb_deregister(&brcmf_usbdrvr);
brcmf_release_fw(&fw_image_list);
}
--
1.7.10.4
next prev parent reply other threads:[~2013-01-02 14:23 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-02 14:22 [PATCH 00/18] brcm80211: cleanup work Arend van Spriel
2013-01-02 14:22 ` [PATCH 01/18] brcmsmac: increase timer reference count for new timers only Arend van Spriel
2013-01-02 14:22 ` [PATCH 02/18] brcmsmac: use perimeter lock in add_interface() callback Arend van Spriel
2013-01-02 14:22 ` [PATCH 03/18] brcmsmac: allow user-space setting of interface address Arend van Spriel
2013-01-02 14:22 ` [PATCH 04/18] brcmsmac: remove dead code Arend van Spriel
2013-01-02 14:22 ` [PATCH 05/18] brcmfmac: do not reconfigure refill rx on 0-length packet Arend van Spriel
2013-01-02 14:22 ` [PATCH 06/18] brcmfmac: removed deprecated set_bitrate_mask support Arend van Spriel
2013-01-02 14:22 ` Arend van Spriel [this message]
2013-01-02 14:22 ` [PATCH 08/18] brcmfmac: define pr_fmt in one place Arend van Spriel
2013-01-02 17:52 ` Joe Perches
2013-01-02 20:07 ` Arend van Spriel
2013-01-02 20:20 ` [PATCH v2 " Arend van Spriel
2013-01-02 20:34 ` Joe Perches
2013-01-02 20:52 ` Arend van Spriel
2013-01-02 14:22 ` [PATCH 09/18] brcmfmac: remove rx helper function from bus interface Arend van Spriel
2013-01-02 14:22 ` [PATCH 10/18] brcmfmac: remove brcmf_proto_hdrpull() " Arend van Spriel
2013-01-02 14:22 ` [PATCH 11/18] brcmfmac: Use dedicated trace level for CDC Arend van Spriel
2013-01-02 14:22 ` [PATCH 12/18] brcmfmac: remove unused event related definitions Arend van Spriel
2013-01-02 14:22 ` [PATCH 13/18] brcmfmac: cleanup netdev transmit callback Arend van Spriel
2013-01-02 14:22 ` [PATCH 14/18] brcmfmac: remove unnecessary curly braces in dhd_attach() Arend van Spriel
2013-01-02 14:22 ` [PATCH 15/18] brcmfmac: Remove unused caching dongle error Arend van Spriel
2013-01-02 14:22 ` [PATCH 16/18] brcmfmac: Return correct error on netdev xmit Arend van Spriel
2013-01-02 14:22 ` [PATCH 17/18] brcmfmac: Removing obsolete variables and inline functions Arend van Spriel
2013-01-02 14:22 ` [PATCH 18/18] brcmfmac: Update init code routines from interface up Arend van Spriel
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=1357136572-18273-8-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;
as well as URLs for NNTP newsgroup(s).