mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2025-09-30 06:22:40 +00:00
1c92e468d5
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.103 removed upstream patches: generic-backport/220-v6.16-powerpc-boot-fix-build-with-gcc-15.patch [1] generic-backport/847-v6.17-Revert-leds-trigger-netdev-Configure-LED-blink-inter.patch [2] update patch to upstream function change bcm53x/patches-6.6/180-usb-xhci-add-support-for-performing-fake-doorbell.patch changed function xhci_disable_and_free_slot() upstream [3] All other patches auto-refreshed. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.103&id=93879b3ba967a33834727abf34ea08764339fe0b [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.103&id=c66caf21b1d0a0847adc34d368e3f6753a2cbd53 [3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/drivers/usb/host?h=v6.6.103&id=e600de541c37f97482fea2a7a26f186141e7ddea Suggested-by: Leo Barsky <leobrsky@proton.me> Signed-off-by: Goetz Goerisch <ggoerisch@gmail.com> Link: https://github.com/openwrt/openwrt/pull/19898 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
112 lines
4.5 KiB
Diff
112 lines
4.5 KiB
Diff
From bc8e1da69a68d9871773b657d18400a7941cbdef Mon Sep 17 00:00:00 2001
|
|
From: Daniel Golle <daniel@makrotopia.org>
|
|
Date: Tue, 28 Nov 2023 04:00:10 +0000
|
|
Subject: [PATCH] leds: trigger: netdev: Extend speeds up to 10G
|
|
|
|
Add 2.5G, 5G and 10G as available speeds to the netdev LED trigger.
|
|
|
|
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
|
Link: https://lore.kernel.org/r/99e7d3304c6bba7f4863a4a80764a869855f2085.1701143925.git.daniel@makrotopia.org
|
|
Signed-off-by: Lee Jones <lee@kernel.org>
|
|
---
|
|
drivers/leds/trigger/ledtrig-netdev.c | 32 ++++++++++++++++++++++++++-
|
|
include/linux/leds.h | 3 +++
|
|
2 files changed, 34 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/leds/trigger/ledtrig-netdev.c
|
|
+++ b/drivers/leds/trigger/ledtrig-netdev.c
|
|
@@ -99,6 +99,18 @@ static void set_baseline_state(struct le
|
|
trigger_data->link_speed == SPEED_1000)
|
|
blink_on = true;
|
|
|
|
+ if (test_bit(TRIGGER_NETDEV_LINK_2500, &trigger_data->mode) &&
|
|
+ trigger_data->link_speed == SPEED_2500)
|
|
+ blink_on = true;
|
|
+
|
|
+ if (test_bit(TRIGGER_NETDEV_LINK_5000, &trigger_data->mode) &&
|
|
+ trigger_data->link_speed == SPEED_5000)
|
|
+ blink_on = true;
|
|
+
|
|
+ if (test_bit(TRIGGER_NETDEV_LINK_10000, &trigger_data->mode) &&
|
|
+ trigger_data->link_speed == SPEED_10000)
|
|
+ blink_on = true;
|
|
+
|
|
if (test_bit(TRIGGER_NETDEV_HALF_DUPLEX, &trigger_data->mode) &&
|
|
trigger_data->duplex == DUPLEX_HALF)
|
|
blink_on = true;
|
|
@@ -289,6 +301,9 @@ static ssize_t netdev_led_attr_show(stru
|
|
case TRIGGER_NETDEV_LINK_10:
|
|
case TRIGGER_NETDEV_LINK_100:
|
|
case TRIGGER_NETDEV_LINK_1000:
|
|
+ case TRIGGER_NETDEV_LINK_2500:
|
|
+ case TRIGGER_NETDEV_LINK_5000:
|
|
+ case TRIGGER_NETDEV_LINK_10000:
|
|
case TRIGGER_NETDEV_HALF_DUPLEX:
|
|
case TRIGGER_NETDEV_FULL_DUPLEX:
|
|
case TRIGGER_NETDEV_TX:
|
|
@@ -319,6 +334,9 @@ static ssize_t netdev_led_attr_store(str
|
|
case TRIGGER_NETDEV_LINK_10:
|
|
case TRIGGER_NETDEV_LINK_100:
|
|
case TRIGGER_NETDEV_LINK_1000:
|
|
+ case TRIGGER_NETDEV_LINK_2500:
|
|
+ case TRIGGER_NETDEV_LINK_5000:
|
|
+ case TRIGGER_NETDEV_LINK_10000:
|
|
case TRIGGER_NETDEV_HALF_DUPLEX:
|
|
case TRIGGER_NETDEV_FULL_DUPLEX:
|
|
case TRIGGER_NETDEV_TX:
|
|
@@ -337,7 +355,10 @@ static ssize_t netdev_led_attr_store(str
|
|
if (test_bit(TRIGGER_NETDEV_LINK, &mode) &&
|
|
(test_bit(TRIGGER_NETDEV_LINK_10, &mode) ||
|
|
test_bit(TRIGGER_NETDEV_LINK_100, &mode) ||
|
|
- test_bit(TRIGGER_NETDEV_LINK_1000, &mode)))
|
|
+ test_bit(TRIGGER_NETDEV_LINK_1000, &mode) ||
|
|
+ test_bit(TRIGGER_NETDEV_LINK_2500, &mode) ||
|
|
+ test_bit(TRIGGER_NETDEV_LINK_5000, &mode) ||
|
|
+ test_bit(TRIGGER_NETDEV_LINK_10000, &mode)))
|
|
return -EINVAL;
|
|
|
|
cancel_delayed_work_sync(&trigger_data->work);
|
|
@@ -367,6 +388,9 @@ DEFINE_NETDEV_TRIGGER(link, TRIGGER_NETD
|
|
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(link_2500, TRIGGER_NETDEV_LINK_2500);
|
|
+DEFINE_NETDEV_TRIGGER(link_5000, TRIGGER_NETDEV_LINK_5000);
|
|
+DEFINE_NETDEV_TRIGGER(link_10000, TRIGGER_NETDEV_LINK_10000);
|
|
DEFINE_NETDEV_TRIGGER(half_duplex, TRIGGER_NETDEV_HALF_DUPLEX);
|
|
DEFINE_NETDEV_TRIGGER(full_duplex, TRIGGER_NETDEV_FULL_DUPLEX);
|
|
DEFINE_NETDEV_TRIGGER(tx, TRIGGER_NETDEV_TX);
|
|
@@ -425,6 +449,9 @@ static struct attribute *netdev_trig_att
|
|
&dev_attr_link_10.attr,
|
|
&dev_attr_link_100.attr,
|
|
&dev_attr_link_1000.attr,
|
|
+ &dev_attr_link_2500.attr,
|
|
+ &dev_attr_link_5000.attr,
|
|
+ &dev_attr_link_10000.attr,
|
|
&dev_attr_full_duplex.attr,
|
|
&dev_attr_half_duplex.attr,
|
|
&dev_attr_rx.attr,
|
|
@@ -522,6 +549,9 @@ static void netdev_trig_work(struct work
|
|
test_bit(TRIGGER_NETDEV_LINK_10, &trigger_data->mode) ||
|
|
test_bit(TRIGGER_NETDEV_LINK_100, &trigger_data->mode) ||
|
|
test_bit(TRIGGER_NETDEV_LINK_1000, &trigger_data->mode) ||
|
|
+ test_bit(TRIGGER_NETDEV_LINK_2500, &trigger_data->mode) ||
|
|
+ test_bit(TRIGGER_NETDEV_LINK_5000, &trigger_data->mode) ||
|
|
+ test_bit(TRIGGER_NETDEV_LINK_10000, &trigger_data->mode) ||
|
|
test_bit(TRIGGER_NETDEV_HALF_DUPLEX, &trigger_data->mode) ||
|
|
test_bit(TRIGGER_NETDEV_FULL_DUPLEX, &trigger_data->mode);
|
|
interval = jiffies_to_msecs(
|
|
--- a/include/linux/leds.h
|
|
+++ b/include/linux/leds.h
|
|
@@ -586,6 +586,9 @@ enum led_trigger_netdev_modes {
|
|
TRIGGER_NETDEV_LINK_10,
|
|
TRIGGER_NETDEV_LINK_100,
|
|
TRIGGER_NETDEV_LINK_1000,
|
|
+ TRIGGER_NETDEV_LINK_2500,
|
|
+ TRIGGER_NETDEV_LINK_5000,
|
|
+ TRIGGER_NETDEV_LINK_10000,
|
|
TRIGGER_NETDEV_HALF_DUPLEX,
|
|
TRIGGER_NETDEV_FULL_DUPLEX,
|
|
TRIGGER_NETDEV_TX,
|