hi,
this patch fixes the usb ipaq driver so that it submits urbs
outside spinlocks.
thanks,
ganesh
# This is a BitKeeper generated patch for the following project:
# Project Name: greg k-h's linux 2.5 USB kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.383 -> 1.384
# drivers/usb/serial/ipaq.c 1.8 -> 1.9
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/03/20 [EMAIL PROTECTED] 1.384
# Don't submit urbs while holding spinlocks. Not strictly required in
# 2.5.x, but it's always better to do less while holding a spinlock.
# Also a good idea to keep 2.{4,5}.x drivers in sync.
# --------------------------------------------
#
diff -Nru a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c
--- a/drivers/usb/serial/ipaq.c Wed Mar 20 06:41:22 2002
+++ b/drivers/usb/serial/ipaq.c Wed Mar 20 06:41:22 2002
@@ -9,6 +9,10 @@
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
+ * (19/3/2002) ganesh
+ * Don't submit urbs while holding spinlocks. Not strictly necessary
+ * in 2.5.x.
+ *
* (8/3/2002) ganesh
* The ipaq sometimes emits a '\0' before the CLIENT string. At this
* point of time, the ppp ldisc is not yet attached to the tty, so
@@ -65,7 +69,7 @@
int count);
static int ipaq_write_bulk(struct usb_serial_port *port, int from_user, const
unsigned char *buf,
int count);
-static int ipaq_write_flush(struct usb_serial_port *port);
+static void ipaq_write_gather(struct usb_serial_port *port);
static void ipaq_read_bulk_callback (struct urb *urb);
static void ipaq_write_bulk_callback(struct urb *urb);
static int ipaq_write_room(struct usb_serial_port *port);
@@ -367,17 +371,23 @@
priv->queue_len += count;
if (priv->active == 0) {
priv->active = 1;
- result = ipaq_write_flush(port);
+ ipaq_write_gather(port);
+ spin_unlock_irqrestore(&write_list_lock, flags);
+ result = usb_submit_urb(port->write_urb, GFP_ATOMIC);
+ if (result) {
+ err(__FUNCTION__ " - failed submitting write urb, error %d",
+result);
+ }
+ } else {
+ spin_unlock_irqrestore(&write_list_lock, flags);
}
- spin_unlock_irqrestore(&write_list_lock, flags);
return result;
}
-static int ipaq_write_flush(struct usb_serial_port *port)
+static void ipaq_write_gather(struct usb_serial_port *port)
{
struct ipaq_private *priv = (struct ipaq_private *)port->private;
struct usb_serial *serial = port->serial;
- int count, room, result;
+ int count, room;
struct ipaq_packet *pkt;
struct urb *urb = port->write_urb;
struct list_head *tmp;
@@ -385,7 +395,7 @@
if (urb->status == -EINPROGRESS) {
/* Should never happen */
err(__FUNCTION__ " - flushing while urb is active !");
- return -EAGAIN;
+ return;
}
room = URBDATA_SIZE;
for (tmp = priv->queue.next; tmp != &priv->queue;) {
@@ -412,11 +422,7 @@
usb_sndbulkpipe(serial->dev, port->bulk_out_endpointAddress),
port->write_urb->transfer_buffer, count,
ipaq_write_bulk_callback,
port);
- result = usb_submit_urb(urb, GFP_ATOMIC);
- if (result) {
- err(__FUNCTION__ " - failed submitting write urb, error %d", result);
- }
- return result;
+ return;
}
static void ipaq_write_bulk_callback(struct urb *urb)
@@ -424,6 +430,7 @@
struct usb_serial_port *port = (struct usb_serial_port *)urb->context;
struct ipaq_private *priv = (struct ipaq_private *)port->private;
unsigned long flags;
+ int result;
if (port_paranoia_check (port, __FUNCTION__)) {
return;
@@ -437,11 +444,16 @@
spin_lock_irqsave(&write_list_lock, flags);
if (!list_empty(&priv->queue)) {
- ipaq_write_flush(port);
+ ipaq_write_gather(port);
+ spin_unlock_irqrestore(&write_list_lock, flags);
+ result = usb_submit_urb(port->write_urb, GFP_ATOMIC);
+ if (result) {
+ err(__FUNCTION__ " - failed submitting write urb, error %d",
+result);
+ }
} else {
priv->active = 0;
+ spin_unlock_irqrestore(&write_list_lock, flags);
}
- spin_unlock_irqrestore(&write_list_lock, flags);
queue_task(&port->tqueue, &tq_immediate);
mark_bh(IMMEDIATE_BH);
This BitKeeper patch contains the following changesets:
+
## Wrapped with gzip_uu ##
begin 664 bkpatch1391
M'XL(`,;AESP``^56;6_;-A#^+/Z*0XNM3FO+I-XB>7#1+%D[8UL29,UG@9)H
MF[`B.B05QZCSWW>4O`1K$:1I,>S#!$%G4G?/\7GN3O!+N#1"3[P%;X19DI?P
MJS)VXMGVUJJU?W,KFTIR_T9H:;GQ2W6%+A=*H<MXJ:[$N(\;;Y1>C5M3C`(_
M'KF%;!8$7<^Y+9>`X6;B,3^\W[';M9AX%[]\N/S]Z(*0Z12.E[Q9B#^%A>F4
M%*MW52MJ?Z457_I*+W;WKW<!I8RQ(*9AG+!X%Z1A&.U80HL*?U;!838ODHST
MYWKW.(]_(@8T9!'+PC@ZW`416G(">-XT`AJ,:3@.*-!D$F:3*'U#XTE(X<D$
M\(;!B)*?X?O)'),23E3SRH)IBRMIH=6%@<U2U@*6JJY0;#!KV=2J7!D?3A4Z
M6BU+6V]!B^M6:E&!;!`%R^/?#J%H+4C[R@"O-WQKH!#6"@U60:6@%N9S<'X/
M[R/(46T4;BV40M1*<!>W$F*-Z)^B87SGWT*EI2LZ)@6S;4J?_`8H:Q"0\X="
MD]$S+T(HI^0MK%T+?:[I/J-KPC%VM.3U6*[YM5_VY674F3C*=EAFENWF/!0,
MQ2V#L,Q0]*?K^52&T-629MA`<11%K&OJ1T-<D_\;-+ZB[Y^B\3`'89!%W1QD
M7TS!X==/01##B(7_P1Q@S_65.(.1WG0W]M#YXT7YAH:<,081@=<P8-G8"42#
M@[THN.M]Z]`VHL0AY'KK0'"&NK'U<4%.DA08F75/8[F5)=PHB7.(#/(-RB[R
M!;=+H0<(UI:8U11YSS)?*VWAM7L>_$1.PD/JD)Q)B>=]";!W]#QWRKSM#II+
M?:V%L4J+P8^]=RV-S=V[(<QKOC!="/JT-7[*^_0=_QSY=YBCMWT@KH?PX?UY
M?O3Q[(_9<1<GYS#H8P_@$ZX]H?4@S]]?GAY_G)V=YCF\@!',.8I8[76U3L@.
M$3I$C%`:?JA>#&&/Y(#OB'<'HC:B@WTV(U0K0+70)+UHR??ICTAI+W]GL,86
MR9:J;2P>6ZDKES)->P]GG*2VU0WN1RR&F,QP3-W^W]NS*$@>D'KFSCGJTCB3
I_!^JC$R#3J[GEQB_%1AY_Q>E7`H<S/9J2M,T+.(R(7\!"I]E-RP)````
`
end
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
