On Tue, Feb 04, 2014 at 07:12:53PM +0200, Emmanuel Grumbach wrote: > From: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx> > > commit 2d93aee152b1758a94a18fe15d72153ba73b5679 upstream. > > Enabling the oscillator consumes slightly more power (100uA) > but allows to make sure that we exit from L1 on time. > > Not doing so might lead to a PCIe specification violation > since we might wake up from L1 at the wrong time. > This issue has been identified on 3160 and 7260 only. > On older NICs L1 off is not enabled, on newer NICs (7265), > the issue is fixed. > > When the bug occurs the user sees that the NIC has > disappeared from the PCI bridge, any access to the device > returns 0xff. > > This fixes: > https://bugzilla.kernel.org/show_bug.cgi?id=64541 > > and has been extensively discussed here: > http://markmail.org/thread/mfmpzqt3r333n4bo > > Cc: stable@xxxxxxxxxxxxxxx [3.10+] > Fixes: 99cd47142399 ("iwlwifi: add 7000 series device configuration") > Reported-and-tested-by: wzyboy <wzyboy@xxxxxxxxxx> > Reviewed-by: Johannes Berg <johannes.berg@xxxxxxxxx> > Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx> > --- > I modified the upstream commit to compile on 3.10. > I simply had to remove the if. > The if asks if we are not dealing with a new device that > doesn't need this HW W/A, but this newer HW isn't supported > at all in 3.10. So no condition needed. Applied, thanks. greg k-h -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html