* Patch "mvneta: use inband status only when explicitly enabled" has been added to the 4.1-stable tree
@ 2015-09-30 3:31 gregkh
2015-09-30 9:12 ` Stas Sergeev
0 siblings, 1 reply; 2+ messages in thread
From: gregkh @ 2015-09-30 3:31 UTC (permalink / raw)
To: stsp, davem, gregkh, stsp, thomas.petazzoni; +Cc: stable, stable-commits
This is a note to let you know that I've just added the patch titled
mvneta: use inband status only when explicitly enabled
to the 4.1-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:
mvneta-use-inband-status-only-when-explicitly-enabled.patch
and it can be found in the queue-4.1 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 Wed Sep 30 05:18:31 CEST 2015
From: Stas Sergeev <stsp@list.ru>
Date: Mon, 20 Jul 2015 17:49:58 -0700
Subject: mvneta: use inband status only when explicitly enabled
From: Stas Sergeev <stsp@list.ru>
[ Upstream commit f8af8e6eb95093d5ce5ebcc52bd1929b0433e172 in net-next tree,
will be pushed to Linus very soon. ]
The commit 898b2970e2c9 ("mvneta: implement SGMII-based in-band link state
signaling") implemented the link parameters auto-negotiation unconditionally.
Unfortunately it appears that some HW that implements SGMII protocol,
doesn't generate the inband status, so it is not possible to auto-negotiate
anything with such HW.
This patch enables the auto-negotiation only if explicitly requested with
the 'managed' DT property.
This patch fixes the following regression:
https://lkml.org/lkml/2015/7/8/865
Signed-off-by: Stas Sergeev <stsp@users.sourceforge.net>
CC: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
CC: netdev@vger.kernel.org
CC: linux-kernel@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/net/ethernet/marvell/mvneta.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -3029,8 +3029,8 @@ static int mvneta_probe(struct platform_
const char *dt_mac_addr;
char hw_mac_addr[ETH_ALEN];
const char *mac_from;
+ const char *managed;
int phy_mode;
- int fixed_phy = 0;
int err;
/* Our multiqueue support is not complete, so for now, only
@@ -3064,7 +3064,6 @@ static int mvneta_probe(struct platform_
dev_err(&pdev->dev, "cannot register fixed PHY\n");
goto err_free_irq;
}
- fixed_phy = 1;
/* In the case of a fixed PHY, the DT node associated
* to the PHY is the Ethernet MAC DT node.
@@ -3088,8 +3087,10 @@ static int mvneta_probe(struct platform_
pp = netdev_priv(dev);
pp->phy_node = phy_node;
pp->phy_interface = phy_mode;
- pp->use_inband_status = (phy_mode == PHY_INTERFACE_MODE_SGMII) &&
- fixed_phy;
+
+ err = of_property_read_string(dn, "managed", &managed);
+ pp->use_inband_status = (err == 0 &&
+ strcmp(managed, "in-band-status") == 0);
pp->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(pp->clk)) {
Patches currently in stable-queue which might be from stsp@list.ru are
queue-4.1/net-phy-fixed_phy-handle-link-down-case.patch
queue-4.1/of_mdio-add-new-dt-property-managed-to-specify-the-phy-management-type.patch
queue-4.1/mvneta-use-inband-status-only-when-explicitly-enabled.patch
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: Patch "mvneta: use inband status only when explicitly enabled" has been added to the 4.1-stable tree
2015-09-30 3:31 Patch "mvneta: use inband status only when explicitly enabled" has been added to the 4.1-stable tree gregkh
@ 2015-09-30 9:12 ` Stas Sergeev
0 siblings, 0 replies; 2+ messages in thread
From: Stas Sergeev @ 2015-09-30 9:12 UTC (permalink / raw)
To: gregkh, davem, stsp, thomas.petazzoni
Cc: stable, Florian Fainelli, Russell King - ARM Linux
30.09.2015 06:31, gregkh@linuxfoundation.org пишет:
>
> This is a note to let you know that I've just added the patch titled
>
> mvneta: use inband status only when explicitly enabled
>
> to the 4.1-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:
> mvneta-use-inband-status-only-when-explicitly-enabled.patch
> and it can be found in the queue-4.1 subdirectory.
>
> If you, or anyone else, feels it should not be added to the stable tree,
I wonder if Russell King has any objections because of this:
http://www.spinics.net/lists/netdev/msg343546.html
Maybe the mentioned problem is already dealt with, I don't know.
Adding to CC those who involved.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-09-30 9:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-09-30 3:31 Patch "mvneta: use inband status only when explicitly enabled" has been added to the 4.1-stable tree gregkh
2015-09-30 9:12 ` Stas Sergeev
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.