lkml.org 
[lkml]   [2012]   [May]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[34-longterm 156/179] USB: xhci: fix OS want to own HC
    Date
    From: JiSheng Zhang <jszhang3@gmail.com>

    -------------------
    This is a commit scheduled for the next v2.6.34 longterm release.
    http://git.kernel.org/?p=linux/kernel/git/paulg/longterm-queue-2.6.34.git
    If you see a problem with using this for longterm, please comment.
    -------------------

    commit 6768458b17f9bf48a4c3a34e49b20344091b5f7e upstream.

    Software should set XHCI_HC_OS_OWNED bit to request ownership of xHC.

    This patch should be backported to kernels as far back as 2.6.31.

    Signed-off-by: JiSheng Zhang <jszhang3@gmail.com>
    Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
    ---
    drivers/usb/host/pci-quirks.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
    index bcf7a88..eae8b18 100644
    --- a/drivers/usb/host/pci-quirks.c
    +++ b/drivers/usb/host/pci-quirks.c
    @@ -444,7 +444,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.9.6


    \
     
     \ /
      Last update: 2012-05-15 06:03    [W:0.025 / U:89.992 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site