lkml.org 
[lkml]   [2010]   [May]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRE: [linux-pm] [PATCH v2] [RFC] ehci: Disable wake on overcurrent (WKOC_E) and disconnect (WKDISC_E)
Hi Alan,

>With this patch, _none_ of the wakeup bits are enabled. That should
>work, right?
>
I guess so, but if no wakeup bits set, how to handle remote wakeup case? Seems you removed remote wakeup case?

>But it leads to another question: Later on, when the controller is put
>is put into low-power mode, I wanted to check with you about it.
>
>> I think the problem is: For the original code, once t2 != t1, the HCD
>> will try to put into phy low power mode. While after the patch, the
>> HCD will only enter phy low power mode if PORT_PE is set and
>> PORT_SUSPEND is not set.
>
>Okay, I understand. Then consider _this_ patch on top of the first
>one. It sets the hostpc register for every port that wasn't already
>suspended, so each phy should end up in low-power mode.
>
>Alan Stern

I will test this patch ...

Thanks,
Alek

>
>
>
>Index: usb-2.6/drivers/usb/host/ehci-hub.c
>===================================================================
>--- usb-2.6.orig/drivers/usb/host/ehci-hub.c
>+++ usb-2.6/drivers/usb/host/ehci-hub.c
>@@ -152,7 +152,6 @@ static int ehci_bus_suspend (struct usb_
> struct ehci_hcd *ehci = hcd_to_ehci (hcd);
> int port;
> int mask;
>- u32 __iomem *hostpc_reg = NULL;
>
> ehci_dbg(ehci, "suspend root hub\n");
>
>@@ -200,23 +199,25 @@ static int ehci_bus_suspend (struct usb_
> while (port--) {
> u32 __iomem *reg = &ehci->regs->port_status [port];
> u32 t1 = ehci_readl(ehci, reg) & ~PORT_RWC_BITS;
>- u32 t2 = t1;
>+ u32 t2 = t1 & ~PORT_WAKE_BITS;
>
>- if (ehci->has_hostpc)
>- hostpc_reg = (u32 __iomem *)((u8 *)ehci->regs
>- + HOSTPC0 + 4 * (port & 0xff));
> /* keep track of which ports we suspend */
>- if (t1 & PORT_OWNER)
>- set_bit(port, &ehci->owned_ports);
>- else if ((t1 & PORT_PE) && !(t1 & PORT_SUSPEND)) {
>- t2 |= PORT_SUSPEND;
>- set_bit(port, &ehci->bus_suspended);
>- ehci_vdbg (ehci, "port %d, %08x -> %08x\n",
>- port + 1, t1, t2);
>- ehci_writel(ehci, t2, reg);
>- if (hostpc_reg) {
>- u32 t3;
>+ if (!(t1 & PORT_SUSPEND)) {
>+ if (t1 & PORT_OWNER) {
>+ set_bit(port, &ehci->owned_ports);
>+ } else if (t1 & PORT_PE) {
>+ t2 |= PORT_SUSPEND;
>+ set_bit(port, &ehci->bus_suspended);
>+ ehci_vdbg (ehci, "port %d, %08x -> %08x\n",
>+ port + 1, t1, t2);
>+ ehci_writel(ehci, t2, reg);
>+ }
>+ if (ehci->has_hostpc) {
>+ u32 __iomem *hostpc_reg;
>+ u32 t3;
>
>+ hostpc_reg = (u32 __iomem *)((u8 *)ehci->regs
>+ + HOSTPC0 + 4 * (port & 0xff));
> spin_unlock_irq(&ehci->lock);
> msleep(5);/* 5ms for HCD enter low pwr mode */
> spin_lock_irq(&ehci->lock);



\
 
 \ /
  Last update: 2010-05-06 17:23    [from the cache]
©2003-2011 Jasper Spaans