Skip to contentSkip to conversation

usb: ss: Fixes for super speed framework

PATCH New Vivek Gautam 5 participants 9 messages Apr 24, 2013 – Apr 25, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover usb: ss: Fixes for super speed framework

This patch series fixes changes for Super speed framework which got pulled-in 'u-boot-usb/next'.
First patch fixes Port Status and Port feature macro constants, then next patch parallelizes power-cycling of power on root-hub ports.
3rd patch in this series also sync the min3/max3 definitions with Linux kernel.

Based on u-boot-usb/next branch with following patch reverted:
usb: hub: Reset only usb 2.0 ports

Vivek Gautam (3):
usb: hub: Parallelize power-cycling of root-hub ports
usb: fix: Fixing Port status and feature number constants
usb: common: Use a global definition for 'min3'

 common/usb_hub.c            |   63 ++++++++++++++++++++++++++++--------------
 drivers/usb/host/ehci-hcd.c |   10 -------
 include/common.h            |   25 ++++++++++++++---
 include/usb_defs.h          |   39 +++++++++++++++-----------
 4 files changed, 86 insertions(+), 51 deletions(-)
Signature · 1 line
1.7.6.5
#1 lore raw

PATCH 1/3 usb: hub: Parallelize power-cycling of root-hub ports

Untill now we power-cycle (aka: disable power on a port and re-enabling again) one port at a time.
Delay of 20ms for Port-power to change multiplies with number of ports in this case.
So better we parallelize this process:
disable power on all ports, wait for port-power to stabilize and then re-enable the power subsequently.

---
 common/usb_hub.c |   23 ++++++++++++++---------
 1 files changed, 14 insertions(+), 9 deletions(-)
common/usb_hub.c +14 -9
index 1e225e6..dad0409 100644
@@ -105,22 +105,25 @@ static void usb_hub_power_on(struct usb_hub_device *hub)
 	int ret;
 
 	dev = hub->pusb_dev;
-	/* Enable power to the ports */
+
+	/*
+	 * Enable power to the ports:
+	 * Here we Power-cycle the ports: aka,
+	 * turning them off and turning on again.
+	 */
 	debug("enabling power on all ports\n");
 	for (i = 0; i < dev->maxchild; i++) {
-		/*
-		 * Power-cycle the ports here: aka,
-		 * turning them off and turning on again.
-		 */
 		usb_clear_port_feature(dev, i + 1, USB_PORT_FEAT_POWER);
 		debug("port %d returns %lX\n", i + 1, dev->status);
+	}
 
-		/* Wait at least 2*bPwrOn2PwrGood for PP to change */
-		mdelay(pgood_delay);
+	/* Wait at least 2*bPwrOn2PwrGood for PP to change */
+	mdelay(pgood_delay);
 
+	for (i = 0; i < dev->maxchild; i++) {
 		ret = usb_get_port_status(dev, i + 1, portsts);
 		if (ret < 0) {
-			debug("port %d: get_port_status failed\n", i + 1);
+			printf("port %d: get_port_status failed\n", i + 1);
 			return;
 		}
 
@@ -135,10 +138,12 @@ static void usb_hub_power_on(struct usb_hub_device *hub)
 		 */
 		portstatus = le16_to_cpu(portsts->wPortStatus);
 		if (portstatus & (USB_PORT_STAT_POWER << 1)) {
-			debug("port %d: Port power change failed\n", i + 1);
+			printf("port %d: Port power change failed\n", i + 1);
 			return;
 		}
+	}
 
+	for (i = 0; i < dev->maxchild; i++) {
 		usb_set_port_feature(dev, i + 1, USB_PORT_FEAT_POWER);
 		debug("port %d returns %lX\n", i + 1, dev->status);
 	}
Signature · 1 line
1.7.6.5
#2 lore raw

PATCH 2/3 usb: fix: Fixing Port status and feature number constants

In reply to Vivek Gautam

Fix the Port status bit constants and Port feature number constants as a part of USB 2.0 and USB 3.0 Hub class.

---
 common/usb_hub.c   |   40 ++++++++++++++++++++++++++++------------
 include/usb_defs.h |   39 +++++++++++++++++++++++----------------
 2 files changed, 51 insertions(+), 28 deletions(-)
common/usb_hub.c +28 -12
index dad0409..d9816e4 100644
@@ -170,14 +170,24 @@ static struct usb_hub_device *usb_hub_allocate(void)
 
 static inline char *portspeed(int portstatus)
 {
-	if (portstatus & (1 << USB_PORT_FEAT_SUPERSPEED))
-		return "5 Gb/s";
-	else if (portstatus & (1 << USB_PORT_FEAT_HIGHSPEED))
-		return "480 Mb/s";
-	else if (portstatus & (1 << USB_PORT_FEAT_LOWSPEED))
-		return "1.5 Mb/s";
-	else
-		return "12 Mb/s";
+	char *speed_str;
+
+	switch (portstatus & USB_PORT_STAT_SPEED_MASK) {
+	case USB_PORT_STAT_SUPER_SPEED:
+		speed_str = "5 Gb/s";
+		break;
+	case USB_PORT_STAT_HIGH_SPEED:
+		speed_str = "480 Mb/s";
+		break;
+	case USB_PORT_STAT_LOW_SPEED:
+		speed_str = "1.5 Mb/s";
+		break;
+	default:
+		speed_str = "12 Mb/s";
+		break;
+	}
+
+	return speed_str;
 }
 
 int hub_port_reset(struct usb_device *dev, int port,
@@ -275,14 +285,20 @@ void usb_hub_port_connect_change(struct usb_device *dev, int port)
 	/* Allocate a new device struct for it */
 	usb = usb_alloc_new_device(dev->controller);
 
-	if (portstatus & USB_PORT_STAT_SUPER_SPEED)
+	switch (portstatus & USB_PORT_STAT_SPEED_MASK) {
+	case USB_PORT_STAT_SUPER_SPEED:
 		usb->speed = USB_SPEED_SUPER;
-	else if (portstatus & USB_PORT_STAT_HIGH_SPEED)
+		break;
+	case USB_PORT_STAT_HIGH_SPEED:
 		usb->speed = USB_SPEED_HIGH;
-	else if (portstatus & USB_PORT_STAT_LOW_SPEED)
+		break;
+	case USB_PORT_STAT_LOW_SPEED:
 		usb->speed = USB_SPEED_LOW;
-	else
+		break;
+	default:
 		usb->speed = USB_SPEED_FULL;
+		break;
+	}
 
 	dev->children[port] = usb;
 	usb->parent = dev;
include/usb_defs.h +23 -16
index 6ce6791..4f3601a 100644
@@ -215,8 +215,6 @@
 #define USB_PORT_FEAT_POWER          8
 #define USB_PORT_FEAT_LOWSPEED       9
 #define USB_PORT_FEAT_HIGHSPEED      10
-#define USB_PORT_FEAT_FULLSPEED      11
-#define USB_PORT_FEAT_SUPERSPEED     12
 #define USB_PORT_FEAT_C_CONNECTION   16
 #define USB_PORT_FEAT_C_ENABLE       17
 #define USB_PORT_FEAT_C_SUSPEND      18
@@ -224,6 +222,17 @@
 #define USB_PORT_FEAT_C_RESET        20
 #define USB_PORT_FEAT_TEST           21
 
+/*
+ * Changes to Port feature numbers for Super speed,
+ * from USB 3.0 spec Table 10-8
+ */
+#define USB_SS_PORT_FEAT_U1_TIMEOUT	23
+#define USB_SS_PORT_FEAT_U2_TIMEOUT	24
+#define USB_SS_PORT_FEAT_C_LINK_STATE	25
+#define USB_SS_PORT_FEAT_C_CONFIG_ERROR	26
+#define USB_SS_PORT_FEAT_BH_RESET	28
+#define USB_SS_PORT_FEAT_C_BH_RESET	29
+
 /* wPortStatus bits */
 #define USB_PORT_STAT_CONNECTION    0x0001
 #define USB_PORT_STAT_ENABLE        0x0002
@@ -233,20 +242,18 @@
 #define USB_PORT_STAT_POWER         0x0100
 #define USB_PORT_STAT_LOW_SPEED     0x0200
 #define USB_PORT_STAT_HIGH_SPEED    0x0400	/* support for EHCI */
-#define USB_PORT_STAT_FULL_SPEED    0x0800
-#define USB_PORT_STAT_SUPER_SPEED   0x1000	/* support for XHCI */
-#define USB_PORT_STAT_SPEED	\
-	(USB_PORT_STAT_LOW_SPEED | USB_PORT_STAT_HIGH_SPEED | \
-	USB_PORT_STAT_FULL_SPEED | USB_PORT_STAT_SUPER_SPEED)
+#define USB_PORT_STAT_SUPER_SPEED   0x0600	/* faking support to XHCI */
+#define USB_PORT_STAT_SPEED_MASK	\
+	(USB_PORT_STAT_LOW_SPEED | USB_PORT_STAT_HIGH_SPEED)
 
 /*
- * Additions to wPortStatus bit field from USB 3.0
- * See USB 3.0 spec Table 10-10
+ * Changes to wPortStatus bit field in USB 3.0
+ * See USB 3.0 spec Table 10-11
  */
-#define USB_PORT_STAT_LINK_STATE	0x01e0
+#define USB_SS_PORT_STAT_LINK_STATE	0x01e0
 #define USB_SS_PORT_STAT_POWER		0x0200
 #define USB_SS_PORT_STAT_SPEED		0x1c00
-#define USB_PORT_STAT_SPEED_5GBPS	0x0000
+#define USB_SS_PORT_STAT_SPEED_5GBPS	0x0000
 
 /* wPortChange bits */
 #define USB_PORT_STAT_C_CONNECTION  0x0001
@@ -256,12 +263,12 @@
 #define USB_PORT_STAT_C_RESET       0x0010
 
 /*
- * Addition to wPortChange bit fields form USB 3.0
- * See USB 3.0 spec Table 10-11
+ * Changes to wPortChange bit fields in USB 3.0
+ * See USB 3.0 spec Table 10-12
  */
-#define USB_PORT_STAT_C_BH_RESET	0x0020
-#define USB_PORT_STAT_C_LINK_STATE	0x0040
-#define USB_PORT_STAT_C_CONFIG_ERROR	0x0080
+#define USB_SS_PORT_STAT_C_BH_RESET	0x0020
+#define USB_SS_PORT_STAT_C_LINK_STATE	0x0040
+#define USB_SS_PORT_STAT_C_CONFIG_ERROR	0x0080
 
 /* wHubCharacteristics (masks) */
 #define HUB_CHAR_LPSM               0x0003
Signature · 1 line
1.7.6.5
#3 lore raw

PATCH 2/3 usb: fix: Fixing Port status and feature number constants

Quoted 34 lines · Vivek Gautam

Fix the Port status bit constants and Port feature number constants as a part of USB 2.0 and USB 3.0 Hub class.

---
 common/usb_hub.c   |   40 ++++++++++++++++++++++++++++------------
 include/usb_defs.h |   39 +++++++++++++++++++++++----------------
 2 files changed, 51 insertions(+), 28 deletions(-)
common/usb_hub.c +9 -8
index dad0409..d9816e4 100644
@@ -170,14 +170,24 @@ static struct usb_hub_device *usb_hub_allocate(void)
 
 static inline char *portspeed(int portstatus)
 {
-       if (portstatus & (1 << USB_PORT_FEAT_SUPERSPEED))
-               return "5 Gb/s";
-       else if (portstatus & (1 << USB_PORT_FEAT_HIGHSPEED))
-               return "480 Mb/s";
-       else if (portstatus & (1 << USB_PORT_FEAT_LOWSPEED))
-               return "1.5 Mb/s";
-       else
-               return "12 Mb/s";
+       char *speed_str;
+
+       switch (portstatus & USB_PORT_STAT_SPEED_MASK) {
+       case USB_PORT_STAT_SUPER_SPEED:
+               speed_str = "5 Gb/s";
+               break;
+       case USB_PORT_STAT_HIGH_SPEED:
+               speed_str = "480 Mb/s";
+               break;

common/usb_hub.c static struct usb_hub_device *usb_hub_allocate(void) · line 191

Quoted 10 lines
common/usb_hub.c +9 -0
+       case USB_PORT_STAT_LOW_SPEED:
+               speed_str = "1.5 Mb/s";
+               break;
+       default:
+               speed_str = "12 Mb/s";
+               break;
+       }
+
+       return speed_str;
 }

Just a nitpick... you could save 8 lines here by moving the return into the case blocks. Rest of the patch set LGTM.

Quoted 107 lines
common/usb_hub.c +10 -4
 int hub_port_reset(struct usb_device *dev, int port,
@@ -275,14 +285,20 @@ void usb_hub_port_connect_change(struct usb_device *dev, int port)
        /* Allocate a new device struct for it */
        usb = usb_alloc_new_device(dev->controller);
 
-       if (portstatus & USB_PORT_STAT_SUPER_SPEED)
+       switch (portstatus & USB_PORT_STAT_SPEED_MASK) {
+       case USB_PORT_STAT_SUPER_SPEED:
                usb->speed = USB_SPEED_SUPER;
-       else if (portstatus & USB_PORT_STAT_HIGH_SPEED)
+               break;
+       case USB_PORT_STAT_HIGH_SPEED:
                usb->speed = USB_SPEED_HIGH;
-       else if (portstatus & USB_PORT_STAT_LOW_SPEED)
+               break;
+       case USB_PORT_STAT_LOW_SPEED:
                usb->speed = USB_SPEED_LOW;
-       else
+               break;
+       default:
                usb->speed = USB_SPEED_FULL;
+               break;
+       }
 
        dev->children[port] = usb;
        usb->parent = dev;
include/usb_defs.h +23 -17
index 6ce6791..4f3601a 100644
@@ -215,8 +215,6 @@
 #define USB_PORT_FEAT_POWER          8
 #define USB_PORT_FEAT_LOWSPEED       9
 #define USB_PORT_FEAT_HIGHSPEED      10
-#define USB_PORT_FEAT_FULLSPEED      11
-#define USB_PORT_FEAT_SUPERSPEED     12
 #define USB_PORT_FEAT_C_CONNECTION   16
 #define USB_PORT_FEAT_C_ENABLE       17
 #define USB_PORT_FEAT_C_SUSPEND      18
@@ -224,6 +222,17 @@
 #define USB_PORT_FEAT_C_RESET        20
 #define USB_PORT_FEAT_TEST           21
 
+/*
+ * Changes to Port feature numbers for Super speed,
+ * from USB 3.0 spec Table 10-8
+ */
+#define USB_SS_PORT_FEAT_U1_TIMEOUT    23
+#define USB_SS_PORT_FEAT_U2_TIMEOUT    24
+#define USB_SS_PORT_FEAT_C_LINK_STATE  25
+#define USB_SS_PORT_FEAT_C_CONFIG_ERROR        26
+#define USB_SS_PORT_FEAT_BH_RESET      28
+#define USB_SS_PORT_FEAT_C_BH_RESET    29
+
 /* wPortStatus bits */
 #define USB_PORT_STAT_CONNECTION    0x0001
 #define USB_PORT_STAT_ENABLE        0x0002
@@ -233,20 +242,18 @@
 #define USB_PORT_STAT_POWER         0x0100
 #define USB_PORT_STAT_LOW_SPEED     0x0200
 #define USB_PORT_STAT_HIGH_SPEED    0x0400     /* support for EHCI */
-#define USB_PORT_STAT_FULL_SPEED    0x0800
-#define USB_PORT_STAT_SUPER_SPEED   0x1000     /* support for XHCI */
-#define USB_PORT_STAT_SPEED    \
-       (USB_PORT_STAT_LOW_SPEED | USB_PORT_STAT_HIGH_SPEED | \
-       USB_PORT_STAT_FULL_SPEED | USB_PORT_STAT_SUPER_SPEED)
+#define USB_PORT_STAT_SUPER_SPEED   0x0600     /* faking support to XHCI */
+#define USB_PORT_STAT_SPEED_MASK       \
+       (USB_PORT_STAT_LOW_SPEED | USB_PORT_STAT_HIGH_SPEED)
 
 /*
- * Additions to wPortStatus bit field from USB 3.0
- * See USB 3.0 spec Table 10-10
+ * Changes to wPortStatus bit field in USB 3.0
+ * See USB 3.0 spec Table 10-11
  */
-#define USB_PORT_STAT_LINK_STATE       0x01e0
+#define USB_SS_PORT_STAT_LINK_STATE    0x01e0
 #define USB_SS_PORT_STAT_POWER         0x0200
 #define USB_SS_PORT_STAT_SPEED         0x1c00
-#define USB_PORT_STAT_SPEED_5GBPS      0x0000
+#define USB_SS_PORT_STAT_SPEED_5GBPS   0x0000
 
 /* wPortChange bits */
 #define USB_PORT_STAT_C_CONNECTION  0x0001
@@ -256,12 +263,12 @@
 #define USB_PORT_STAT_C_RESET       0x0010
 
 /*
- * Addition to wPortChange bit fields form USB 3.0
- * See USB 3.0 spec Table 10-11
+ * Changes to wPortChange bit fields in USB 3.0
+ * See USB 3.0 spec Table 10-12
  */
-#define USB_PORT_STAT_C_BH_RESET       0x0020
-#define USB_PORT_STAT_C_LINK_STATE     0x0040
-#define USB_PORT_STAT_C_CONFIG_ERROR   0x0080
+#define USB_SS_PORT_STAT_C_BH_RESET    0x0020
+#define USB_SS_PORT_STAT_C_LINK_STATE  0x0040
+#define USB_SS_PORT_STAT_C_CONFIG_ERROR        0x0080
 
 /* wHubCharacteristics (masks) */
 #define HUB_CHAR_LPSM               0x0003
--

1.7.6.5

#4 lore raw

PATCH 3/3 usb: common: Use a global definition for 'min3'

In reply to Vivek Gautam

We can use a common global method for calculating minimum of 3 numbers. Put the same in 'common header' and let 'ehci' use it.

---
 drivers/usb/host/ehci-hcd.c |   10 ----------
 include/common.h            |   25 +++++++++++++++++++++----
 2 files changed, 21 insertions(+), 14 deletions(-)
drivers/usb/host/ehci-hcd.c +0 -10
index 19d4352..e0f3e4b 100644
@@ -603,16 +603,6 @@ fail:
 	return -1;
 }
 
-static inline int min3(int a, int b, int c)
-{
-
-	if (b < a)
-		a = b;
-	if (c < a)
-		a = c;
-	return a;
-}
-
 int
 ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer,
 		 int length, struct devrequest *req)
include/common.h +21 -4
index 0cfa6a8..b0258a0 100644
@@ -199,18 +199,35 @@ typedef void (interrupt_handler_t)(void *);
  * General Purpose Utilities
  */
 #define min(X, Y)				\
-	({ typeof (X) __x = (X);		\
-		typeof (Y) __y = (Y);		\
+	({ typeof(X) __x = (X);			\
+		typeof(Y) __y = (Y);		\
 		(__x < __y) ? __x : __y; })
 
 #define max(X, Y)				\
-	({ typeof (X) __x = (X);		\
-		typeof (Y) __y = (Y);		\
+	({ typeof(X) __x = (X);			\
+		typeof(Y) __y = (Y);		\
 		(__x > __y) ? __x : __y; })
 
 #define MIN(x, y)  min(x, y)
 #define MAX(x, y)  max(x, y)
 
+#define min3(X, Y, Z)				\
+	({ typeof(X) __x = (X);			\
+		typeof(Y) __y = (Y);		\
+		typeof(Z) __z = (Z);		\
+		__x < __y ? (__x < __z ? __x : __z) :	\
+		(__y < __z ? __y : __z); })
+
+#define max3(X, Y, Z)				\
+	({ typeof(X) __x = (X);			\
+		typeof(Y) __y = (Y);		\
+		typeof(Z) __z = (Z);		\
+		__x > __y ? (__x > __z ? __x : __z) :	\
+		(__y > __z ? __y : __z); })
+
+#define MIN3(x, y, z)  min3(x, y, z)
+#define MAX3(x, y, z)  max3(x, y, z)
+
 /*
  * Return the absolute value of a number.
  *
Signature · 1 line
1.7.6.5
#5 lore raw

PATCH 3/3 usb: common: Use a global definition for 'min3'

CC Tom Rini
Quoted 77 lines · Vivek Gautam

We can use a common global method for calculating minimum of 3 numbers. Put the same in 'common header' and let 'ehci' use it.

---
 drivers/usb/host/ehci-hcd.c |   10 ----------
 include/common.h            |   25 +++++++++++++++++++++----
 2 files changed, 21 insertions(+), 14 deletions(-)
drivers/usb/host/ehci-hcd.c +0 -10
index 19d4352..e0f3e4b 100644
@@ -603,16 +603,6 @@ fail:
        return -1;
 }
 
-static inline int min3(int a, int b, int c)
-{
-
-       if (b < a)
-               a = b;
-       if (c < a)
-               a = c;
-       return a;
-}
-
 int
 ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer,
                 int length, struct devrequest *req)
include/common.h +21 -5
index 0cfa6a8..b0258a0 100644
@@ -199,18 +199,35 @@ typedef void (interrupt_handler_t)(void *);
  * General Purpose Utilities
  */
 #define min(X, Y)                              \
-       ({ typeof (X) __x = (X);                \
-               typeof (Y) __y = (Y);           \
+       ({ typeof(X) __x = (X);                 \
+               typeof(Y) __y = (Y);            \
                (__x < __y) ? __x : __y; })
 
 #define max(X, Y)                              \
-       ({ typeof (X) __x = (X);                \
-               typeof (Y) __y = (Y);           \
+       ({ typeof(X) __x = (X);                 \
+               typeof(Y) __y = (Y);            \
                (__x > __y) ? __x : __y; })
 
 #define MIN(x, y)  min(x, y)
 #define MAX(x, y)  max(x, y)
 
+#define min3(X, Y, Z)                          \
+       ({ typeof(X) __x = (X);                 \
+               typeof(Y) __y = (Y);            \
+               typeof(Z) __z = (Z);            \
+               __x < __y ? (__x < __z ? __x : __z) :   \
+               (__y < __z ? __y : __z); })
+
+#define max3(X, Y, Z)                          \
+       ({ typeof(X) __x = (X);                 \
+               typeof(Y) __y = (Y);            \
+               typeof(Z) __z = (Z);            \
+               __x > __y ? (__x > __z ? __x : __z) :   \
+               (__y > __z ? __y : __z); })
+
+#define MIN3(x, y, z)  min3(x, y, z)
+#define MAX3(x, y, z)  max3(x, y, z)
+
 /*
  * Return the absolute value of a number.
  *
--

1.7.6.5

Signature · 2 lines
Best Regards
Vivek
#6 lore raw

PATCH 3/3 usb: common: Use a global definition for 'min3'

In reply to Vivek Gautam
Quoted 5 lines · Vivek Gautam

We can use a common global method for calculating minimum of 3 numbers. Put the same in 'common header' and let 'ehci' use it.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130425/aa09f480/attachment.pgp>
#7 lore raw

cover usb: ss: Fixes for super speed framework

In reply to Vivek Gautam

Dear Vivek Gautam,

Quoted 10 lines

This patch series fixes changes for Super speed framework which got pulled-in 'u-boot-usb/next'.
First patch fixes Port Status and Port feature macro constants, then next patch parallelizes power-cycling of power on root-hub ports.
3rd patch in this series also sync the min3/max3 definitions with Linux kernel.

Based on u-boot-usb/next branch with following patch reverted:
usb: hub: Reset only usb 2.0 ports

Fixed Julius's comment , applied and pushed.

Best regards,
Marek Vasut

#8 lore raw

cover usb: ss: Fixes for super speed framework

Hi Marek,

Quoted 10 lines · Marek Vasut

Dear Vivek Gautam,

Quoted 8 lines

This patch series fixes changes for Super speed framework which got pulled-in 'u-boot-usb/next'.
First patch fixes Port Status and Port feature macro constants, then next patch parallelizes power-cycling of power on root-hub ports.
3rd patch in this series also sync the min3/max3 definitions with Linux kernel.

Quoted 4 lines
Quoted 2 lines

Based on u-boot-usb/next branch with following patch reverted:
usb: hub: Reset only usb 2.0 ports

Fixed Julius's comment , applied and pushed.

Thanks :-)

Signature · 2 lines
Best Regards
Vivek