On Thu, Apr 19, 2012 at 09:18:57AM -0700, Greg KH wrote: > On Wed, Apr 18, 2012 at 02:23:41PM -0700, Sarah Sharp wrote: > > Hi Greg, > > > > It looks like several stable trees are missing this commit: > > > > commit fb3d85bc7193f23c9a564502df95564c49a32c91 > > Author: Sarah Sharp <[email protected]> > > Date: Fri Mar 16 13:27:39 2012 -0700 > > Really? I see that in the 3.0, 3.2, and 3.3-stable quilt trees right > now, you should have gotten an email saying it was added, did you not?
I probably got the email, but that commit wasn't present in the stable git tree. I was using this git tree, and the linux-3.0.y branch: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git I guess that commit must have been in your quilt queue and not in the tree? Or maybe I just checked out the latest stable tag and not the actual branch? Meh, in either case, it's fixed now. I'll figure out what I did wrong. > > xhci: Restore event ring dequeue pointer on resume. > > > > 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]> > > Cc: [email protected] > > > > diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c > > index f68bc15..d2222dc 100644 > > --- a/drivers/usb/host/xhci.c > > +++ b/drivers/usb/host/xhci.c > > @@ -684,6 +684,7 @@ static void xhci_restore_registers(struct xhci_hcd > > *xhci) > > 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) > > > > Once you apply commit fb3d85bc, then commit c7713e7 applies cleanly. > > Ah, ok, sorry, I missed the dependancy here, my fault. I think I was > trying to look at the commit dates, and got it wrong. I've queued up > c7713e736526d8c9f6f87716fb90562a8ffaff2c just fine now, sorry for the > noise and thanks for figuring it out. No worries! Sarah Sharp -- 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
