--- zzzz-none-000/linux-2.6.32.61/drivers/usb/host/xhci-hub.c	2013-06-10 09:43:48.000000000 +0000
+++ ar9-7330-650/linux-2.6.32.61/drivers/usb/host/xhci-hub.c	2014-10-29 15:55:54.000000000 +0000
@@ -24,6 +24,8 @@
 
 #include "xhci.h"
 
+extern int usb3port_config;
+
 static void xhci_hub_descriptor(struct xhci_hcd *xhci,
 		struct usb_hub_descriptor *desc)
 {
@@ -161,12 +163,15 @@
 		xhci_dbg(xhci, "get port status, actual port %d status  = 0x%x\n", wIndex, temp);
 
 		/* wPortChange bits */
-		if (temp & PORT_CSC)
+		if (temp & (PORT_CSC|PORT_PLC))
 			status |= 1 << USB_PORT_FEAT_C_CONNECTION;
 		if (temp & PORT_PEC)
 			status |= 1 << USB_PORT_FEAT_C_ENABLE;
 		if ((temp & PORT_OCC))
 			status |= 1 << USB_PORT_FEAT_C_OVER_CURRENT;
+		/* AVM/WK Workaround: tell USB core about RESET completion */
+		if (temp & (PORT_RC|PORT_WRC))
+			status |= 1 << USB_PORT_FEAT_C_RESET;
 		/*
 		 * FIXME ignoring suspend, reset, and USB 2.1/3.0 specific
 		 * changes
@@ -179,7 +184,7 @@
 			status |= 1 << USB_PORT_FEAT_ENABLE;
 		if (temp & PORT_OC)
 			status |= 1 << USB_PORT_FEAT_OVER_CURRENT;
-		if (temp & PORT_RESET)
+		if (temp & (PORT_RESET|PORT_WR))
 			status |= 1 << USB_PORT_FEAT_RESET;
 		if (temp & PORT_POWER)
 			status |= 1 << USB_PORT_FEAT_POWER;
@@ -202,13 +207,21 @@
 			 * However, khubd will ignore the roothub events until
 			 * the roothub is registered.
 			 */
-			xhci_writel(xhci, temp | PORT_POWER, addr);
-
+			if ((wIndex < (ports/2)) && !((1<<wIndex) & usb3port_config)) {
+				printk (KERN_INFO "AVM: disable USB3 port#%d status = 0x%x\n", wIndex, temp);
+				xhci_writel(xhci, temp & ~ PORT_POWER, addr);
+			} else {
+				xhci_writel(xhci, temp | PORT_POWER, addr);
+			}
 			temp = xhci_readl(xhci, addr);
 			xhci_dbg(xhci, "set port power, actual port %d status  = 0x%x\n", wIndex, temp);
 			break;
 		case USB_PORT_FEAT_RESET:
-			temp = (temp | PORT_RESET);
+			if (wIndex < (ports/2)) {
+				temp = (temp | PORT_WR);
+			} else {
+				temp = (temp | PORT_RESET);
+			}
 			xhci_writel(xhci, temp, addr);
 
 			temp = xhci_readl(xhci, addr);
@@ -228,17 +241,51 @@
 		temp = xhci_readl(xhci, addr);
 		temp = xhci_port_state_to_neutral(temp);
 		switch (wValue) {
+		case USB_PORT_FEAT_POWER:
+			status = 0; 
+			temp &= ~((u32)PORT_POWER);
+			port_change_bit = "power";
+			break;
 		case USB_PORT_FEAT_C_RESET:
-			status = PORT_RC;
-			port_change_bit = "reset";
+			status = PORT_RC|PORT_WRC;
+			port_change_bit = "reset CHG";
 			break;
 		case USB_PORT_FEAT_C_CONNECTION:
-			status = PORT_CSC;
-			port_change_bit = "connect";
+			status = PORT_CSC|PORT_PLC;
+			port_change_bit = "connect CHG";
+			/* AVM: Restore RX Detect State for SS ports */
+			if (!(temp & PORT_CONNECT)) {
+				if (wIndex < 2) {
+					temp &= ~(0xf<<5);
+					temp |= (5<<5);
+					temp |= (1<<16);
+				}
+			}
 			break;
 		case USB_PORT_FEAT_C_OVER_CURRENT:
 			status = PORT_OCC;
-			port_change_bit = "over-current";
+			port_change_bit = "over-current CHG";
+			break;
+		case USB_PORT_FEAT_ENABLE:
+			status = PORT_PE;
+			port_change_bit = "enable";
+			/* AVM: Restore RX Detect State for SS ports */
+			if (wIndex < (ports/2)) {
+				temp &= ~(0xf<<5);
+				temp |= (5<<5);
+				temp |= (1<<16);
+			}
+			break;
+			
+		case USB_PORT_FEAT_C_ENABLE:
+			status = PORT_PEC; 
+			port_change_bit = "enable CHG";
+			/* AVM: Restore RX Detect State for SS ports*/
+			if (wIndex < (ports/2)) {
+				temp &= ~(0xf<<5);
+				temp |= (5<<5);
+				temp |= (1<<16);
+			}
 			break;
 		default:
 			goto error;
@@ -246,7 +293,7 @@
 		/* Change bits are all write 1 to clear */
 		xhci_writel(xhci, temp | status, addr);
 		temp = xhci_readl(xhci, addr);
-		xhci_dbg(xhci, "clear port %s change, actual port %d status  = 0x%x\n",
+		xhci_dbg(xhci, "clear port %s, actual port %d status  = 0x%x\n",
 				port_change_bit, wIndex, temp);
 		temp = xhci_readl(xhci, addr); /* unblock any posted writes */
 		break;
@@ -295,7 +342,8 @@
 		addr = &xhci->op_regs->port_status_base +
 			NUM_PORT_REGS*i;
 		temp = xhci_readl(xhci, addr);
-		if (temp & (PORT_CSC | PORT_PEC | PORT_OCC)) {
+		/* AVM/WK Workaround: PORT_RC added */
+		if (temp & (PORT_CSC | PORT_PEC | PORT_OCC|PORT_RC|PORT_PLC)) {
 			if (i < 7)
 				buf[0] |= 1 << (i + 1);
 			else