wifi: rtw88: Add support for LED blinking
PATCH v3 1/1 wifi: rtw88: Add support for LED blinking
Register a struct led_classdev with the kernel's LED subsystem and create a throughput-based trigger for it. Then mac80211 makes the LED blink.
Tested with Tenda U12 (RTL8812AU), Tenda U9 (RTL8811CU), TP-Link Archer T2U Nano (RTL8811AU), TP-Link Archer T3U Plus (RTL8812BU), Edimax EW-7611UCB (RTL8821AU), LM842 (RTL8822CU).
Also tested with devices which don't have LEDs: the laptop's internal RTL8822CE and a no-name RTL8723DU.
---
v2:
- Move LED (de)init to a new file led.c
- Use #ifdef CONFIF_LEDS_CLASS only in the new file led.h
v3:
- Make the empty functions inline.
- Use brightness_set_blocking for SDIO as well, because a user reported errors:
Jan 06 12:01:17 X96 kernel: Voluntary context switch within RCU read-side critical section! ... Jan 06 12:01:17 X96 kernel: Call trace: Jan 06 12:01:17 X96 kernel: rcu_note_context_switch+0x404/0x4c4 Jan 06 12:01:17 X96 kernel: __schedule+0xa0/0xadc Jan 06 12:01:17 X96 kernel: schedule+0x34/0x134 Jan 06 12:01:17 X96 kernel: schedule_timeout+0x174/0x184 Jan 06 12:01:17 X96 kernel: wait_for_completion+0x74/0x158 Jan 06 12:01:17 X96 kernel: mmc_wait_for_req_done+0x2c/0xf8 Jan 06 12:01:17 X96 kernel: mmc_wait_for_req+0xb0/0x100 Jan 06 12:01:17 X96 kernel: mmc_io_rw_extended+0x1d0/0x2c0 Jan 06 12:01:17 X96 kernel: sdio_io_rw_ext_helper+0x190/0x234 Jan 06 12:01:17 X96 kernel: sdio_readl+0x30/0x5c Jan 06 12:01:17 X96 kernel: rtw_sdio_readl+0xbc/0xd4 [rtw_sdio] Jan 06 12:01:17 X96 kernel: rtw_sdio_read32+0xb8/0x204 [rtw_sdio] Jan 06 12:01:17 X96 kernel: rtw8822c_led_set+0x34/0x78 [rtw_8822c] --- drivers/net/wireless/realtek/rtw88/Makefile | 2 + drivers/net/wireless/realtek/rtw88/led.c | 73 +++++++++++++++++++ drivers/net/wireless/realtek/rtw88/led.h | 25 +++++++ drivers/net/wireless/realtek/rtw88/main.c | 12 ++- drivers/net/wireless/realtek/rtw88/main.h | 5 ++ drivers/net/wireless/realtek/rtw88/reg.h | 12 +++ drivers/net/wireless/realtek/rtw88/rtw8812a.c | 17 +++++ drivers/net/wireless/realtek/rtw88/rtw8821a.c | 26 +++++++ drivers/net/wireless/realtek/rtw88/rtw8821c.c | 19 +++++ drivers/net/wireless/realtek/rtw88/rtw8822b.c | 19 +++++ drivers/net/wireless/realtek/rtw88/rtw8822c.c | 19 +++++ 11 files changed, 227 insertions(+), 2 deletions(-) create mode 100644 drivers/net/wireless/realtek/rtw88/led.c create mode 100644 drivers/net/wireless/realtek/rtw88/led.h
drivers/net/wireless/realtek/rtw88/Makefile +2 -0
@@ -20,6 +20,8 @@ rtw88_core-y += main.o \ rtw88_core-$(CONFIG_PM) += wow.o +rtw88_core-$(CONFIG_LEDS_CLASS) += led.o + obj-$(CONFIG_RTW88_8822B) += rtw88_8822b.o rtw88_8822b-objs := rtw8822b.o rtw8822b_table.o
drivers/net/wireless/realtek/rtw88/led.c new file +73 -0
73 lines not on this page · raw message
drivers/net/wireless/realtek/rtw88/led.h new file +25 -0
@@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ +/* Copyright(c) 2025 Realtek Corporation +*/ + +#ifndef __RTW_LED_H +#define __RTW_LED_H + +#ifdef CONFIG_LEDS_CLASS + +void rtw_led_init (struct rtw_dev *rtwdev); +void rtw_led_deinit (struct rtw_dev *rtwdev); + +#else + +static inline void rtw_led_init (struct rtw_dev *rtwdev) +{ +} + +static inline void rtw_led_deinit (struct rtw_dev *rtwdev) +{ +} + +#endif + +#endif
drivers/net/wireless/realtek/rtw88/main.c +10 -2
@@ -19,6 +19,7 @@#include "bf.h" #include "sar.h" #include "sdio.h" +#include "led.h" bool rtw_disable_lps_deep_mode;EXPORT_SYMBOL (rtw_disable_lps_deep_mode);
@@ -2292,16 +2293,18 @@ int rtw_register_hw(struct rtw_dev *rtwdev, struct ieee80211_hw *hw)return ret; } +rtw_led_init (rtwdev); + ret =ieee80211_register_hw (hw);if (ret) {rtw_err (rtwdev,"failed to register hw\n" ); -return ret; + goto led_deinit; } ret =rtw_regd_hint (rtwdev);if (ret) {rtw_err (rtwdev,"failed to hint regd\n" ); -return ret; + goto led_deinit; }rtw_debugfs_init (rtwdev);
@@ -2310,6 +2313,10 @@ int rtw_register_hw(struct rtw_dev *rtwdev, struct ieee80211_hw *hw) rtwdev->bf_info.bfer_su_cnt =0 ;return 0 ; + +led_deinit: +rtw_led_deinit (rtwdev); +return ret; }EXPORT_SYMBOL (rtw_register_hw);
@@ -2320,6 +2327,7 @@ void rtw_unregister_hw(struct rtw_dev *rtwdev, struct ieee80211_hw *hw)ieee80211_unregister_hw (hw);rtw_unset_supported_band (hw, chip);rtw_debugfs_deinit (rtwdev); +rtw_led_deinit (rtwdev); }EXPORT_SYMBOL (rtw_unregister_hw);
drivers/net/wireless/realtek/rtw88/main.h +5 -0
@@ -887,6 +887,7 @@ struct rtw_chip_ops { bool is_tx2_path);void (*config_txrx_mode)(struct rtw_dev *rtwdev,u8 tx_path,u8 rx_path,bool is_tx2_path); +void (*led_set)(struct led_classdev *led,enum led_brightness brightness);/* for USB/SDIO only */ void (*fill_txdesc_checksum)(struct rtw_dev *rtwdev, struct rtw_tx_pkt_info *pkt_info,
@@ -2097,6 +2098,10 @@ struct rtw_dev {struct completion fw_scan_density;bool ap_active; +bool led_registered; +char led_name[32 ]; +struct led_classdev led_cdev; +/* hci related data, must be last */ u8 priv[]__aligned(sizeof(void *)) ; };
drivers/net/wireless/realtek/rtw88/reg.h +12 -0
@@ -78,7 +78,19 @@#define BIT_PAPE_SEL_EN BIT(25)#define BIT_DPDT_WL_SEL BIT(24)#define BIT_DPDT_SEL_EN BIT(23) +#define BIT_GPIO13_14_WL_CTRL_EN BIT(22) +#define BIT_LED2_SV BIT(19) +#define BIT_LED2_CM GENMASK(18, 16) +#define BIT_LED1_SV BIT(11) +#define BIT_LED1_CM GENMASK(10, 8) +#define BIT_LED0_SV BIT(3) +#define BIT_LED0_CM GENMASK(2, 0) +#define BIT_LED_MODE_SW_CTRL 0 +#define BIT_LED_MODE_RX 6 +#define BIT_LED_MODE_TX 4 +#define BIT_LED_MODE_TRX 2#define REG_LEDCFG2 0x004E +#define REG_GPIO_PIN_CTRL_2 0x0060#define REG_PAD_CTRL1 0x0064#define BIT_BT_BTG_SEL BIT(31)#define BIT_PAPE_WLBT_SEL BIT(29)
drivers/net/wireless/realtek/rtw88/rtw8812a.c +17 -0
@@ -868,6 +868,22 @@ static void rtw8812a_pwr_track(struct rtw_dev *rtwdev) dm_info->pwr_trk_triggered = false; } +static void rtw8812a_led_set (struct led_classdev *led, +enum led_brightness brightness) +{ + struct rtw_dev *rtwdev = container_of(led, struct rtw_dev, led_cdev); +u8 ledcfg; + + ledcfg =rtw_read8 (rtwdev,REG_LED_CFG ); + ledcfg &=BIT (6 ) |BIT (4 ); + ledcfg |=BIT (5 ); + +if (brightness ==LED_OFF ) + ledcfg |=BIT (3 ); + +rtw_write8 (rtwdev,REG_LED_CFG , ledcfg); +} +static void rtw8812a_fill_txdesc_checksum (struct rtw_dev *rtwdev,struct rtw_tx_pkt_info *pkt_info,u8 *txdesc)
@@ -916,6 +932,7 @@ static const struct rtw_chip_ops rtw8812a_ops = { .config_bfee = NULL, .set_gid_table = NULL, .cfg_csi_rate = NULL, + .led_set = rtw8812a_led_set, .fill_txdesc_checksum = rtw8812a_fill_txdesc_checksum, .coex_set_init = rtw8812a_coex_cfg_init, .coex_set_ant_switch = NULL,
drivers/net/wireless/realtek/rtw88/rtw8821a.c +26 -0
@@ -706,6 +706,31 @@ static void rtw8821a_pwr_track(struct rtw_dev *rtwdev) dm_info->pwr_trk_triggered = false; } +static void rtw8821a_led_set (struct led_classdev *led, +enum led_brightness brightness) +{ + struct rtw_dev *rtwdev = container_of(led, struct rtw_dev, led_cdev); +u32 gpio8_cfg; +u8 ledcfg; + +if (brightness ==LED_OFF ) { + gpio8_cfg =rtw_read32 (rtwdev,REG_GPIO_PIN_CTRL_2 ); + gpio8_cfg &= ~BIT (24 ); + gpio8_cfg |=BIT (16 ) |BIT (8 ); +rtw_write32 (rtwdev,REG_GPIO_PIN_CTRL_2 , gpio8_cfg); + }else { + ledcfg =rtw_read8 (rtwdev,REG_LED_CFG +2 ); + gpio8_cfg =rtw_read32 (rtwdev,REG_GPIO_PIN_CTRL_2 ); + + ledcfg &=BIT (7 ) |BIT (6 ); +rtw_write8 (rtwdev,REG_LED_CFG +2 , ledcfg); + + gpio8_cfg &= ~(BIT (24 ) |BIT (8 )); + gpio8_cfg |=BIT (16 ); +rtw_write32 (rtwdev,REG_GPIO_PIN_CTRL_2 , gpio8_cfg); + } +} +static void rtw8821a_fill_txdesc_checksum (struct rtw_dev *rtwdev,struct rtw_tx_pkt_info *pkt_info,u8 *txdesc)
@@ -853,6 +878,7 @@ static const struct rtw_chip_ops rtw8821a_ops = { .config_bfee = NULL, .set_gid_table = NULL, .cfg_csi_rate = NULL, + .led_set = rtw8821a_led_set, .fill_txdesc_checksum = rtw8821a_fill_txdesc_checksum, .coex_set_init = rtw8821a_coex_cfg_init, .coex_set_ant_switch = rtw8821a_coex_cfg_ant_switch,
drivers/net/wireless/realtek/rtw88/rtw8821c.c +19 -0
@@ -1206,6 +1206,24 @@ static void rtw8821c_phy_cck_pd_set(struct rtw_dev *rtwdev, u8 new_lvl) dm_info->cck_pd_default + new_lvl * 2); } +static void rtw8821c_led_set (struct led_classdev *led, +enum led_brightness brightness) +{ + struct rtw_dev *rtwdev = container_of(led, struct rtw_dev, led_cdev); +u32 ledcfg; + + ledcfg =rtw_read32 (rtwdev,REG_LED_CFG ); +u32p_replace_bits (&ledcfg,BIT_LED_MODE_SW_CTRL ,BIT_LED2_CM ); + ledcfg &= ~BIT_GPIO13_14_WL_CTRL_EN ; + +if (brightness ==LED_OFF ) + ledcfg |=BIT_LED2_SV ; +else + ledcfg &= ~BIT_LED2_SV ; + +rtw_write32 (rtwdev,REG_LED_CFG , ledcfg); +} +static void rtw8821c_fill_txdesc_checksum (struct rtw_dev *rtwdev,struct rtw_tx_pkt_info *pkt_info,u8 *txdesc)
@@ -1655,6 +1673,7 @@ static const struct rtw_chip_ops rtw8821c_ops = { .config_bfee = rtw8821c_bf_config_bfee, .set_gid_table = rtw_bf_set_gid_table, .cfg_csi_rate = rtw_bf_cfg_csi_rate, + .led_set = rtw8821c_led_set, .fill_txdesc_checksum = rtw8821c_fill_txdesc_checksum, .coex_set_init = rtw8821c_coex_cfg_init,
drivers/net/wireless/realtek/rtw88/rtw8822b.c +19 -0
@@ -1566,6 +1566,24 @@ static void rtw8822b_adaptivity(struct rtw_dev *rtwdev)rtw_phy_set_edcca_th (rtwdev, l2h, h2l); } +static void rtw8822b_led_set (struct led_classdev *led, +enum led_brightness brightness) +{ + struct rtw_dev *rtwdev = container_of(led, struct rtw_dev, led_cdev); +u32 ledcfg; + + ledcfg =rtw_read32 (rtwdev,REG_LED_CFG ); +u32p_replace_bits (&ledcfg,BIT_LED_MODE_SW_CTRL ,BIT_LED2_CM ); + ledcfg &= ~BIT_GPIO13_14_WL_CTRL_EN ; + +if (brightness ==LED_OFF ) + ledcfg |=BIT_LED2_SV ; +else + ledcfg &= ~BIT_LED2_SV ; + +rtw_write32 (rtwdev,REG_LED_CFG , ledcfg); +} +static void rtw8822b_fill_txdesc_checksum (struct rtw_dev *rtwdev,struct rtw_tx_pkt_info *pkt_info,u8 *txdesc)
@@ -2146,6 +2164,7 @@ static const struct rtw_chip_ops rtw8822b_ops = { .cfg_csi_rate = rtw_bf_cfg_csi_rate, .adaptivity_init = rtw8822b_adaptivity_init, .adaptivity = rtw8822b_adaptivity, + .led_set = rtw8822b_led_set, .fill_txdesc_checksum = rtw8822b_fill_txdesc_checksum, .coex_set_init = rtw8822b_coex_cfg_init,
drivers/net/wireless/realtek/rtw88/rtw8822c.c +19 -0
@@ -4537,6 +4537,24 @@ static void rtw8822c_adaptivity(struct rtw_dev *rtwdev)rtw_phy_set_edcca_th (rtwdev, l2h, h2l); } +static void rtw8822c_led_set (struct led_classdev *led, +enum led_brightness brightness) +{ + struct rtw_dev *rtwdev = container_of(led, struct rtw_dev, led_cdev); +u32 ledcfg; + + ledcfg =rtw_read32 (rtwdev,REG_LED_CFG ); +u32p_replace_bits (&ledcfg,BIT_LED_MODE_SW_CTRL ,BIT_LED2_CM ); + ledcfg &= ~BIT_GPIO13_14_WL_CTRL_EN ; + +if (brightness ==LED_OFF ) + ledcfg |=BIT_LED2_SV ; +else + ledcfg &= ~BIT_LED2_SV ; + +rtw_write32 (rtwdev,REG_LED_CFG , ledcfg); +} +static void rtw8822c_fill_txdesc_checksum (struct rtw_dev *rtwdev,struct rtw_tx_pkt_info *pkt_info,u8 *txdesc)
@@ -4964,6 +4982,7 @@ static const struct rtw_chip_ops rtw8822c_ops = { .cfo_track = rtw8822c_cfo_track, .config_tx_path = rtw8822c_config_tx_path, .config_txrx_mode = rtw8822c_config_trx_mode, + .led_set = rtw8822c_led_set, .fill_txdesc_checksum = rtw8822c_fill_txdesc_checksum, .coex_set_init = rtw8822c_coex_cfg_init,
Signature · 1 line
2.47.1
Quoted 4 lines · Bitterblue Smith
Register a struct
led_classdevwith the kernel's LED subsystem and create a throughput-based trigger for it. Then mac80211 makes the LED blink.
Quoted 8 lines
Tested with Tenda U12 (RTL8812AU), Tenda U9 (RTL8811CU), TP-Link Archer T2U Nano (RTL8811AU), TP-Link Archer T3U Plus (RTL8812BU), Edimax EW-7611UCB (RTL8821AU), LM842 (RTL8822CU).
Also tested with devices which don't have LEDs: the laptop's internal RTL8822CE and a no-name RTL8723DU.
Signed-off-by Bitterblue Smith <[email protected]>
Ping-Ke Shih
maintainerQuoted 8 lines · Bitterblue Smith
Register a struct
led_classdevwith the kernel's LED subsystem and create a throughput-based trigger for it. Then mac80211 makes the LED blink.Tested with Tenda U12 (RTL8812AU), Tenda U9 (RTL8811CU), TP-Link Archer T2U Nano (RTL8811AU), TP-Link Archer T3U Plus (RTL8812BU), Edimax EW-7611UCB (RTL8821AU), LM842 (RTL8822CU).
Quoted 5 lines
Also tested with devices which don't have LEDs: the laptop's internal RTL8822CE and a no-name RTL8723DU.
Signed-off-by Bitterblue Smith <[email protected]>Acked-by Ping-Ke Shih <[email protected]>
1 patch(es) applied to rtw-next branch of rtw.git, thanks.
4b6652bc6d8d wifi: rtw88: Add support for LED blinking