From: Greg KH <gregkh@linuxfoundation.org>
To: Diego Viola <diego.viola@gmail.com>
Cc: davem@davemloft.net, stable@vger.kernel.org,
stable-commits@vger.kernel.org
Subject: Re: Patch "net: jme: fix suspend/resume on JMC260" has been added to the 4.4-stable tree
Date: Sat, 16 Apr 2016 14:17:29 -0700 [thread overview]
Message-ID: <20160416211729.GA20798@kroah.com> (raw)
In-Reply-To: <CA+ToGPEh2-VoAUacts683+a=zC6UCNxF=R8PQZjBUysdmjQhqw@mail.gmail.com>
On Sat, Apr 16, 2016 at 04:11:52PM -0300, Diego Viola wrote:
> On Sat, Apr 16, 2016 at 2:06 PM, <gregkh@linuxfoundation.org> 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@vger.kernel.org> know about it.
> >
> >
> > From foo@baz Sat Apr 16 10:02:52 PDT 2016
> > From: Diego Viola <diego.viola@gmail.com>
> > Date: Tue, 23 Feb 2016 12:04:04 -0300
> > Subject: net: jme: fix suspend/resume on JMC260
> >
> > From: Diego Viola <diego.viola@gmail.com>
> >
> > [ 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@gmail.com>
> > Signed-off-by: David S. Miller <davem@davemloft.net>
> > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > ---
> > 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@gmail.com 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
next prev parent reply other threads:[~2016-04-16 21:17 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-16 17:06 Patch "net: jme: fix suspend/resume on JMC260" has been added to the 4.4-stable tree gregkh
2016-04-16 19:11 ` Diego Viola
2016-04-16 21:17 ` Greg KH [this message]
2016-04-16 22:53 ` David Miller
2016-04-26 14:41 ` Ben Hutchings
2016-04-26 23:58 ` Diego Viola
2016-04-27 0:02 ` Ben Hutchings
2016-04-27 0:03 ` Diego Viola
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160416211729.GA20798@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=davem@davemloft.net \
--cc=diego.viola@gmail.com \
--cc=stable-commits@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.