Skip to contentSkip to conversation

usb/xhci: remove XHCI init code from other usb controllers

PATCH New Zhao Qiang 3 participants 4 messages Mar 24, 2014 – Oct 22, 2014

lore
Share & tools
lore

Zhao Qiang

author
#0 lore raw

PATCH 1/1 usb/xhci: remove XHCI init code from other usb controllers

The patch with commit id "020bbcb76b5be0d5406d2ae7c26dbdb013ead812" adds some init codes for XHCI but not for other usb controllers. And it will causes a bug for EHCI.
so use macro "#ifdef CONFIG_USB_XHCI" to run it just for XHCI.

Signed-off-by Zhao Qiang <[email protected]>
---
 common/usb_hub.c | 5 +++++
 1 file changed, 5 insertions(+)
common/usb_hub.c +5 -0
index ffac0e7..7f791f1 100644
@@ -90,12 +90,16 @@ static void usb_hub_power_on(struct usb_hub_device *hub)
 	int i;
 	struct usb_device *dev;
 	unsigned pgood_delay = hub->desc.bPwrOn2PwrGood * 2;
+
+#ifdef CONFIG_USB_XHCI
 	ALLOC_CACHE_ALIGN_BUFFER(struct usb_port_status, portsts, 1);
 	unsigned short portstatus;
 	int ret;
+#endif
 
 	dev = hub->pusb_dev;
 
+#ifdef CONFIG_USB_XHCI
 	/*
 	 * Enable power to the ports:
 	 * Here we Power-cycle the ports: aka,

@@ -132,6 +136,7 @@ static void usb_hub_power_on(struct usb_hub_device *hub)
 			continue;
 		}
 	}
+#endif
 
 	for (i = 0; i < dev->maxchild; i++) {
 		usb_set_port_feature(dev, i + 1, USB_PORT_FEAT_POWER);
Signature · 1 line
1.8.5
#1 lore raw

PATCH 1/1 usb/xhci: remove XHCI init code from other usb controllers

Quoted 6 lines · Zhao Qiang

The patch with commit id "020bbcb76b5be0d5406d2ae7c26dbdb013ead812" adds some init codes for XHCI but not for other usb controllers. And it will causes a bug for EHCI.
so use macro "#ifdef CONFIG_USB_XHCI" to run it just for XHCI.

Signed-off-by Zhao Qiang <[email protected]>

Is this still relevant? What kind of bug does this fix exactly?

Also, next time please CC me.

Best regards,
Marek Vasut

#2 lore raw

PATCH 1/1 usb/xhci: remove XHCI init code from other usb controllers

Quoted 6 lines · Marek Vasut
Quoted 5 lines · Zhao Qiang

The patch with commit id "020bbcb76b5be0d5406d2ae7c26dbdb013ead812" adds some init codes for XHCI but not for other usb controllers. And it will causes a bug for EHCI.
so use macro "#ifdef CONFIG_USB_XHCI" to run it just for XHCI.

Quoted 6 lines
Quoted 1 line
Signed-off-by Zhao Qiang <[email protected]>

Is this still relevant? What kind of bug does this fix exactly?

Also, next time please CC me.

I think so. Qiang just pinged me yesterday. Do you think it is reasonable to conditionally power cycle the ports?

York

#3 lore raw

PATCH 1/1 usb/xhci: remove XHCI init code from other usb controllers

Quoted 7 lines · York Sun
Quoted 6 lines · Marek Vasut
Quoted 5 lines · Zhao Qiang

The patch with commit id "020bbcb76b5be0d5406d2ae7c26dbdb013ead812" adds some init codes for XHCI but not for other usb controllers. And it will causes a bug for EHCI.
so use macro "#ifdef CONFIG_USB_XHCI" to run it just for XHCI.

Quoted 8 lines
Quoted 5 lines
Quoted 1 line
Signed-off-by Zhao Qiang <[email protected]>

Is this still relevant? What kind of bug does this fix exactly?

Also, next time please CC me.

I think so. Qiang just pinged me yesterday. Do you think it is reasonable to conditionally power cycle the ports?

CCing samsung guys. I have yet to hear what issue do you observe with this patch.

Best regards,
Marek Vasut