USB on PPC440GP (cache incoherent)

diff -Nru a/drivers/usb/hub.c b/drivers/usb/hub.c
@@ -155,7 +155,7 @@
 static int usb_hub_configure(struct usb_hub *hub, struct usb_endpoint_descriptor *endpoint)
 {
 	struct usb_device *dev = hub->dev;
-	struct usb_hub_status hubstatus;
+	struct usb_hub_status *hubstatus;
 	char portstr[USB_MAXCHILDREN + 1];
 	unsigned int pipe;
 	int i, maxp, ret;

@@ -258,27 +258,36 @@
 
 	dbg("port removable status: %s", portstr);
 
-	ret = usb_get_hub_status(dev, &hubstatus);
+        hubstatus = kmalloc(sizeof *hubstatus, GFP_KERNEL);
+        if (!hubstatus) {
+                err("Unable to allocate hubstatus");
+                kfree(hub->descriptor);
+                return -1;
+        }
+	ret = usb_get_hub_status(dev, hubstatus);
 	if (ret < 0) {
 		err("Unable to get hub status (err = %d)", ret);
+                kfree(hubstatus);
 		kfree(hub->descriptor);
 		return -1;
 	}
 
-	le16_to_cpus(&hubstatus.wHubStatus);
+	le16_to_cpus(&hubstatus->wHubStatus);
 
 	dbg("local power source is %s",
-		(hubstatus.wHubStatus & HUB_STATUS_LOCAL_POWER) ? "lost (inactive)" : "good");
+		(hubstatus->wHubStatus & HUB_STATUS_LOCAL_POWER) ? "lost (inactive)" : "good");
 
 	dbg("%sover-current condition exists",
-		(hubstatus.wHubStatus & HUB_STATUS_OVERCURRENT) ? "" : "no ");
+		(hubstatus->wHubStatus & HUB_STATUS_OVERCURRENT) ? "" : "no ");
+
+        kfree(hubstatus);
 
 	/* Start the interrupt endpoint */
 	pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress);
 	maxp = usb_maxpacket(dev, pipe, usb_pipeout(pipe));
 
-	if (maxp > sizeof(hub->buffer))
-		maxp = sizeof(hub->buffer);
+	if (maxp > USB_HUB_BUFFER_SIZE)
+		maxp = USB_HUB_BUFFER_SIZE;
 
 	hub->urb = usb_alloc_urb(0);
 	if (!hub->urb) {

@@ -357,6 +366,13 @@
 
 	memset(hub, 0, sizeof(*hub));
 
+        hub->buffer = kmalloc(USB_HUB_BUFFER_SIZE, GFP_KERNEL);
+        if (!hub->buffer) {
+                err("couldn't kmalloc hub->buffer");
+                kfree(hub);
+                return NULL;
+        }
+
 	INIT_LIST_HEAD(&hub->event_list);
 	hub->dev = dev;
 	init_MUTEX(&hub->khubd_sem);

@@ -383,6 +399,7 @@
 
 	spin_unlock_irqrestore(&hub_event_lock, flags);
 
+        kfree(hub->buffer);
 	kfree(hub);
 
 	return NULL;

@@ -417,6 +434,11 @@
 		hub->descriptor = NULL;
 	}
 
+        if (hub->buffer) {
+                kfree(hub->buffer);
+                hub->buffer = NULL;
+        }
+
 	/* Free the memory */
 	kfree(hub);
 }

@@ -782,7 +804,7 @@
 	struct list_head *tmp;
 	struct usb_device *dev;
 	struct usb_hub *hub;
-	struct usb_hub_status hubsts;
+	struct usb_hub_status *hubsts;
 	u16 hubstatus;
 	u16 hubchange;
 	u16 portstatus;

@@ -872,22 +894,28 @@
 		} /* end for i */
 
 		/* deal with hub status changes */
-		if (usb_get_hub_status(dev, &hubsts) < 0)
-			err("get_hub_status failed");
-		else {
-			hubstatus = le16_to_cpup(&hubsts.wHubStatus);
-			hubchange = le16_to_cpup(&hubsts.wHubChange);
-			if (hubchange & HUB_CHANGE_LOCAL_POWER) {
-				dbg("hub power change");
-				usb_clear_hub_feature(dev, C_HUB_LOCAL_POWER);
-			}
-			if (hubchange & HUB_CHANGE_OVERCURRENT) {
-				dbg("hub overcurrent change");
-				wait_ms(500);	/* Cool down */
-				usb_clear_hub_feature(dev, C_HUB_OVER_CURRENT);
-                        	usb_hub_power_on(hub);
-			}
+                hubsts = kmalloc(sizeof *hubsts, GFP_KERNEL);
+                if (!hubsts) {
+                        err("couldn't allocate hubsts");
+                } else {
+                        if (usb_get_hub_status(dev, hubsts) < 0)
+                                err("get_hub_status failed");
+                        else {
+                                hubstatus = le16_to_cpup(&hubsts->wHubStatus);
+                                hubchange = le16_to_cpup(&hubsts->wHubChange);
+                                if (hubchange & HUB_CHANGE_LOCAL_POWER) {
+                                        dbg("hub power change");
+                                        usb_clear_hub_feature(dev, C_HUB_LOCAL_POWER);
+                                }
+                                if (hubchange & HUB_CHANGE_OVERCURRENT) {
+                                        dbg("hub overcurrent change");
+                                        wait_ms(500);	/* Cool down */
+                                        usb_clear_hub_feature(dev, C_HUB_OVER_CURRENT);
+                                        usb_hub_power_on(hub);
+                                }
+                        }
 		}
+                kfree(hubsts);
 		up(&hub->khubd_sem);
         } /* end while (1) */
 

@@ -995,7 +1023,7 @@
 int usb_reset_device(struct usb_device *dev)
 {
 	struct usb_device *parent = dev->parent;
-	struct usb_device_descriptor descriptor;
+	struct usb_device_descriptor *descriptor;
 	int i, ret, port = -1;
 
 	if (!parent) {

@@ -1044,17 +1072,19 @@
 	 * If nothing changed, we reprogram the configuration and then
 	 * the alternate settings.
 	 */
-	ret = usb_get_descriptor(dev, USB_DT_DEVICE, 0, &descriptor,
-			sizeof(descriptor));
+        descriptor = kmalloc(sizeof *descriptor, GFP_KERNEL);
+	ret = usb_get_descriptor(dev, USB_DT_DEVICE, 0, descriptor,
+                                 sizeof *descriptor);
 	if (ret < 0)
 		return ret;
 
-	le16_to_cpus(&descriptor.bcdUSB);
-	le16_to_cpus(&descriptor.idVendor);
-	le16_to_cpus(&descriptor.idProduct);
-	le16_to_cpus(&descriptor.bcdDevice);
+	le16_to_cpus(&descriptor->bcdUSB);
+	le16_to_cpus(&descriptor->idVendor);
+	le16_to_cpus(&descriptor->idProduct);
+	le16_to_cpus(&descriptor->bcdDevice);
 
-	if (memcmp(&dev->descriptor, &descriptor, sizeof(descriptor))) {
+	if (memcmp(&dev->descriptor, descriptor, sizeof *descriptor)) {
+                kfree(descriptor);
 		usb_destroy_configuration(dev);
 
 		ret = usb_get_device_descriptor(dev);

@@ -1083,6 +1113,7 @@
 
 		return 1;
 	}
+        kfree(descriptor);
 
 	ret = usb_set_configuration(dev, dev->actconfig->bConfigurationValue);
 	if (ret < 0) {

diff -Nru a/drivers/usb/hub.h b/drivers/usb/hub.h
@@ -120,13 +120,15 @@
 
 struct usb_device;
 
+/* add 1 bit for hub status change and add 7 bits to round up to byte boundary */
+#define USB_HUB_BUFFER_SIZE ((USB_MAXCHILDREN + 1 + 7) / 8)
+
 struct usb_hub {
 	struct usb_device *dev;
 
 	struct urb *urb;		/* Interrupt polling pipe */
 
-	char buffer[(USB_MAXCHILDREN + 1 + 7) / 8]; /* add 1 bit for hub status change */
-					/* and add 7 bits to round up to byte boundary */
+        char *buffer;
 	int error;
 	int nerrors;
 

271 lines not on this page · raw message

diff -Nru a/drivers/usb/usb.c b/drivers/usb/usb.c
@@ -1787,16 +1787,23 @@
 {
 	int i = 5;
 	int result;
+        void *tmp_buf;
 
-	memset(buf,0,size);	// Make sure we parse really received data
+        tmp_buf = kmalloc(size, in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);
+        if (!tmp_buf) {
+          return -ENOMEM;
+        }
+	memset(tmp_buf,0,size);	// Make sure we parse really received data
 
 	while (i--) {
 		if ((result = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
 			USB_REQ_GET_DESCRIPTOR, USB_DIR_IN,
-			(type << 8) + index, 0, buf, size, HZ * GET_TIMEOUT)) > 0 ||
+			(type << 8) + index, 0, tmp_buf, size, HZ * GET_TIMEOUT)) > 0 ||
 		     result == -EPIPE)
 			break;	/* retry if the returned length was 0; flaky device */
 	}
+        memcpy(buf, tmp_buf, size);
+        kfree(tmp_buf);
 	return result;
 }