ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-28 01:28:59 +00:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity
4d0dc5e15e
openwrt/target/linux/realtek/patches-5.15/704-include-linux-add-phy-hsgmii-mode.patch

63 lines
2.1 KiB
Diff
Raw Normal View History

realtek: copy dts/files/patches/configs for 5.15 Copy dts/files/patches/configs from 5.10 to 5.15. Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com> [refresh with updated DGS-1210 dts files] Signed-off-by: Sander Vanheule <sander@svanheule.net>
2022-09-09 13:08:16 +00:00
From 9d9bf16aa8d966834ac1280f96c37d22552c33d1 Mon Sep 17 00:00:00 2001
From: Birger Koblitz <git@birger-koblitz.de>
Date: Wed, 8 Sep 2021 16:13:18 +0200
Subject: phy: Add PHY hsgmii mode
This adds RTL93xx-specific MAC configuration routines that allow also configuration
of 10GBit links for phylink. There is support for the Realtek-specific HISGMI
protocol.
Submitted-by: Birger Koblitz <git@birger-koblitz.de>
---
realtek: 5.15: fix compilation warning with PHY_INTERFACE_MODE_HSGMII PHY_INTERFACE_MODE_HSGMII was not handled in phylink_get_linkmodes and phylink_parse_mode. Fix compilation warning by adding it in the enum: drivers/net/phy/phylink.c: In function 'phylink_get_linkmodes': drivers/net/phy/phylink.c:360:9: error: enumeration value 'PHY_INTERFACE_MODE_HSGMII' not handled in switch [-Werror=switch] 360 | switch (interface) { | ^~~~~~ cc1: all warnings being treated as errors Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
2023-05-06 23:37:48 +00:00
drivers/net/phy/phylink.c | 2 ++
realtek: copy dts/files/patches/configs for 5.15 Copy dts/files/patches/configs from 5.10 to 5.15. Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com> [refresh with updated DGS-1210 dts files] Signed-off-by: Sander Vanheule <sander@svanheule.net>
2022-09-09 13:08:16 +00:00
include/linux/phy.h | 3 +++
realtek: 5.15: fix compilation warning with PHY_INTERFACE_MODE_HSGMII PHY_INTERFACE_MODE_HSGMII was not handled in phylink_get_linkmodes and phylink_parse_mode. Fix compilation warning by adding it in the enum: drivers/net/phy/phylink.c: In function 'phylink_get_linkmodes': drivers/net/phy/phylink.c:360:9: error: enumeration value 'PHY_INTERFACE_MODE_HSGMII' not handled in switch [-Werror=switch] 360 | switch (interface) { | ^~~~~~ cc1: all warnings being treated as errors Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
2023-05-06 23:37:48 +00:00
2 file changed, 5 insertions(+)
realtek: copy dts/files/patches/configs for 5.15 Copy dts/files/patches/configs from 5.10 to 5.15. Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com> [refresh with updated DGS-1210 dts files] Signed-off-by: Sander Vanheule <sander@svanheule.net>
2022-09-09 13:08:16 +00:00
kernel: 5.15: backport v6.1 PHY changes required for Aquantia Signed-off-by: Rafał Miłecki <rafal@milecki.pl> (cherry picked from commit 2df8a0ccb0b0461836e3ab88c7d4dc848664def4)
2024-01-26 05:35:27 +00:00
--- a/drivers/net/phy/phy-core.c
+++ b/drivers/net/phy/phy-core.c
@@ -124,6 +124,7 @@ int phy_interface_num_ports(phy_interfac
case PHY_INTERFACE_MODE_MOCA:
case PHY_INTERFACE_MODE_TRGMII:
case PHY_INTERFACE_MODE_USXGMII:
+ case PHY_INTERFACE_MODE_HSGMII:
case PHY_INTERFACE_MODE_SGMII:
case PHY_INTERFACE_MODE_SMII:
case PHY_INTERFACE_MODE_1000BASEX:
realtek: 5.15: fix compilation warning with PHY_INTERFACE_MODE_HSGMII PHY_INTERFACE_MODE_HSGMII was not handled in phylink_get_linkmodes and phylink_parse_mode. Fix compilation warning by adding it in the enum: drivers/net/phy/phylink.c: In function 'phylink_get_linkmodes': drivers/net/phy/phylink.c:360:9: error: enumeration value 'PHY_INTERFACE_MODE_HSGMII' not handled in switch [-Werror=switch] 360 | switch (interface) { | ^~~~~~ cc1: all warnings being treated as errors Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
2023-05-06 23:37:48 +00:00
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
kernel: 5.15: backport v6.1 PHY changes required for Aquantia Signed-off-by: Rafał Miłecki <rafal@milecki.pl> (cherry picked from commit 2df8a0ccb0b0461836e3ab88c7d4dc848664def4)
2024-01-26 05:35:27 +00:00
@@ -410,6 +410,7 @@ void phylink_get_linkmodes(unsigned long
realtek: 5.15: fix compilation warning with PHY_INTERFACE_MODE_HSGMII PHY_INTERFACE_MODE_HSGMII was not handled in phylink_get_linkmodes and phylink_parse_mode. Fix compilation warning by adding it in the enum: drivers/net/phy/phylink.c: In function 'phylink_get_linkmodes': drivers/net/phy/phylink.c:360:9: error: enumeration value 'PHY_INTERFACE_MODE_HSGMII' not handled in switch [-Werror=switch] 360 | switch (interface) { | ^~~~~~ cc1: all warnings being treated as errors Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
2023-05-06 23:37:48 +00:00
case PHY_INTERFACE_MODE_XGMII:
case PHY_INTERFACE_MODE_RXAUI:
+ case PHY_INTERFACE_MODE_HSGMII:
case PHY_INTERFACE_MODE_XAUI:
case PHY_INTERFACE_MODE_10GBASER:
case PHY_INTERFACE_MODE_10GKR:
kernel: 5.15: backport v6.1 PHY changes required for Aquantia Signed-off-by: Rafał Miłecki <rafal@milecki.pl> (cherry picked from commit 2df8a0ccb0b0461836e3ab88c7d4dc848664def4)
2024-01-26 05:35:27 +00:00
@@ -665,6 +666,7 @@ static int phylink_parse_mode(struct phy
realtek: 5.15: fix compilation warning with PHY_INTERFACE_MODE_HSGMII PHY_INTERFACE_MODE_HSGMII was not handled in phylink_get_linkmodes and phylink_parse_mode. Fix compilation warning by adding it in the enum: drivers/net/phy/phylink.c: In function 'phylink_get_linkmodes': drivers/net/phy/phylink.c:360:9: error: enumeration value 'PHY_INTERFACE_MODE_HSGMII' not handled in switch [-Werror=switch] 360 | switch (interface) { | ^~~~~~ cc1: all warnings being treated as errors Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
2023-05-06 23:37:48 +00:00
fallthrough;
case PHY_INTERFACE_MODE_USXGMII:
case PHY_INTERFACE_MODE_10GKR:
+ case PHY_INTERFACE_MODE_HSGMII:
case PHY_INTERFACE_MODE_10GBASER:
phylink_set(pl->supported, 10baseT_Half);
phylink_set(pl->supported, 10baseT_Full);
realtek: copy dts/files/patches/configs for 5.15 Copy dts/files/patches/configs from 5.10 to 5.15. Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com> [refresh with updated DGS-1210 dts files] Signed-off-by: Sander Vanheule <sander@svanheule.net>
2022-09-09 13:08:16 +00:00
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
kernel: 5.15: backport v6.1 PHY changes required for Aquantia Signed-off-by: Rafał Miłecki <rafal@milecki.pl> (cherry picked from commit 2df8a0ccb0b0461836e3ab88c7d4dc848664def4)
2024-01-26 05:35:27 +00:00
@@ -141,6 +141,7 @@ typedef enum {
realtek: copy dts/files/patches/configs for 5.15 Copy dts/files/patches/configs from 5.10 to 5.15. Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com> [refresh with updated DGS-1210 dts files] Signed-off-by: Sander Vanheule <sander@svanheule.net>
2022-09-09 13:08:16 +00:00
PHY_INTERFACE_MODE_XGMII,
PHY_INTERFACE_MODE_XLGMII,
PHY_INTERFACE_MODE_MOCA,
+ PHY_INTERFACE_MODE_HSGMII,
PHY_INTERFACE_MODE_QSGMII,
PHY_INTERFACE_MODE_TRGMII,
PHY_INTERFACE_MODE_100BASEX,
kernel: 5.15: backport v6.1 PHY changes required for Aquantia Signed-off-by: Rafał Miłecki <rafal@milecki.pl> (cherry picked from commit 2df8a0ccb0b0461836e3ab88c7d4dc848664def4)
2024-01-26 05:35:27 +00:00
@@ -248,6 +249,8 @@ static inline const char *phy_modes(phy_
realtek: copy dts/files/patches/configs for 5.15 Copy dts/files/patches/configs from 5.10 to 5.15. Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com> [refresh with updated DGS-1210 dts files] Signed-off-by: Sander Vanheule <sander@svanheule.net>
2022-09-09 13:08:16 +00:00
return "xlgmii";
case PHY_INTERFACE_MODE_MOCA:
return "moca";
+ case PHY_INTERFACE_MODE_HSGMII:
+ return "hsgmii";
case PHY_INTERFACE_MODE_QSGMII:
return "qsgmii";
case PHY_INTERFACE_MODE_TRGMII:
Reference in New Issue Copy Permalink