| 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: Thu, 16 Feb 2023 02:32:26 +0100
From: Christian Marangi <ansuelsmth@...il.com>
To: Pavel Machek <pavel@....cz>, Lee Jones <lee@...nel.org>,
Rob Herring <robh+dt@...nel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@...aro.org>,
Andrew Lunn <andrew@...n.ch>,
Florian Fainelli <f.fainelli@...il.com>,
Vladimir Oltean <olteanv@...il.com>,
"David S. Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>,
Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>,
Heiner Kallweit <hkallweit1@...il.com>,
Russell King <linux@...linux.org.uk>,
Jonathan Corbet <corbet@....net>,
Christian Marangi <ansuelsmth@...il.com>,
"Russell King (Oracle)" <rmk+kernel@...linux.org.uk>,
Jacek Anaszewski <jacek.anaszewski@...il.com>,
John Crispin <john@...ozen.org>, linux-leds@...r.kernel.org,
devicetree@...r.kernel.org, linux-kernel@...r.kernel.org,
netdev@...r.kernel.org, linux-doc@...r.kernel.org,
Tim Harvey <tharvey@...eworks.com>,
Alexander Stein <alexander.stein@...tq-group.com>,
Rasmus Villemoes <rasmus.villemoes@...vas.dk>,
Bagas Sanjaya <bagasdotme@...il.com>,
Arun.Ramadoss@...rochip.com
Subject: [PATCH v8 09/13] leds: trigger: netdev: add additional hardware only triggers
Add additional hardware only triggers commonly supported by switch LEDs.
Additional modes:
link_10: LED on with link up AND speed 10mbps
link_100: LED on with link up AND speed 100mbps
link_1000: LED on with link up AND speed 1000mbps
half_duplex: LED on with link up AND half_duplex mode
full_duplex: LED on with link up AND full duplex mode
activity: LED blink on tx or rx event
Signed-off-by: Christian Marangi <ansuelsmth@...il.com>
---
drivers/leds/trigger/ledtrig-netdev.c | 58 +++++++++++++++++++++++++++
include/linux/leds.h | 6 +++
2 files changed, 64 insertions(+)
diff --git a/drivers/leds/trigger/ledtrig-netdev.c b/drivers/leds/trigger/ledtrig-netdev.c
index b992d617f406..b229bdb69501 100644
--- a/drivers/leds/trigger/ledtrig-netdev.c
+++ b/drivers/leds/trigger/ledtrig-netdev.c
@@ -33,6 +33,17 @@
* (not supported in hw mode)
* link - LED's normal state reflects whether the link is up
* (has carrier) or not
+ * link_10 - LED's normal state reflects whether the link is
+ * up and at 10mbps speed (hardware only)
+ * link_100 - LED's normal state reflects whether the link is
+ * up and at 100mbps speed (hardware only)
+ * link_1000 - LED's normal state reflects whether the link is
+ * up and at 1000mbps speed (hardware only)
+ * half_duplex - LED's normal state reflects whether the link is
+ * up and hafl duplex (hardware only)
+ * full_duplex - LED's normal state reflects whether the link is
+ * up and full duplex (hardware only)
+ * activity - LED's blinks on transmitted or received data (hardware only)
* tx - LED blinks on transmitted data
* rx - LED blinks on receive data
* available_mode - Display available mode and how they can be handled
@@ -66,6 +77,12 @@ struct netdev_led_attr_detail {
static struct netdev_led_attr_detail attr_details[] = {
{ .name = "link", .bit = TRIGGER_NETDEV_LINK},
+ { .name = "link_10", .hardware_only = true, .bit = TRIGGER_NETDEV_LINK_10},
+ { .name = "link_100", .hardware_only = true, .bit = TRIGGER_NETDEV_LINK_100},
+ { .name = "link_1000", .hardware_only = true, .bit = TRIGGER_NETDEV_LINK_1000},
+ { .name = "half_duplex", .hardware_only = true, .bit = TRIGGER_NETDEV_HALF_DUPLEX},
+ { .name = "full_duplex", .hardware_only = true, .bit = TRIGGER_NETDEV_FULL_DUPLEX},
+ { .name = "activity", .hardware_only = true, .bit = TRIGGER_NETDEV_ACTIVITY },
{ .name = "tx", .bit = TRIGGER_NETDEV_TX},
{ .name = "rx", .bit = TRIGGER_NETDEV_RX},
};
@@ -123,6 +140,23 @@ static bool validate_baseline_state(struct led_netdev_data *trigger_data)
if (hw_blink_modes && hw_blink_modes != trigger_data->mode)
return false;
+ /* Check conflicts single rx or tx can't be active if activity is
+ * active.
+ */
+ if (test_bit(TRIGGER_NETDEV_ACTIVITY, &hw_blink_modes) &&
+ (test_bit(TRIGGER_NETDEV_TX, &hw_blink_modes) ||
+ test_bit(TRIGGER_NETDEV_RX, &hw_blink_modes)))
+ return false;
+
+ /* Check conflicts single link speed can't be active if link is
+ * active.
+ */
+ if (test_bit(TRIGGER_NETDEV_LINK, &hw_blink_modes) &&
+ (test_bit(TRIGGER_NETDEV_LINK_10, &hw_blink_modes) ||
+ test_bit(TRIGGER_NETDEV_LINK_100, &hw_blink_modes) ||
+ test_bit(TRIGGER_NETDEV_LINK_1000, &hw_blink_modes)))
+ return false;
+
/* Modes are valid. Decide now the running mode to later
* set the baseline.
*/
@@ -267,6 +301,12 @@ static ssize_t netdev_led_attr_show(struct device *dev, char *buf,
switch (attr) {
case TRIGGER_NETDEV_LINK:
+ case TRIGGER_NETDEV_LINK_10:
+ case TRIGGER_NETDEV_LINK_100:
+ case TRIGGER_NETDEV_LINK_1000:
+ case TRIGGER_NETDEV_HALF_DUPLEX:
+ case TRIGGER_NETDEV_FULL_DUPLEX:
+ case TRIGGER_NETDEV_ACTIVITY:
case TRIGGER_NETDEV_TX:
case TRIGGER_NETDEV_RX:
bit = attr;
@@ -292,6 +332,12 @@ static ssize_t netdev_led_attr_store(struct device *dev, const char *buf,
switch (attr) {
case TRIGGER_NETDEV_LINK:
+ case TRIGGER_NETDEV_LINK_10:
+ case TRIGGER_NETDEV_LINK_100:
+ case TRIGGER_NETDEV_LINK_1000:
+ case TRIGGER_NETDEV_HALF_DUPLEX:
+ case TRIGGER_NETDEV_FULL_DUPLEX:
+ case TRIGGER_NETDEV_ACTIVITY:
case TRIGGER_NETDEV_TX:
case TRIGGER_NETDEV_RX:
bit = attr;
@@ -332,6 +378,12 @@ static ssize_t netdev_led_attr_store(struct device *dev, const char *buf,
static DEVICE_ATTR_RW(trigger_name)
DEFINE_NETDEV_TRIGGER(link, TRIGGER_NETDEV_LINK);
+DEFINE_NETDEV_TRIGGER(link_10, TRIGGER_NETDEV_LINK_10);
+DEFINE_NETDEV_TRIGGER(link_100, TRIGGER_NETDEV_LINK_100);
+DEFINE_NETDEV_TRIGGER(link_1000, TRIGGER_NETDEV_LINK_1000);
+DEFINE_NETDEV_TRIGGER(half_duplex, TRIGGER_NETDEV_HALF_DUPLEX);
+DEFINE_NETDEV_TRIGGER(full_duplex, TRIGGER_NETDEV_FULL_DUPLEX);
+DEFINE_NETDEV_TRIGGER(activity, TRIGGER_NETDEV_ACTIVITY);
DEFINE_NETDEV_TRIGGER(tx, TRIGGER_NETDEV_TX);
DEFINE_NETDEV_TRIGGER(rx, TRIGGER_NETDEV_RX);
@@ -425,6 +477,12 @@ static DEVICE_ATTR_RO(available_mode);
static struct attribute *netdev_trig_attrs[] = {
&dev_attr_device_name.attr,
&dev_attr_link.attr,
+ &dev_attr_link_10.attr,
+ &dev_attr_link_100.attr,
+ &dev_attr_link_1000.attr,
+ &dev_attr_half_duplex.attr,
+ &dev_attr_full_duplex.attr,
+ &dev_attr_activity.attr,
&dev_attr_rx.attr,
&dev_attr_tx.attr,
&dev_attr_interval.attr,
diff --git a/include/linux/leds.h b/include/linux/leds.h
index a31f158e5351..9071ab768776 100644
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -574,6 +574,12 @@ static inline void *led_get_trigger_data(struct led_classdev *led_cdev)
/* Trigger specific enum */
enum led_trigger_netdev_modes {
TRIGGER_NETDEV_LINK = 1,
+ TRIGGER_NETDEV_LINK_10,
+ TRIGGER_NETDEV_LINK_100,
+ TRIGGER_NETDEV_LINK_1000,
+ TRIGGER_NETDEV_HALF_DUPLEX,
+ TRIGGER_NETDEV_FULL_DUPLEX,
+ TRIGGER_NETDEV_ACTIVITY,
TRIGGER_NETDEV_TX,
TRIGGER_NETDEV_RX,
};
--
2.38.1
Powered by blists - more mailing lists