Skip to contentSkip to conversation

Patch "net: jme: fix suspend/resume on JMC260" has been added to the 4.4-stable tree

PATCH Applied [email protected] 4 participants 8 messages Apr 16, 2016 – Apr 27, 2016

Subsystems (3)
Network drivers Stable branch Jme network driver
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

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 <[email protected]> know about it.

Quoted 1 line

From foo@baz Sat Apr 16 10:02:52 PDT 2016

From: Diego Viola <[email protected]>
Date: Tue, 23 Feb 2016 12:04:04 -0300
Subject: net: jme: fix suspend/resume on JMC260

From: Diego Viola <[email protected]>

[ 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 <[email protected]>
Signed-off-by David S. Miller <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 drivers/net/ethernet/jme.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/jme.c +2 -1
@@ -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 [email protected] are

queue-4.4/net-jme-fix-suspend-resume-on-jmc260.patch

#1 lore raw
Quoted 61 lines · On Sat, Apr 16, 2016 at 2:06 PM, <[email protected]> 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 <[email protected]> know about it.

From foo@baz Sat Apr 16 10:02:52 PDT 2016
From: Diego Viola <[email protected]>
Date: Tue, 23 Feb 2016 12:04:04 -0300
Subject: net: jme: fix suspend/resume on JMC260

From: Diego Viola <[email protected]>

[ 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 <[email protected]>
Signed-off-by David S. Miller <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 drivers/net/ethernet/jme.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/jme.c +2 -1
@@ -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;
 }
Quoted 3 lines

Patches currently in stable-queue which might be from [email protected] 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

author maintainer
#2 lore raw
Quoted 64 lines · Diego Viola
Quoted 63 lines · On Sat, Apr 16, 2016 at 2:06 PM, <[email protected]> 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 <[email protected]> know about it.

From foo@baz Sat Apr 16 10:02:52 PDT 2016
From: Diego Viola <[email protected]>
Date: Tue, 23 Feb 2016 12:04:04 -0300
Subject: net: jme: fix suspend/resume on JMC260

From: Diego Viola <[email protected]>

[ 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 <[email protected]>
Signed-off-by David S. Miller <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 drivers/net/ethernet/jme.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/jme.c +2 -1
@@ -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 [email protected] are

Quoted 7 lines
Quoted 1 line

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

maintainer
#3 lore raw

From: Greg KH <[email protected]>
Date: Sat, 16 Apr 2016 14:17:29 -0700

Quoted 1 line

They look sane to me, David, any objection for me taking these?

No objections.

Applied
#4 lore raw
In reply to Diego Viola
Quoted 1 line · Diego Viola

On Sat, Apr 16, 2016 at 2:06 PM,  <[email protected]> wrote:

[...]

Quoted 8 lines
Quoted 8 lines

From foo@baz Sat Apr 16 10:02:52 PDT 2016
From: Diego Viola <[email protected]>
Date: Tue, 23 Feb 2016 12:04:04 -0300
Subject: net: jme: fix suspend/resume on JMC260

From: Diego Viola <[email protected]>

[ Upstream commit ee50c130c82175eaa0820c96b6d3763928af2241 ]

[...]

Quoted 5 lines

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.

Signature · 3 lines
Ben Hutchings
The generation of random numbers is too important to be left to chance.
                                                            - Robert Coveyou
#5 lore raw
Quoted 18 lines · Ben Hutchings
Quoted 1 line · Diego Viola

On Sat, Apr 16, 2016 at 2:06 PM, <[email protected]> wrote:

[...]

Quoted 8 lines
Quoted 8 lines

From foo@baz Sat Apr 16 10:02:52 PDT 2016
From: Diego Viola <[email protected]>
Date: Tue, 23 Feb 2016 12:04:04 -0300
Subject: net: jme: fix suspend/resume on JMC260

From: Diego Viola <[email protected]>

[ Upstream commit ee50c130c82175eaa0820c96b6d3763928af2241 ]

[...]

Quoted 5 lines

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

Quoted 8 lines

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

#6 lore raw
Quoted 25 lines · Diego Viola
Quoted 24 lines · Ben Hutchings
Quoted 2 lines · Diego Viola

On Sat, Apr 16, 2016 at 2:06 PM,  <[email protected]> wrote:

[...]

Quoted 10 lines
Quoted 10 lines

From foo@baz Sat Apr 16 10:02:52 PDT 2016
From: Diego Viola <[email protected]>
Date: Tue, 23 Feb 2016 12:04:04 -0300
Subject: net: jme: fix suspend/resume on JMC260

From: Diego Viola <[email protected]>

[ Upstream commit ee50c130c82175eaa0820c96b6d3763928af2241 ]

[...]

Quoted 6 lines

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.

Quoted 7 lines
Quoted 6 lines

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.

Signature · 2 lines
Ben Hutchings
Once a job is fouled up, anything done to improve it makes it worse.
#7 lore raw
Quoted 34 lines · Ben Hutchings
Quoted 25 lines · Diego Viola
Quoted 24 lines · Ben Hutchings
Quoted 2 lines · Diego Viola

On Sat, Apr 16, 2016 at 2:06 PM, <[email protected]> wrote:

[...]

Quoted 10 lines
Quoted 10 lines

From foo@baz Sat Apr 16 10:02:52 PDT 2016
From: Diego Viola <[email protected]>
Date: Tue, 23 Feb 2016 12:04:04 -0300
Subject: net: jme: fix suspend/resume on JMC260

From: Diego Viola <[email protected]>

[ Upstream commit ee50c130c82175eaa0820c96b6d3763928af2241 ]

[...]

Quoted 6 lines

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.

Quoted 7 lines
Quoted 6 lines

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?

Quoted 7 lines

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.