| 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
| ||
|
Message-ID: <2239338.iZASKD2KPV@steina-w>
Date: Fri, 08 Sep 2023 11:23:05 +0200
From: Alexander Stein <alexander.stein@...tq-group.com>
To: netdev@...r.kernel.org, Sascha Hauer <s.hauer@...gutronix.de>
Cc: Andrew Lunn <andrew@...n.ch>,
Heiner Kallweit <hkallweit1@...il.com>,
Russell King <linux@...linux.org.uk>,
linux-kernel@...r.kernel.org, kernel@...gutronix.de,
Michael Riesch <michael.riesch@...fvision.net>,
Sascha Hauer <s.hauer@...gutronix.de>
Subject: Re: [PATCH] net: phy: dp83867: Add support for hardware blinking LEDs
Hi Sascha,
thanks for the patch.
Am Donnerstag, 7. September 2023, 10:47:31 CEST schrieb Sascha Hauer:
> This implements the led_hw_* hooks to support hardware blinking LEDs on
> the DP83867 phy. The driver supports all LED modes that have a
> corresponding TRIGGER_NETDEV_* define. Error and collision do not have
> a TRIGGER_NETDEV_* define, so these modes are currently not supported.
>
> Signed-off-by: Sascha Hauer <s.hauer@...gutronix.de>
This works as intended so far. Unfortunately this driver and the PHY LED
framework do not support active-low LEDs (yet).
Tested-by: Alexander Stein <alexander.stein@...tq-group.com> #TQMa8MxML/MBa8Mx
> ---
> drivers/net/phy/dp83867.c | 137 ++++++++++++++++++++++++++++++++++++++
> 1 file changed, 137 insertions(+)
>
> diff --git a/drivers/net/phy/dp83867.c b/drivers/net/phy/dp83867.c
> index e397e7d642d92..5f08f9d38bd7a 100644
> --- a/drivers/net/phy/dp83867.c
> +++ b/drivers/net/phy/dp83867.c
> @@ -159,6 +159,23 @@
> #define DP83867_LED_DRV_EN(x) BIT((x) * 4)
> #define DP83867_LED_DRV_VAL(x) BIT((x) * 4 + 1)
>
> +#define DP83867_LED_FN(idx, val) (((val) & 0xf) << ((idx) * 4))
> +#define DP83867_LED_FN_MASK(idx) (0xf << ((idx) * 4))
> +#define DP83867_LED_FN_RX_ERR 0xe /* Receive Error */
> +#define DP83867_LED_FN_RX_TX_ERR 0xd /* Receive Error or Transmit
Error */
> +#define DP83867_LED_FN_LINK_RX_TX 0xb /* Link established, blink for rx
or
> tx activity */ +#define DP83867_LED_FN_FULL_DUPLEX 0xa /* Full
duplex */
> +#define DP83867_LED_FN_LINK_100_1000_BT 0x9 /* 100/1000BT link
established
> */ +#define DP83867_LED_FN_LINK_10_100_BT 0x8 /* 10/100BT link
established
> */ +#define DP83867_LED_FN_LINK_10_BT 0x7 /* 10BT link established */
> +#define DP83867_LED_FN_LINK_100_BTX 0x6 /* 100 BTX link established */
> +#define DP83867_LED_FN_LINK_1000_BT 0x5 /* 1000 BT link established */
> +#define DP83867_LED_FN_COLLISION 0x4 /* Collision detected */
> +#define DP83867_LED_FN_RX 0x3 /* Receive activity */
> +#define DP83867_LED_FN_TX 0x2 /* Transmit activity */
> +#define DP83867_LED_FN_RX_TX 0x1 /* Receive or Transmit
activity */
> +#define DP83867_LED_FN_LINK 0x0 /* Link established */
> +
> enum {
> DP83867_PORT_MIRROING_KEEP,
> DP83867_PORT_MIRROING_EN,
> @@ -1018,6 +1035,123 @@ dp83867_led_brightness_set(struct phy_device
> *phydev, val);
> }
>
> +static int dp83867_led_mode(u8 index, unsigned long rules)
> +{
> + if (index >= DP83867_LED_COUNT)
> + return -EINVAL;
> +
> + switch (rules) {
> + case BIT(TRIGGER_NETDEV_LINK):
> + return DP83867_LED_FN_LINK;
> + case BIT(TRIGGER_NETDEV_LINK_10):
> + return DP83867_LED_FN_LINK_10_BT;
> + case BIT(TRIGGER_NETDEV_LINK_100):
> + return DP83867_LED_FN_LINK_100_BTX;
> + case BIT(TRIGGER_NETDEV_FULL_DUPLEX):
> + return DP83867_LED_FN_FULL_DUPLEX;
> + case BIT(TRIGGER_NETDEV_TX):
> + return DP83867_LED_FN_TX;
> + case BIT(TRIGGER_NETDEV_RX):
> + return DP83867_LED_FN_RX;
> + case BIT(TRIGGER_NETDEV_LINK_1000):
> + return DP83867_LED_FN_LINK_1000_BT;
> + case BIT(TRIGGER_NETDEV_TX) | BIT(TRIGGER_NETDEV_RX):
> + return DP83867_LED_FN_RX_TX;
> + case BIT(TRIGGER_NETDEV_LINK_100) | BIT(TRIGGER_NETDEV_LINK_1000):
> + return DP83867_LED_FN_LINK_100_1000_BT;
> + case BIT(TRIGGER_NETDEV_LINK_10) | BIT(TRIGGER_NETDEV_LINK_100):
> + return DP83867_LED_FN_LINK_10_100_BT;
> + case BIT(TRIGGER_NETDEV_LINK) | BIT(TRIGGER_NETDEV_TX) |
> BIT(TRIGGER_NETDEV_RX): + return DP83867_LED_FN_LINK_RX_TX;
> + default:
> + return -EOPNOTSUPP;
> + }
> +}
> +
> +static int dp83867_led_hw_is_supported(struct phy_device *phydev, u8 index,
> + unsigned long rules)
> +{
> + int ret;
> +
> + ret = dp83867_led_mode(index, rules);
> + if (ret < 0)
> + return ret;
> +
> + return 0;
> +}
> +
> +static int dp83867_led_hw_control_set(struct phy_device *phydev, u8 index,
> + unsigned long rules)
> +{
> + int mode, ret;
> +
> + mode = dp83867_led_mode(index, rules);
> + if (mode < 0)
> + return mode;
> +
> + ret = phy_modify(phydev, DP83867_LEDCR1, DP83867_LED_FN_MASK(index),
> + DP83867_LED_FN(index, mode));
> + if (ret)
> + return ret;
> +
> + return phy_modify(phydev, DP83867_LEDCR2, DP83867_LED_DRV_EN(index),
0);
> +}
> +
> +static int dp83867_led_hw_control_get(struct phy_device *phydev, u8 index,
> + unsigned long *rules)
> +{
> + int val;
> +
> + val = phy_read(phydev, DP83867_LEDCR1);
> + if (val < 0)
> + return val;
> +
> + val &= DP83867_LED_FN_MASK(index);
> + val >>= index * 4;
> +
> + switch (val) {
> + case DP83867_LED_FN_LINK:
> + *rules = BIT(TRIGGER_NETDEV_LINK);
> + break;
> + case DP83867_LED_FN_LINK_10_BT:
> + *rules = BIT(TRIGGER_NETDEV_LINK_10);
> + break;
> + case DP83867_LED_FN_LINK_100_BTX:
> + *rules = BIT(TRIGGER_NETDEV_LINK_100);
> + break;
> + case DP83867_LED_FN_FULL_DUPLEX:
> + *rules = BIT(TRIGGER_NETDEV_FULL_DUPLEX);
> + break;
> + case DP83867_LED_FN_TX:
> + *rules = BIT(TRIGGER_NETDEV_TX);
> + break;
> + case DP83867_LED_FN_RX:
> + *rules = BIT(TRIGGER_NETDEV_RX);
> + break;
> + case DP83867_LED_FN_LINK_1000_BT:
> + *rules = BIT(TRIGGER_NETDEV_LINK_1000);
> + break;
> + case DP83867_LED_FN_RX_TX:
> + *rules = BIT(TRIGGER_NETDEV_TX) | BIT(TRIGGER_NETDEV_RX);
> + break;
> + case DP83867_LED_FN_LINK_100_1000_BT:
> + *rules = BIT(TRIGGER_NETDEV_LINK_100) |
BIT(TRIGGER_NETDEV_LINK_1000);
> + break;
> + case DP83867_LED_FN_LINK_10_100_BT:
> + *rules = BIT(TRIGGER_NETDEV_LINK_10) |
BIT(TRIGGER_NETDEV_LINK_100);
> + break;
> + case DP83867_LED_FN_LINK_RX_TX:
> + *rules = BIT(TRIGGER_NETDEV_LINK) | BIT(TRIGGER_NETDEV_TX)
|
> + BIT(TRIGGER_NETDEV_RX);
> + break;
> + default:
> + *rules = 0;
> + break;
> + }
> +
> + return 0;
> +}
> +
> static struct phy_driver dp83867_driver[] = {
> {
> .phy_id = DP83867_PHY_ID,
> @@ -1047,6 +1181,9 @@ static struct phy_driver dp83867_driver[] = {
> .set_loopback = dp83867_loopback,
>
> .led_brightness_set = dp83867_led_brightness_set,
> + .led_hw_is_supported = dp83867_led_hw_is_supported,
> + .led_hw_control_set = dp83867_led_hw_control_set,
> + .led_hw_control_get = dp83867_led_hw_control_get,
> },
> };
> module_phy_driver(dp83867_driver);
--
TQ-Systems GmbH | Mühlstraße 2, Gut Delling | 82229 Seefeld, Germany
Amtsgericht München, HRB 105018
Geschäftsführer: Detlef Schneider, Rüdiger Stahl, Stefan Schneider
http://www.tq-group.com/
Powered by blists - more mailing lists