Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 46672
b: refs/heads/master
c: e631656
h: refs/heads/master
v: v3
  • Loading branch information
Alan Stern authored and Greg Kroah-Hartman committed Feb 7, 2007
1 parent e8a1635 commit ad0065b
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 32 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 896fbd7199035958013d106329843d8ae9618753
refs/heads/master: e6316565e568b3b5733be10cfca3c27259bef499
55 changes: 24 additions & 31 deletions trunk/drivers/usb/host/ehci-hub.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ static int ehci_bus_resume (struct usb_hcd *hcd)
static int check_reset_complete (
struct ehci_hcd *ehci,
int index,
u32 __iomem *status_reg,
int port_status
) {
if (!(port_status & PORT_CONNECT)) {
Expand All @@ -217,8 +218,7 @@ static int check_reset_complete (
// what happens if HCS_N_CC(params) == 0 ?
port_status |= PORT_OWNER;
port_status &= ~PORT_RWC_BITS;
ehci_writel(ehci, port_status,
&ehci->regs->port_status [index]);
ehci_writel(ehci, port_status, status_reg);

} else
ehci_dbg (ehci, "port %d high speed\n", index + 1);
Expand Down Expand Up @@ -347,6 +347,7 @@ static int ehci_hub_control (
) {
struct ehci_hcd *ehci = hcd_to_ehci (hcd);
int ports = HCS_N_PORTS (ehci->hcs_params);
u32 __iomem *status_reg = &ehci->regs->port_status[wIndex - 1];
u32 temp, status;
unsigned long flags;
int retval = 0;
Expand Down Expand Up @@ -375,18 +376,17 @@ static int ehci_hub_control (
if (!wIndex || wIndex > ports)
goto error;
wIndex--;
temp = ehci_readl(ehci, &ehci->regs->port_status [wIndex]);
temp = ehci_readl(ehci, status_reg);
if (temp & PORT_OWNER)
break;

switch (wValue) {
case USB_PORT_FEAT_ENABLE:
ehci_writel(ehci, temp & ~PORT_PE,
&ehci->regs->port_status [wIndex]);
ehci_writel(ehci, temp & ~PORT_PE, status_reg);
break;
case USB_PORT_FEAT_C_ENABLE:
ehci_writel(ehci, (temp & ~PORT_RWC_BITS) | PORT_PEC,
&ehci->regs->port_status [wIndex]);
status_reg);
break;
case USB_PORT_FEAT_SUSPEND:
if (temp & PORT_RESET)
Expand All @@ -399,7 +399,7 @@ static int ehci_hub_control (
/* resume signaling for 20 msec */
temp &= ~(PORT_RWC_BITS | PORT_WAKE_BITS);
ehci_writel(ehci, temp | PORT_RESUME,
&ehci->regs->port_status [wIndex]);
status_reg);
ehci->reset_done [wIndex] = jiffies
+ msecs_to_jiffies (20);
}
Expand All @@ -411,15 +411,15 @@ static int ehci_hub_control (
if (HCS_PPC (ehci->hcs_params))
ehci_writel(ehci,
temp & ~(PORT_RWC_BITS | PORT_POWER),
&ehci->regs->port_status [wIndex]);
status_reg);
break;
case USB_PORT_FEAT_C_CONNECTION:
ehci_writel(ehci, (temp & ~PORT_RWC_BITS) | PORT_CSC,
&ehci->regs->port_status [wIndex]);
status_reg);
break;
case USB_PORT_FEAT_C_OVER_CURRENT:
ehci_writel(ehci, (temp & ~PORT_RWC_BITS) | PORT_OCC,
&ehci->regs->port_status [wIndex]);
status_reg);
break;
case USB_PORT_FEAT_C_RESET:
/* GetPortStatus clears reset */
Expand All @@ -443,7 +443,7 @@ static int ehci_hub_control (
goto error;
wIndex--;
status = 0;
temp = ehci_readl(ehci, &ehci->regs->port_status [wIndex]);
temp = ehci_readl(ehci, status_reg);

// wPortChange bits
if (temp & PORT_CSC)
Expand All @@ -461,13 +461,11 @@ static int ehci_hub_control (
ehci->reset_done [wIndex] = 0;

/* stop resume signaling */
temp = ehci_readl(ehci,
&ehci->regs->port_status [wIndex]);
temp = ehci_readl(ehci, status_reg);
ehci_writel(ehci,
temp & ~(PORT_RWC_BITS | PORT_RESUME),
&ehci->regs->port_status [wIndex]);
retval = handshake(ehci,
&ehci->regs->port_status [wIndex],
temp & ~(PORT_RWC_BITS | PORT_RESUME),
status_reg);
retval = handshake(ehci, status_reg,
PORT_RESUME, 0, 2000 /* 2msec */);
if (retval != 0) {
ehci_err (ehci, "port %d resume error %d\n",
Expand All @@ -486,12 +484,11 @@ static int ehci_hub_control (

/* force reset to complete */
ehci_writel(ehci, temp & ~(PORT_RWC_BITS | PORT_RESET),
&ehci->regs->port_status [wIndex]);
status_reg);
/* REVISIT: some hardware needs 550+ usec to clear
* this bit; seems too long to spin routinely...
*/
retval = handshake(ehci,
&ehci->regs->port_status [wIndex],
retval = handshake(ehci, status_reg,
PORT_RESET, 0, 750);
if (retval != 0) {
ehci_err (ehci, "port %d reset error %d\n",
Expand All @@ -500,9 +497,8 @@ static int ehci_hub_control (
}

/* see what we found out */
temp = check_reset_complete (ehci, wIndex,
ehci_readl(ehci,
&ehci->regs->port_status [wIndex]));
temp = check_reset_complete (ehci, wIndex, status_reg,
ehci_readl(ehci, status_reg));
}

// don't show wPortStatus if it's owned by a companion hc
Expand Down Expand Up @@ -547,7 +543,7 @@ static int ehci_hub_control (
if (!wIndex || wIndex > ports)
goto error;
wIndex--;
temp = ehci_readl(ehci, &ehci->regs->port_status [wIndex]);
temp = ehci_readl(ehci, status_reg);
if (temp & PORT_OWNER)
break;

Expand All @@ -561,13 +557,12 @@ static int ehci_hub_control (
goto error;
if (device_may_wakeup(&hcd->self.root_hub->dev))
temp |= PORT_WAKE_BITS;
ehci_writel(ehci, temp | PORT_SUSPEND,
&ehci->regs->port_status [wIndex]);
ehci_writel(ehci, temp | PORT_SUSPEND, status_reg);
break;
case USB_PORT_FEAT_POWER:
if (HCS_PPC (ehci->hcs_params))
ehci_writel(ehci, temp | PORT_POWER,
&ehci->regs->port_status [wIndex]);
status_reg);
break;
case USB_PORT_FEAT_RESET:
if (temp & PORT_RESUME)
Expand Down Expand Up @@ -595,8 +590,7 @@ static int ehci_hub_control (
ehci->reset_done [wIndex] = jiffies
+ msecs_to_jiffies (50);
}
ehci_writel(ehci, temp,
&ehci->regs->port_status [wIndex]);
ehci_writel(ehci, temp, status_reg);
break;

/* For downstream facing ports (these): one hub port is put
Expand All @@ -611,8 +605,7 @@ static int ehci_hub_control (
ehci_quiesce(ehci);
ehci_halt(ehci);
temp |= selector << 16;
ehci_writel(ehci, temp,
&ehci->regs->port_status [wIndex]);
ehci_writel(ehci, temp, status_reg);
break;

default:
Expand Down

0 comments on commit ad0065b

Please sign in to comment.