| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Mon, 26 Jun 2023 09:03:47 +0530
From: Kalesh Anakkur Purayil <kalesh-anakkur.purayil@...adcom.com>
To: Andrew Lunn <andrew@...n.ch>
Cc: netdev <netdev@...r.kernel.org>, Heiner Kallweit <hkallweit1@...il.com>,
Russell King <rmk+kernel@...linux.org.uk>, Simon Horman <simon.horman@...igine.com>,
Christian Marangi <ansuelsmth@...il.com>
Subject: Re: [PATCH v2 net-next 3/3] net: phy: marvell: Add support for
offloading LED blinking
On Sun, Jun 25, 2023 at 2:27 AM Andrew Lunn <andrew@...n.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@...igine.com>
> Signed-off-by: Andrew Lunn <andrew@...n.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
>
>
>
--
Regards,
Kalesh A P
Content of type "text/html" skipped
Download attachment "smime.p7s" of type "application/pkcs7-signature" (4239 bytes)
Powered by blists - more mailing lists