iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xhci: change xhci_test_and_clear_bit() to use new port structure

Browse Source 
Don't use pointers to port array and port index as function parameters
in xhci_test_and_clear_bit(), just use a pointer to the right port
structure.

xhci_test_and_clear_bit() was the last port_array user in
xhci_get_port_status() and handle_port_status(), so remove the
port_array from them as well.

Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mathias Nyman 2018-05-21 16:40:00 +03:00 committed by Greg Kroah-Hartman
parent 6b7f40f712
commit eaefcf246b
3 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/usb/host/xhci-hub.c
View File

@ -717,16 +717,16 @@ static void xhci_set_remote_wake_mask(struct xhci_hcd *xhci,
} }
/* Test and clear port RWC bit */ /* Test and clear port RWC bit */
void xhci_test_and_clear_bit(struct xhci_hcd *xhci, __le32 __iomem **port_array, void xhci_test_and_clear_bit(struct xhci_hcd *xhci, struct xhci_port *port,
int port_id, u32 port_bit) u32 port_bit)
{ {
u32 temp; u32 temp;
temp = readl(port_array[port_id]); temp = readl(port->addr);
if (temp & port_bit) { if (temp & port_bit) {
temp = xhci_port_state_to_neutral(temp); temp = xhci_port_state_to_neutral(temp);
temp |= port_bit; temp |= port_bit;
writel(temp, port_array[port_id]); writel(temp, port->addr);
} }
} }
@ -846,8 +846,7 @@ static u32 xhci_get_ext_port_status(u32 raw_port_status, u32 port_li)
*/ */
static u32 xhci_get_port_status(struct usb_hcd *hcd, static u32 xhci_get_port_status(struct usb_hcd *hcd,
struct xhci_bus_state *bus_state, struct xhci_bus_state *bus_state,
__le32 __iomem **port_array, u16 wIndex, u32 raw_port_status,
u16 wIndex, u32 raw_port_status,
unsigned long flags) unsigned long flags)
__releases(&xhci->lock) __releases(&xhci->lock)
__acquires(&xhci->lock) __acquires(&xhci->lock)
@ -930,8 +929,7 @@ static u32 xhci_get_port_status(struct usb_hcd *hcd,
set_bit(wIndex, &bus_state->rexit_ports); set_bit(wIndex, &bus_state->rexit_ports);
xhci_test_and_clear_bit(xhci, port_array, wIndex, xhci_test_and_clear_bit(xhci, port, PORT_PLC);
PORT_PLC);
xhci_set_link_state(xhci, port, XDEV_U0); xhci_set_link_state(xhci, port, XDEV_U0);
spin_unlock_irqrestore(&xhci->lock, flags); spin_unlock_irqrestore(&xhci->lock, flags);
@ -1091,8 +1089,8 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
break; break;
} }
trace_xhci_get_port_status(wIndex, temp); trace_xhci_get_port_status(wIndex, temp);
status = xhci_get_port_status(hcd, bus_state, port_array, status = xhci_get_port_status(hcd, bus_state, wIndex, temp,
wIndex, temp, flags); flags);
if (status == 0xffffffff) if (status == 0xffffffff)
goto error; goto error;
@ -1673,7 +1671,7 @@ int xhci_bus_resume(struct usb_hcd *hcd)
for_each_set_bit(port_index, &bus_state->bus_suspended, for_each_set_bit(port_index, &bus_state->bus_suspended,
BITS_PER_LONG) { BITS_PER_LONG) {
/* Clear PLC to poll it later for U0 transition */ /* Clear PLC to poll it later for U0 transition */
xhci_test_and_clear_bit(xhci, port_array, port_index, xhci_test_and_clear_bit(xhci, ports[port_index],
PORT_PLC); PORT_PLC);
xhci_set_link_state(xhci, ports[port_index], XDEV_U0); xhci_set_link_state(xhci, ports[port_index], XDEV_U0);
} }
@ -1688,7 +1686,7 @@ int xhci_bus_resume(struct usb_hcd *hcd)
port_index); port_index);
continue; continue;
} }
xhci_test_and_clear_bit(xhci, port_array, port_index, PORT_PLC); xhci_test_and_clear_bit(xhci, ports[port_index], PORT_PLC);
slot_id = xhci_find_slot_id_by_port(hcd, xhci, port_index + 1); slot_id = xhci_find_slot_id_by_port(hcd, xhci, port_index + 1);
if (slot_id) if (slot_id)
xhci_ring_device(xhci, slot_id); xhci_ring_device(xhci, slot_id);

15
drivers/usb/host/xhci-ring.c
View File

@ -1527,7 +1527,6 @@ static void handle_port_status(struct xhci_hcd *xhci,
int slot_id; int slot_id;
unsigned int hcd_portnum; unsigned int hcd_portnum;
struct xhci_bus_state *bus_state; struct xhci_bus_state *bus_state;
__le32 __iomem **port_array;
bool bogus_port_status = false; bool bogus_port_status = false;
struct xhci_port *port; struct xhci_port *port;
@ -1555,11 +1554,6 @@ static void handle_port_status(struct xhci_hcd *xhci,
hcd = port->rhub->hcd; hcd = port->rhub->hcd;
bus_state = &xhci->bus_state[hcd_index(hcd)]; bus_state = &xhci->bus_state[hcd_index(hcd)];
if (hcd->speed >= HCD_USB3)
port_array = xhci->usb3_ports;
else
port_array = xhci->usb2_ports;
hcd_portnum = port->hcd_portnum; hcd_portnum = port->hcd_portnum;
portsc = readl(port->addr); portsc = readl(port->addr);
@ -1589,8 +1583,7 @@ static void handle_port_status(struct xhci_hcd *xhci,
* device and host initiated resume. * device and host initiated resume.
*/ */
bus_state->port_remote_wakeup |= 1 << hcd_portnum; bus_state->port_remote_wakeup |= 1 << hcd_portnum;
xhci_test_and_clear_bit(xhci, port_array, xhci_test_and_clear_bit(xhci, port, PORT_PLC);
hcd_portnum, PORT_PLC);
xhci_set_link_state(xhci, port, XDEV_U0); xhci_set_link_state(xhci, port, XDEV_U0);
/* Need to wait until the next link state change /* Need to wait until the next link state change
* indicates the device is actually in U0. * indicates the device is actually in U0.
@ -1628,8 +1621,7 @@ static void handle_port_status(struct xhci_hcd *xhci,
xhci_ring_device(xhci, slot_id); xhci_ring_device(xhci, slot_id);
if (bus_state->port_remote_wakeup & (1 << hcd_portnum)) { if (bus_state->port_remote_wakeup & (1 << hcd_portnum)) {
bus_state->port_remote_wakeup &= ~(1 << hcd_portnum); bus_state->port_remote_wakeup &= ~(1 << hcd_portnum);
xhci_test_and_clear_bit(xhci, port_array, xhci_test_and_clear_bit(xhci, port, PORT_PLC);
hcd_portnum, PORT_PLC);
usb_wakeup_notification(hcd->self.root_hub, usb_wakeup_notification(hcd->self.root_hub,
hcd_portnum + 1); hcd_portnum + 1);
bogus_port_status = true; bogus_port_status = true;
@ -1651,8 +1643,7 @@ static void handle_port_status(struct xhci_hcd *xhci,
} }
if (hcd->speed < HCD_USB3) if (hcd->speed < HCD_USB3)
xhci_test_and_clear_bit(xhci, port_array, hcd_portnum, xhci_test_and_clear_bit(xhci, port, PORT_PLC);
PORT_PLC);
cleanup: cleanup:
/* Update event ring dequeue pointer before dropping the lock */ /* Update event ring dequeue pointer before dropping the lock */

4
drivers/usb/host/xhci.h
View File

@ -2104,8 +2104,8 @@ unsigned int count_trbs(u64 addr, u64 len);
/* xHCI roothub code */ /* xHCI roothub code */
void xhci_set_link_state(struct xhci_hcd *xhci, struct xhci_port *port, void xhci_set_link_state(struct xhci_hcd *xhci, struct xhci_port *port,
u32 link_state); u32 link_state);
void xhci_test_and_clear_bit(struct xhci_hcd *xhci, __le32 __iomem **port_array, void xhci_test_and_clear_bit(struct xhci_hcd *xhci, struct xhci_port *port,
int port_id, u32 port_bit); u32 port_bit);
int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, u16 wIndex, int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, u16 wIndex,
char *buf, u16 wLength); char *buf, u16 wLength);
int xhci_hub_status_data(struct usb_hcd *hcd, char *buf); int xhci_hub_status_data(struct usb_hcd *hcd, char *buf);