From: Dan Williams <dcbw@redhat•com>
To: Oliver Neukum <oliver@neukum•org>
Cc: Elina Pasheva <epasheva@sierrawireless•com>,
netdev@vger•kernel.org, linux-usb@vger•kernel.org,
Rory Filer <rfiler@sierrawireless•com>, Phil Sutter <phil@nwl•cc>
Subject: [PATCH 1/2 v2] usbnet: allow status interrupt URB to always be active
Date: Wed, 06 Feb 2013 12:36:38 -0600 [thread overview]
Message-ID: <1360175798.11742.12.camel@dcbw.foobar.com> (raw)
In-Reply-To: <1357318096.5370.15.camel@dcbw.foobar.com>
Some drivers (ex sierra_net) need the status interrupt URB
active even when the device is closed, because they receive
custom indications from firmware. Allow sub-drivers to set
a flag that submits the status interrupt URB on probe and
keeps the URB alive over device open/close. The URB is still
killed/re-submitted for suspend/resume, as before.
Signed-off-by: Dan Williams <dcbw@redhat•com>
---
Note: unchanged from previous version, but rebased.
drivers/net/usb/usbnet.c | 43 +++++++++++++++++++++++++++++++------------
include/linux/usb/usbnet.h | 3 +++
2 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 5e33606..5019cc7 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -206,13 +206,13 @@ static void intr_complete (struct urb *urb)
break;
}
- if (!netif_running (dev->net))
- return;
-
- status = usb_submit_urb (urb, GFP_ATOMIC);
- if (status != 0)
- netif_err(dev, timer, dev->net,
- "intr resubmit --> %d\n", status);
+ if (dev->driver_info->flags & FLAG_INTR_ALWAYS ||
+ netif_running(dev->net)) {
+ status = usb_submit_urb(urb, GFP_ATOMIC);
+ if (status != 0)
+ netif_err(dev, timer, dev->net,
+ "intr resubmit --> %d\n", status);
+ }
}
static int init_status (struct usbnet *dev, struct usb_interface *intf)
@@ -725,7 +725,8 @@ int usbnet_stop (struct net_device *net)
if (!(info->flags & FLAG_AVOID_UNLINK_URBS))
usbnet_terminate_urbs(dev);
- usb_kill_urb(dev->interrupt);
+ if (!(info->flags & FLAG_INTR_ALWAYS))
+ usb_kill_urb(dev->interrupt);
usbnet_purge_paused_rxq(dev);
@@ -786,7 +787,7 @@ int usbnet_open (struct net_device *net)
}
/* start any status interrupt transfer */
- if (dev->interrupt) {
+ if (dev->interrupt && !(info->flags & FLAG_INTR_ALWAYS)) {
retval = usb_submit_urb (dev->interrupt, GFP_KERNEL);
if (retval < 0) {
netif_err(dev, ifup, dev->net,
@@ -1496,6 +1497,15 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
if (status < 0)
goto out3;
+ /* Submit status interrupt URB immediately if sub-driver wants */
+ if (dev->interrupt && (info->flags & FLAG_INTR_ALWAYS)) {
+ status = usb_submit_urb(dev->interrupt, GFP_KERNEL);
+ if (status < 0) {
+ dev_err(&udev->dev, "intr submit %d\n", status);
+ goto out4;
+ }
+ }
+
if (!dev->rx_urb_size)
dev->rx_urb_size = dev->hard_mtu;
dev->maxpacket = usb_maxpacket (dev->udev, dev->out, 1);
@@ -1507,7 +1517,7 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
status = register_netdev (net);
if (status)
- goto out4;
+ goto out5;
netif_info(dev, probe, dev->net,
"register '%s' at usb-%s-%s, %s, %pM\n",
udev->dev.driver->name,
@@ -1525,6 +1535,8 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
return 0;
+out5:
+ usb_kill_urb(dev->interrupt);
out4:
usb_free_urb(dev->interrupt);
out3:
@@ -1586,8 +1598,15 @@ int usbnet_resume (struct usb_interface *intf)
if (!--dev->suspend_count) {
/* resume interrupt URBs */
- if (dev->interrupt && test_bit(EVENT_DEV_OPEN, &dev->flags))
- usb_submit_urb(dev->interrupt, GFP_NOIO);
+ if (dev->interrupt &&
+ (dev->driver_info->flags & FLAG_INTR_ALWAYS ||
+ test_bit(EVENT_DEV_OPEN, &dev->flags))) {
+ retval = usb_submit_urb(dev->interrupt, GFP_NOIO);
+ if (retval < 0) {
+ netif_err(dev, ifup, dev->net,
+ "intr submit %d\n", retval);
+ }
+ }
spin_lock_irq(&dev->txq.lock);
while ((res = usb_get_from_anchor(&dev->deferred))) {
diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h
index 0de078d..b0f17f6 100644
--- a/include/linux/usb/usbnet.h
+++ b/include/linux/usb/usbnet.h
@@ -111,6 +111,9 @@ struct driver_info {
#define FLAG_MULTI_PACKET 0x2000
#define FLAG_RX_ASSEMBLE 0x4000 /* rx packets may span >1 frames */
+/* Indicates that the interrupt URB should not depend on netdev open/close */
+#define FLAG_INTR_ALWAYS 0x8000
+
/* init device ... can sleep, or cause probe() failure */
int (*bind)(struct usbnet *, struct usb_interface *);
--
1.7.11.7
next prev parent reply other threads:[~2013-02-06 18:36 UTC|newest]
Thread overview: 89+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-27 14:12 strange behaviour of MC7700 with sierra_net Phil Sutter
[not found] ` <20110727141246.GC29616-2COwY06ShZsYt6otZODPyA@public.gmane.org>
2011-07-27 19:40 ` Dan Williams
[not found] ` <1311795643.17655.13.camel-wKZy7rqYPVb5EHUCmHmTqw@public.gmane.org>
2011-07-28 16:32 ` Phil Sutter
[not found] ` <8F90F944E50427428C60E12A34A309D23424BB0F25@carmd-exchmb01.sierrawireless.local>
[not found] ` <8F90F944E50427428C60E12A34A309D23424BB0F25-3qf8vkpM5jTbmvMHnzRVpW3Pdy6AhKVLXbPIYa3/oNjDOqzlkpFKJg@public.gmane.org>
2011-08-04 16:38 ` Phil Sutter
2013-01-04 16:48 ` [PATCH 1/2] usbnet: allow status interrupt URB to always be active Dan Williams
2013-01-04 16:51 ` [PATCH 2/2] sierra_net: keep status interrupt URB active over netdev open/close Dan Williams
[not found] ` <1357318289.5370.19.camel-wKZy7rqYPVb5EHUCmHmTqw@public.gmane.org>
2013-02-06 18:42 ` [PATCH 2/2 v2] sierra_net: fix issues with SYNC/RESTART messages and interrupt pipe setup Dan Williams
[not found] ` <1360176176.11742.16.camel-wKZy7rqYPVb5EHUCmHmTqw@public.gmane.org>
2013-02-06 20:17 ` Oliver Neukum
2013-02-07 21:09 ` Dan Williams
2013-02-06 21:11 ` Bjørn Mork
2013-02-07 17:06 ` Dan Williams
2013-02-13 11:44 ` Bjørn Mork
2013-02-13 16:34 ` Dan Williams
2013-01-04 22:16 ` [PATCH 1/2] usbnet: allow status interrupt URB to always be active Oliver Neukum
2013-01-05 1:26 ` Dan Williams
2013-01-05 11:01 ` Oliver Neukum
2013-01-05 11:44 ` Bjørn Mork
2013-01-07 15:25 ` Dan Williams
2013-01-14 17:52 ` Dan Williams
[not found] ` <1357349193.19684.3.camel-wKZy7rqYPVb5EHUCmHmTqw@public.gmane.org>
2013-01-05 10:59 ` Bjørn Mork
[not found] ` <87y5g7nbej.fsf-lbf33ChDnrE/G1V5fR+Y7Q@public.gmane.org>
2013-01-07 7:40 ` Oliver Neukum
2013-01-07 15:21 ` Dan Williams
2013-01-11 3:06 ` Ming Lei
2013-01-14 17:23 ` Dan Williams
2013-01-15 1:13 ` Ming Lei
2013-02-06 18:36 ` Dan Williams [this message]
2013-02-06 20:19 ` [PATCH 1/2 v2] " Oliver Neukum
2013-03-28 16:30 ` [PATCH 1/2 v3] " Dan Williams
[not found] ` <1364488207.1877.20.camel-wKZy7rqYPVb5EHUCmHmTqw@public.gmane.org>
2013-03-28 16:32 ` [PATCH 2/2 v3] sierra_net: keep status interrupt URB active Dan Williams
[not found] ` <1364488327.1877.22.camel-wKZy7rqYPVb5EHUCmHmTqw@public.gmane.org>
2013-03-29 19:21 ` David Miller
2013-03-29 19:20 ` [PATCH 1/2 v3] usbnet: allow status interrupt URB to always be active David Miller
[not found] ` <CACVXFVMBAzTYZKiE_uSTqr_yB4f7c5_PSnK=LBP6=oWdWwYHfg@mail.gmail.com>
[not found] ` <CACVXFVMBAzTYZKiE_uSTqr_yB4f7c5_PSnK=LBP6=oWdWwYHfg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-04-01 16:04 ` Dan Williams
2013-04-09 23:02 ` [PATCH 1/2 v4] " Dan Williams
2013-04-09 23:05 ` [PATCH 2/2 v4] sierra_net: keep status interrupt URB active Dan Williams
2013-04-10 7:15 ` Oliver Neukum
2013-04-10 14:57 ` Dan Williams
2013-04-10 15:01 ` Oliver Neukum
2013-04-10 7:23 ` [PATCH 1/2 v4] usbnet: allow status interrupt URB to always be active Oliver Neukum
[not found] ` <2328167.HJRXSHNhKT-7ztolUikljGernLeA6q8OA@public.gmane.org>
2013-04-10 12:49 ` Dan Williams
2013-04-10 13:06 ` Oliver Neukum
2013-04-10 13:18 ` Dan Williams
2013-04-10 13:29 ` Oliver Neukum
[not found] ` <1542762.9EJvNHlBNo-7ztolUikljGernLeA6q8OA@public.gmane.org>
2013-04-10 13:54 ` Dan Williams
[not found] ` <1365602083.28888.40.camel-wKZy7rqYPVb5EHUCmHmTqw@public.gmane.org>
2013-04-10 13:58 ` Oliver Neukum
2013-04-10 15:01 ` Dan Williams
2013-04-10 18:10 ` Oliver Neukum
2013-04-10 20:30 ` [PATCH 1/2 v5] " Dan Williams
[not found] ` <1365625850.22411.1.camel-wKZy7rqYPVb5EHUCmHmTqw@public.gmane.org>
2013-04-10 20:33 ` [PATCH 2/2 v5] sierra_net: keep status interrupt URB active Dan Williams
2013-04-11 2:31 ` [PATCH 1/2 v5] usbnet: allow status interrupt URB to always be active Ming Lei
2013-04-11 6:50 ` Oliver Neukum
2013-04-11 8:06 ` Bjørn Mork
2013-04-11 8:37 ` Ming Lei
2013-04-11 9:59 ` Oliver Neukum
2013-04-11 10:04 ` Bjørn Mork
2013-04-11 10:09 ` Ming Lei
2013-04-11 10:19 ` Ming Lei
[not found] ` <CACVXFVNn9MQr6JLdin=u642Jb-2ZPfVk8YaBmNdhU0_2e7WJqQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-04-11 10:26 ` Bjørn Mork
2013-04-11 10:30 ` Ming Lei
2013-04-11 11:08 ` Bjørn Mork
[not found] ` <87d2u1wci6.fsf-lbf33ChDnrE/G1V5fR+Y7Q@public.gmane.org>
2013-04-11 11:42 ` Ming Lei
[not found] ` <CACVXFVO13tG606nDHth5rEA9jexj1iFHnry5ktrMpm_aGGTSvw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-04-11 11:54 ` Oliver Neukum
2013-04-11 12:16 ` Ming Lei
2013-04-11 8:09 ` Ming Lei
2013-04-11 9:53 ` Oliver Neukum
2013-04-11 10:03 ` Ming Lei
2013-04-11 11:14 ` Oliver Neukum
2013-04-11 12:11 ` Ming Lei
2013-04-11 12:28 ` Oliver Neukum
2013-04-11 12:59 ` Ming Lei
[not found] ` <CACVXFVPPzva+EwjNdxWsg4FufCc0zzzzvhGH_nLv479vT8VcxQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-04-12 6:37 ` Oliver Neukum
2013-04-12 9:42 ` Ming Lei
2013-04-12 10:02 ` Oliver Neukum
2013-04-12 10:08 ` Ming Lei
2013-04-12 10:13 ` Bjørn Mork
2013-04-11 15:28 ` Dan Williams
2013-04-12 7:28 ` Oliver Neukum
2013-04-10 21:35 ` Oliver Neukum
2013-04-15 15:59 ` Dan Williams
2013-04-16 1:15 ` Ming Lei
2013-04-16 7:57 ` Oliver Neukum
[not found] ` <1637650.tuYfvStuVJ-7ztolUikljGernLeA6q8OA@public.gmane.org>
2013-04-17 1:56 ` Ming Lei
2013-04-17 6:55 ` Oliver Neukum
[not found] ` <5581442.KzM2iaDSQ0-7ztolUikljGernLeA6q8OA@public.gmane.org>
2013-04-18 3:51 ` Ming Lei
2013-04-19 8:25 ` Oliver Neukum
2013-04-24 12:31 ` Dan Williams
2013-04-25 13:00 ` Oliver Neukum
[not found] ` <1365548547.23372.2.camel-wKZy7rqYPVb5EHUCmHmTqw@public.gmane.org>
2013-04-10 13:25 ` [PATCH 1/2 v4] " Bjørn Mork
2013-04-10 13:31 ` Oliver Neukum
[not found] ` <1365604263.28888.56.camel@dcbw.foobar.com>
2013-04-10 15:21 ` Bjørn Mork
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=1360175798.11742.12.camel@dcbw.foobar.com \
--to=dcbw@redhat$(echo .)com \
--cc=epasheva@sierrawireless$(echo .)com \
--cc=linux-usb@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=oliver@neukum$(echo .)org \
--cc=phil@nwl$(echo .)cc \
--cc=rfiler@sierrawireless$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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