* Patch "net: jme: fix suspend/resume on JMC260" has been added to the 4.4-stable tree
@ 2016-04-16 17:06 gregkh
2016-04-16 19:11 ` Diego Viola
0 siblings, 1 reply; 8+ messages in thread
From: gregkh @ 2016-04-16 17:06 UTC (permalink / raw)
To: diego.viola, davem, gregkh; +Cc: stable, stable-commits
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Patch "net: jme: fix suspend/resume on JMC260" has been added to the 4.4-stable tree
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
2016-04-26 14:41 ` Ben Hutchings
0 siblings, 2 replies; 8+ messages in thread
From: Diego Viola @ 2016-04-16 19:11 UTC (permalink / raw)
To: gregkh; +Cc: davem, stable, stable-commits
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
Diego
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Patch "net: jme: fix suspend/resume on JMC260" has been added to the 4.4-stable tree
2016-04-16 19:11 ` Diego Viola
@ 2016-04-16 21:17 ` Greg KH
2016-04-16 22:53 ` David Miller
2016-04-26 14:41 ` Ben Hutchings
1 sibling, 1 reply; 8+ messages in thread
From: Greg KH @ 2016-04-16 21:17 UTC (permalink / raw)
To: Diego Viola; +Cc: davem, stable, stable-commits
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Patch "net: jme: fix suspend/resume on JMC260" has been added to the 4.4-stable tree
2016-04-16 21:17 ` Greg KH
@ 2016-04-16 22:53 ` David Miller
0 siblings, 0 replies; 8+ messages in thread
From: David Miller @ 2016-04-16 22:53 UTC (permalink / raw)
To: gregkh; +Cc: diego.viola, stable, stable-commits
From: Greg KH <gregkh@linuxfoundation.org>
Date: Sat, 16 Apr 2016 14:17:29 -0700
> They look sane to me, David, any objection for me taking these?
No objections.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Patch "net: jme: fix suspend/resume on JMC260" has been added to the 4.4-stable tree
2016-04-16 19:11 ` Diego Viola
2016-04-16 21:17 ` Greg KH
@ 2016-04-26 14:41 ` Ben Hutchings
2016-04-26 23:58 ` Diego Viola
1 sibling, 1 reply; 8+ messages in thread
From: Ben Hutchings @ 2016-04-26 14:41 UTC (permalink / raw)
To: Diego Viola, gregkh; +Cc: davem, stable
[-- Attachment #1: Type: text/plain, Size: 1079 bytes --]
On Sat, 2016-04-16 at 16:11 -0300, Diego Viola wrote:
> On Sat, Apr 16, 2016 at 2:06 PM, <gregkh@linuxfoundation.org> wrote:
[...]
> > 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 ]
[...]
> 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
I've queued these all up for 3.2 and 3.16, thanks.
Ben.
--
Ben Hutchings
The generation of random numbers is too important to be left to chance.
- Robert Coveyou
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Patch "net: jme: fix suspend/resume on JMC260" has been added to the 4.4-stable tree
2016-04-26 14:41 ` Ben Hutchings
@ 2016-04-26 23:58 ` Diego Viola
2016-04-27 0:02 ` Ben Hutchings
0 siblings, 1 reply; 8+ messages in thread
From: Diego Viola @ 2016-04-26 23:58 UTC (permalink / raw)
To: Ben Hutchings; +Cc: gregkh, davem, stable
On Tue, Apr 26, 2016 at 11:41 AM, Ben Hutchings <ben@decadent.org.uk> wrote:
> On Sat, 2016-04-16 at 16:11 -0300, Diego Viola wrote:
>> On Sat, Apr 16, 2016 at 2:06 PM, <gregkh@linuxfoundation.org> wrote:
> [...]
>> > 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 ]
> [...]
>> 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
>
> I've queued these all up for 3.2 and 3.16, thanks.
>
> Ben.
>
> --
> Ben Hutchings
> The generation of random numbers is too important to be left to chance.
> - Robert Coveyou
Thanks. Will it be included in the 4.4 kernel as well?
Diego
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Patch "net: jme: fix suspend/resume on JMC260" has been added to the 4.4-stable tree
2016-04-26 23:58 ` Diego Viola
@ 2016-04-27 0:02 ` Ben Hutchings
2016-04-27 0:03 ` Diego Viola
0 siblings, 1 reply; 8+ messages in thread
From: Ben Hutchings @ 2016-04-27 0:02 UTC (permalink / raw)
To: Diego Viola; +Cc: gregkh, davem, stable
[-- Attachment #1: Type: text/plain, Size: 1639 bytes --]
On Tue, 2016-04-26 at 20:58 -0300, Diego Viola wrote:
> On Tue, Apr 26, 2016 at 11:41 AM, Ben Hutchings <ben@decadent.org.uk> wrote:
> >
> > On Sat, 2016-04-16 at 16:11 -0300, Diego Viola wrote:
> > >
> > > On Sat, Apr 16, 2016 at 2:06 PM, <gregkh@linuxfoundation.org> wrote:
> > [...]
> > >
> > > >
> > > > 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 ]
> > [...]
> > >
> > > 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
> > I've queued these all up for 3.2 and 3.16, thanks.
> >
> > Ben.
> >
> > --
> > Ben Hutchings
> > The generation of random numbers is too important to be left to chance.
> > - Robert Coveyou
> Thanks. Will it be included in the 4.4 kernel as well?
Greg maintains 4.4.y and I assume he'll get round to including them.
Ben.
--
Ben Hutchings
Once a job is fouled up, anything done to improve it makes it worse.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Patch "net: jme: fix suspend/resume on JMC260" has been added to the 4.4-stable tree
2016-04-27 0:02 ` Ben Hutchings
@ 2016-04-27 0:03 ` Diego Viola
0 siblings, 0 replies; 8+ messages in thread
From: Diego Viola @ 2016-04-27 0:03 UTC (permalink / raw)
To: Ben Hutchings; +Cc: gregkh, davem, stable
On Tue, Apr 26, 2016 at 9:02 PM, Ben Hutchings <ben@decadent.org.uk> wrote:
> On Tue, 2016-04-26 at 20:58 -0300, Diego Viola wrote:
>> On Tue, Apr 26, 2016 at 11:41 AM, Ben Hutchings <ben@decadent.org.uk> wrote:
>> >
>> > On Sat, 2016-04-16 at 16:11 -0300, Diego Viola wrote:
>> > >
>> > > On Sat, Apr 16, 2016 at 2:06 PM, <gregkh@linuxfoundation.org> wrote:
>> > [...]
>> > >
>> > > >
>> > > > 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 ]
>> > [...]
>> > >
>> > > 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
>> > I've queued these all up for 3.2 and 3.16, thanks.
>> >
>> > Ben.
>> >
>> > --
>> > Ben Hutchings
>> > The generation of random numbers is too important to be left to chance.
>> > - Robert Coveyou
>> Thanks. Will it be included in the 4.4 kernel as well?
>
> Greg maintains 4.4.y and I assume he'll get round to including them.
>
> Ben.
>
> --
> Ben Hutchings
> Once a job is fouled up, anything done to improve it makes it worse.
Great, thanks.
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2016-04-27 0:03 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).