linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] USB: xhci: fix OS want to own HC
@ 2011-07-16  3:04 JiSheng Zhang
  2011-07-18 16:44 ` Sarah Sharp
  0 siblings, 1 reply; 3+ messages in thread
From: JiSheng Zhang @ 2011-07-16  3:04 UTC (permalink / raw)
  To: linux-kernel, sarah.a.sharp

Software should set XHCI_HC_OS_OWNED bit to request ownership of xHC

Signed-off-by: JiSheng Zhang <jszhang3@gmail.com>
---
 drivers/usb/host/pci-quirks.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
index fd93061..1a73004 100644
--- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c
@@ -775,7 +775,7 @@ static void __devinit quirk_usb_handoff_xhci(struct pci_dev *pdev)
 
 	/* If the BIOS owns the HC, signal that the OS wants it, and wait */
 	if (val & XHCI_HC_BIOS_OWNED) {
-		writel(val & XHCI_HC_OS_OWNED, base + ext_cap_offset);
+		writel(val | XHCI_HC_OS_OWNED, base + ext_cap_offset);
 
 		/* Wait for 5 seconds with 10 microsecond polling interval */
 		timeout = handshake(base + ext_cap_offset, XHCI_HC_BIOS_OWNED,
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] USB: xhci: fix OS want to own HC
  2011-07-16  3:04 [PATCH] USB: xhci: fix OS want to own HC JiSheng Zhang
@ 2011-07-18 16:44 ` Sarah Sharp
  2011-07-19  1:18   ` Greg KH
  0 siblings, 1 reply; 3+ messages in thread
From: Sarah Sharp @ 2011-07-18 16:44 UTC (permalink / raw)
  To: JiSheng Zhang; +Cc: linux-kernel, Greg KH

On Sat, Jul 16, 2011 at 11:04:19AM +0800, JiSheng Zhang wrote:
> Software should set XHCI_HC_OS_OWNED bit to request ownership of xHC

Good catch!  I'll queue this up to my for-usb-linus branch and send it
out to Greg later today.

Greg, do you think it's too late to get this into 3.0?  Shall I just
add it to usb-next and mark it for stable?

Sarah Sharp

> Signed-off-by: JiSheng Zhang <jszhang3@gmail.com>
> ---
>  drivers/usb/host/pci-quirks.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
> index fd93061..1a73004 100644
> --- a/drivers/usb/host/pci-quirks.c
> +++ b/drivers/usb/host/pci-quirks.c
> @@ -775,7 +775,7 @@ static void __devinit quirk_usb_handoff_xhci(struct pci_dev *pdev)
>  
>  	/* If the BIOS owns the HC, signal that the OS wants it, and wait */
>  	if (val & XHCI_HC_BIOS_OWNED) {
> -		writel(val & XHCI_HC_OS_OWNED, base + ext_cap_offset);
> +		writel(val | XHCI_HC_OS_OWNED, base + ext_cap_offset);
>  
>  		/* Wait for 5 seconds with 10 microsecond polling interval */
>  		timeout = handshake(base + ext_cap_offset, XHCI_HC_BIOS_OWNED,
> -- 
> 1.7.5.4
> 

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] USB: xhci: fix OS want to own HC
  2011-07-18 16:44 ` Sarah Sharp
@ 2011-07-19  1:18   ` Greg KH
  0 siblings, 0 replies; 3+ messages in thread
From: Greg KH @ 2011-07-19  1:18 UTC (permalink / raw)
  To: Sarah Sharp; +Cc: JiSheng Zhang, linux-kernel

On Mon, Jul 18, 2011 at 09:44:10AM -0700, Sarah Sharp wrote:
> On Sat, Jul 16, 2011 at 11:04:19AM +0800, JiSheng Zhang wrote:
> > Software should set XHCI_HC_OS_OWNED bit to request ownership of xHC
> 
> Good catch!  I'll queue this up to my for-usb-linus branch and send it
> out to Greg later today.
> 
> Greg, do you think it's too late to get this into 3.0?

Yes.

> Shall I just add it to usb-next and mark it for stable?

Yes.

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2011-07-19  1:43 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-07-16  3:04 [PATCH] USB: xhci: fix OS want to own HC JiSheng Zhang
2011-07-18 16:44 ` Sarah Sharp
2011-07-19  1:18   ` Greg KH

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).