diff mbox series

[v2,net-next,3/3] net: phy: marvell: Add support for offloading LED blinking

Message ID 20230624205629.4158216-4-andrew@lunn.ch (mailing list archive)
State Changes Requested
Delegated to: Netdev Maintainers
Headers show
Series Support offload LED blinking to PHY. | expand

Checks

Context Check Description
netdev/series_format success Posting correctly formatted
netdev/tree_selection success Clearly marked for net-next
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 8 this patch: 8
netdev/cc_maintainers warning 4 maintainers not CCed: kuba@kernel.org davem@davemloft.net pabeni@redhat.com edumazet@google.com
netdev/build_clang success Errors and warnings before: 8 this patch: 8
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 8 this patch: 8
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 279 lines checked
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0

Commit Message

Andrew Lunn June 24, 2023, 8:56 p.m. UTC 
Add the code needed to indicate if a given blinking pattern can be
offloaded, to offload a pattern and to try to return the current
pattern. It is expected that ledtrig-netdev will gain support for
other patterns, such as different link speeds etc. So the code is
over-engineers to make adding such additional patterns easy.

Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
 drivers/net/phy/marvell.c | 243 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 243 insertions(+)

Comments

Kalesh Anakkur Purayil June 26, 2023, 3:33 a.m. UTC | #1 
On Sun, Jun 25, 2023 at 2:27 AM Andrew Lunn <andrew@lunn.ch> wrote:

> Add the code needed to indicate if a given blinking pattern can be
> offloaded, to offload a pattern and to try to return the current
> pattern. It is expected that ledtrig-netdev will gain support for
> other patterns, such as different link speeds etc. So the code is
> over-engineers to make adding such additional patterns easy.
>
> Reviewed-by: Simon Horman <simon.horman@corigine.com>
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> ---
>  drivers/net/phy/marvell.c | 243 ++++++++++++++++++++++++++++++++++++++
>  1 file changed, 243 insertions(+)
>
> diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
> index 43b6cb725551..a443df3034f3 100644
> --- a/drivers/net/phy/marvell.c
> +++ b/drivers/net/phy/marvell.c
> @@ -2893,6 +2893,234 @@ static int m88e1318_led_blink_set(struct
> phy_device *phydev, u8 index,
>                                MII_88E1318S_PHY_LED_FUNC, reg);
>  }
>
> +struct marvell_led_rules {
> +       int mode;
> +       unsigned long rules;
> +};
> +
> +static const struct marvell_led_rules marvell_led0[] = {
> +       {
> +               .mode = 0,
> +               .rules = BIT(TRIGGER_NETDEV_LINK),
> +       },
> +       {
> +               .mode = 3,
> +               .rules = (BIT(TRIGGER_NETDEV_RX) |
> +                         BIT(TRIGGER_NETDEV_TX)),
> +       },
> +       {
> +               .mode = 4,
> +               .rules = (BIT(TRIGGER_NETDEV_RX) |
> +                         BIT(TRIGGER_NETDEV_TX)),
> +       },
> +       {
> +               .mode = 5,
> +               .rules = BIT(TRIGGER_NETDEV_TX),
> +       },
> +       {
> +               .mode = 8,
> +               .rules = 0,
> +       },
> +};
> +
> +static const struct marvell_led_rules marvell_led1[] = {
> +       {
> +               .mode = 1,
> +               .rules = (BIT(TRIGGER_NETDEV_LINK) |
> +                         BIT(TRIGGER_NETDEV_RX) |
> +                         BIT(TRIGGER_NETDEV_TX)),
> +       },
> +       {
> +               .mode = 2,
> +               .rules = (BIT(TRIGGER_NETDEV_LINK) |
> +                         BIT(TRIGGER_NETDEV_RX)),
> +       },
> +       {
> +               .mode = 3,
> +               .rules = (BIT(TRIGGER_NETDEV_RX) |
> +                         BIT(TRIGGER_NETDEV_TX)),
> +       },
> +       {
> +               .mode = 4,
> +               .rules = (BIT(TRIGGER_NETDEV_RX) |
> +                         BIT(TRIGGER_NETDEV_TX)),
> +       },
> +       {
> +               .mode = 8,
> +               .rules = 0,
> +       },
> +};
> +
> +static const struct marvell_led_rules marvell_led2[] = {
> +       {
> +               .mode = 0,
> +               .rules = BIT(TRIGGER_NETDEV_LINK),
> +       },
> +       {
> +               .mode = 1,
> +               .rules = (BIT(TRIGGER_NETDEV_LINK) |
> +                         BIT(TRIGGER_NETDEV_RX) |
> +                         BIT(TRIGGER_NETDEV_TX)),
> +       },
> +       {
> +               .mode = 3,
> +               .rules = (BIT(TRIGGER_NETDEV_RX) |
> +                         BIT(TRIGGER_NETDEV_TX)),
> +       },
> +       {
> +               .mode = 4,
> +               .rules = (BIT(TRIGGER_NETDEV_RX) |
> +                         BIT(TRIGGER_NETDEV_TX)),
> +       },
> +       {
> +               .mode = 5,
> +               .rules = BIT(TRIGGER_NETDEV_TX),
> +       },
> +       {
> +               .mode = 8,
> +               .rules = 0,
> +       },
> +};
> +
> +static int marvell_find_led_mode(unsigned long rules,
> +                                const struct marvell_led_rules
> *marvell_rules,
> +                                int count,
> +                                int *mode)
> +{
> +       int i;
> +
> +       for (i = 0; i < count; i++) {
> +               if (marvell_rules[i].rules == rules) {
> +                       *mode = marvell_rules[i].mode;
> +                       return 0;
> +               }
> +       }
> +       return -EOPNOTSUPP;
> +}
> +
> +static int marvell_get_led_mode(u8 index, unsigned long rules, int *mode)
> +{
> +       int ret;
> +
> +       switch (index) {
> +       case 0:
> +               ret = marvell_find_led_mode(rules, marvell_led0,
> +                                           ARRAY_SIZE(marvell_led0),
> mode);
> +               break;
>
[Kalesh]: If you return directly from here, you can avoid the "return ret;"
at the end of this function. Also, it will make other cases in sync with
the default one.

> +       case 1:
> +               ret = marvell_find_led_mode(rules, marvell_led1,
> +                                           ARRAY_SIZE(marvell_led1),
> mode);
> +               break;
> +       case 2:
> +               ret = marvell_find_led_mode(rules, marvell_led2,
> +                                           ARRAY_SIZE(marvell_led2),
> mode);
> +               break;
> +       default:
> +               return -EINVAL;
> +       }
> +
> +       return ret;
> +}
> +
> +static int marvell_find_led_rules(unsigned long *rules,
> +                                 const struct marvell_led_rules
> *marvell_rules,
> +                                 int count,
> +                                 int mode)
> +{
> +       int i;
> +
> +       for (i = 0; i < count; i++) {
> +               if (marvell_rules[i].mode == mode) {
> +                       *rules = marvell_rules[i].rules;
> +                       return 0;
> +               }
> +       }
> +       return -EOPNOTSUPP;
> +}
> +
> +static int marvell_get_led_rules(u8 index, unsigned long *rules, int mode)
> +{
> +       int ret;
> +
> +       switch (index) {
> +       case 0:
> +               ret = marvell_find_led_rules(rules, marvell_led0,
> +                                            ARRAY_SIZE(marvell_led0),
> mode);
> +               break;
> +       case 1:
> +               ret = marvell_find_led_rules(rules, marvell_led1,
> +                                            ARRAY_SIZE(marvell_led1),
> mode);
> +               break;
> +       case 2:
> +               ret = marvell_find_led_rules(rules, marvell_led2,
> +                                            ARRAY_SIZE(marvell_led2),
> mode);
> +               break;
> +       default:
> +               return -EOPNOTSUPP;
> +       }
> +
> +       return ret;
> +}
> +
> +static int m88e1318_led_hw_is_supported(struct phy_device *phydev, u8
> index,
> +                                       unsigned long rules)
> +{
> +       int mode, ret;
> +
> +       switch (index) {
> +       case 0:
> +       case 1:
> +       case 2:
> +               ret = marvell_get_led_mode(index, rules, &mode);
> +               break;
> +       default:
> +               ret = -EINVAL;
> +       }
> +
> +       return ret;
> +}
> +
> +static int m88e1318_led_hw_control_set(struct phy_device *phydev, u8
> index,
> +                                      unsigned long rules)
> +{
> +       int mode, ret, reg;
> +
> +       switch (index) {
> +       case 0:
> +       case 1:
> +       case 2:
> +               ret = marvell_get_led_mode(index, rules, &mode);
> +               break;
> +       default:
> +               ret = -EINVAL;
> +       }
> +
> +       if (ret < 0)
> +               return ret;
> +
> +       reg = phy_read_paged(phydev, MII_MARVELL_LED_PAGE,
> +                            MII_88E1318S_PHY_LED_FUNC);
>
[Kalesh]: Don't you need a check here for "reg  < 0"?

> +       reg &= ~(0xf << (4 * index));
> +       reg |= mode << (4 * index);
> +       return phy_write_paged(phydev, MII_MARVELL_LED_PAGE,
> +                              MII_88E1318S_PHY_LED_FUNC, reg);
> +}
> +
> +static int m88e1318_led_hw_control_get(struct phy_device *phydev, u8
> index,
> +                                      unsigned long *rules)
> +{
> +       int mode, reg;
> +
> +       if (index > 2)
> +               return -EINVAL;
> +
> +       reg = phy_read_paged(phydev, MII_MARVELL_LED_PAGE,
> +                            MII_88E1318S_PHY_LED_FUNC);
> +       mode = (reg >> (4 * index)) & 0xf;
> +
> +       return marvell_get_led_rules(index, rules, mode);
> +}
> +
>  static int marvell_probe(struct phy_device *phydev)
>  {
>         struct marvell_priv *priv;
> @@ -3144,6 +3372,9 @@ static struct phy_driver marvell_drivers[] = {
>                 .get_stats = marvell_get_stats,
>                 .led_brightness_set = m88e1318_led_brightness_set,
>                 .led_blink_set = m88e1318_led_blink_set,
> +               .led_hw_is_supported = m88e1318_led_hw_is_supported,
> +               .led_hw_control_set = m88e1318_led_hw_control_set,
> +               .led_hw_control_get = m88e1318_led_hw_control_get,
>         },
>         {
>                 .phy_id = MARVELL_PHY_ID_88E1145,
> @@ -3252,6 +3483,9 @@ static struct phy_driver marvell_drivers[] = {
>                 .cable_test_get_status =
> marvell_vct7_cable_test_get_status,
>                 .led_brightness_set = m88e1318_led_brightness_set,
>                 .led_blink_set = m88e1318_led_blink_set,
> +               .led_hw_is_supported = m88e1318_led_hw_is_supported,
> +               .led_hw_control_set = m88e1318_led_hw_control_set,
> +               .led_hw_control_get = m88e1318_led_hw_control_get,
>         },
>         {
>                 .phy_id = MARVELL_PHY_ID_88E1540,
> @@ -3280,6 +3514,9 @@ static struct phy_driver marvell_drivers[] = {
>                 .cable_test_get_status =
> marvell_vct7_cable_test_get_status,
>                 .led_brightness_set = m88e1318_led_brightness_set,
>                 .led_blink_set = m88e1318_led_blink_set,
> +               .led_hw_is_supported = m88e1318_led_hw_is_supported,
> +               .led_hw_control_set = m88e1318_led_hw_control_set,
> +               .led_hw_control_get = m88e1318_led_hw_control_get,
>         },
>         {
>                 .phy_id = MARVELL_PHY_ID_88E1545,
> @@ -3308,6 +3545,9 @@ static struct phy_driver marvell_drivers[] = {
>                 .cable_test_get_status =
> marvell_vct7_cable_test_get_status,
>                 .led_brightness_set = m88e1318_led_brightness_set,
>                 .led_blink_set = m88e1318_led_blink_set,
> +               .led_hw_is_supported = m88e1318_led_hw_is_supported,
> +               .led_hw_control_set = m88e1318_led_hw_control_set,
> +               .led_hw_control_get = m88e1318_led_hw_control_get,
>         },
>         {
>                 .phy_id = MARVELL_PHY_ID_88E3016,
> @@ -3451,6 +3691,9 @@ static struct phy_driver marvell_drivers[] = {
>                 .set_tunable = m88e1540_set_tunable,
>                 .led_brightness_set = m88e1318_led_brightness_set,
>                 .led_blink_set = m88e1318_led_blink_set,
> +               .led_hw_is_supported = m88e1318_led_hw_is_supported,
> +               .led_hw_control_set = m88e1318_led_hw_control_set,
> +               .led_hw_control_get = m88e1318_led_hw_control_get,
>         },
>  };
>
> --
> 2.40.1
>
>
>
diff mbox series

Patch

diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 43b6cb725551..a443df3034f3 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -2893,6 +2893,234 @@  static int m88e1318_led_blink_set(struct phy_device *phydev, u8 index,
 			       MII_88E1318S_PHY_LED_FUNC, reg);
 }
 
+struct marvell_led_rules {
+	int mode;
+	unsigned long rules;
+};
+
+static const struct marvell_led_rules marvell_led0[] = {
+	{
+		.mode = 0,
+		.rules = BIT(TRIGGER_NETDEV_LINK),
+	},
+	{
+		.mode = 3,
+		.rules = (BIT(TRIGGER_NETDEV_RX) |
+			  BIT(TRIGGER_NETDEV_TX)),
+	},
+	{
+		.mode = 4,
+		.rules = (BIT(TRIGGER_NETDEV_RX) |
+			  BIT(TRIGGER_NETDEV_TX)),
+	},
+	{
+		.mode = 5,
+		.rules = BIT(TRIGGER_NETDEV_TX),
+	},
+	{
+		.mode = 8,
+		.rules = 0,
+	},
+};
+
+static const struct marvell_led_rules marvell_led1[] = {
+	{
+		.mode = 1,
+		.rules = (BIT(TRIGGER_NETDEV_LINK) |
+			  BIT(TRIGGER_NETDEV_RX) |
+			  BIT(TRIGGER_NETDEV_TX)),
+	},
+	{
+		.mode = 2,
+		.rules = (BIT(TRIGGER_NETDEV_LINK) |
+			  BIT(TRIGGER_NETDEV_RX)),
+	},
+	{
+		.mode = 3,
+		.rules = (BIT(TRIGGER_NETDEV_RX) |
+			  BIT(TRIGGER_NETDEV_TX)),
+	},
+	{
+		.mode = 4,
+		.rules = (BIT(TRIGGER_NETDEV_RX) |
+			  BIT(TRIGGER_NETDEV_TX)),
+	},
+	{
+		.mode = 8,
+		.rules = 0,
+	},
+};
+
+static const struct marvell_led_rules marvell_led2[] = {
+	{
+		.mode = 0,
+		.rules = BIT(TRIGGER_NETDEV_LINK),
+	},
+	{
+		.mode = 1,
+		.rules = (BIT(TRIGGER_NETDEV_LINK) |
+			  BIT(TRIGGER_NETDEV_RX) |
+			  BIT(TRIGGER_NETDEV_TX)),
+	},
+	{
+		.mode = 3,
+		.rules = (BIT(TRIGGER_NETDEV_RX) |
+			  BIT(TRIGGER_NETDEV_TX)),
+	},
+	{
+		.mode = 4,
+		.rules = (BIT(TRIGGER_NETDEV_RX) |
+			  BIT(TRIGGER_NETDEV_TX)),
+	},
+	{
+		.mode = 5,
+		.rules = BIT(TRIGGER_NETDEV_TX),
+	},
+	{
+		.mode = 8,
+		.rules = 0,
+	},
+};
+
+static int marvell_find_led_mode(unsigned long rules,
+				 const struct marvell_led_rules *marvell_rules,
+				 int count,
+				 int *mode)
+{
+	int i;
+
+	for (i = 0; i < count; i++) {
+		if (marvell_rules[i].rules == rules) {
+			*mode = marvell_rules[i].mode;
+			return 0;
+		}
+	}
+	return -EOPNOTSUPP;
+}
+
+static int marvell_get_led_mode(u8 index, unsigned long rules, int *mode)
+{
+	int ret;
+
+	switch (index) {
+	case 0:
+		ret = marvell_find_led_mode(rules, marvell_led0,
+					    ARRAY_SIZE(marvell_led0), mode);
+		break;
+	case 1:
+		ret = marvell_find_led_mode(rules, marvell_led1,
+					    ARRAY_SIZE(marvell_led1), mode);
+		break;
+	case 2:
+		ret = marvell_find_led_mode(rules, marvell_led2,
+					    ARRAY_SIZE(marvell_led2), mode);
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	return ret;
+}
+
+static int marvell_find_led_rules(unsigned long *rules,
+				  const struct marvell_led_rules *marvell_rules,
+				  int count,
+				  int mode)
+{
+	int i;
+
+	for (i = 0; i < count; i++) {
+		if (marvell_rules[i].mode == mode) {
+			*rules = marvell_rules[i].rules;
+			return 0;
+		}
+	}
+	return -EOPNOTSUPP;
+}
+
+static int marvell_get_led_rules(u8 index, unsigned long *rules, int mode)
+{
+	int ret;
+
+	switch (index) {
+	case 0:
+		ret = marvell_find_led_rules(rules, marvell_led0,
+					     ARRAY_SIZE(marvell_led0), mode);
+		break;
+	case 1:
+		ret = marvell_find_led_rules(rules, marvell_led1,
+					     ARRAY_SIZE(marvell_led1), mode);
+		break;
+	case 2:
+		ret = marvell_find_led_rules(rules, marvell_led2,
+					     ARRAY_SIZE(marvell_led2), mode);
+		break;
+	default:
+		return -EOPNOTSUPP;
+	}
+
+	return ret;
+}
+
+static int m88e1318_led_hw_is_supported(struct phy_device *phydev, u8 index,
+					unsigned long rules)
+{
+	int mode, ret;
+
+	switch (index) {
+	case 0:
+	case 1:
+	case 2:
+		ret = marvell_get_led_mode(index, rules, &mode);
+		break;
+	default:
+		ret = -EINVAL;
+	}
+
+	return ret;
+}
+
+static int m88e1318_led_hw_control_set(struct phy_device *phydev, u8 index,
+				       unsigned long rules)
+{
+	int mode, ret, reg;
+
+	switch (index) {
+	case 0:
+	case 1:
+	case 2:
+		ret = marvell_get_led_mode(index, rules, &mode);
+		break;
+	default:
+		ret = -EINVAL;
+	}
+
+	if (ret < 0)
+		return ret;
+
+	reg = phy_read_paged(phydev, MII_MARVELL_LED_PAGE,
+			     MII_88E1318S_PHY_LED_FUNC);
+	reg &= ~(0xf << (4 * index));
+	reg |= mode << (4 * index);
+	return phy_write_paged(phydev, MII_MARVELL_LED_PAGE,
+			       MII_88E1318S_PHY_LED_FUNC, reg);
+}
+
+static int m88e1318_led_hw_control_get(struct phy_device *phydev, u8 index,
+				       unsigned long *rules)
+{
+	int mode, reg;
+
+	if (index > 2)
+		return -EINVAL;
+
+	reg = phy_read_paged(phydev, MII_MARVELL_LED_PAGE,
+			     MII_88E1318S_PHY_LED_FUNC);
+	mode = (reg >> (4 * index)) & 0xf;
+
+	return marvell_get_led_rules(index, rules, mode);
+}
+
 static int marvell_probe(struct phy_device *phydev)
 {
 	struct marvell_priv *priv;
@@ -3144,6 +3372,9 @@  static struct phy_driver marvell_drivers[] = {
 		.get_stats = marvell_get_stats,
 		.led_brightness_set = m88e1318_led_brightness_set,
 		.led_blink_set = m88e1318_led_blink_set,
+		.led_hw_is_supported = m88e1318_led_hw_is_supported,
+		.led_hw_control_set = m88e1318_led_hw_control_set,
+		.led_hw_control_get = m88e1318_led_hw_control_get,
 	},
 	{
 		.phy_id = MARVELL_PHY_ID_88E1145,
@@ -3252,6 +3483,9 @@  static struct phy_driver marvell_drivers[] = {
 		.cable_test_get_status = marvell_vct7_cable_test_get_status,
 		.led_brightness_set = m88e1318_led_brightness_set,
 		.led_blink_set = m88e1318_led_blink_set,
+		.led_hw_is_supported = m88e1318_led_hw_is_supported,
+		.led_hw_control_set = m88e1318_led_hw_control_set,
+		.led_hw_control_get = m88e1318_led_hw_control_get,
 	},
 	{
 		.phy_id = MARVELL_PHY_ID_88E1540,
@@ -3280,6 +3514,9 @@  static struct phy_driver marvell_drivers[] = {
 		.cable_test_get_status = marvell_vct7_cable_test_get_status,
 		.led_brightness_set = m88e1318_led_brightness_set,
 		.led_blink_set = m88e1318_led_blink_set,
+		.led_hw_is_supported = m88e1318_led_hw_is_supported,
+		.led_hw_control_set = m88e1318_led_hw_control_set,
+		.led_hw_control_get = m88e1318_led_hw_control_get,
 	},
 	{
 		.phy_id = MARVELL_PHY_ID_88E1545,
@@ -3308,6 +3545,9 @@  static struct phy_driver marvell_drivers[] = {
 		.cable_test_get_status = marvell_vct7_cable_test_get_status,
 		.led_brightness_set = m88e1318_led_brightness_set,
 		.led_blink_set = m88e1318_led_blink_set,
+		.led_hw_is_supported = m88e1318_led_hw_is_supported,
+		.led_hw_control_set = m88e1318_led_hw_control_set,
+		.led_hw_control_get = m88e1318_led_hw_control_get,
 	},
 	{
 		.phy_id = MARVELL_PHY_ID_88E3016,
@@ -3451,6 +3691,9 @@  static struct phy_driver marvell_drivers[] = {
 		.set_tunable = m88e1540_set_tunable,
 		.led_brightness_set = m88e1318_led_brightness_set,
 		.led_blink_set = m88e1318_led_blink_set,
+		.led_hw_is_supported = m88e1318_led_hw_is_supported,
+		.led_hw_control_set = m88e1318_led_hw_control_set,
+		.led_hw_control_get = m88e1318_led_hw_control_get,
 	},
 };