usb: xhci: add helper to read PORTSC register

Add a dedicated helper function to read the USB Port Status and Control
(PORTSC) register. This complements xhci_portsc_writel() and improves code
clarity by providing a clear counterpart for reading the register.

Suggested-by: Peter Chen <peter.chen@kernel.org>
Reviewed-by: Peter Chen <peter.chen@kerne.org>
Signed-off-by: Niklas Neronin <niklas.neronin@linux.intel.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Link: https://patch.msgid.link/20251119142417.2820519-7-mathias.nyman@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/xhci-debugfs.c b/drivers/usb/host/xhci-debugfs.c
index df99fffc61205ea1df698618b7cb89b0f358445d..d32ac8f84691cf17d7b87112bf2dbf0b77a1eddd 100644 (file)
--- a/drivers/usb/host/xhci-debugfs.c
+++ b/drivers/usb/host/xhci-debugfs.c
@@ -329,7 +329,7 @@ static int xhci_portsc_show(struct seq_file *s, void *unused)
        u32                     portsc;
        char                    str[XHCI_MSG_MAX];
 
-       portsc = readl(port->addr);
+       portsc = xhci_portsc_readl(port);
        seq_printf(s, "%s\n", xhci_decode_portsc(str, portsc));
 
        return 0;
@@ -359,7 +359,7 @@ static ssize_t xhci_port_write(struct file *file,  const char __user *ubuf,
                        return count;
                spin_lock_irqsave(&xhci->lock, flags);
                /* compliance mode can only be enabled on ports in RxDetect */
-               portsc = readl(port->addr);
+               portsc = xhci_portsc_readl(port);
                if ((portsc & PORT_PLS_MASK) != XDEV_RXDETECT) {
                        spin_unlock_irqrestore(&xhci->lock, flags);
                        return -EPERM;

diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
index d0300c0978039d1b20910087b78735782cb8c288..2927b8a8032783c9545ff62b0faedb68621fd6b9 100644 (file)
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
@@ -299,7 +299,7 @@ static void xhci_usb2_hub_descriptor(struct usb_hcd *hcd, struct xhci_hcd *xhci,
         */
        memset(port_removable, 0, sizeof(port_removable));
        for (i = 0; i < ports; i++) {
-               portsc = readl(rhub->ports[i]->addr);
+               portsc = xhci_portsc_readl(rhub->ports[i]);
                /* If a device is removable, PORTSC reports a 0, same as in the
                 * hub descriptor DeviceRemovable bits.
                 */
@@ -356,7 +356,7 @@ static void xhci_usb3_hub_descriptor(struct usb_hcd *hcd, struct xhci_hcd *xhci,
        port_removable = 0;
        /* bit 0 is reserved, bit 1 is for port 1, etc. */
        for (i = 0; i < ports; i++) {
-               portsc = readl(rhub->ports[i]->addr);
+               portsc = xhci_portsc_readl(rhub->ports[i]);
                if (portsc & PORT_DEV_REMOVE)
                        port_removable |= 1 << (i + 1);
        }
@@ -566,13 +566,13 @@ static void xhci_disable_port(struct xhci_hcd *xhci, struct xhci_port *port)
                return;
        }
 
-       portsc = readl(port->addr);
+       portsc = xhci_portsc_readl(port);
        portsc = xhci_port_state_to_neutral(portsc);
 
        /* Write 1 to disable the port */
        xhci_portsc_writel(port, portsc | PORT_PE);
 
-       portsc = readl(port->addr);
+       portsc = xhci_portsc_readl(port);
        xhci_dbg(xhci, "disable port %d-%d, portsc: 0x%x\n",
                 hcd->self.busnum, port->hcd_portnum + 1, portsc);
 }
@@ -622,7 +622,7 @@ static void xhci_clear_port_change_bit(struct xhci_hcd *xhci, u16 wValue,
        }
        /* Change bits are all write 1 to clear */
        xhci_portsc_writel(port, port_status | status);
-       port_status = readl(port->addr);
+       port_status = xhci_portsc_readl(port);
 
        xhci_dbg(xhci, "clear port%d %s change, portsc: 0x%x\n",
                 wIndex + 1, port_change_bit, port_status);
@@ -650,7 +650,7 @@ static void xhci_set_port_power(struct xhci_hcd *xhci, struct xhci_port *port,
        u32 temp;
 
        hcd = port->rhub->hcd;
-       temp = readl(port->addr);
+       temp = xhci_portsc_readl(port);
 
        xhci_dbg(xhci, "set port power %d-%d %s, portsc: 0x%x\n",
                 hcd->self.busnum, port->hcd_portnum + 1, on ? "ON" : "OFF", temp);
@@ -660,7 +660,7 @@ static void xhci_set_port_power(struct xhci_hcd *xhci, struct xhci_port *port,
        if (on) {
                /* Power on */
                xhci_portsc_writel(port, temp | PORT_POWER);
-               readl(port->addr);
+               xhci_portsc_readl(port);
        } else {
                /* Power off */
                xhci_portsc_writel(port, temp & ~PORT_POWER);
@@ -801,7 +801,7 @@ void xhci_set_link_state(struct xhci_hcd *xhci, struct xhci_port *port,
        u32 temp;
        u32 portsc;
 
-       portsc = readl(port->addr);
+       portsc = xhci_portsc_readl(port);
        temp = xhci_port_state_to_neutral(portsc);
        temp &= ~PORT_PLS_MASK;
        temp |= PORT_LINK_STROBE | link_state;
@@ -817,7 +817,7 @@ static void xhci_set_remote_wake_mask(struct xhci_hcd *xhci,
 {
        u32 temp;
 
-       temp = readl(port->addr);
+       temp = xhci_portsc_readl(port);
        temp = xhci_port_state_to_neutral(temp);
 
        if (wake_mask & USB_PORT_FEAT_REMOTE_WAKE_CONNECT)
@@ -844,7 +844,7 @@ void xhci_test_and_clear_bit(struct xhci_hcd *xhci, struct xhci_port *port,
 {
        u32 temp;
 
-       temp = readl(port->addr);
+       temp = xhci_portsc_readl(port);
        if (temp & port_bit) {
                temp = xhci_port_state_to_neutral(temp);
                temp |= port_bit;
@@ -1002,7 +1002,7 @@ static int xhci_handle_usb2_port_link_resume(struct xhci_port *port,
                        }
                        xhci_ring_device(xhci, port->slot_id);
                } else {
-                       int port_status = readl(port->addr);
+                       int port_status = xhci_portsc_readl(port);
 
                        xhci_warn(xhci, "Port resume timed out, port %d-%d: 0x%x\n",
                                  hcd->self.busnum, wIndex + 1, port_status);
@@ -1263,7 +1263,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
 
                wIndex--;
                port = ports[portnum1 - 1];
-               temp = readl(port->addr);
+               temp = xhci_portsc_readl(port);
                if (temp == ~(u32)0) {
                        xhci_hc_died(xhci);
                        retval = -ENODEV;
@@ -1309,7 +1309,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
 
                port = ports[portnum1 - 1];
                wIndex--;
-               temp = readl(port->addr);
+               temp = xhci_portsc_readl(port);
                if (temp == ~(u32)0) {
                        xhci_hc_died(xhci);
                        retval = -ENODEV;
@@ -1319,7 +1319,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                /* FIXME: What new port features do we need to support? */
                switch (wValue) {
                case USB_PORT_FEAT_SUSPEND:
-                       temp = readl(port->addr);
+                       temp = xhci_portsc_readl(port);
                        if ((temp & PORT_PLS_MASK) != XDEV_U0) {
                                /* Resume the port to U0 first */
                                xhci_set_link_state(xhci, port, XDEV_U0);
@@ -1331,7 +1331,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                         * a port unless the port reports that it is in the
                         * enabled (PED = ‘1’,PLS < ‘3’) state.
                         */
-                       temp = readl(port->addr);
+                       temp = xhci_portsc_readl(port);
                        if ((temp & PORT_PE) == 0 || (temp & PORT_RESET)
                                || (temp & PORT_PLS_MASK) >= XDEV_U3) {
                                xhci_warn(xhci, "USB core suspending port %d-%d not in U0/U1/U2\n",
@@ -1354,11 +1354,11 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                        msleep(10); /* wait device to enter */
                        spin_lock_irqsave(&xhci->lock, flags);
 
-                       temp = readl(port->addr);
+                       temp = xhci_portsc_readl(port);
                        bus_state->suspended_ports |= 1 << wIndex;
                        break;
                case USB_PORT_FEAT_LINK_STATE:
-                       temp = readl(port->addr);
+                       temp = xhci_portsc_readl(port);
                        /* Disable port */
                        if (link_state == USB_SS_PORT_LS_SS_DISABLED) {
                                xhci_dbg(xhci, "Disable port %d-%d\n",
@@ -1372,7 +1372,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                                        PORT_OCC | PORT_RC | PORT_PLC |
                                        PORT_CEC;
                                xhci_portsc_writel(port, temp | PORT_PE);
-                               temp = readl(port->addr);
+                               temp = xhci_portsc_readl(port);
                                break;
                        }
 
@@ -1381,7 +1381,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                                xhci_dbg(xhci, "Enable port %d-%d\n",
                                         hcd->self.busnum, portnum1);
                                xhci_set_link_state(xhci, port, link_state);
-                               temp = readl(port->addr);
+                               temp = xhci_portsc_readl(port);
                                break;
                        }
 
@@ -1414,7 +1414,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                                         hcd->self.busnum, portnum1);
                                xhci_set_link_state(xhci, port, link_state);
 
-                               temp = readl(port->addr);
+                               temp = xhci_portsc_readl(port);
                                break;
                        }
                        /* Port must be enabled */
@@ -1462,7 +1462,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                                        xhci_dbg(xhci, "missing U0 port change event for port %d-%d\n",
                                                 hcd->self.busnum, portnum1);
                                spin_lock_irqsave(&xhci->lock, flags);
-                               temp = readl(port->addr);
+                               temp = xhci_portsc_readl(port);
                                break;
                        }
 
@@ -1480,12 +1480,12 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                                spin_unlock_irqrestore(&xhci->lock, flags);
                                while (retries--) {
                                        usleep_range(4000, 8000);
-                                       temp = readl(port->addr);
+                                       temp = xhci_portsc_readl(port);
                                        if ((temp & PORT_PLS_MASK) == XDEV_U3)
                                                break;
                                }
                                spin_lock_irqsave(&xhci->lock, flags);
-                               temp = readl(port->addr);
+                               temp = xhci_portsc_readl(port);
                                bus_state->suspended_ports |= 1 << wIndex;
                        }
                        break;
@@ -1502,20 +1502,20 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                        temp = (temp | PORT_RESET);
                        xhci_portsc_writel(port, temp);
 
-                       temp = readl(port->addr);
+                       temp = xhci_portsc_readl(port);
                        xhci_dbg(xhci, "set port reset, actual port %d-%d status  = 0x%x\n",
                                 hcd->self.busnum, portnum1, temp);
                        break;
                case USB_PORT_FEAT_REMOTE_WAKE_MASK:
                        xhci_set_remote_wake_mask(xhci, port, wake_mask);
-                       temp = readl(port->addr);
+                       temp = xhci_portsc_readl(port);
                        xhci_dbg(xhci, "set port remote wake mask, actual port %d-%d status  = 0x%x\n",
                                 hcd->self.busnum, portnum1, temp);
                        break;
                case USB_PORT_FEAT_BH_PORT_RESET:
                        temp |= PORT_WR;
                        xhci_portsc_writel(port, temp);
-                       temp = readl(port->addr);
+                       temp = xhci_portsc_readl(port);
                        break;
                case USB_PORT_FEAT_U1_TIMEOUT:
                        if (hcd->speed < HCD_USB3)
@@ -1547,7 +1547,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                        goto error;
                }
                /* unblock any posted writes */
-               temp = readl(port->addr);
+               temp = xhci_portsc_readl(port);
                break;
        case ClearPortFeature:
                if (!portnum1 || portnum1 > max_ports)
@@ -1556,7 +1556,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                port = ports[portnum1 - 1];
 
                wIndex--;
-               temp = readl(port->addr);
+               temp = xhci_portsc_readl(port);
                if (temp == ~(u32)0) {
                        xhci_hc_died(xhci);
                        retval = -ENODEV;
@@ -1566,7 +1566,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                temp = xhci_port_state_to_neutral(temp);
                switch (wValue) {
                case USB_PORT_FEAT_SUSPEND:
-                       temp = readl(port->addr);
+                       temp = xhci_portsc_readl(port);
                        xhci_dbg(xhci, "clear USB_PORT_FEAT_SUSPEND\n");
                        xhci_dbg(xhci, "PORTSC %04x\n", temp);
                        if (temp & PORT_RESET)
@@ -1681,7 +1681,7 @@ int xhci_hub_status_data(struct usb_hcd *hcd, char *buf)
 
        /* For each port, did anything change?  If so, set that bit in buf. */
        for (i = 0; i < max_ports; i++) {
-               temp = readl(ports[i]->addr);
+               temp = xhci_portsc_readl(ports[i]);
                if (temp == ~(u32)0) {
                        xhci_hc_died(xhci);
                        retval = -ENODEV;
@@ -1750,7 +1750,7 @@ int xhci_bus_suspend(struct usb_hcd *hcd)
                u32 t1, t2;
                int retries = 10;
 retry:
-               t1 = readl(ports[port_index]->addr);
+               t1 = xhci_portsc_readl(ports[port_index]);
                t2 = xhci_port_state_to_neutral(t1);
                portsc_buf[port_index] = 0;
 
@@ -1849,7 +1849,7 @@ static bool xhci_port_missing_cas_quirk(struct xhci_port *port)
 {
        u32 portsc;
 
-       portsc = readl(port->addr);
+       portsc = xhci_portsc_readl(port);
 
        /* if any of these are set we are not stuck */
        if (portsc & (PORT_CONNECT | PORT_CAS))
@@ -1864,7 +1864,7 @@ static bool xhci_port_missing_cas_quirk(struct xhci_port *port)
        portsc |= PORT_WR;
        xhci_portsc_writel(port, portsc);
        /* flush write */
-       readl(port->addr);
+       xhci_portsc_readl(port);
        return true;
 }
 
@@ -1911,7 +1911,7 @@ int xhci_bus_resume(struct usb_hcd *hcd)
        }
        port_index = max_ports;
        while (port_index--) {
-               portsc = readl(ports[port_index]->addr);
+               portsc = xhci_portsc_readl(ports[port_index]);
 
                /* warm reset CAS limited ports stuck in polling/compliance */
                if ((xhci->quirks & XHCI_MISSING_CAS) &&

diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index b1192648aee7fcb244fbb74fb806af109544f8a8..2ba0261a29c1b24e74e3a8728b579fe9c09149ba 100644 (file)
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -898,7 +898,7 @@ static int xhci_pci_poweroff_late(struct usb_hcd *hcd, bool do_wakeup)
 
        for (i = 0; i < HCS_MAX_PORTS(xhci->hcs_params1); i++) {
                port = &xhci->hw_ports[i];
-               portsc = readl(port->addr);
+               portsc = xhci_portsc_readl(port);
 
                if ((portsc & PORT_PLS_MASK) != XDEV_U3)
                        continue;

diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index aa7fc4d6f97c151d199ced80da702908fdaaac45..88022d221c70fa77590d137630dfeb3d07551b4f 100644 (file)
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -2027,7 +2027,7 @@ static void handle_port_status(struct xhci_hcd *xhci, union xhci_trb *event)
        hcd = port->rhub->hcd;
        bus_state = &port->rhub->bus_state;
        hcd_portnum = port->hcd_portnum;
-       portsc = readl(port->addr);
+       portsc = xhci_portsc_readl(port);
 
        xhci_dbg(xhci, "Port change event, %d-%d, id %d, portsc: 0x%x\n",
                 hcd->self.busnum, hcd_portnum + 1, port_id, portsc);

diff --git a/drivers/usb/host/xhci-tegra.c b/drivers/usb/host/xhci-tegra.c
index 5255b10028931c5e878089a23121bbc371b3e10e..1e23f198a005cf05f3d3fc1ced77657e46fa8b15 100644 (file)
--- a/drivers/usb/host/xhci-tegra.c
+++ b/drivers/usb/host/xhci-tegra.c
@@ -2036,7 +2036,7 @@ static bool xhci_hub_ports_suspended(struct xhci_hub *hub)
        u32 value;
 
        for (i = 0; i < hub->num_ports; i++) {
-               value = readl(hub->ports[i]->addr);
+               value = xhci_portsc_readl(hub->ports[i]);
                if ((value & PORT_PE) == 0)
                        continue;
 
@@ -2162,7 +2162,7 @@ static void tegra_xhci_enable_phy_sleepwalk_wake(struct tegra_xusb *tegra)
                        if (!is_host_mode_phy(tegra, i, j))
                                continue;
 
-                       portsc = readl(rhub->ports[index]->addr);
+                       portsc = xhci_portsc_readl(rhub->ports[index]);
                        speed = tegra_xhci_portsc_to_speed(tegra, portsc);
                        tegra_xusb_padctl_enable_phy_sleepwalk(padctl, phy, speed);
                        tegra_xusb_padctl_enable_phy_wake(padctl, phy);
@@ -2257,7 +2257,7 @@ static int tegra_xusb_enter_elpg(struct tegra_xusb *tegra, bool is_auto_resume)
        for (i = 0; i < xhci->usb2_rhub.num_ports; i++) {
                if (!xhci->usb2_rhub.ports[i])
                        continue;
-               portsc = readl(xhci->usb2_rhub.ports[i]->addr);
+               portsc = xhci_portsc_readl(xhci->usb2_rhub.ports[i]);
                tegra->lp0_utmi_pad_mask &= ~BIT(i);
                if (((portsc & PORT_PLS_MASK) == XDEV_U3) || ((portsc & DEV_SPEED_MASK) == XDEV_FS))
                        tegra->lp0_utmi_pad_mask |= BIT(i);
@@ -2790,7 +2790,7 @@ static int tegra_xhci_hub_control(struct usb_hcd *hcd, u16 type_req, u16 value,
                while (i--) {
                        if (!test_bit(i, &bus_state->resuming_ports))
                                continue;
-                       portsc = readl(ports[i]->addr);
+                       portsc = xhci_portsc_readl(ports[i]);
                        if ((portsc & PORT_PLS_MASK) == XDEV_RESUME)
                                tegra_phy_xusb_utmi_pad_power_on(
                                        tegra_xusb_get_phy(tegra, "usb2", (int) i));
@@ -2808,7 +2808,7 @@ static int tegra_xhci_hub_control(struct usb_hcd *hcd, u16 type_req, u16 value,
                        if (!index || index > rhub->num_ports)
                                return -EPIPE;
                        ports = rhub->ports;
-                       portsc = readl(ports[port]->addr);
+                       portsc = xhci_portsc_readl(ports[port]);
                        if (portsc & PORT_CONNECT)
                                tegra_phy_xusb_utmi_pad_power_on(phy);
                }
@@ -2827,7 +2827,7 @@ static int tegra_xhci_hub_control(struct usb_hcd *hcd, u16 type_req, u16 value,
 
                if ((type_req == ClearPortFeature) && (value == USB_PORT_FEAT_C_CONNECTION)) {
                        ports = rhub->ports;
-                       portsc = readl(ports[port]->addr);
+                       portsc = xhci_portsc_readl(ports[port]);
                        if (!(portsc & PORT_CONNECT)) {
                                /* We don't suspend the PAD while HNP role swap happens on the OTG
                                 * port

diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 84e109dbabe888ede77158e6957032a746ddd6a7..6b47b218cb243ed7467a2d747afbd8ccaba1cf35 100644 (file)
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -48,6 +48,12 @@ void xhci_portsc_writel(struct xhci_port *port, u32 val)
 }
 EXPORT_SYMBOL_GPL(xhci_portsc_writel);
 
+u32 xhci_portsc_readl(struct xhci_port *port)
+{
+       return readl(port->addr);
+}
+EXPORT_SYMBOL_GPL(xhci_portsc_readl);
+
 static bool td_on_ring(struct xhci_td *td, struct xhci_ring *ring)
 {
        struct xhci_segment *seg;
@@ -380,7 +386,7 @@ static void compliance_mode_recovery(struct timer_list *t)
                return;
 
        for (i = 0; i < rhub->num_ports; i++) {
-               temp = readl(rhub->ports[i]->addr);
+               temp = xhci_portsc_readl(rhub->ports[i]);
                if ((temp & PORT_PLS_MASK) == USB_SS_PORT_LS_COMP_MOD) {
                        /*
                         * Compliance Mode Detected. Letting USB Core
@@ -903,7 +909,7 @@ static void xhci_disable_hub_port_wake(struct xhci_hcd *xhci,
        spin_lock_irqsave(&xhci->lock, flags);
 
        for (i = 0; i < rhub->num_ports; i++) {
-               portsc = readl(rhub->ports[i]->addr);
+               portsc = xhci_portsc_readl(rhub->ports[i]);
                t1 = xhci_port_state_to_neutral(portsc);
                t2 = t1;
 
@@ -943,7 +949,7 @@ static bool xhci_pending_portevent(struct xhci_hcd *xhci)
        port_index = xhci->usb2_rhub.num_ports;
        ports = xhci->usb2_rhub.ports;
        while (port_index--) {
-               portsc = readl(ports[port_index]->addr);
+               portsc = xhci_portsc_readl(ports[port_index]);
                if (portsc & PORT_CHANGE_MASK ||
                    (portsc & PORT_PLS_MASK) == XDEV_RESUME)
                        return true;
@@ -951,7 +957,7 @@ static bool xhci_pending_portevent(struct xhci_hcd *xhci)
        port_index = xhci->usb3_rhub.num_ports;
        ports = xhci->usb3_rhub.ports;
        while (port_index--) {
-               portsc = readl(ports[port_index]->addr);
+               portsc = xhci_portsc_readl(ports[port_index]);
                if (portsc & (PORT_CHANGE_MASK | PORT_CAS) ||
                    (portsc & PORT_PLS_MASK) == XDEV_RESUME)
                        return true;

diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index 3b6b2d0d4c60fe7da59588531890745817874c63..bddf9c15d81342f9a4092eab88da6130d055585c 100644 (file)
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -1962,6 +1962,7 @@ void xhci_add_interrupter(struct xhci_hcd *xhci, unsigned int intr_num);
 int xhci_usb_endpoint_maxp(struct usb_device *udev,
                           struct usb_host_endpoint *host_ep);
 void xhci_portsc_writel(struct xhci_port *port, u32 val);
+u32 xhci_portsc_readl(struct xhci_port *port);
 
 /* xHCI roothub code */
 void xhci_set_link_state(struct xhci_hcd *xhci, struct xhci_port *port,