ipq40xx: add PSGMII PHY mode to phylink_get_linkmodes()
authorRobert Marko <robimarko@gmail.com>
Sat, 6 May 2023 10:45:56 +0000 (12:45 +0200)
committerChristian Marangi <ansuelsmth@gmail.com>
Fri, 12 May 2023 01:15:34 +0000 (03:15 +0200)
Upstream commit ("net: phylink: add generic validate implementation") was
backported, however PSGMII PHY mode patch for ipq40xx was not updated to
add PSGMII to phylink_get_linkmodes() so the following warning would be
printed during kernel compilation:
drivers/net/phy/phylink.c: In function 'phylink_get_linkmodes':
drivers/net/phy/phylink.c:360:9: error: enumeration value 'PHY_INTERFACE_MODE_PSGMII' not handled in switch [-Werror=switch]
  360 |         switch (interface) {
      |         ^~~~~~

Resolve the warning by adding the PSGMII mode to phylink_get_linkmodes().

Signed-off-by: Robert Marko <robimarko@gmail.com>
target/linux/ipq40xx/patches-5.15/704-net-phy-define-PSGMII-PHY-interface-mode.patch

index 36d3e2738fbdb6efcbfe4a77da3e67a50397992d..faac6fa145a59cb14016ee5f7902d6b344597daf 100644 (file)
@@ -1,4 +1,4 @@
-From 3e1825e00dafb68eec25df389b63f3ab3d905b59 Mon Sep 17 00:00:00 2001
+From 157ac9f52fd9b9a22cf12f7755a905fb34ef72f7 Mon Sep 17 00:00:00 2001
 From: Gabor Juhos <j4g8y7@gmail.com>
 Date: Fri, 25 Dec 2020 08:02:47 +0100
 Subject: [PATCH] net: phy: define PSGMII PHY interface mode
@@ -16,9 +16,9 @@ of connection between the MAC and PHY.
 Signed-off-by: Gabor Juhos <j4g8y7@gmail.com>
 ---
  Documentation/devicetree/bindings/net/ethernet-controller.yaml | 1 +
- drivers/net/phy/phylink.c                                      | +
+ drivers/net/phy/phylink.c                                      | 2 ++
  include/linux/phy.h                                            | 3 +++
- 3 files changed, 5 insertions(+)
+ 3 files changed, 6 insertions(+)
 
 --- a/Documentation/devicetree/bindings/net/ethernet-controller.yaml
 +++ b/Documentation/devicetree/bindings/net/ethernet-controller.yaml
@@ -32,7 +32,15 @@ Signed-off-by: Gabor Juhos <j4g8y7@gmail.com>
        - rev-mii
 --- a/drivers/net/phy/phylink.c
 +++ b/drivers/net/phy/phylink.c
-@@ -629,6 +629,7 @@ static int phylink_parse_mode(struct phy
+@@ -366,6 +366,7 @@ void phylink_get_linkmodes(unsigned long
+       case PHY_INTERFACE_MODE_RGMII_RXID:
+       case PHY_INTERFACE_MODE_RGMII_ID:
+       case PHY_INTERFACE_MODE_RGMII:
++      case PHY_INTERFACE_MODE_PSGMII:
+       case PHY_INTERFACE_MODE_QSGMII:
+       case PHY_INTERFACE_MODE_SGMII:
+       case PHY_INTERFACE_MODE_GMII:
+@@ -629,6 +630,7 @@ static int phylink_parse_mode(struct phy
  
                switch (pl->link_config.interface) {
                case PHY_INTERFACE_MODE_SGMII: