net: Add basic LED support for switch/phy
Subsystems (9)
Christian Marangi
maintainerv7 cover net: Add basic LED support for switch/phy
This is a continue of [1]. It was decided to take a more gradual approach to implement LEDs support for switch and phy starting with basic support and then implementing the hw control part when we have all the prereq done.
This series implements only the brightness_set() and blink_set() ops. An example of switch implementation is done with qca8k.
For PHY a more generic approach is used with implementing the LED support in PHY core and with the user (in this case marvell) adding all the required functions.
Currently we set the default-state as "keep" to not change the default configuration of the declared LEDs since almost every switch have a default configuration.
[1] https://lore.kernel.org/lkml/[email protected]/
Changes in new series v7:
- Drop ethernet-leds schema and add unevaluatedProperties to ethernet-controller and ethernet-phy schema
- Drop function-enumerator binding from schema example and DT
- Set devname_mandatory for qca8k leds and assign better name to LEDs using the format {slave_mii_bus id}:0{port number}:{color}:{function}
- Add Documentation patch for Correct LEDs naming from Andrew
- Changes in Andrew patch:
- net: phy: Add a binding for PHY LEDs
- Convert index from u32 to u8
- net: phy: phy_device: Call into the PHY driver to set LED brightness
- Fixup kernel doc
- Convert index from u32 to u8
- net: phy: marvell: Add software control of the LEDs
- Convert index from u32 to u8
- net: phy: phy_device: Call into the PHY driver to set LED blinking
- Kernel doc fix
- Convert index from u32 to u8
- net: phy: marvell: Implement led_blink_set()
- Convert index from u32 to u8
Changes in new series v6:
- Add leds-ethernet.yaml to document reg in led node
- Update ethernet-controller and ethernet-phy to follow new leds-ethernet schema
- Fix comments in qca8k-leds.c (at least -> at most)
(wrong GENMASK for led phy 0 and 4)
- Add review and ack tag from Pavel Machek
- Changes in Andrew patch:
- leds: Provide stubs for when CLASS_LED & NEW_LEDS are disabled
- Change LED_CLASS to NEW_LEDS for led_init_default_state_get()
- net: phy: Add a binding for PHY LEDs
- Add dependency on LED_CLASS
- Drop review tag from Michal Kubiak (patch modified)
Changes in new series v5:
- Rebase everything on top of net-next/main
- Add more info on LED probe fail for qca8k
- Drop some additional raw number and move to define in qca8k header
- Add additional info on LED mapping on qca8k regs
- Checks port number in qca8k switch port parse
- Changes in Andrew patch:
- Add additional patch for stubs when CLASS_LED disabled
- Drop CLASS_LED dependency for PHYLIB (to fix kbot errors reported)
Changes in new series v4:
- Changes in Andrew patch:
- net: phy: Add a binding for PHY LEDs:
- Rename phy_led: led_list to list
- Rename phy_device: led_list to leds
- Remove phy_leds_remove() since devm_ should do what is needed
- Fixup documentation for struct phy_led
- Fail probe on LED errors
- net: phy: phy_device: Call into the PHY driver to set LED brightness
- Moved phy_led::phydev from previous patch to here since it is first used here.
- net: phy: marvell: Implement led_blink_set()
- Use int instead of unsigned
- net: phy: marvell: Add software control of the LEDs
- Use int instead of unsigned
- Add depends on LED_CLASS for qca8k Kconfig
- Fix Makefile for qca8k as suggested
- Move qca8k_setup_led_ctrl to separate header
- Move Documentation from dsa-port to ethernet-controller
- Drop trailing . from Andrew patch fro consistency
Changes in new series v3:
- Move QCA8K_LEDS Kconfig option from tristate to bool
- Use new helper led_init_default_state_get for default-state in qca8k
- Drop cled_qca8k_brightness_get() as there isn't a good way to describe the mode the led is currently in
- Rework qca8k_led_brightness_get() to return true only when LED is set to always ON
Changes in new series v2:
- Add LEDs node for rb3011
- Fix rb3011 switch node unevaluated properties while running
make dtbs_check
- Fix a copypaste error in qca8k-leds.c for port 4 required shift
- Drop phy-handle usage for qca8k and use qca8k_port_to_phy()
- Add review tag from Andrew
- Add Christian Marangi SOB in each Andrew patch
- Add extra description for dsa-port stressing that PHY have no access and LED are controlled by the related MAC
- Add missing additionalProperties for dsa-port.yaml and ethernet-phy.yaml
Changes from the old v8 series:
- Drop linux,default-trigger set to netdev.
- Dropped every hw control related patch and implement only blink_set and brightness_set
- Add default-state to "keep" for each LED node example
Andrew Lunn (8):
leds: Provide stubs for when CLASS_LED & NEW_LEDS are disabled
net: phy: Add a binding for PHY LEDs
net: phy: phy_device: Call into the PHY driver to set LED brightness
net: phy: marvell: Add software control of the LEDs
net: phy: phy_device: Call into the PHY driver to set LED blinking
net: phy: marvell: Implement led_blink_set()
arm: mvebu: dt: Add PHY LED support for 370-rd WAN port
Documentation: LEDs: Describe good names for network LEDs
Christian Marangi (8):
net: dsa: qca8k: move qca8k_port_to_phy() to header
net: dsa: qca8k: add LEDs basic support
net: dsa: qca8k: add LEDs blink_set() support
dt-bindings: net: ethernet-controller: Document support for LEDs node
dt-bindings: net: dsa: qca8k: add LEDs definition example
ARM: dts: qcom: ipq8064-rb3011: Drop unevaluated properties in switch
nodes
ARM: dts: qcom: ipq8064-rb3011: Add Switch LED for each port
dt-bindings: net: phy: Document support for LEDs node
.../devicetree/bindings/net/dsa/qca8k.yaml | 22 ++ .../bindings/net/ethernet-controller.yaml | 35 +++ .../devicetree/bindings/net/ethernet-phy.yaml | 43 +++ Documentation/leds/well-known-leds.txt | 30 ++ arch/arm/boot/dts/armada-370-rd.dts | 12 + arch/arm/boot/dts/qcom-ipq8064-rb3011.dts | 124 +++++++- drivers/net/dsa/qca/Kconfig | 8 + drivers/net/dsa/qca/Makefile | 3 + drivers/net/dsa/qca/qca8k-8xxx.c | 20 +- drivers/net/dsa/qca/qca8k-leds.c | 277 ++++++++++++++++++ drivers/net/dsa/qca/qca8k.h | 74 +++++ drivers/net/dsa/qca/qca8k_leds.h | 16 + drivers/net/phy/Kconfig | 1 + drivers/net/phy/marvell.c | 81 ++++- drivers/net/phy/phy_device.c | 103 +++++++ include/linux/leds.h | 18 ++ include/linux/phy.h | 41 +++ 17 files changed, 884 insertions(+), 24 deletions(-) create mode 100644 drivers/net/dsa/qca/qca8k-leds.c create mode 100644 drivers/net/dsa/qca/qca8k_leds.h
Signature · 1 line
2.39.2
Christian Marangi
maintainerPATCH v7 1/16 net: dsa: qca8k: move qca8k_port_to_phy() to header
Move qca8k_port_to_phy() to qca8k header as it's useful for future reference in Switch LEDs module since the same logic is applied to get the right index of the switch port.
Make it inline as it's simple function that just decrease the port.
--- drivers/net/dsa/qca/qca8k-8xxx.c | 15 --------------- drivers/net/dsa/qca/qca8k.h | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 15 deletions(-)
drivers/net/dsa/qca/qca8k-8xxx.c +0 -15
@@ -772,21 +772,6 @@ qca8k_phy_eth_command(struct qca8k_priv *priv, bool read, int phy,return ret; } -static u32 -qca8k_port_to_phy (int port) -{ -/* From Andrew Lunn: -* Port 0 has no internal phy. -* Port 1 has an internal PHY at MDIO address 0. -* Port 2 has an internal PHY at MDIO address 1. -* ... -* Port 5 has an internal PHY at MDIO address 4. -* Port 6 has no internal PHY. -*/ - -return port -1 ; -} -static int qca8k_mdio_busy_wait (struct mii_bus *bus,u32 reg,u32 mask) {
drivers/net/dsa/qca/qca8k.h +14 -0
@@ -421,6 +421,20 @@ struct qca8k_fdb {u8 mac[6 ]; }; +static inline u32 qca8k_port_to_phy (int port) +{ +/* From Andrew Lunn: +* Port 0 has no internal phy. +* Port 1 has an internal PHY at MDIO address 0. +* Port 2 has an internal PHY at MDIO address 1. +* ... +* Port 5 has an internal PHY at MDIO address 4. +* Port 6 has no internal PHY. +*/ + +return port -1 ; +} +/* Common setup function */ extern const struct qca8k_mib_desc ar8327_mib[];extern const struct regmap_access_table qca8k_readable_table;
Signature · 1 line
2.39.2
Christian Marangi
maintainerPATCH v7 2/16 net: dsa: qca8k: add LEDs basic support
In reply to Christian MarangiAdd LEDs basic support for qca8k Switch Family by adding basic brightness_set() support.
Since these LEDs refelect port status, the default label is set to ":port". DT binding should describe the color and function of the LEDs using standard LEDs api.
Each LED always have the device name as prefix. The device name is composed from the mii bus id and the PHY addr resulting in example names like:
- qca8k-0.0:00:amber:lan
- qca8k-0.0:00:white:lan
- qca8k-0.0:01:amber:lan
- qca8k-0.0:01:white:lan
These LEDs supports only blocking variant of the brightness_set() function since they can sleep during access of the switch leds to set the brightness.
While at it add to the qca8k header file each mode defined by the Switch Documentation for future use.
--- drivers/net/dsa/qca/Kconfig | 8 ++ drivers/net/dsa/qca/Makefile | 3 + drivers/net/dsa/qca/qca8k-8xxx.c | 5 + drivers/net/dsa/qca/qca8k-leds.c | 239 +++++++++++++++++++++++++++++++ drivers/net/dsa/qca/qca8k.h | 60 ++++++++ drivers/net/dsa/qca/qca8k_leds.h | 16 +++ 6 files changed, 331 insertions(+) create mode 100644 drivers/net/dsa/qca/qca8k-leds.c create mode 100644 drivers/net/dsa/qca/qca8k_leds.h
drivers/net/dsa/qca/Kconfig +8 -0
@@ -15,3 +15,11 @@ config NET_DSA_QCA8K help This enables support for the Qualcomm Atheros QCA8K Ethernet switch chips. + +config NET_DSA_QCA8K_LEDS_SUPPORT + bool "Qualcomm Atheros QCA8K Ethernet switch family LEDs support" + depends on NET_DSA_QCA8K + depends on LEDS_CLASS + help + This enabled support for LEDs present on the Qualcomm Atheros + QCA8K Ethernet switch chips.
drivers/net/dsa/qca/Makefile +3 -0
@@ -2,3 +2,6 @@ obj-$(CONFIG_NET_DSA_AR9331) += ar9331.o obj-$(CONFIG_NET_DSA_QCA8K) += qca8k.o qca8k-y += qca8k-common.o qca8k-8xxx.o +ifdef CONFIG_NET_DSA_QCA8K_LEDS_SUPPORT +qca8k-y += qca8k-leds.o +endif
drivers/net/dsa/qca/qca8k-8xxx.c +5 -0
@@ -22,6 +22,7 @@#include <linux/dsa/tag_qca.h> #include "qca8k.h" +#include "qca8k_leds.h" static void qca8k_split_addr (u32 regaddr,u16 *r1,u16 *r2,u16 *page)
@@ -1782,6 +1783,10 @@ qca8k_setup(struct dsa_switch *ds)if (ret)return ret; + ret =qca8k_setup_led_ctrl (priv); +if (ret) +return ret; +qca8k_setup_pcs (priv, &priv->pcs_port_0,0 );qca8k_setup_pcs (priv, &priv->pcs_port_6,6 );
drivers/net/dsa/qca/qca8k-leds.c new file +239 -0
239 lines not on this page · raw message
drivers/net/dsa/qca/qca8k.h +60 -0
84 lines not on this page · raw message
drivers/net/dsa/qca/qca8k_leds.h new file +16 -0
@@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef __QCA8K_LEDS_H +#define __QCA8K_LEDS_H + +/* Leds Support function */ +#ifdef CONFIG_NET_DSA_QCA8K_LEDS_SUPPORT +int qca8k_setup_led_ctrl (struct qca8k_priv *priv); +#else +static inline int qca8k_setup_led_ctrl (struct qca8k_priv *priv) +{ +return 0 ; +} +#endif + +#endif /* __QCA8K_LEDS_H */
Signature · 1 line
2.39.2
Re: [net-next PATCH v7 02/16] net: dsa: qca8k: add LEDs basic support
Quoted 14 lines · Christian Marangi
Add LEDs basic support for qca8k Switch Family by adding basic
brightness_set()support.Since these LEDs refelect port status, the default label is set to ":port". DT binding should describe the color and function of the LEDs using standard LEDs api.
Each LED always have the device name as prefix. The device name is composed from the mii bus id and the PHY addr resulting in example names like:
- qca8k-0.0:00:amber:lan
- qca8k-0.0:00:white:lan
- qca8k-0.0:01:amber:lan
- qca8k-0.0:01:white:lan
Quoted 8 lines
These LEDs supports only blocking variant of the
brightness_set()function since they can sleep during access of the switch leds to set the brightness.While at it add to the qca8k header file each mode defined by the Switch Documentation for future use.
Signed-off-by Christian Marangi <[email protected]>
Signature · 1 line
Florian
Christian Marangi
maintainerPATCH v7 3/16 net: dsa: qca8k: add LEDs blink_set() support
In reply to Christian MarangiAdd LEDs blink_set() support to qca8k Switch Family. These LEDs support hw accellerated blinking at a fixed rate of 4Hz.
Reject any other value since not supported by the LEDs switch.
--- drivers/net/dsa/qca/qca8k-leds.c | 38 ++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+)
drivers/net/dsa/qca/qca8k-leds.c +38 -0
@@ -127,6 +127,43 @@ qca8k_led_brightness_get(struct qca8k_led *led)return val ==QCA8K_LED_ALWAYS_ON ; } +static int +qca8k_cled_blink_set (struct led_classdev *ldev, +unsigned long *delay_on, +unsigned long *delay_off) +{ + struct qca8k_led *led = container_of(ldev, struct qca8k_led, cdev); +u32 mask, val =QCA8K_LED_ALWAYS_BLINK_4HZ ; +struct qca8k_led_pattern_en reg_info; +struct qca8k_priv *priv = led->priv; + +if (*delay_on ==0 && *delay_off ==0 ) { + *delay_on =125 ; + *delay_off =125 ; + } + +if (*delay_on !=125 || *delay_off !=125 ) { +/* The hardware only supports blinking at 4Hz. Fall back +* to software implementation in other cases. +*/ +return -EINVAL ; + } + +qca8k_get_enable_led_reg (led->port_num, led->led_num, ®_info); + +if (led->port_num ==0 || led->port_num ==4 ) { + mask =QCA8K_LED_PATTERN_EN_MASK ; + val <<=QCA8K_LED_PATTERN_EN_SHIFT ; + }else { + mask =QCA8K_LED_PHY123_PATTERN_EN_MASK ; + } + +regmap_update_bits (priv->regmap, reg_info.reg, mask << reg_info.shift, + val << reg_info.shift); + +return 0 ; +} +static int qca8k_parse_port_leds (struct qca8k_priv *priv,struct fwnode_handle *port,int port_num) {
@@ -186,6 +223,7 @@ qca8k_parse_port_leds(struct qca8k_priv *priv, struct fwnode_handle *port, int p port_led->cdev.max_brightness =1 ; port_led->cdev.brightness_set_blocking = qca8k_cled_brightness_set_blocking; + port_led->cdev.blink_set = qca8k_cled_blink_set; init_data.default_label =":port" ; init_data.fwnode = led; init_data.devname_mandatory = true;
Signature · 1 line
2.39.2
Christian Marangi
maintainerPATCH v7 4/16 leds: Provide stubs for when CLASS_LED & NEW_LEDS are disabled
In reply to Christian MarangiFrom: Andrew Lunn <[email protected]>
Provide stubs for devm_led_classdev_register_ext() and led_init_default_state_get() so that LED drivers embedded within other drivers such as PHYs and Ethernet switches still build when LEDS_CLASS or NEW_LEDS are disabled. This also helps with Kconfig dependencies, which are somewhat hairy for phylib and mdio and only get worse when adding a dependency on LED_CLASS.
--- include/linux/leds.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
include/linux/leds.h +18 -0
@@ -82,7 +82,15 @@ struct led_init_data {bool devname_mandatory; }; +#if IS_ENABLED (CONFIG_NEW_LEDS )enum led_default_state led_init_default_state_get (struct fwnode_handle *fwnode); +#else +static inline enum led_default_state +led_init_default_state_get (struct fwnode_handle *fwnode) +{ +return LEDS_DEFSTATE_OFF ; +} +#endif struct led_hw_trigger_type {int dummy;
@@ -217,9 +225,19 @@ static inline int led_classdev_register(struct device *parent,return led_classdev_register_ext (parent, led_cdev,NULL ); } +#if IS_ENABLED (CONFIG_LEDS_CLASS )int devm_led_classdev_register_ext (struct device *parent,struct led_classdev *led_cdev,struct led_init_data *init_data); +#else +static inline int +devm_led_classdev_register_ext (struct device *parent, +struct led_classdev *led_cdev, +struct led_init_data *init_data) +{ +return 0 ; +} +#endif static inline int devm_led_classdev_register (struct device *parent,struct led_classdev *led_cdev)
Signature · 1 line
2.39.2
Christian Marangi
maintainerPATCH v7 5/16 net: phy: Add a binding for PHY LEDs
In reply to Christian MarangiFrom: Andrew Lunn <[email protected]>
Define common binding parsing for all PHY drivers with LEDs using phylib. Parse the DT as part of the phy_probe and add LEDs to the linux LED class infrastructure. For the moment, provide a dummy brightness function, which will later be replaced with a call into the PHY driver. This allows testing since the LED core might otherwise reject an LED whose brightness cannot be set.
Add a dependency on LED_CLASS. It either needs to be built in, or not enabled, since a modular build can result in linker errors.
--- drivers/net/phy/Kconfig | 1 + drivers/net/phy/phy_device.c | 76 ++++++++++++++++++++++++++++++++++++ include/linux/phy.h | 16 ++++++++ 3 files changed, 93 insertions(+)
drivers/net/phy/Kconfig +1 -0
@@ -18,6 +18,7 @@ menuconfig PHYLIB depends on NETDEVICES select MDIO_DEVICE select MDIO_DEVRES + depends on LEDS_CLASS || LEDS_CLASS=n help Ethernet controllers are usually attached to PHY devices. This option provides infrastructure for
drivers/net/phy/phy_device.c +76 -0
104 lines not on this page · raw message
include/linux/phy.h +16 -0
@@ -14,6 +14,7 @@#include <linux/compiler.h> #include <linux/spinlock.h> #include <linux/ethtool.h> +#include <linux/leds.h> #include <linux/linkmode.h> #include <linux/netlink.h> #include <linux/mdio.h>
@@ -600,6 +601,7 @@ struct macsec_ops;* @phy_num_led_triggers: Number of triggers in @phy_led_triggers * @led_link_trigger: LED trigger for link up/down * @last_triggered: last LED trigger for link speed +* @leds: list of PHY LED structures * @master_slave_set: User requested master/slave configuration * @master_slave_get: Current master/slave advertisement * @master_slave_state: Current master/slave configuration
@@ -699,6 +701,7 @@ struct phy_device {struct phy_led_trigger *led_link_trigger;#endif +struct list_head leds;/* * Interrupt number for this PHY
@@ -834,6 +837,19 @@ struct phy_plca_status {bool pst; }; +/** +* struct phy_led: An LED driven by the PHY +* +* @list: List of LEDs +* @led_cdev: Standard LED class structure +* @index: Number of the LED +*/ +struct phy_led { +struct list_head list; +struct led_classdev led_cdev; +u8 index; +}; +/** * struct phy_driver - Driver structure for a particular PHY type *
Signature · 1 line
2.39.2
Re: [net-next PATCH v7 05/16] net: phy: Add a binding for PHY LEDs
Quoted 9 lines · Christian Marangi
From: Andrew Lunn <[email protected]>
Define common binding parsing for all PHY drivers with LEDs using phylib. Parse the DT as part of the
phy_probeand add LEDs to the linux LED class infrastructure. For the moment, provide a dummy brightness function, which will later be replaced with a call into the PHY driver. This allows testing since the LED core might otherwise reject an LED whose brightness cannot be set.
Quoted 5 lines
Add a dependency on
LED_CLASS. It either needs to be built in, or not enabled, since a modular build can result in linker errors.Signed-off-by Andrew Lunn <[email protected]>Signed-off-by Christian Marangi <[email protected]>
Signature · 1 line
Florian
Christian Marangi
maintainerPATCH v7 6/16 net: phy: phy_device: Call into the PHY driver to set LED brightness
In reply to Christian MarangiFrom: Andrew Lunn <[email protected]>
Linux LEDs can be software controlled via the brightness file in /sys. LED drivers need to implement a brightness_set function which the core will call. Implement an intermediary in phy_device, which will call into the phy driver if it implements the necessary function.
--- drivers/net/phy/phy_device.c | 15 ++++++++++++--- include/linux/phy.h | 13 +++++++++++++ 2 files changed, 25 insertions(+), 3 deletions(-)
drivers/net/phy/phy_device.c +12 -3
@@ -2991,11 +2991,18 @@ static bool phy_drv_supports_irq(struct phy_driver *phydrv)return phydrv->config_intr && phydrv->handle_interrupt; } -/* Dummy implementation until calls into PHY driver are added */ static int phy_led_set_brightness (struct led_classdev *led_cdev,enum led_brightness value) { -return 0 ; +struct phy_led *phyled =to_phy_led (led_cdev); +struct phy_device *phydev = phyled->phydev; +int err; + +mutex_lock (&phydev->lock); + err = phydev->drv->led_brightness_set (phydev, phyled->index, value); +mutex_unlock (&phydev->lock); + +return err; } static int of_phy_led(struct phy_device *phydev,
@@ -3012,12 +3019,14 @@ static int of_phy_led(struct phy_device *phydev,return -ENOMEM ; cdev = &phyled->led_cdev; + phyled->phydev = phydev; err =of_property_read_u8 (led,"reg" , &phyled->index);if (err)return err; - cdev->brightness_set_blocking = phy_led_set_brightness; +if (phydev->drv->led_brightness_set) + cdev->brightness_set_blocking = phy_led_set_brightness; cdev->max_brightness =1 ; init_data.devicename =dev_name (&phydev->mdio.dev); init_data.fwnode =of_fwnode_handle (led);
include/linux/phy.h +13 -0
@@ -841,15 +841,19 @@ struct phy_plca_status {* struct phy_led: An LED driven by the PHY * * @list: List of LEDs +* @phydev: PHY this LED is attached to * @led_cdev: Standard LED class structure * @index: Number of the LED */ struct phy_led {struct list_head list; +struct phy_device *phydev;struct led_classdev led_cdev;u8 index; }; +#define to_phy_led (d) container_of(d, struct phy_led, led_cdev) +/** * struct phy_driver - Driver structure for a particular PHY type *
@@ -1072,6 +1076,15 @@ struct phy_driver {/** @get_plca_status: Return the current PLCA status info */ int (*get_plca_status)(struct phy_device *dev,struct phy_plca_status *plca_st); + +/** +* @led_brightness_set: Set a PHY LED brightness. Index +* indicates which of the PHYs led should be set. Value +* follows the standard LED class meaning, e.g. LED_OFF, +* LED_HALF, LED_FULL. +*/ +int (*led_brightness_set)(struct phy_device *dev, +u8 index,enum led_brightness value); };#define to_phy_driver (d) container_of(to_mdio_common_driver(d), \ struct phy_driver, mdiodrv)
Signature · 7 lines
2.39.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Christian Marangi
maintainerPATCH v7 7/16 net: phy: marvell: Add software control of the LEDs
In reply to Christian MarangiFrom: Andrew Lunn <[email protected]>
Add a brightness function, so the LEDs can be controlled from software using the standard Linux LED infrastructure.
--- drivers/net/phy/marvell.c | 45 ++++++++++++++++++++++++++++++++++----- 1 file changed, 40 insertions(+), 5 deletions(-)
drivers/net/phy/marvell.c +40 -5
@@ -144,11 +144,13 @@/* WOL Event Interrupt Enable */ #define MII_88E1318S_PHY_CSIER_WOL_EIE BIT(7) -/* LED Timer Control Register */ -#define MII_88E1318S_PHY_LED_TCR 0x12 -#define MII_88E1318S_PHY_LED_TCR_FORCE_INT BIT(15) -#define MII_88E1318S_PHY_LED_TCR_INTn_ENABLE BIT(7) -#define MII_88E1318S_PHY_LED_TCR_INT_ACTIVE_LOW BIT(11) +#define MII_88E1318S_PHY_LED_FUNC 0x10 +#define MII_88E1318S_PHY_LED_FUNC_OFF (0x8) +#define MII_88E1318S_PHY_LED_FUNC_ON (0x9) +#define MII_88E1318S_PHY_LED_TCR 0x12 +#define MII_88E1318S_PHY_LED_TCR_FORCE_INT BIT(15) +#define MII_88E1318S_PHY_LED_TCR_INTn_ENABLE BIT(7) +#define MII_88E1318S_PHY_LED_TCR_INT_ACTIVE_LOW BIT(11)/* Magic Packet MAC address registers */ #define MII_88E1318S_PHY_MAGIC_PACKET_WORD2 0x17
@@ -2832,6 +2834,34 @@ static int marvell_hwmon_probe(struct phy_device *phydev) }#endif +static int m88e1318_led_brightness_set (struct phy_device *phydev, +u8 index,enum led_brightness value) +{ +int reg; + + reg =phy_read_paged (phydev,MII_MARVELL_LED_PAGE , +MII_88E1318S_PHY_LED_FUNC ); +if (reg <0 ) +return reg; + +switch (index) { +case 0 : +case 1 : +case 2 : + reg &= ~(0xf << (4 * index)); +if (value ==LED_OFF ) + reg |=MII_88E1318S_PHY_LED_FUNC_OFF << (4 * index); +else + reg |=MII_88E1318S_PHY_LED_FUNC_ON << (4 * index); +break ; +default : +return -EINVAL ; + } + +return phy_write_paged (phydev,MII_MARVELL_LED_PAGE , +MII_88E1318S_PHY_LED_FUNC , reg); +} +static int marvell_probe (struct phy_device *phydev) {struct marvell_priv *priv;
@@ -3081,6 +3111,7 @@ static struct phy_driver marvell_drivers[] = { .get_sset_count = marvell_get_sset_count, .get_strings = marvell_get_strings, .get_stats = marvell_get_stats, + .led_brightness_set = m88e1318_led_brightness_set, }, { .phy_id = MARVELL_PHY_ID_88E1145,
@@ -3187,6 +3218,7 @@ static struct phy_driver marvell_drivers[] = { .cable_test_start = marvell_vct7_cable_test_start, .cable_test_tdr_start = marvell_vct5_cable_test_tdr_start, .cable_test_get_status = marvell_vct7_cable_test_get_status, + .led_brightness_set = m88e1318_led_brightness_set, }, { .phy_id = MARVELL_PHY_ID_88E1540,
@@ -3213,6 +3245,7 @@ static struct phy_driver marvell_drivers[] = { .cable_test_start = marvell_vct7_cable_test_start, .cable_test_tdr_start = marvell_vct5_cable_test_tdr_start, .cable_test_get_status = marvell_vct7_cable_test_get_status, + .led_brightness_set = m88e1318_led_brightness_set, }, { .phy_id = MARVELL_PHY_ID_88E1545,
@@ -3239,6 +3272,7 @@ static struct phy_driver marvell_drivers[] = { .cable_test_start = marvell_vct7_cable_test_start, .cable_test_tdr_start = marvell_vct5_cable_test_tdr_start, .cable_test_get_status = marvell_vct7_cable_test_get_status, + .led_brightness_set = m88e1318_led_brightness_set, }, { .phy_id = MARVELL_PHY_ID_88E3016,
@@ -3380,6 +3414,7 @@ static struct phy_driver marvell_drivers[] = { .get_stats = marvell_get_stats, .get_tunable = m88e1540_get_tunable, .set_tunable = m88e1540_set_tunable, + .led_brightness_set = m88e1318_led_brightness_set, }, };
Signature · 7 lines
2.39.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Christian Marangi
maintainerPATCH v7 8/16 net: phy: phy_device: Call into the PHY driver to set LED blinking
In reply to Christian MarangiFrom: Andrew Lunn <[email protected]>
Linux LEDs can be requested to perform hardware accelerated blinking. Pass this to the PHY driver, if it implements the op.
--- drivers/net/phy/phy_device.c | 18 ++++++++++++++++++ include/linux/phy.h | 12 ++++++++++++ 2 files changed, 30 insertions(+)
drivers/net/phy/phy_device.c +18 -0
@@ -3005,6 +3005,22 @@ static int phy_led_set_brightness(struct led_classdev *led_cdev,return err; } +static int phy_led_blink_set (struct led_classdev *led_cdev, +unsigned long *delay_on, +unsigned long *delay_off) +{ +struct phy_led *phyled =to_phy_led (led_cdev); +struct phy_device *phydev = phyled->phydev; +int err; + +mutex_lock (&phydev->lock); + err = phydev->drv->led_blink_set (phydev, phyled->index, + delay_on, delay_off); +mutex_unlock (&phydev->lock); + +return err; +} +static int of_phy_led (struct phy_device *phydev,struct device_node *led) {
@@ -3027,6 +3043,8 @@ static int of_phy_led(struct phy_device *phydev,if (phydev->drv->led_brightness_set) cdev->brightness_set_blocking = phy_led_set_brightness; +if (phydev->drv->led_blink_set) + cdev->blink_set = phy_led_blink_set; cdev->max_brightness =1 ; init_data.devicename =dev_name (&phydev->mdio.dev); init_data.fwnode =of_fwnode_handle (led);
include/linux/phy.h +12 -0
@@ -1085,6 +1085,18 @@ struct phy_driver {*/ int (*led_brightness_set)(struct phy_device *dev,u8 index,enum led_brightness value); + +/** +* @led_blink_set: Set a PHY LED brightness. Index indicates +* which of the PHYs led should be configured to blink. Delays +* are in milliseconds and if both are zero then a sensible +* default should be chosen. The call should adjust the +* timings in that case and if it can't match the values +* specified exactly. +*/ +int (*led_blink_set)(struct phy_device *dev,u8 index, +unsigned long *delay_on, +unsigned long *delay_off); };#define to_phy_driver (d) container_of(to_mdio_common_driver(d), \ struct phy_driver, mdiodrv)
Signature · 7 lines
2.39.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Christian Marangi
maintainerPATCH v7 9/16 net: phy: marvell: Implement led_blink_set()
In reply to Christian MarangiFrom: Andrew Lunn <[email protected]>
The Marvell PHY can blink the LEDs, simple on/off. All LEDs blink at the same rate, and the reset default is 84ms per blink, which is around 12Hz.
--- drivers/net/phy/marvell.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+)
drivers/net/phy/marvell.c +36 -0
@@ -147,6 +147,8 @@#define MII_88E1318S_PHY_LED_FUNC 0x10#define MII_88E1318S_PHY_LED_FUNC_OFF (0x8)#define MII_88E1318S_PHY_LED_FUNC_ON (0x9) +#define MII_88E1318S_PHY_LED_FUNC_HI_Z (0xa) +#define MII_88E1318S_PHY_LED_FUNC_BLINK (0xb)#define MII_88E1318S_PHY_LED_TCR 0x12#define MII_88E1318S_PHY_LED_TCR_FORCE_INT BIT(15)#define MII_88E1318S_PHY_LED_TCR_INTn_ENABLE BIT(7)
@@ -2862,6 +2864,35 @@ static int m88e1318_led_brightness_set(struct phy_device *phydev, MII_88E1318S_PHY_LED_FUNC, reg); } +static int m88e1318_led_blink_set (struct phy_device *phydev,u8 index, +unsigned long *delay_on, +unsigned long *delay_off) +{ +int reg; + + reg =phy_read_paged (phydev,MII_MARVELL_LED_PAGE , +MII_88E1318S_PHY_LED_FUNC ); +if (reg <0 ) +return reg; + +switch (index) { +case 0 : +case 1 : +case 2 : + reg &= ~(0xf << (4 * index)); + reg |=MII_88E1318S_PHY_LED_FUNC_BLINK << (4 * index); +/* Reset default is 84ms */ + *delay_on =84 /2 ; + *delay_off =84 /2 ; +break ; +default : +return -EINVAL ; + } + +return phy_write_paged (phydev,MII_MARVELL_LED_PAGE , +MII_88E1318S_PHY_LED_FUNC , reg); +} +static int marvell_probe (struct phy_device *phydev) {struct marvell_priv *priv;
@@ -3112,6 +3143,7 @@ static struct phy_driver marvell_drivers[] = { .get_strings = marvell_get_strings, .get_stats = marvell_get_stats, .led_brightness_set = m88e1318_led_brightness_set, + .led_blink_set = m88e1318_led_blink_set, }, { .phy_id = MARVELL_PHY_ID_88E1145,
@@ -3219,6 +3251,7 @@ static struct phy_driver marvell_drivers[] = { .cable_test_tdr_start = marvell_vct5_cable_test_tdr_start, .cable_test_get_status = marvell_vct7_cable_test_get_status, .led_brightness_set = m88e1318_led_brightness_set, + .led_blink_set = m88e1318_led_blink_set, }, { .phy_id = MARVELL_PHY_ID_88E1540,
@@ -3246,6 +3279,7 @@ static struct phy_driver marvell_drivers[] = { .cable_test_tdr_start = marvell_vct5_cable_test_tdr_start, .cable_test_get_status = marvell_vct7_cable_test_get_status, .led_brightness_set = m88e1318_led_brightness_set, + .led_blink_set = m88e1318_led_blink_set, }, { .phy_id = MARVELL_PHY_ID_88E1545,
@@ -3273,6 +3307,7 @@ static struct phy_driver marvell_drivers[] = { .cable_test_tdr_start = marvell_vct5_cable_test_tdr_start, .cable_test_get_status = marvell_vct7_cable_test_get_status, .led_brightness_set = m88e1318_led_brightness_set, + .led_blink_set = m88e1318_led_blink_set, }, { .phy_id = MARVELL_PHY_ID_88E3016,
@@ -3415,6 +3450,7 @@ static struct phy_driver marvell_drivers[] = { .get_tunable = m88e1540_get_tunable, .set_tunable = m88e1540_set_tunable, .led_brightness_set = m88e1318_led_brightness_set, + .led_blink_set = m88e1318_led_blink_set, }, };
Signature · 7 lines
2.39.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Christian Marangi
maintainerPATCH v7 10/16 dt-bindings: net: ethernet-controller: Document support for LEDs node
In reply to Christian MarangiDocument support for LEDs node in ethernet-controller. Ethernet Controller may support different LEDs that can be configured for different operation like blinking on traffic event or port link.
Also add some Documentation to describe the difference of these nodes compared to PHY LEDs, since ethernet-controller LEDs are controllable by the ethernet controller regs and the possible intergated PHY doesn't have control on them.
--- .../bindings/net/ethernet-controller.yaml | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+)
Documentation/devicetree/bindings/net/ethernet-controller.yaml +35 -0
@@ -222,6 +222,41 @@ properties: required: - speed + leds: + description: + Describes the LEDs associated by Ethernet Controller. + These LEDs are not integrated in the PHY and PHY doesn't have any + control on them. Ethernet Controller regs are used to control + these defined LEDs. + + type: object + + properties: + '#address-cells': + const: 1 + + '#size-cells': + const: 0 + + patternProperties: + '^led@[a-f0-9]+$': + $ref: /schemas/leds/common.yaml# + + properties: + reg: + maxItems: 1 + description: + This define the LED index in the PHY or the MAC. It's really + driver dependent and required for ports that define multiple + LED for the same port. + + required: + - reg + + unevaluatedProperties: false + + additionalProperties: false + dependencies: pcs-handle-names: [pcs-handle]
Signature · 1 line
2.39.2
Christian Marangi
maintainerPATCH v7 11/16 dt-bindings: net: dsa: qca8k: add LEDs definition example
In reply to Christian MarangiAdd LEDs definition example for qca8k Switch Family to describe how they should be defined for a correct usage.
--- .../devicetree/bindings/net/dsa/qca8k.yaml | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+)
Documentation/devicetree/bindings/net/dsa/qca8k.yaml +22 -0
@@ -18,6 +18,8 @@ description: PHY it is connected to. In this config, an internal mdio-bus is registered and the MDIO master is used for communication. Mixed external and internal mdio-bus configurations are not supported by the hardware. + Each phy has at most 3 LEDs connected and can be declared + using the standard LEDs structure. properties: compatible:
@@ -117,6 +119,7 @@ unevaluatedProperties: false examples: - | #include <dt-bindings/gpio/gpio.h> + #include <dt-bindings/leds/common.h> mdio { #address-cells = <1>;
@@ -226,6 +229,25 @@ examples: label = "lan1"; phy-mode = "internal"; phy-handle = <&internal_phy_port1>; + + leds { + #address-cells = <1>; + #size-cells = <0>; + + led@0 { + reg = <0>; + color = <LED_COLOR_ID_WHITE>; + function = LED_FUNCTION_LAN; + default-state = "keep"; + }; + + led@1 { + reg = <1>; + color = <LED_COLOR_ID_AMBER>; + function = LED_FUNCTION_LAN; + default-state = "keep"; + }; + }; }; port@2 {
Signature · 7 lines
2.39.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Christian Marangi
maintainerPATCH v7 12/16 ARM: dts: qcom: ipq8064-rb3011: Drop unevaluated properties in switch nodes
In reply to Christian MarangiIPQ8064 MikroTik RB3011UiAS-RM DT have currently unevaluted properties in the 2 switch nodes. The bindings #address-cells and #size-cells are redundant and cause warning for 'Unevaluated properties are not allowed'.
Drop these bindings to mute these warning as they should not be there from the start.
--- arch/arm/boot/dts/qcom-ipq8064-rb3011.dts | 4 ---- 1 file changed, 4 deletions(-)
arch/arm/boot/dts/qcom-ipq8064-rb3011.dts +0 -4
@@ -38,8 +38,6 @@ mdio0: mdio-0 { switch0: switch@10 { compatible = "qca,qca8337"; - #address-cells = <1>; - #size-cells = <0>; dsa,member = <0 0>;
@@ -105,8 +103,6 @@ mdio1: mdio-1 { switch1: switch@14 { compatible = "qca,qca8337"; - #address-cells = <1>; - #size-cells = <0>; dsa,member = <1 0>;
Signature · 7 lines
2.39.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Christian Marangi
maintainerPATCH v7 13/16 ARM: dts: qcom: ipq8064-rb3011: Add Switch LED for each port
In reply to Christian MarangiAdd Switch LED for each port for MikroTik RB3011UiAS-RM.
MikroTik RB3011UiAS-RM is a 10 port device with 2 qca8337 switch chips connected.
It was discovered that in the hardware design all 3 Switch LED trace of the related port is connected to the same LED. This was discovered by setting to 'always on' the related led in the switch regs and noticing that all 3 LED for the specific port (for example for port 1) cause the connected LED for port 1 to turn on. As an extra test we tried enabling 2 different LED for the port resulting in the LED turned off only if every led in the reg was off.
Aside from this funny and strange hardware implementation, the device itself have one green LED for each port, resulting in 10 green LED one for each of the 10 supported port.
--- arch/arm/boot/dts/qcom-ipq8064-rb3011.dts | 120 ++++++++++++++++++++++ 1 file changed, 120 insertions(+)
arch/arm/boot/dts/qcom-ipq8064-rb3011.dts +120 -0
@@ -65,26 +65,86 @@ fixed-link { port@1 { reg = <1>; label = "sw1"; + + leds { + #address-cells = <1>; + #size-cells = <0>; + + led@0 { + reg = <0>; + color = <LED_COLOR_ID_GREEN>; + function = LED_FUNCTION_LAN; + default-state = "keep"; + }; + }; }; port@2 { reg = <2>; label = "sw2"; + + leds { + #address-cells = <1>; + #size-cells = <0>; + + led@0 { + reg = <0>; + color = <LED_COLOR_ID_GREEN>; + function = LED_FUNCTION_LAN; + default-state = "keep"; + }; + }; }; port@3 { reg = <3>; label = "sw3"; + + leds { + #address-cells = <1>; + #size-cells = <0>; + + led@0 { + reg = <0>; + color = <LED_COLOR_ID_GREEN>; + function = LED_FUNCTION_LAN; + default-state = "keep"; + }; + }; }; port@4 { reg = <4>; label = "sw4"; + + leds { + #address-cells = <1>; + #size-cells = <0>; + + led@0 { + reg = <0>; + color = <LED_COLOR_ID_GREEN>; + function = LED_FUNCTION_LAN; + default-state = "keep"; + }; + }; }; port@5 { reg = <5>; label = "sw5"; + + leds { + #address-cells = <1>; + #size-cells = <0>; + + led@0 { + reg = <0>; + color = <LED_COLOR_ID_GREEN>; + function = LED_FUNCTION_LAN; + default-state = "keep"; + }; + }; }; }; };
@@ -130,26 +190,86 @@ fixed-link { port@1 { reg = <1>; label = "sw6"; + + leds { + #address-cells = <1>; + #size-cells = <0>; + + led@0 { + reg = <0>; + color = <LED_COLOR_ID_GREEN>; + function = LED_FUNCTION_LAN; + default-state = "keep"; + }; + }; }; port@2 { reg = <2>; label = "sw7"; + + leds { + #address-cells = <1>; + #size-cells = <0>; + + led@0 { + reg = <0>; + color = <LED_COLOR_ID_GREEN>; + function = LED_FUNCTION_LAN; + default-state = "keep"; + }; + }; }; port@3 { reg = <3>; label = "sw8"; + + leds { + #address-cells = <1>; + #size-cells = <0>; + + led@0 { + reg = <0>; + color = <LED_COLOR_ID_GREEN>; + function = LED_FUNCTION_LAN; + default-state = "keep"; + }; + }; }; port@4 { reg = <4>; label = "sw9"; + + leds { + #address-cells = <1>; + #size-cells = <0>; + + led@0 { + reg = <0>; + color = <LED_COLOR_ID_GREEN>; + function = LED_FUNCTION_LAN; + default-state = "keep"; + }; + }; }; port@5 { reg = <5>; label = "sw10"; + + leds { + #address-cells = <1>; + #size-cells = <0>; + + led@0 { + reg = <0>; + color = <LED_COLOR_ID_GREEN>; + function = LED_FUNCTION_LAN; + default-state = "keep"; + }; + }; }; }; };
Signature · 1 line
2.39.2
Re: [net-next PATCH v7 13/16] ARM: dts: qcom: ipq8064-rb3011: Add Switch LED for each port
Quoted 13 lines · Christian Marangi
Add Switch LED for each port for MikroTik RB3011UiAS-RM.
MikroTik RB3011UiAS-RM is a 10 port device with 2 qca8337 switch chips connected.
It was discovered that in the hardware design all 3 Switch LED trace of the related port is connected to the same LED. This was discovered by setting to 'always on' the related led in the switch regs and noticing that all 3 LED for the specific port (for example for port 1) cause the connected LED for port 1 to turn on. As an extra test we tried enabling 2 different LED for the port resulting in the LED turned off only if every led in the reg was off.
Quoted 8 lines
Aside from this funny and strange hardware implementation, the device itself have one green LED for each port, resulting in 10 green LED one for each of the 10 supported port.
Cc Jonathan McDowell <[email protected]>Signed-off-by Christian Marangi <[email protected]>--- arch/arm/boot/dts/qcom-ipq8064-rb3011.dts | 120 ++++++++++++++++++++++
Please do not send the DTS patches to the net-next, but to the Qualcomm SoC maintainers. The DTS must not be mixed with driver code.
Best regards,
Krzysztof
Christian Marangi
maintainerRe: [net-next PATCH v7 13/16] ARM: dts: qcom: ipq8064-rb3011: Add Switch LED for each port
Quoted 18 lines · Krzysztof Kozlowski
Quoted 17 lines · Christian Marangi
Add Switch LED for each port for MikroTik RB3011UiAS-RM.
MikroTik RB3011UiAS-RM is a 10 port device with 2 qca8337 switch chips connected.
It was discovered that in the hardware design all 3 Switch LED trace of the related port is connected to the same LED. This was discovered by setting to 'always on' the related led in the switch regs and noticing that all 3 LED for the specific port (for example for port 1) cause the connected LED for port 1 to turn on. As an extra test we tried enabling 2 different LED for the port resulting in the LED turned off only if every led in the reg was off.
Aside from this funny and strange hardware implementation, the device itself have one green LED for each port, resulting in 10 green LED one for each of the 10 supported port.
Quoted 8 lines
Quoted 4 lines
Cc Jonathan McDowell <[email protected]>Signed-off-by Christian Marangi <[email protected]>--- arch/arm/boot/dts/qcom-ipq8064-rb3011.dts | 120 ++++++++++++++++++++++Please do not send the DTS patches to the net-next, but to the Qualcomm SoC maintainers. The DTS must not be mixed with driver code.
Hi,
sorry for the mess, it was asked to give an user of the LED feature for qca8k so I was a bit confused on where to include it and at the end I decided to put it in this series.
What was the correct way? 2 different series and reference the DT one in the net-next? (or not targetting net-next at all?)
Signature · 1 line
Ansuel
Re: [net-next PATCH v7 13/16] ARM: dts: qcom: ipq8064-rb3011: Add Switch LED for each port
Quoted 28 lines · Christian Marangi
Quoted 18 lines · Krzysztof Kozlowski
Quoted 17 lines · Christian Marangi
Add Switch LED for each port for MikroTik RB3011UiAS-RM.
MikroTik RB3011UiAS-RM is a 10 port device with 2 qca8337 switch chips connected.
It was discovered that in the hardware design all 3 Switch LED trace of the related port is connected to the same LED. This was discovered by setting to 'always on' the related led in the switch regs and noticing that all 3 LED for the specific port (for example for port 1) cause the connected LED for port 1 to turn on. As an extra test we tried enabling 2 different LED for the port resulting in the LED turned off only if every led in the reg was off.
Aside from this funny and strange hardware implementation, the device itself have one green LED for each port, resulting in 10 green LED one for each of the 10 supported port.
Quoted 8 lines
Quoted 4 lines
Cc Jonathan McDowell <[email protected]>Signed-off-by Christian Marangi <[email protected]>--- arch/arm/boot/dts/qcom-ipq8064-rb3011.dts | 120 ++++++++++++++++++++++Please do not send the DTS patches to the net-next, but to the Qualcomm SoC maintainers. The DTS must not be mixed with driver code.
Quoted 8 lines
Hi,
sorry for the mess, it was asked to give an user of the LED feature for qca8k so I was a bit confused on where to include it and at the end I decided to put it in this series.
What was the correct way? 2 different series and reference the DT one in the net-next? (or not targetting net-next at all?)
Send a separate patchset and provide a lore URL to it in the bindings (or vice versa).
Best regards,
Krzysztof
Christian Marangi
maintainerPATCH v7 14/16 dt-bindings: net: phy: Document support for LEDs node
In reply to Christian MarangiDocument support for LEDs node in phy and add an example for it. PHY LED will have to match led pattern and should be treated as a generic led.
--- .../devicetree/bindings/net/ethernet-phy.yaml | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+)
Documentation/devicetree/bindings/net/ethernet-phy.yaml +43 -0
@@ -197,6 +197,35 @@ properties: PHY's that have configurable TX internal delays. If this property is present then the PHY applies the TX delay. + leds: + type: object + + properties: + '#address-cells': + const: 1 + + '#size-cells': + const: 0 + + patternProperties: + '^led@[a-f0-9]+$': + $ref: /schemas/leds/common.yaml# + + properties: + reg: + maxItems: 1 + description: + This define the LED index in the PHY or the MAC. It's really + driver dependent and required for ports that define multiple + LED for the same port. + + required: + - reg + + unevaluatedProperties: false + + additionalProperties: false + required: - reg
@@ -204,6 +233,8 @@ additionalProperties: true examples: - | + #include <dt-bindings/leds/common.h> + ethernet { #address-cells = <1>; #size-cells = <0>;
@@ -219,5 +250,17 @@ examples: reset-gpios = <&gpio1 4 1>; reset-assert-us = <1000>; reset-deassert-us = <2000>; + + leds { + #address-cells = <1>; + #size-cells = <0>; + + led@0 { + reg = <0>; + color = <LED_COLOR_ID_WHITE>; + function = LED_FUNCTION_LAN; + default-state = "keep"; + }; + }; }; };
Signature · 1 line
2.39.2
Christian Marangi
maintainerPATCH v7 15/16 arm: mvebu: dt: Add PHY LED support for 370-rd WAN port
In reply to Christian MarangiFrom: Andrew Lunn <[email protected]>
The WAN port of the 370-RD has a Marvell PHY, with one LED on the front panel.y List this LED in the device tree.
--- arch/arm/boot/dts/armada-370-rd.dts | 12 ++++++++++++ 1 file changed, 12 insertions(+)
arch/arm/boot/dts/armada-370-rd.dts +12 -0
@@ -20,6 +20,7 @@ /dts-v1/; #include <dt-bindings/input/input.h> #include <dt-bindings/interrupt-controller/irq.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/gpio/gpio.h> #include "armada-370.dtsi"
@@ -135,6 +136,17 @@ &mdio { pinctrl-names = "default"; phy0: ethernet-phy@0 { reg = <0>; + leds { + #address-cells = <1>; + #size-cells = <0>; + + led@0 { + reg = <0>; + color = <LED_COLOR_ID_WHITE>; + function = LED_FUNCTION_WAN; + default-state = "keep"; + }; + }; }; switch: switch@10 {
Signature · 1 line
2.39.2
Christian Marangi
maintainerPATCH v7 16/16 Documentation: LEDs: Describe good names for network LEDs
In reply to Christian MarangiFrom: Andrew Lunn <[email protected]>
Network LEDs can exist in both the MAC and the PHY. Naming is difficult because the netdev name is neither stable or unique, do to commands like ip link set name eth42 dev eth0, and network namesspaces.
Give some example names where the MAC and the PHY have unique names based on device tree nodes, or PCI bus addresses.
Since the LED can be used for anything which Linux supports for LEDs, avoid using names like activity or link, rather describe the location on the RJ-45, of what the RJ-45 is expected to be used for, WAN/LAN etc.
--- Documentation/leds/well-known-leds.txt | 30 ++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)
Documentation/leds/well-known-leds.txt +30 -0
@@ -70,3 +70,33 @@ Good: "platform:*:charging" (allwinner sun50i) * Screen Good: ":backlight" (Motorola Droid 4) + +* Ethernet LEDs + +Currently two types of Network LEDs are support, those controlled by +the PHY and those by the MAC. In theory both can be present at the +same time for one Linux netdev, hence the names need to differ between +MAC and PHY. + +Do not use the netdev name, such as eth0, enp1s0. These are not stable +and are not unique. They also don't differentiate between MAC and PHY. + +** MAC LEDs + +Good: f1070000.ethernet:white:WAN +Good: mdio_mux-0.1:00:green:left +Good: 0000:02:00.0:yellow:top + +The first part must uniquely name the MAC controller. Then follows the +colour. WAN/LAN should be used for a single LED. If there are +multiple LEDs, use left/right, or top/bottom to indicate their +position on the RJ45 socket. + +** PHY LEDs + +Good: f1072004.mdio-mii:00: white:WAN +Good: !mdio-mux!mdio@2!switch@0!mdio:01:green:right +Good: r8169-0-200:00:yellow:bottom + +The first part must uniquely name the PHY. This often means uniquely +identifying the MDIO bus controller, and the address on the bus.
Signature · 7 lines
2.39.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Jakub Kicinski
maintainerQuoted 8 lines · On Mon, 17 Apr 2023 17:17:22 +0200 Christian Marangi wrote:
This is a continue of [1]. It was decided to take a more gradual approach to implement LEDs support for switch and phy starting with basic support and then implementing the hw control part when we have all the prereq done.
This series implements only the
brightness_set()andblink_set()ops. An example of switch implementation is done with qca8k.
Quoted 7 lines
For PHY a more generic approach is used with implementing the LED support in PHY core and with the user (in this case marvell) adding all the required functions.
Currently we set the default-state as "keep" to not change the default configuration of the declared LEDs since almost every switch have a default configuration.
IIRC we were supposed to take these via netdev with acks from Pavel/Lee. So we need acks on patches 4/5/16 ? If there is a repost, could you take out the arch/arm patches? They should not go via netdev, we'll try to filter them out when applying but mistakes happen.
Signature · 1 line
pw-bot: need-ack
Andrew Lunn
maintainerQuoted 4 lines
IIRC we were supposed to take these via netdev with acks from Pavel/Lee. So we need acks on patches 4/5/16 ? If there is a repost, could you take out the
arch/armpatches? They should not go via netdev, we'll try to filter them out when applying but mistakes happen.
The 370rd patch could in theory go via netdev. I maintain it, both at the board and mvebu SoC level, so can give my Acked-by:, in addition to my Signed-off-by:. It is very unlikely there will be any sort of merge conflict.
Andrew
Andrew Lunn
maintainerQuoted 4 lines
IIRC we were supposed to take these via netdev with acks from Pavel/Lee. So we need acks on patches 4/5/16 ? If there is a repost, could you take out the
arch/armpatches? They should not go via netdev, we'll try to filter them out when applying but mistakes happen.
Ah, mute point now, the whole patchset has been merged.
Andrew
This series was applied to netdev/net-next.git (main) by David S. Miller <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (main) by David S. Miller <[email protected]>:
Quoted 9 lines · On Mon, 17 Apr 2023 17:17:22 +0200 you wrote:
This is a continue of [1]. It was decided to take a more gradual approach to implement LEDs support for switch and phy starting with basic support and then implementing the hw control part when we have all the prereq done.
This series implements only the
brightness_set()andblink_set()ops. An example of switch implementation is done with qca8k.[...]
Here is the summary with links:
- [net-next,v7,01/16] net: dsa: qca8k: move qca8k_port_to_phy() to header
https://git.kernel.org/netdev/net-next/c/3e8b4d6277fd - [net-next,v7,02/16] net: dsa: qca8k: add LEDs basic support https://git.kernel.org/netdev/net-next/c/1e264f9d2918 - [net-next,v7,03/16] net: dsa: qca8k: add LEDs blink_set() support https://git.kernel.org/netdev/net-next/c/91acadcc6e59 - [net-next,v7,04/16] leds: Provide stubs for when CLASS_LED & NEW_LEDS are disabled https://git.kernel.org/netdev/net-next/c/e5029edd5393 - [net-next,v7,05/16] net: phy: Add a binding for PHY LEDs https://git.kernel.org/netdev/net-next/c/01e5b728e9e4 - [net-next,v7,06/16] net: phy: phy_device: Call into the PHY driver to set LED brightness https://git.kernel.org/netdev/net-next/c/684818189b04 - [net-next,v7,07/16] net: phy: marvell: Add software control of the LEDs https://git.kernel.org/netdev/net-next/c/2d3960e58ef7 - [net-next,v7,08/16] net: phy: phy_device: Call into the PHY driver to set LED blinking https://git.kernel.org/netdev/net-next/c/4e901018432e - [net-next,v7,09/16] net: phy: marvell: Implement led_blink_set() https://git.kernel.org/netdev/net-next/c/ea9e86485dec - [net-next,v7,10/16] dt-bindings: net: ethernet-controller: Document support for LEDs node https://git.kernel.org/netdev/net-next/c/57b6c752c5c0 - [net-next,v7,11/16] dt-bindings: net: dsa: qca8k: add LEDs definition example https://git.kernel.org/netdev/net-next/c/ed617bc022f4 - [net-next,v7,12/16] ARM: dts: qcom: ipq8064-rb3011: Drop unevaluated properties in switch nodes https://git.kernel.org/netdev/net-next/c/939595c79d12 - [net-next,v7,13/16] ARM: dts: qcom: ipq8064-rb3011: Add Switch LED for each port https://git.kernel.org/netdev/net-next/c/09930f1fb875 - [net-next,v7,14/16] dt-bindings: net: phy: Document support for LEDs node https://git.kernel.org/netdev/net-next/c/18a24b694a2b - [net-next,v7,15/16] arm: mvebu: dt: Add PHY LED support for 370-rd WAN port https://git.kernel.org/netdev/net-next/c/380a8fe1b2f4 - [net-next,v7,16/16] Documentation: LEDs: Describe good names for network LEDs https://git.kernel.org/netdev/net-next/c/c693ea2fd6e3
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html