This is a note to let you know that I've just added the patch titled
xhci: Restore event ring dequeue pointer on resume.
to the 3.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
xhci-restore-event-ring-dequeue-pointer-on-resume.patch
and it can be found in the queue-3.0 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From fb3d85bc7193f23c9a564502df95564c49a32c91 Mon Sep 17 00:00:00 2001
From: Sarah Sharp <[email protected]>
Date: Fri, 16 Mar 2012 13:27:39 -0700
Subject: xhci: Restore event ring dequeue pointer on resume.
From: Sarah Sharp <[email protected]>
commit fb3d85bc7193f23c9a564502df95564c49a32c91 upstream.
The xhci_save_registers() function saved the event ring dequeue pointer
in the s3 register structure, but xhci_restore_registers() never
restored it. No other code in the xHCI successful resume path would
ever restore it either. Fix that.
This should be backported to kernels as old as 2.6.37, that contain the
commit 5535b1d5f8885695c6ded783c692e3c0d0eda8ca "USB: xHCI: PCI power
management implementation".
Signed-off-by: Sarah Sharp <[email protected]>
Tested-by: Elric Fu <[email protected]>
Cc: Andiry Xu <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/usb/host/xhci.c | 1 +
1 file changed, 1 insertion(+)
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -627,6 +627,7 @@ static void xhci_restore_registers(struc
xhci_writel(xhci, xhci->s3.irq_control, &xhci->ir_set->irq_control);
xhci_writel(xhci, xhci->s3.erst_size, &xhci->ir_set->erst_size);
xhci_write_64(xhci, xhci->s3.erst_base, &xhci->ir_set->erst_base);
+ xhci_write_64(xhci, xhci->s3.erst_dequeue, &xhci->ir_set->erst_dequeue);
}
static void xhci_set_cmd_ring_deq(struct xhci_hcd *xhci)
Patches currently in stable-queue which might be from
[email protected] are
queue-3.0/xhci-don-t-re-enable-ie-constantly.patch
queue-3.0/xhci-correct-the-define-xhci_legacy_disable_smi.patch
queue-3.0/xhci-don-t-write-zeroed-pointers-to-xhc-registers.patch
queue-3.0/xhci-restore-event-ring-dequeue-pointer-on-resume.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
