[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1865303E0DED764181A9D882DEF65FB61A82A6D6F9@shsmsx502.ccr.corp.intel.com>
Date: Thu, 6 May 2010 08:11:08 +0800
From: "Du, Alek" <alek.du@...el.com>
To: Alan Stern <stern@...land.harvard.edu>
CC: Ondrej Zary <linux@...nbow-software.org>,
Linux-pm mailing list <linux-pm@...ts.linux-foundation.org>,
USB list <linux-usb@...r.kernel.org>,
Kernel development list <linux-kernel@...r.kernel.org>
Subject: RE: [linux-pm] [PATCH v2] [RFC] ehci: Disable wake on overcurrent
(WKOC_E) and disconnect (WKDISC_E)
>-----Original Message-----
>From: Alan Stern [mailto:stern@...land.harvard.edu]
>Sent: Wednesday, May 05, 2010 11:56 PM
>To: Du, Alek
>Cc: Ondrej Zary; Linux-pm mailing list; USB list; Kernel development list
>Subject: Re: [linux-pm] [PATCH v2] [RFC] ehci: Disable wake on overcurrent
>(WKOC_E) and disconnect (WKDISC_E)
>
>On Wed, 5 May 2010, Du, Alek wrote:
>
>> On Fri, 30 Apr 2010 01:45:33 +0800
>> Alan Stern <stern@...land.harvard.edu> wrote:
>>
>>
>> > This patch fixes the problem on my system. Does it work for you?
>> > I still think that disabling wakeup at the PCI or platform level should
>> > override the port wakeup flags, but apparently it doesn't.
>> >
>> > Alek, can you confirm that the changes in this patch are okay for the
>> > Moorestown EHCI controller? I had to guess at how to handle the
>> > HOSTPCx register settings.
>> >
>> > Alan Stern
>>
>>
>> Alan,
>>
>> As I tested, the patch breaks phy low power mode, the EHCI works, but it
>never
>> enter phy low power mode when suspending port...
>>
>> I guess this part of the diff breaks it.
>>
>>
>> - /* only enable appropriate wake bits, otherwise the
>> - * hardware can not go phy low power mode. If a race
>> - * condition happens here(connection change during bits
>> - * set), the port change detection will finally fix it.
>> - */
>> - if (t1 & PORT_CONNECT) {
>> - t2 |= PORT_WKOC_E | PORT_WKDISC_E;
>> - t2 &= ~PORT_WKCONN_E;
>> - } else {
>> - t2 |= PORT_WKOC_E | PORT_WKCONN_E;
>> - t2 &= ~PORT_WKDISC_E;
>> - }
>
>That seems very odd. Why should removing code that enables wakeup bits
>cause the suspend to fail? Can't the phy go into low-power mode when
>all the wakeup bits are disabled?
>
>Does applying this additional patch on top of the previous one help?
>
>Alan Stern
>
>
>
>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
>@@ -200,7 +200,7 @@ 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;
>
> if (ehci->has_hostpc)
> hostpc_reg = (u32 __iomem *)((u8 *)ehci->regs
>@@ -209,6 +209,7 @@ static int ehci_bus_suspend (struct usb_
> if (t1 & PORT_OWNER)
> set_bit(port, &ehci->owned_ports);
> else if ((t1 & PORT_PE) && !(t1 & PORT_SUSPEND)) {
>+ t2 = t1 & ~PORT_WAKE_BITS;
> t2 |= PORT_SUSPEND;
> set_bit(port, &ehci->bus_suspended);
> ehci_vdbg (ehci, "port %d, %08x -> %08x\n",
Alan,
This would be better, but before entering phy low power mode, the HW need the exact wakeup bits to be set, that's why we have:
/* only enable appropriate wake bits, otherwise the
* hardware can not go phy low power mode. If a race
* condition happens here(connection change during bits
* set), the port change detection will finally fix it.
*/
In the code. When port is connected, we must only enable PORT_WKOC_E | PORT_WKDISC_E, and when port is disconnected, we must only enable PORT_WKOC_E | PORT_WKCONN_E. Enable all wakeup bits won't work.
Thanks,
Alek
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists