The option driver
- violates DMA coherency rules
- allocates ~16500 bytes in one chunk
This patch splits out the buffers and uses __get_free_page() to avoid
higher order allocations.
Signed-off-by: Oliver Neukum <[EMAIL PROTECTED]>
Acked-By: Matthias Urlichs <[EMAIL PROTECTED]>
----
--- linux-2.6.24-ser/drivers/usb/serial/option.c.alt 2008-01-30
15:02:12.000000000 +0100
+++ linux-2.6.24-ser/drivers/usb/serial/option.c 2008-01-30
15:19:15.000000000 +0100
@@ -247,10 +247,10 @@ static int debug;
struct option_port_private {
/* Input endpoints and buffer for this port */
struct urb *in_urbs[N_IN_URB];
- char in_buffer[N_IN_URB][IN_BUFLEN];
+ u8 *in_buffer[N_IN_URB];
/* Output endpoints and buffer for this port */
struct urb *out_urbs[N_OUT_URB];
- char out_buffer[N_OUT_URB][OUT_BUFLEN];
+ u8 *out_buffer[N_OUT_URB];
unsigned long out_busy; /* Bit vector of URBs in use */
/* Settings for the port */
@@ -737,7 +737,7 @@ static int option_send_setup(struct usb_
static int option_startup(struct usb_serial *serial)
{
- int i, err;
+ int i, j, err;
struct usb_serial_port *port;
struct option_port_private *portdata;
@@ -753,6 +753,18 @@ static int option_startup(struct usb_ser
return (1);
}
+ for (j = 0; j < N_IN_URB; j++) {
+ portdata->in_buffer[j] = (u8
*)__get_free_page(GFP_KERNEL);
+ if (!portdata->in_buffer[j])
+ goto bail_out_error;
+ }
+
+ for (j = 0; j < N_OUT_URB; j++) {
+ portdata->out_buffer[j] = kmalloc(OUT_BUFLEN,
GFP_KERNEL);
+ if (!portdata->out_buffer[j])
+ goto bail_out_error2;
+ }
+
usb_set_serial_port_data(port, portdata);
if (! port->interrupt_in_urb)
@@ -766,6 +778,16 @@ static int option_startup(struct usb_ser
option_setup_urbs(serial);
return (0);
+
+bail_out_error2:
+ for (j = 0; j < N_OUT_URB; j++)
+ kfree(portdata->out_buffer[j]);
+bail_out_error:
+ for (j = 0; j < N_IN_URB; j++)
+ if(portdata->in_buffer[j])
+ free_page((unsigned long)portdata->in_buffer[j]);
+ kfree(portdata);
+ return 1;
}
static void option_shutdown(struct usb_serial *serial)
@@ -794,12 +816,14 @@ static void option_shutdown(struct usb_s
for (j = 0; j < N_IN_URB; j++) {
if (portdata->in_urbs[j]) {
usb_free_urb(portdata->in_urbs[j]);
+ free_page((unsigned
long)portdata->in_buffer[j]);
portdata->in_urbs[j] = NULL;
}
}
for (j = 0; j < N_OUT_URB; j++) {
if (portdata->out_urbs[j]) {
usb_free_urb(portdata->out_urbs[j]);
+ kfree(portdata->out_buffer[j]);
portdata->out_urbs[j] = NULL;
}
}
--
Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED]
Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de
- -
Humor in the Court:
Q: Are you qualified to give a urine sample?
A: Yes, I have been since early childhood.
-
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
