On Sat, Apr 16, 2016 at 04:11:52PM -0300, Diego Viola wrote: > On Sat, Apr 16, 2016 at 2:06 PM, <gregkh@xxxxxxxxxxxxxxxxxxx> wrote: > > > > This is a note to let you know that I've just added the patch titled > > > > net: jme: fix suspend/resume on JMC260 > > > > to the 4.4-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: > > net-jme-fix-suspend-resume-on-jmc260.patch > > and it can be found in the queue-4.4 subdirectory. > > > > If you, or anyone else, feels it should not be added to the stable tree, > > please let <stable@xxxxxxxxxxxxxxx> know about it. > > > > > > From foo@baz Sat Apr 16 10:02:52 PDT 2016 > > From: Diego Viola <diego.viola@xxxxxxxxx> > > Date: Tue, 23 Feb 2016 12:04:04 -0300 > > Subject: net: jme: fix suspend/resume on JMC260 > > > > From: Diego Viola <diego.viola@xxxxxxxxx> > > > > [ Upstream commit ee50c130c82175eaa0820c96b6d3763928af2241 ] > > > > The JMC260 network card fails to suspend/resume because the call to > > jme_start_irq() was too early, moving the call to jme_start_irq() after > > the call to jme_reset_link() makes it work. > > > > Prior this change suspend/resume would fail unless /sys/power/pm_async=0 > > was explicitly specified. > > > > Relevant bug report: https://bugzilla.kernel.org/show_bug.cgi?id=112351 > > > > Signed-off-by: Diego Viola <diego.viola@xxxxxxxxx> > > Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx> > > Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > > --- > > drivers/net/ethernet/jme.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > --- a/drivers/net/ethernet/jme.c > > +++ b/drivers/net/ethernet/jme.c > > @@ -3312,13 +3312,14 @@ jme_resume(struct device *dev) > > jme_reset_phy_processor(jme); > > jme_phy_calibration(jme); > > jme_phy_setEA(jme); > > - jme_start_irq(jme); > > netif_device_attach(netdev); > > > > atomic_inc(&jme->link_changing); > > > > jme_reset_link(jme); > > > > + jme_start_irq(jme); > > + > > return 0; > > } > > > > > > > > Patches currently in stable-queue which might be from diego.viola@xxxxxxxxx are > > > > queue-4.4/net-jme-fix-suspend-resume-on-jmc260.patch > > Sorry for sending my email twice, I think these 2 patches should also > be backported: > > https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/drivers/net/ethernet/jme.c?id=0772a99b818079e628a1da122ac7ee023faed83e > https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/drivers/net/ethernet/jme.c?id=81422e672f8181d7ad1ee6c60c723aac649f538f They look sane to me, David, any objection for me taking these? 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