From: Laura Abbott <labbott-rxtnV0ftBwyoClj4AeEUq9i2O/JbrIOy@public.gmane.org>
To: Marcel Holtmann <marcel-kz+m5ild9QBg9hUCZPvPmw@public.gmane.org>
Cc: Laura Abbott
<labbott-rxtnV0ftBwyoClj4AeEUq9i2O/JbrIOy@public.gmane.org>,
Alan Stern
<stern-nwvwT67g6+6dFdvTe/nMLpVzexx5G7lz@public.gmane.org>,
Takashi Iwai <tiwai-l3A5Bk7waGM@public.gmane.org>,
Oliver Neukum <oneukum-IBi9RG/b67k@public.gmane.org>,
Ming Lei <ming.lei-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>,
"David S. Miller" <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>,
Johan Hedberg
<johan.hedberg-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
"Rafael J. Wysocki"
<rafael.j.wysocki-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>,
"Gustavo F. Padovan"
<gustavo-THi1TnShQwVAfugRpC6u6w@public.gmane.org>,
<linux-bluetooth-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
Linux Kernel Mailing List
<linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
USB list <linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
netdev <netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
Subject: [PATCH 2/2] Bluetooth: btusb: Add reset_resume function
Date: Mon, 1 Jun 2015 18:14:42 -0700 [thread overview]
Message-ID: <1433207682-15064-2-git-send-email-labbott@fedoraproject.org> (raw)
In-Reply-To: <1433207682-15064-1-git-send-email-labbott-rxtnV0ftBwyoClj4AeEUq9i2O/JbrIOy@public.gmane.org>
In-Reply-To: <DF182762-5B64-4B76-8D3E-AF3728102881-kz+m5ild9QBg9hUCZPvPmw@public.gmane.org>
Some USB hubs may lose power across suspend/resume.
Add a reset_resume callback to properly reset those bluetoot devices.
Signed-off-by: Laura Abbott <labbott-rxtnV0ftBwyoClj4AeEUq9i2O/JbrIOy@public.gmane.org>
---
Now the setup function is called again with the HCI_RESET_RESUME
flag set. The various functions could then use that RESET_RESUME
flag to determine if loading the firmware is appropriate or not.
---
drivers/bluetooth/btusb.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 3c10d4d..34884cf 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -3382,6 +3382,21 @@ done:
return err;
}
+
+static int btusb_reset_resume(struct usb_interface *intf)
+{
+ struct btusb_data *data = usb_get_intfdata(intf);
+ struct hci_dev *hdev = data->hdev;
+ int ret;
+
+ BT_DBG("intf %p", intf);
+
+ ret = btusb_resume(intf);
+ if (ret)
+ return ret;
+
+ return hci_reset_resume_dev(hdev);
+}
#endif
static struct usb_driver btusb_driver = {
@@ -3391,6 +3406,7 @@ static struct usb_driver btusb_driver = {
#ifdef CONFIG_PM
.suspend = btusb_suspend,
.resume = btusb_resume,
+ .reset_resume = btusb_reset_resume,
#endif
.id_table = btusb_table,
.supports_autosuspend = 1,
--
2.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2015-06-02 1:14 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-12 0:52 [RESEND][PATCH] Bluetooth: Make request workqueue freezable Laura Abbott
2015-05-12 1:07 ` Marcel Holtmann
2015-05-12 1:46 ` Laura Abbott
2015-05-12 15:14 ` Marcel Holtmann
2015-05-13 1:18 ` Laura Abbott
[not found] ` <5552A655.2030005-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2015-05-19 9:46 ` Takashi Iwai
2015-05-19 14:26 ` Alan Stern
2015-05-19 14:52 ` Oliver Neukum
2015-05-19 15:22 ` Marcel Holtmann
2015-05-19 17:17 ` Alan Stern
2015-05-19 17:13 ` Takashi Iwai
2015-05-19 17:42 ` Oliver Neukum
[not found] ` <1432057375.3970.4.camel-IBi9RG/b67k@public.gmane.org>
2015-05-20 6:29 ` Takashi Iwai
2015-05-20 8:40 ` Oliver Neukum
2015-05-20 9:46 ` Marcel Holtmann
2015-05-20 12:44 ` Takashi Iwai
2015-05-20 23:42 ` Laura Abbott
2015-05-21 4:21 ` Takashi Iwai
2015-05-21 12:07 ` Marcel Holtmann
2015-05-21 12:36 ` Takashi Iwai
2015-05-21 14:18 ` Alan Stern
2015-05-21 14:39 ` Marcel Holtmann
[not found] ` <33C25745-6839-4858-9A3E-19EC6408ECED-kz+m5ild9QBg9hUCZPvPmw@public.gmane.org>
2015-05-21 15:26 ` Alan Stern
2015-05-21 15:35 ` Takashi Iwai
[not found] ` <s5hsiaq3pv4.wl-tiwai-l3A5Bk7waGM@public.gmane.org>
2015-05-21 17:27 ` Arend van Spriel
2015-05-21 17:32 ` Takashi Iwai
2015-05-21 20:46 ` Arend van Spriel
[not found] ` <555E442A.808-dY08KVG/lbpWk0Htik3J/w@public.gmane.org>
2015-05-22 11:30 ` Oliver Neukum
2015-05-21 17:37 ` Alan Stern
2015-05-21 18:11 ` Takashi Iwai
2015-05-21 18:17 ` Laura Abbott
2015-05-22 0:21 ` Laura Abbott
[not found] ` <555E767B.2040808-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2015-05-22 3:13 ` Marcel Holtmann
2015-05-28 0:47 ` Laura Abbott
[not found] ` <DF182762-5B64-4B76-8D3E-AF3728102881-kz+m5ild9QBg9hUCZPvPmw@public.gmane.org>
2015-06-02 1:14 ` [PATCH 1/2] Bluetooth: Add reset_resume function Laura Abbott
[not found] ` <1433207682-15064-1-git-send-email-labbott-rxtnV0ftBwyoClj4AeEUq9i2O/JbrIOy@public.gmane.org>
2015-06-02 1:28 ` Marcel Holtmann
[not found] ` <BB3BCC01-8BF0-4A17-B8E6-F17B875F1997-kz+m5ild9QBg9hUCZPvPmw@public.gmane.org>
2015-06-02 14:17 ` Josh Boyer
[not found] ` <CA+5PVA6o2=dF5BrJQojhMjJhsAiM9vaADd_ix3SAvVEbLXkjCQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-06-02 15:07 ` Marcel Holtmann
2015-06-02 7:47 ` Oliver Neukum
2015-06-02 1:14 ` Laura Abbott [this message]
[not found] ` <1433207682-15064-2-git-send-email-labbott-rxtnV0ftBwyoClj4AeEUq9i2O/JbrIOy@public.gmane.org>
2015-06-02 1:32 ` [PATCH 2/2] Bluetooth: btusb: " Marcel Holtmann
2015-05-22 7:37 ` [RESEND][PATCH] Bluetooth: Make request workqueue freezable Arend van Spriel
2015-05-22 7:41 ` Arend van Spriel
2015-05-21 15:04 ` Takashi Iwai
2015-05-20 10:02 ` 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=1433207682-15064-2-git-send-email-labbott@fedoraproject.org \
--to=labbott-rxtnv0ftbwyoclj4aeeuq9i2o/jbrioy@public.gmane.org \
--cc=davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org \
--cc=gustavo-THi1TnShQwVAfugRpC6u6w@public.gmane.org \
--cc=johan.hedberg-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=linux-bluetooth-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=marcel-kz+m5ild9QBg9hUCZPvPmw@public.gmane.org \
--cc=ming.lei-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org \
--cc=netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=oneukum-IBi9RG/b67k@public.gmane.org \
--cc=rafael.j.wysocki-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org \
--cc=stern-nwvwT67g6+6dFdvTe/nMLpVzexx5G7lz@public.gmane.org \
--cc=tiwai-l3A5Bk7waGM@public.gmane.org \
/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).