1 files changed, 18 insertions, 2 deletions

diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
index d5eb357aa5c4..aa90ad4d4fd5 100644
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
@@ -29,7 +29,7 @@
 #define PORT_RWC_BITS   (PORT_CSC | PORT_PEC | PORT_WRC | PORT_OCC | \
                          PORT_RC | PORT_PLC | PORT_PE)
 
-/* usb 1.1 root hub device descriptor */
+/* USB 3.0 BOS descriptor and a capability descriptor, combined */
 static u8 usb_bos_descriptor [] = {
         USB_DT_BOS_SIZE,                /*  __u8 bLength, 5 bytes */
         USB_DT_BOS,                     /*  __u8 bDescriptorType */
@@ -422,7 +422,7 @@ void xhci_set_link_state(struct xhci_hcd *xhci, __le32 __iomem **port_array,
         xhci_writel(xhci, temp, port_array[port_id]);
 }
 
-void xhci_set_remote_wake_mask(struct xhci_hcd *xhci,
+static void xhci_set_remote_wake_mask(struct xhci_hcd *xhci,
                 __le32 __iomem **port_array, int port_id, u16 wake_mask)
 {
         u32 temp;
@@ -808,6 +808,12 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
 
                         temp = xhci_readl(xhci, port_array[wIndex]);
                         xhci_dbg(xhci, "set port power, actual port %d status  = 0x%x\n", wIndex, temp);
+
+                        temp = usb_acpi_power_manageable(hcd->self.root_hub,
+                                        wIndex);
+                        if (temp)
+                                usb_acpi_set_power_state(hcd->self.root_hub,
+                                                wIndex, true);
                         break;
                 case USB_PORT_FEAT_RESET:
                         temp = (temp | PORT_RESET);
@@ -907,6 +913,16 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                         xhci_disable_port(hcd, xhci, wIndex,
                                         port_array[wIndex], temp);
                         break;
+                case USB_PORT_FEAT_POWER:
+                        xhci_writel(xhci, temp & ~PORT_POWER,
+                                port_array[wIndex]);
+
+                        temp = usb_acpi_power_manageable(hcd->self.root_hub,
+                                        wIndex);
+                        if (temp)
+                                usb_acpi_set_power_state(hcd->self.root_hub,
+                                                wIndex, false);
+                        break;
                 default:
                         goto error;
                 }