3c3825436e
Refreshed all patches. Remove upstreamed: - 600-ipv6-addrconf-call-ipv6_mc_up-for-non-Ethernet-inter.patch - 184-USB-serial-option-add-Wistron-Neweb-D19Q1.patch Fixes: - CVE-2020-8647 - CVE-2020-8648 (potentially) - CVE-2020-8649 Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
35 lines
1.4 KiB
Diff
35 lines
1.4 KiB
Diff
From eda3d1b0228484fb52b7244a68fd4cc8a985ed10 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Chevallier <maxime.chevallier@bootlin.com>
|
|
Date: Wed, 27 Mar 2019 17:31:06 +0100
|
|
Subject: [PATCH] net: mvneta: Add 2500BaseT support
|
|
|
|
Some PHYs will use the 2500BaseX PHY_INTERFACE_MODE when being linked
|
|
with a partner using 2.5GBaseT.
|
|
|
|
Since we can't autonegotiate this speed between the MAC and the PHY, we
|
|
need to have the proper comphy support enabled, to make sure we can
|
|
safely advertise 2.5G and 1G in BaseT and be able to switch between both
|
|
corresponding PHY interface modes. This is now possible since comphy
|
|
support was added to this driver.
|
|
|
|
This commit adds the 2500BaseT mode to the list of supported modes when
|
|
using 2500BaseX, and was tested on a setup with an Armada385 and a
|
|
88E2010 PHY, both with and without the comphy node in the DT.
|
|
|
|
Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/ethernet/marvell/mvneta.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
--- a/drivers/net/ethernet/marvell/mvneta.c
|
|
+++ b/drivers/net/ethernet/marvell/mvneta.c
|
|
@@ -3401,6 +3401,7 @@ static void mvneta_validate(struct net_d
|
|
phylink_set(mask, 1000baseX_Full);
|
|
}
|
|
if (pp->comphy || state->interface == PHY_INTERFACE_MODE_2500BASEX) {
|
|
+ phylink_set(mask, 2500baseT_Full);
|
|
phylink_set(mask, 2500baseX_Full);
|
|
}
|
|
|