mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-06-17 04:33:57 +02:00
kernel: 5.10: backport 100 BaseX SFP support
Backport upstream support for 100Base-FX, 100Base-LX, 100Base-PX and 100Base-BX10 SFP modules. This is a prerequisite for the Globalscale MOCHAbin hybrid 1G SFP/Copper support backporting. Signed-off-by: Robert Marko <robert.marko@sartura.hr>
This commit is contained in:
parent
70729d3454
commit
b0f6162d68
|
@ -0,0 +1,56 @@
|
||||||
|
From b1ae3587d16a8c8fc9453e147c8708d6f006ffbb Mon Sep 17 00:00:00 2001
|
||||||
|
From: Bjarni Jonasson <bjarni.jonasson@microchip.com>
|
||||||
|
Date: Wed, 13 Jan 2021 12:56:25 +0100
|
||||||
|
Subject: [PATCH] net: phy: Add 100 base-x mode
|
||||||
|
|
||||||
|
Sparx-5 supports this mode and it is missing in the PHY core.
|
||||||
|
|
||||||
|
Signed-off-by: Bjarni Jonasson <bjarni.jonasson@microchip.com>
|
||||||
|
Reviewed-by: Russell King <rmk+kernel@armlinux.org.uk>
|
||||||
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||||
|
---
|
||||||
|
Documentation/networking/phy.rst | 5 +++++
|
||||||
|
include/linux/phy.h | 4 ++++
|
||||||
|
2 files changed, 9 insertions(+)
|
||||||
|
|
||||||
|
--- a/Documentation/networking/phy.rst
|
||||||
|
+++ b/Documentation/networking/phy.rst
|
||||||
|
@@ -286,6 +286,11 @@ Some of the interface modes are describe
|
||||||
|
Note: due to legacy usage, some 10GBASE-R usage incorrectly makes
|
||||||
|
use of this definition.
|
||||||
|
|
||||||
|
+``PHY_INTERFACE_MODE_100BASEX``
|
||||||
|
+ This defines IEEE 802.3 Clause 24. The link operates at a fixed data
|
||||||
|
+ rate of 125Mpbs using a 4B/5B encoding scheme, resulting in an underlying
|
||||||
|
+ data rate of 100Mpbs.
|
||||||
|
+
|
||||||
|
Pause frames / flow control
|
||||||
|
===========================
|
||||||
|
|
||||||
|
--- a/include/linux/phy.h
|
||||||
|
+++ b/include/linux/phy.h
|
||||||
|
@@ -104,6 +104,7 @@ extern const int phy_10gbit_features_arr
|
||||||
|
* @PHY_INTERFACE_MODE_MOCA: Multimedia over Coax
|
||||||
|
* @PHY_INTERFACE_MODE_QSGMII: Quad SGMII
|
||||||
|
* @PHY_INTERFACE_MODE_TRGMII: Turbo RGMII
|
||||||
|
+ * @PHY_INTERFACE_MODE_100BASEX: 100 BaseX
|
||||||
|
* @PHY_INTERFACE_MODE_1000BASEX: 1000 BaseX
|
||||||
|
* @PHY_INTERFACE_MODE_2500BASEX: 2500 BaseX
|
||||||
|
* @PHY_INTERFACE_MODE_RXAUI: Reduced XAUI
|
||||||
|
@@ -135,6 +136,7 @@ typedef enum {
|
||||||
|
PHY_INTERFACE_MODE_MOCA,
|
||||||
|
PHY_INTERFACE_MODE_QSGMII,
|
||||||
|
PHY_INTERFACE_MODE_TRGMII,
|
||||||
|
+ PHY_INTERFACE_MODE_100BASEX,
|
||||||
|
PHY_INTERFACE_MODE_1000BASEX,
|
||||||
|
PHY_INTERFACE_MODE_2500BASEX,
|
||||||
|
PHY_INTERFACE_MODE_RXAUI,
|
||||||
|
@@ -217,6 +219,8 @@ static inline const char *phy_modes(phy_
|
||||||
|
return "usxgmii";
|
||||||
|
case PHY_INTERFACE_MODE_10GKR:
|
||||||
|
return "10gbase-kr";
|
||||||
|
+ case PHY_INTERFACE_MODE_100BASEX:
|
||||||
|
+ return "100base-x";
|
||||||
|
default:
|
||||||
|
return "unknown";
|
||||||
|
}
|
|
@ -0,0 +1,40 @@
|
||||||
|
From 6e12f35cef6b8a458d7ecf507ae330e0bffaad8c Mon Sep 17 00:00:00 2001
|
||||||
|
From: Bjarni Jonasson <bjarni.jonasson@microchip.com>
|
||||||
|
Date: Wed, 13 Jan 2021 12:56:26 +0100
|
||||||
|
Subject: [PATCH] sfp: add support for 100 base-x SFPs
|
||||||
|
|
||||||
|
Add support for 100Base-FX, 100Base-LX, 100Base-PX and 100Base-BX10 modules
|
||||||
|
This is needed for Sparx-5 switch.
|
||||||
|
|
||||||
|
Signed-off-by: Bjarni Jonasson <bjarni.jonasson@microchip.com>
|
||||||
|
Reviewed-by: Russell King <rmk+kernel@armlinux.org.uk>
|
||||||
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||||
|
---
|
||||||
|
drivers/net/phy/sfp-bus.c | 9 +++++++++
|
||||||
|
1 file changed, 9 insertions(+)
|
||||||
|
|
||||||
|
--- a/drivers/net/phy/sfp-bus.c
|
||||||
|
+++ b/drivers/net/phy/sfp-bus.c
|
||||||
|
@@ -280,6 +280,12 @@ void sfp_parse_support(struct sfp_bus *b
|
||||||
|
br_min <= 1300 && br_max >= 1200)
|
||||||
|
phylink_set(modes, 1000baseX_Full);
|
||||||
|
|
||||||
|
+ /* 100Base-FX, 100Base-LX, 100Base-PX, 100Base-BX10 */
|
||||||
|
+ if (id->base.e100_base_fx || id->base.e100_base_lx)
|
||||||
|
+ phylink_set(modes, 100baseFX_Full);
|
||||||
|
+ if ((id->base.e_base_px || id->base.e_base_bx10) && br_nom == 100)
|
||||||
|
+ phylink_set(modes, 100baseFX_Full);
|
||||||
|
+
|
||||||
|
/* For active or passive cables, select the link modes
|
||||||
|
* based on the bit rates and the cable compliance bytes.
|
||||||
|
*/
|
||||||
|
@@ -399,6 +405,9 @@ phy_interface_t sfp_select_interface(str
|
||||||
|
if (phylink_test(link_modes, 1000baseX_Full))
|
||||||
|
return PHY_INTERFACE_MODE_1000BASEX;
|
||||||
|
|
||||||
|
+ if (phylink_test(link_modes, 100baseFX_Full))
|
||||||
|
+ return PHY_INTERFACE_MODE_100BASEX;
|
||||||
|
+
|
||||||
|
dev_warn(bus->sfp_dev, "Unable to ascertain link mode\n");
|
||||||
|
|
||||||
|
return PHY_INTERFACE_MODE_NA;
|
|
@ -23,7 +23,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
||||||
sysfs_remove_link(&dev->dev.kobj, "phydev");
|
sysfs_remove_link(&dev->dev.kobj, "phydev");
|
||||||
--- a/include/linux/phy.h
|
--- a/include/linux/phy.h
|
||||||
+++ b/include/linux/phy.h
|
+++ b/include/linux/phy.h
|
||||||
@@ -761,6 +761,12 @@ struct phy_driver {
|
@@ -765,6 +765,12 @@ struct phy_driver {
|
||||||
/** @handle_interrupt: Override default interrupt handling */
|
/** @handle_interrupt: Override default interrupt handling */
|
||||||
irqreturn_t (*handle_interrupt)(struct phy_device *phydev);
|
irqreturn_t (*handle_interrupt)(struct phy_device *phydev);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user