rtw88: add wowlan support for 8822c
v2 cover rtw88: add wowlan support for 8822c
From: Yan-Hsuan Chuang <[email protected]>
Add wake on wireless LAN support for 8822c. When system enters suspend, wifi driver can enable wowlan mode, and waits for waking host up by receiving wireless LAN events. Events could be AP lost, deauthed, magic packets, rekey, or patterns. Also most of the functions can be shutdown to reduce power consumption.
To enter wowlan mode, Realtek's devices need to swap to another firmware called wowlan firmware. It can monitor special events and generate wake up signals if necessary. To swap the firmware, driver needs to re-configure the HCI link, to make sure that the link is idle, reset the link for sending H2C commands to wowlan firmware, and then stop the link.
After wake up signals generated and sent to host, driver needs to swap back to normal firmware to get to the original state before suspend. So it should setup the link again and send H2C commands to firmware to restore the information.
v1 -> v2
* remove duplicated rtw_pci_dma_reset()
Chin-Yen Lee (6):
rtw88: pci: reset ring index when release skbs in tx ring
rtw88: pci: reset dma when reset pci trx ring
rtw88: load wowlan firmware if wowlan is supported
rtw88: support wowlan feature for 8822c
rtw88: Add wowlan pattern match support
rtw88: add wowlan net-detect support
drivers/net/wireless/realtek/rtw88/Makefile | 1 + drivers/net/wireless/realtek/rtw88/debug.h | 1 + drivers/net/wireless/realtek/rtw88/fw.c | 384 +++++++- drivers/net/wireless/realtek/rtw88/fw.h | 186 ++++ drivers/net/wireless/realtek/rtw88/mac80211.c | 44 + drivers/net/wireless/realtek/rtw88/main.c | 76 +- drivers/net/wireless/realtek/rtw88/main.h | 67 ++ drivers/net/wireless/realtek/rtw88/pci.c | 38 +- drivers/net/wireless/realtek/rtw88/reg.h | 27 + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 18 + drivers/net/wireless/realtek/rtw88/util.h | 2 + drivers/net/wireless/realtek/rtw88/wow.c | 890 ++++++++++++++++++ drivers/net/wireless/realtek/rtw88/wow.h | 58 ++ 13 files changed, 1759 insertions(+), 33 deletions(-) create mode 100644 drivers/net/wireless/realtek/rtw88/wow.c create mode 100644 drivers/net/wireless/realtek/rtw88/wow.h
Signature · 1 line
2.17.1
PATCH v2 1/6 rtw88: pci: reset ring index when release skbs in tx ring
From: Chin-Yen Lee <[email protected]>
When skbs queued for each TX ring are relased in PCI stop flow, the ring index should be reset at the same time.
---
v1 -> v2
* no change
drivers/net/wireless/realtek/rtw88/pci.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/realtek/rtw88/pci.c +1 -0
@@ -506,6 +506,7 @@ static void rtw_pci_dma_release(struct rtw_dev *rtwdev, struct rtw_pci *rtwpci)struct rtw_pci_tx_ring *tx_ring;u8 queue; +rtw_pci_reset_trx_ring (rtwdev);for (queue =0 ; queue <RTK_MAX_TX_QUEUE_NUM ; queue++) { tx_ring = &rtwpci->tx_rings[queue];rtw_pci_free_tx_ring_skbs (rtwdev, tx_ring);
Signature · 1 line
2.17.1
PATCH v2 2/6 rtw88: pci: reset dma when reset pci trx ring
In reply to [email protected]From: Chin-Yen Lee <[email protected]>
When PCI trx rings are reset, the DMA engine should also be reset. Otherswise, the rx_tag of rx flow is not synchronous to hw.
Remove DMA reset when rtw_pci_start() as we added it in rtw_pci_setup().
---
v1 -> v2
* remove duplicated rtw_pci_dma_reset()
drivers/net/wireless/realtek/rtw88/pci.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
drivers/net/wireless/realtek/rtw88/pci.c +10 -9
@@ -486,13 +486,6 @@ static void rtw_pci_disable_interrupt(struct rtw_dev *rtwdev, rtwpci->irq_enabled = false; } -static int rtw_pci_setup (struct rtw_dev *rtwdev) -{ -rtw_pci_reset_trx_ring (rtwdev); - -return 0 ; -} -static void rtw_pci_dma_reset (struct rtw_dev *rtwdev,struct rtw_pci *rtwpci) {/* reset dma and rx tag */
@@ -501,6 +494,16 @@ static void rtw_pci_dma_reset(struct rtw_dev *rtwdev, struct rtw_pci *rtwpci) rtwpci->rx_tag =0 ; } +static int rtw_pci_setup (struct rtw_dev *rtwdev) +{ +struct rtw_pci *rtwpci = (struct rtw_pci *)rtwdev->priv; + +rtw_pci_reset_trx_ring (rtwdev); +rtw_pci_dma_reset (rtwdev, rtwpci); + +return 0 ; +} +static void rtw_pci_dma_release (struct rtw_dev *rtwdev,struct rtw_pci *rtwpci) {struct rtw_pci_tx_ring *tx_ring;
@@ -518,8 +521,6 @@ static int rtw_pci_start(struct rtw_dev *rtwdev)struct rtw_pci *rtwpci = (struct rtw_pci *)rtwdev->priv;unsigned long flags; -rtw_pci_dma_reset (rtwdev, rtwpci); -spin_lock_irqsave (&rtwpci->irq_lock, flags);rtw_pci_enable_interrupt (rtwdev, rtwpci);spin_unlock_irqrestore (&rtwpci->irq_lock, flags);
Signature · 1 line
2.17.1
Re: [PATCH v2 2/6] rtw88: pci: reset dma when reset pci trx ring
Quoted 6 lines · On Mon, Dec 9, 2019 at 3:21 PM <[email protected]> wrote:
From: Chin-Yen Lee <[email protected]>
When PCI trx rings are reset, the DMA engine should also be reset. Otherswise, the
rx_tagof rx flow is not synchronous to hw.
Quoted 6 lines
Remove DMA reset when
rtw_pci_start()as we added it inrtw_pci_setup().Signed-off-by Chin-Yen Lee <[email protected]>Signed-off-by Yan-Hsuan Chuang <[email protected]>---
Quoted 54 lines
v1 -> v2
* remove duplicatedrtw_pci_dma_reset()drivers/net/wireless/realtek/rtw88/pci.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)drivers/net/wireless/realtek/rtw88/pci.c +10
-10@@ -486,13 +486,6 @@ static void rtw_pci_disable_interrupt(struct rtw_dev *rtwdev, rtwpci->irq_enabled = false; } -static int rtw_pci_setup (struct rtw_dev *rtwdev) -{ -rtw_pci_reset_trx_ring (rtwdev); - -return 0 ; -} -static void rtw_pci_dma_reset (struct rtw_dev *rtwdev,struct rtw_pci *rtwpci) {/* reset dma and rx tag */ @@ -501,6 +494,16 @@ static void rtw_pci_dma_reset(struct rtw_dev *rtwdev, struct rtw_pci *rtwpci) rtwpci->rx_tag =0 ; } +static int rtw_pci_setup (struct rtw_dev *rtwdev) +{ +struct rtw_pci *rtwpci = (struct rtw_pci *)rtwdev->priv; + +rtw_pci_reset_trx_ring (rtwdev); +rtw_pci_dma_reset (rtwdev, rtwpci); + +return 0 ; +} +static void rtw_pci_dma_release (struct rtw_dev *rtwdev,struct rtw_pci *rtwpci) {struct rtw_pci_tx_ring *tx_ring;@@ -518,8 +521,6 @@ static int rtw_pci_start(struct rtw_dev *rtwdev)struct rtw_pci *rtwpci = (struct rtw_pci *)rtwdev->priv;unsigned long flags; -rtw_pci_dma_reset (rtwdev, rtwpci); -spin_lock_irqsave (&rtwpci->irq_lock, flags);rtw_pci_enable_interrupt (rtwdev, rtwpci);spin_unlock_irqrestore (&rtwpci->irq_lock, flags); --2.17.1
PATCH v2 3/6 rtw88: load wowlan firmware if wowlan is supported
In reply to [email protected]From: Chin-Yen Lee <[email protected]>
Driver used to download normal firmware only, but some devices support wowlan and require to download wowlan firmware when system suspends. So modify rtw_load_firmware() and its callback to allow driver to download both normal and wowlan firmware.
---
v1 -> v2
* no change
drivers/net/wireless/realtek/rtw88/main.c | 72 +++++++++++++++++++---- drivers/net/wireless/realtek/rtw88/main.h | 10 ++++ 2 files changed, 70 insertions(+), 12 deletions(-)
drivers/net/wireless/realtek/rtw88/main.c +60 -12
@@ -793,6 +793,26 @@ void rtw_update_sta_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si)rtw_fw_send_ra_info (rtwdev, si); } +static int rtw_wait_firmware_completion (struct rtw_dev *rtwdev) +{ +struct rtw_chip_info *chip = rtwdev->chip; +struct rtw_fw_state *fw; + + fw = &rtwdev->fw; +wait_for_completion (&fw->completion); +if (!fw->firmware) +return -EINVAL ; + +if (chip->wow_fw_name) { + fw = &rtwdev->wow_fw; +wait_for_completion (&fw->completion); +if (!fw->firmware) +return -EINVAL ; + } + +return 0 ; +} +static int rtw_power_on (struct rtw_dev *rtwdev) {struct rtw_chip_info *chip = rtwdev->chip;
@@ -813,11 +833,10 @@ static int rtw_power_on(struct rtw_dev *rtwdev) goto err; } -wait_for_completion (&fw->completion); -if (!fw->firmware) { - ret = -EINVAL ; -rtw_err (rtwdev,"failed to load firmware\n" ); - goto err; + ret =rtw_wait_firmware_completion (rtwdev); +if (ret) { +rtw_err (rtwdev,"failed to wait firmware completion\n" ); + goto err_off; } ret =rtw_download_firmware (rtwdev, fw);
@@ -1020,8 +1039,8 @@ static void rtw_unset_supported_band(struct ieee80211_hw *hw,static void rtw_load_firmware_cb (const struct firmware *firmware,void *context) { -struct rtw_dev *rtwdev = context; -struct rtw_fw_state *fw = &rtwdev->fw; +struct rtw_fw_state *fw = context; +struct rtw_dev *rtwdev = fw->rtwdev;const struct rtw_fw_hdr *fw_hdr;if (!firmware || !firmware->data) {
@@ -1043,17 +1062,35 @@ static void rtw_load_firmware_cb(const struct firmware *firmware, void *context) fw->version, fw->sub_version, fw->sub_index, fw->h2c_version); } -static int rtw_load_firmware (struct rtw_dev *rtwdev,const char *fw_name) +static int rtw_load_firmware (struct rtw_dev *rtwdev,enum rtw_fw_type type) { -struct rtw_fw_state *fw = &rtwdev->fw; +const char *fw_name; +struct rtw_fw_state *fw;int ret; +switch (type) { +case RTW_WOWLAN_FW : + fw = &rtwdev->wow_fw; + fw_name = rtwdev->chip->wow_fw_name; +break ; + +case RTW_NORMAL_FW : + fw = &rtwdev->fw; + fw_name = rtwdev->chip->fw_name; +break ; + +default : +rtw_warn (rtwdev,"unsupported firmware type\n" ); +return -ENOENT ; + } + + fw->rtwdev = rtwdev;init_completion (&fw->completion); ret =request_firmware_nowait (THIS_MODULE , true, fw_name, rtwdev->dev, -GFP_KERNEL , rtwdev, rtw_load_firmware_cb); +GFP_KERNEL , fw, rtw_load_firmware_cb);if (ret) { -rtw_err (rtwdev,"async firmware request failed\n" ); +rtw_err (rtwdev,"failed to async firmware request\n" );return ret; }
@@ -1372,12 +1409,19 @@ int rtw_core_init(struct rtw_dev *rtwdev)BIT_HTC_LOC_CTRL |BIT_APP_PHYSTS |BIT_AB |BIT_AM |BIT_APM ; - ret =rtw_load_firmware (rtwdev, rtwdev->chip->fw_name); + ret =rtw_load_firmware (rtwdev,RTW_NORMAL_FW );if (ret) {rtw_warn (rtwdev,"no firmware loaded\n" );return ret; } +if (chip->wow_fw_name) { + ret =rtw_load_firmware (rtwdev,RTW_WOWLAN_FW ); +if (ret) { +rtw_warn (rtwdev,"no wow firmware loaded\n" ); +return ret; + } + }return 0 ; }EXPORT_SYMBOL (rtw_core_init);
@@ -1385,12 +1429,16 @@ EXPORT_SYMBOL(rtw_core_init);void rtw_core_deinit (struct rtw_dev *rtwdev) {struct rtw_fw_state *fw = &rtwdev->fw; +struct rtw_fw_state *wow_fw = &rtwdev->wow_fw;struct rtw_rsvd_page *rsvd_pkt, *tmp;unsigned long flags;if (fw->firmware)release_firmware (fw->firmware); +if (wow_fw->firmware) +release_firmware (wow_fw->firmware); +tasklet_kill (&rtwdev->tx_tasklet);spin_lock_irqsave (&rtwdev->tx_report.q_lock, flags);skb_queue_purge (&rtwdev->tx_report.queue);
drivers/net/wireless/realtek/rtw88/main.h +10 -0
@@ -193,6 +193,11 @@ enum rtw_rx_queue_type {RTK_MAX_RX_QUEUE_NUM }; +enum rtw_fw_type { +RTW_NORMAL_FW =0x0 , +RTW_WOWLAN_FW =0x1 , +}; +enum rtw_rate_index {RTW_RATEID_BGN_40M_2SS =0 ,RTW_RATEID_BGN_40M_1SS =1 ,
@@ -1030,6 +1035,8 @@ struct rtw_chip_info {u8 bfer_su_max_num;u8 bfer_mu_max_num; +const char *wow_fw_name; +/* coex paras */ u32 coex_para_ver;u8 bt_desired_ver;
@@ -1456,6 +1463,7 @@ struct rtw_fifo_conf {struct rtw_fw_state {const struct firmware *firmware; +struct rtw_dev *rtwdev;struct completion completion;u16 version;u8 sub_version;
@@ -1580,6 +1588,8 @@ struct rtw_dev {u8 mp_mode; +struct rtw_fw_state wow_fw; +/* hci related data, must be last */ u8 priv[0 ]__aligned(sizeof(void *)) ; };
Signature · 1 line
2.17.1
PATCH v2 4/6 rtw88: support wowlan feature for 8822c
In reply to [email protected]From: Chin-Yen Lee <[email protected]>
Wake on WLAN(wowlan) is a feature which allows devices to be woken up from suspend state through wlan events.
When user enables wowlan feature and then let the device enter suspend state, wowlan firmware will be loaded by the driver and periodically monitors wifi packets. Power consumption of wifi chip will be reduced in this state.
If wowlan firmware detects that specific wlan event happens, it will issue wakeup signal to trigger resume process. Driver will load normal firmware and let wifi chip return to the original state.
Currently supported wlan events include receiving magic packet, rekey packet and deauth packet, and disconnecting from AP.
---
v1 -> v2
* no change
drivers/net/wireless/realtek/rtw88/Makefile | 1 + drivers/net/wireless/realtek/rtw88/debug.h | 1 + drivers/net/wireless/realtek/rtw88/fw.c | 86 +++ drivers/net/wireless/realtek/rtw88/fw.h | 69 +++ drivers/net/wireless/realtek/rtw88/mac80211.c | 44 ++ drivers/net/wireless/realtek/rtw88/main.c | 3 + drivers/net/wireless/realtek/rtw88/main.h | 18 + drivers/net/wireless/realtek/rtw88/pci.c | 18 + drivers/net/wireless/realtek/rtw88/reg.h | 13 + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 12 + drivers/net/wireless/realtek/rtw88/util.h | 2 + drivers/net/wireless/realtek/rtw88/wow.c | 531 ++++++++++++++++++ drivers/net/wireless/realtek/rtw88/wow.h | 38 ++ 13 files changed, 836 insertions(+) create mode 100644 drivers/net/wireless/realtek/rtw88/wow.c create mode 100644 drivers/net/wireless/realtek/rtw88/wow.h
drivers/net/wireless/realtek/rtw88/Makefile +1 -0
@@ -15,6 +15,7 @@ rtw88-y += main.o \ ps.o \ sec.o \ bf.o \ + wow.o \ regd.o rtw88-$(CONFIG_RTW88_8822BE) += rtw8822b.o rtw8822b_table.o
drivers/net/wireless/realtek/rtw88/debug.h +1 -0
@@ -18,6 +18,7 @@ enum rtw_debug_mask {RTW_DBG_DEBUGFS =0x00000200 ,RTW_DBG_PS =0x00000400 ,RTW_DBG_BF =0x00000800 , +RTW_DBG_WOW =0x00001000 , RTW_DBG_ALL = 0xffffffff };
drivers/net/wireless/realtek/rtw88/fw.c +86 -0
98 lines not on this page · raw message
drivers/net/wireless/realtek/rtw88/fw.h +69 -0
91 lines not on this page · raw message
drivers/net/wireless/realtek/rtw88/mac80211.c +44 -0
61 lines not on this page · raw message
drivers/net/wireless/realtek/rtw88/main.c +3 -0
@@ -1493,6 +1493,9 @@ int rtw_register_hw(struct rtw_dev *rtwdev, struct ieee80211_hw *hw)wiphy_ext_feature_set (hw->wiphy,NL80211_EXT_FEATURE_CAN_REPLACE_PTK0 ); +#ifdef CONFIG_PM + hw->wiphy->wowlan = rtwdev->chip->wowlan_stub; +#endif rtw_set_supported_band (hw, rtwdev->chip);SET_IEEE80211_PERM_ADDR (hw, rtwdev->efuse.addr);
drivers/net/wireless/realtek/rtw88/main.h +18 -0
@@ -342,6 +342,7 @@ enum rtw_flags {RTW_FLAG_LEISURE_PS_DEEP ,RTW_FLAG_DIG_DISABLE ,RTW_FLAG_BUSY_TRAFFIC , +RTW_FLAG_WOWLAN , NUM_OF_RTW_FLAGS, };
@@ -372,6 +373,15 @@ enum rtw_snr { RTW_SNR_NUM }; +enum rtw_wow_flags { +RTW_WOW_FLAG_EN_MAGIC_PKT , +RTW_WOW_FLAG_EN_REKEY_PKT , +RTW_WOW_FLAG_EN_DISCONNECT , + +/* keep it last */ +RTW_WOW_FLAG_MAX , +}; +/* the power index is represented by differences, which cck-1s & ht40-1s are * the base values, so for 1s's differences, there are only ht20 & ofdm */
@@ -907,6 +917,12 @@ struct rtw_intf_phy_para {u16 platform; }; +struct rtw_wow_param { +struct ieee80211_vif *wow_vif; + DECLARE_BITMAP(flags, RTW_WOW_FLAG_MAX); +u8 txpause; +}; +struct rtw_intf_phy_para_table {struct rtw_intf_phy_para *usb2_para;struct rtw_intf_phy_para *usb3_para;
@@ -1036,6 +1052,7 @@ struct rtw_chip_info {u8 bfer_mu_max_num;const char *wow_fw_name; +const struct wiphy_wowlan_support *wowlan_stub;/* coex paras */ u32 coex_para_ver;
@@ -1589,6 +1606,7 @@ struct rtw_dev {u8 mp_mode;struct rtw_fw_state wow_fw; +struct rtw_wow_param wow;/* hci related data, must be last */ u8 priv[0 ]__aligned(sizeof(void *)) ;
drivers/net/wireless/realtek/rtw88/pci.c +18 -0
@@ -1266,6 +1266,23 @@ static void rtw_pci_phy_cfg(struct rtw_dev *rtwdev)rtw_pci_link_cfg (rtwdev); } +#ifdef CONFIG_PM +static int rtw_pci_suspend (struct device *dev) +{ +return 0 ; +} + +static int rtw_pci_resume (struct device *dev) +{ +return 0 ; +} + +static SIMPLE_DEV_PM_OPS(rtw_pm_ops, rtw_pci_suspend, rtw_pci_resume); +#define RTW_PM_OPS (&rtw_pm_ops) +#else +#define RTW_PM_OPS NULL +#endif +static int rtw_pci_claim (struct rtw_dev *rtwdev,struct pci_dev *pdev) {int ret;
@@ -1491,6 +1508,7 @@ static struct pci_driver rtw_pci_driver = { .id_table = rtw_pci_id_table, .probe = rtw_pci_probe, .remove = rtw_pci_remove, + .driver.pm = RTW_PM_OPS, };module_pci_driver (rtw_pci_driver);
drivers/net/wireless/realtek/rtw88/reg.h +13 -0
@@ -9,6 +9,8 @@#define BIT_FEN_CPUEN BIT(2)#define BIT_FEN_BB_GLB_RST BIT(1)#define BIT_FEN_BB_RSTB BIT(0) +#define BIT_R_DIS_PRST BIT(6) +#define BIT_WLOCK_1C_B6 BIT(5)#define REG_SYS_PW_CTRL 0x0004#define REG_SYS_CLK_CTRL 0x0008#define BIT_CPU_CLK_EN BIT(14)
@@ -160,8 +162,12 @@#define REG_CR 0x0100#define REG_TRXFF_BNDY 0x0114#define REG_RXFF_BNDY 0x011C +#define REG_FE1IMR 0x0120 +#define BIT_FS_RXDONE BIT(16)#define REG_PKTBUF_DBG_CTRL 0x0140#define REG_C2HEVT 0x01A0 +#define REG_MCUTST_II 0x01C4 +#define REG_WOWLAN_WAKE_REASON 0x01C7#define REG_HMETFR 0x01CC#define REG_HMEBOX0 0x01D0#define REG_HMEBOX1 0x01D4
@@ -192,9 +198,16 @@#define REG_H2C_TAIL 0x0248#define REG_H2C_READ_ADDR 0x024C#define REG_H2C_INFO 0x0254 +#define REG_RXPKT_NUM 0x0284 +#define BIT_RXDMA_REQ BIT(19) +#define BIT_RW_RELEASE BIT(18) +#define BIT_RXDMA_IDLE BIT(17) +#define REG_RXPKTNUM 0x02B0#define REG_INT_MIG 0x0304 +#define REG_BCNQ_INFO 0x0418 +#define BIT_MGQ_CPU_EMPTY BIT(24)#define REG_FWHW_TXQ_CTRL 0x0420#define BIT_EN_BCNQ_DL BIT(22)#define BIT_EN_WR_FREE_TAIL BIT(20)
drivers/net/wireless/realtek/rtw88/rtw8822c.c +12 -0
@@ -4060,6 +4060,13 @@ static const struct rtw_pwr_track_tbl rtw8822c_rtw_pwr_track_tbl = { .pwrtrk_2g_ccka_p = rtw8822c_pwrtrk_2g_cck_a_p, }; +#ifdef CONFIG_PM +static const struct wiphy_wowlan_support rtw_wowlan_stub_8822c = { + .flags =WIPHY_WOWLAN_MAGIC_PKT |WIPHY_WOWLAN_GTK_REKEY_FAILURE | +WIPHY_WOWLAN_DISCONNECT |WIPHY_WOWLAN_SUPPORTS_GTK_REKEY , +}; +#endif +struct rtw_chip_info rtw8822c_hw_spec = { .ops = &rtw8822c_ops, .id =RTW_CHIP_TYPE_8822C ,
@@ -4106,6 +4113,10 @@ struct rtw_chip_info rtw8822c_hw_spec = { .bfer_su_max_num = 2, .bfer_mu_max_num =1 , +#ifdef CONFIG_PM + .wow_fw_name ="rtw88/rtw8822c_wow_fw.bin" , + .wowlan_stub = &rtw_wowlan_stub_8822c, +#endif .coex_para_ver =0x19062706 , .bt_desired_ver = 0x6, .scbd_support = true,
@@ -4135,3 +4146,4 @@ struct rtw_chip_info rtw8822c_hw_spec = {EXPORT_SYMBOL (rtw8822c_hw_spec);MODULE_FIRMWARE ("rtw88/rtw8822c_fw.bin" ); +MODULE_FIRMWARE ("rtw88/rtw8822c_wow_fw.bin" );
drivers/net/wireless/realtek/rtw88/util.h +2 -0
@@ -15,6 +15,8 @@ struct rtw_dev; IEEE80211_IFACE_ITER_NORMAL, iterator, data)#define rtw_iterate_stas_atomic (rtwdev, iterator, data) \ ieee80211_iterate_stations_atomic(rtwdev->hw, iterator, data) +#define rtw_iterate_keys (rtwdev, vif, iterator, data) \ + ieee80211_iter_keys(rtwdev->hw, vif, iterator, data)static inline u8 *get_hdr_bssid (struct ieee80211_hdr *hdr) {
drivers/net/wireless/realtek/rtw88/wow.c new file +531 -0
531 lines not on this page · raw message
drivers/net/wireless/realtek/rtw88/wow.h new file +38 -0
@@ -0,0 +1,38 @@ +/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ +/* Copyright(c) 2018-2019 Realtek Corporation +*/ + +#ifndef __RTW_WOW_H__ +#define __RTW_WOW_H__ + +enum rtw_wake_reason { +RTW_WOW_RSN_RX_PTK_REKEY =0x1 , +RTW_WOW_RSN_RX_GTK_REKEY =0x2 , +RTW_WOW_RSN_RX_DEAUTH =0x8 , +RTW_WOW_RSN_DISCONNECT =0x10 , +RTW_WOW_RSN_RX_MAGIC_PKT =0x21 , +}; + +struct rtw_fw_media_status_iter_data { +struct rtw_dev *rtwdev; +u8 connect; +}; + +struct rtw_fw_key_type_iter_data { +struct rtw_dev *rtwdev; +u8 group_key_type; +u8 pairwise_key_type; +}; + +static inline bool rtw_wow_mgd_linked (struct rtw_dev *rtwdev) +{ +struct ieee80211_vif *wow_vif = rtwdev->wow.wow_vif; +struct rtw_vif *rtwvif = (struct rtw_vif *)wow_vif->drv_priv; + +return (rtwvif->net_type ==RTW_NET_MGD_LINKED ); +} + +int rtw_wow_suspend (struct rtw_dev *rtwdev,struct cfg80211_wowlan *wowlan); +int rtw_wow_resume (struct rtw_dev *rtwdev); + +#endif
Signature · 1 line
2.17.1
Re: [PATCH v2 4/6] rtw88: support wowlan feature for 8822c
Quoted 332 lines · On Mon, Dec 9, 2019 at 3:21 PM <[email protected]> wrote:
From: Chin-Yen Lee <[email protected]>
Wake on WLAN(wowlan) is a feature which allows devices to be woken up from suspend state through wlan events.
When user enables wowlan feature and then let the device enter suspend state, wowlan firmware will be loaded by the driver and periodically monitors wifi packets. Power consumption of wifi chip will be reduced in this state.
If wowlan firmware detects that specific wlan event happens, it will issue wakeup signal to trigger resume process. Driver will load normal firmware and let wifi chip return to the original state.
Currently supported wlan events include receiving magic packet, rekey packet and deauth packet, and disconnecting from AP.
Signed-off-by Chin-Yen Lee <[email protected]>Signed-off-by Yan-Hsuan Chuang <[email protected]>---
v1 -> v2
* no changedrivers/net/wireless/realtek/rtw88/wow.c new file +299
-0@@ -0,0 +1,531 @@ +// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause +/* Copyright(c) 2018-2019 Realtek Corporation +*/ + +#include "main.h" +#include "fw.h" +#include "wow.h" +#include "reg.h" +#include "debug.h" +#include "mac.h" +#include "ps.h" + +static void rtw_wow_show_wakeup_reason (struct rtw_dev *rtwdev) +{ +u8 reason; + + reason =rtw_read8 (rtwdev,REG_WOWLAN_WAKE_REASON ); + +if (reason ==RTW_WOW_RSN_RX_DEAUTH ) +rtw_dbg (rtwdev,RTW_DBG_WOW ,"WOW: Rx deauth\n" ); +else if (reason ==RTW_WOW_RSN_DISCONNECT ) +rtw_dbg (rtwdev,RTW_DBG_WOW ,"WOW: AP is off\n" ); +else if (reason ==RTW_WOW_RSN_RX_MAGIC_PKT ) +rtw_dbg (rtwdev,RTW_DBG_WOW ,"WOW: Rx magic packet\n" ); +else if (reason ==RTW_WOW_RSN_RX_GTK_REKEY ) +rtw_dbg (rtwdev,RTW_DBG_WOW ,"WOW: Rx gtk rekey\n" ); +else if (reason ==RTW_WOW_RSN_RX_PTK_REKEY ) +rtw_dbg (rtwdev,RTW_DBG_WOW ,"WOW: Rx ptk rekey\n" ); +else +rtw_warn (rtwdev,"Unknown wakeup reason %x\n" , reason); +} + +static void rtw_wow_bb_stop (struct rtw_dev *rtwdev) +{ +struct rtw_wow_param *rtw_wow = &rtwdev->wow; + +/* wait 100ms for firmware to finish TX */ +msleep (100 ); + +if (!rtw_read32_mask (rtwdev,REG_BCNQ_INFO ,BIT_MGQ_CPU_EMPTY )) +rtw_warn (rtwdev,"Wrong status of MGQ_CPU empty!\n" ); + + rtw_wow->txpause =rtw_read8 (rtwdev,REG_TXPAUSE ); +rtw_write8 (rtwdev,REG_TXPAUSE ,0xff ); +rtw_write8_clr (rtwdev,REG_SYS_FUNC_EN ,BIT_FEN_BB_RSTB ); +} + +static void rtw_wow_bb_start (struct rtw_dev *rtwdev) +{ +struct rtw_wow_param *rtw_wow = &rtwdev->wow; + +rtw_write8_set (rtwdev,REG_SYS_FUNC_EN ,BIT_FEN_BB_RSTB ); +rtw_write8 (rtwdev,REG_TXPAUSE , rtw_wow->txpause); +} + +static void rtw_wow_rx_dma_stop (struct rtw_dev *rtwdev) +{ +/* wait 100ms for HW to finish rx dma */ +msleep (100 ); + +rtw_write32_set (rtwdev,REG_RXPKT_NUM ,BIT_RW_RELEASE ); + +if (!check_hw_ready (rtwdev,REG_RXPKT_NUM ,BIT_RXDMA_IDLE ,1 )) +rtw_err (rtwdev,"failed to stop rx dma\n" ); +} + +static void rtw_wow_rx_dma_start (struct rtw_dev *rtwdev) +{ +rtw_write32_clr (rtwdev,REG_RXPKT_NUM ,BIT_RW_RELEASE ); +} + +static bool rtw_wow_check_fw_status (struct rtw_dev *rtwdev,bool wow_enable) +{ +bool ret; + +/* wait 100ms for wow firmware to finish work */ +msleep (100 ); + +if (wow_enable) { +if (!rtw_read8 (rtwdev,REG_WOWLAN_WAKE_REASON )) + ret =0 ; + }else { +if (rtw_read32_mask (rtwdev,REG_FE1IMR ,BIT_FS_RXDONE ) ==0 && +rtw_read32_mask (rtwdev,REG_RXPKT_NUM ,BIT_RW_RELEASE ) ==0 ) + ret =0 ; + } + +if (ret) +rtw_err (rtwdev,"failed to check wow status %s\n" , + wow_enable ?"enabled" :"disabled" ); + +return ret; +} + +static void rtw_wow_fw_security_type_iter (struct ieee80211_hw *hw, +struct ieee80211_vif *vif, +struct ieee80211_sta *sta, +struct ieee80211_key_conf *key, +void *data) +{ +struct rtw_fw_key_type_iter_data *iter_data = data; +struct rtw_dev *rtwdev = hw->priv; +u8 hw_key_type; + +if (vif != rtwdev->wow.wow_vif) +return ; + +switch (key->cipher) { +case WLAN_CIPHER_SUITE_WEP40 : + hw_key_type =RTW_CAM_WEP40 ; +break ; +case WLAN_CIPHER_SUITE_WEP104 : + hw_key_type =RTW_CAM_WEP104 ; +break ; +case WLAN_CIPHER_SUITE_TKIP : + hw_key_type =RTW_CAM_TKIP ; + key->flags |=IEEE80211_KEY_FLAG_GENERATE_MMIC ; +break ; +case WLAN_CIPHER_SUITE_CCMP : + hw_key_type =RTW_CAM_AES ; + key->flags |=IEEE80211_KEY_FLAG_SW_MGMT_TX ; +break ; +default : +rtw_err (rtwdev,"Unsupported key type for wowlan mode\n" ); + hw_key_type =0 ; +break ; + } + +if (sta) + iter_data->pairwise_key_type = hw_key_type; +else + iter_data->group_key_type = hw_key_type; +} + +static void rtw_wow_fw_security_type (struct rtw_dev *rtwdev) +{ +struct rtw_fw_key_type_iter_data data = {}; +struct ieee80211_vif *wow_vif = rtwdev->wow.wow_vif; + + data.rtwdev = rtwdev; +rtw_iterate_keys (rtwdev, wow_vif, + rtw_wow_fw_security_type_iter, &data); +rtw_fw_set_aoac_global_info_cmd (rtwdev, data.pairwise_key_type, + data.group_key_type); +} + +static int rtw_wow_fw_start (struct rtw_dev *rtwdev) +{ +if (rtw_wow_mgd_linked (rtwdev)) { +rtw_send_rsvd_page_h2c (rtwdev); +rtw_wow_fw_security_type (rtwdev); +rtw_fw_set_disconnect_decision_cmd (rtwdev, true); +rtw_fw_set_keep_alive_cmd (rtwdev, true); + } + +rtw_fw_set_wowlan_ctrl_cmd (rtwdev, true); +rtw_fw_set_remote_wake_ctrl_cmd (rtwdev, true); + +return rtw_wow_check_fw_status (rtwdev, true); +} + +static int rtw_wow_fw_stop (struct rtw_dev *rtwdev) +{ +if (rtw_wow_mgd_linked (rtwdev)) { +rtw_fw_set_disconnect_decision_cmd (rtwdev, false); +rtw_fw_set_keep_alive_cmd (rtwdev, false); + } + +rtw_fw_set_wowlan_ctrl_cmd (rtwdev, false); +rtw_fw_set_remote_wake_ctrl_cmd (rtwdev, false); + +return rtw_wow_check_fw_status (rtwdev, false); +} + +static void rtw_wow_avoid_reset_mac (struct rtw_dev *rtwdev) +{ +/* When resuming from wowlan mode, some hosts issue signal +* (PCIE: PREST, USB: SE0RST) to device, and lead to reset +* mac core. If it happens, the connection to AP will be lost. +* Setting REG_RSV_CTRL Register can avoid this process. +*/ +switch (rtw_hci_type (rtwdev)) { +case RTW_HCI_TYPE_PCIE : +case RTW_HCI_TYPE_USB : +rtw_write8 (rtwdev,REG_RSV_CTRL ,BIT_WLOCK_1C_B6 ); +rtw_write8 (rtwdev,REG_RSV_CTRL , +BIT_WLOCK_1C_B6 |BIT_R_DIS_PRST ); +break ; +default : +rtw_warn (rtwdev,"Unsupported hci type to disable reset MAC\n" ); +break ; + } +} + +static void rtw_wow_fw_media_status_iter (void *data,struct ieee80211_sta *sta) +{ +struct rtw_sta_info *si = (struct rtw_sta_info *)sta->drv_priv; +struct rtw_fw_media_status_iter_data *iter_data = data; +struct rtw_dev *rtwdev = iter_data->rtwdev; + +rtw_fw_media_status_report (rtwdev, si->mac_id, iter_data->connect); +} + +static void rtw_wow_fw_media_status (struct rtw_dev *rtwdev,bool connect) +{ +struct rtw_fw_media_status_iter_data data; + + data.rtwdev = rtwdev; + data.connect = connect; + +rtw_iterate_stas_atomic (rtwdev, rtw_wow_fw_media_status_iter, &data); +} + +void __rtw_wow_config_linked_rsvd_page (struct rtw_dev *rtwdev) +{ +rtw_add_rsvd_page (rtwdev,RSVD_PS_POLL , true); +rtw_add_rsvd_page (rtwdev,RSVD_QOS_NULL , true); +rtw_add_rsvd_page (rtwdev,RSVD_NULL , true); +rtw_add_rsvd_page (rtwdev,RSVD_LPS_PG_DPK , true); +rtw_add_rsvd_page (rtwdev,RSVD_LPS_PG_INFO , true); +} + +static void rtw_wow_config_rsvd_page (struct rtw_dev *rtwdev) +{ +rtw_reset_rsvd_page (rtwdev); + +if (rtw_wow_mgd_linked (rtwdev)) +__rtw_wow_config_linked_rsvd_page (rtwdev); +} + +static int rtw_wow_dl_fw_rsvd_page (struct rtw_dev *rtwdev) +{ +struct ieee80211_vif *wow_vif = rtwdev->wow.wow_vif; + +rtw_wow_config_rsvd_page (rtwdev); + +return rtw_fw_download_rsvd_page (rtwdev, wow_vif); +} + +static int rtw_wow_swap_fw (struct rtw_dev *rtwdev,enum rtw_fw_type type) +{ +struct rtw_fw_state *fw; +int ret; + +switch (type) { +case RTW_WOWLAN_FW : + fw = &rtwdev->wow_fw; +break ; + +case RTW_NORMAL_FW : + fw = &rtwdev->fw; +break ; + +default : +rtw_warn (rtwdev,"unsupported firmware type to swap\n" ); +return -ENOENT ; + } + + ret =rtw_download_firmware (rtwdev, fw); +if (ret) + goto out; + +rtw_fw_send_general_info (rtwdev); +rtw_fw_send_phydm_info (rtwdev); +rtw_wow_fw_media_status (rtwdev, true); + +out: +return ret; +} + +static int __rtw_wow_leave_linked_ps (struct rtw_dev *rtwdev) +{ +if (!test_bit (RTW_FLAG_WOWLAN , rtwdev->flags)) +cancel_delayed_work_sync (&rtwdev->watch_dog_work); + +return 0 ; +} + +static int rtw_wow_leave_ps (struct rtw_dev *rtwdev) +{ +int ret =0 ; + +if (rtw_wow_mgd_linked (rtwdev)) + ret =__rtw_wow_leave_linked_ps (rtwdev); + +return ret; +} + +static int __rtw_wow_enter_linked_ps (struct rtw_dev *rtwdev) +{ +struct rtw_wow_param *rtw_wow = &rtwdev->wow; +struct ieee80211_vif *wow_vif = rtw_wow->wow_vif; +struct rtw_vif *rtwvif = (struct rtw_vif *)wow_vif->drv_priv; + +rtw_enter_lps (rtwdev, rtwvif->port); + +return 0 ; +} +
drivers/net/wireless/realtek/rtw88/wow.c line 309
Quoted 10 lines
drivers/net/wireless/realtek/rtw88/wow.c new file +10
-0+static int rtw_wow_enter_ps (struct rtw_dev *rtwdev) +{ +int ret =0 ; + +if (rtw_wow_mgd_linked (rtwdev)) + ret =__rtw_wow_enter_linked_ps (rtwdev); + +return ret; +} +
I don't like __underscore_means_inner_function(). The function void __rtw_wow_config_linked_rsvd_page does not even prefix with static. I strongly prefer function_has_a_proper_name() so please come up with something that describes what it is really doing and name it like that. The rest of the code looks OK to me.
Quoted 3 lines
--
2.17.1
RE: [PATCH v2 4/6] rtw88: support wowlan feature for 8822c
From: Chris Chiu
Quoted 369 lines · On Mon, Dec 9, 2019 at 3:21 PM <[email protected]> wrote:
Quoted 20 lines
From: Chin-Yen Lee <[email protected]>
Wake on WLAN(wowlan) is a feature which allows devices to be woken up from suspend state through wlan events.
When user enables wowlan feature and then let the device enter suspend state, wowlan firmware will be loaded by the driver and periodically monitors wifi packets. Power consumption of wifi chip will be reduced in this state.
If wowlan firmware detects that specific wlan event happens, it will issue wakeup signal to trigger resume process. Driver will load normal firmware and let wifi chip return to the original state.
Currently supported wlan events include receiving magic packet, rekey packet and deauth packet, and disconnecting from AP.
Review
Quoted 8 lines
Signed-off-by Chin-Yen Lee <[email protected]>Signed-off-by Yan-Hsuan Chuang <[email protected]>---
v1 -> v2
* no change(quoted diff) +0
-0
b/drivers/net/wireless/realtek/rtw88/wow.cQuoted 15 lines
new file mode 100644
index 000000000000..e1657d3cb615drivers/net/wireless/realtek/rtw88/wow.c new file +10
-0@@ -0,0 +1,531 @@ +// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause +/* Copyright(c) 2018-2019 Realtek Corporation +*/ + +#include "main.h" +#include "fw.h" +#include "wow.h" +#include "reg.h" +#include "debug.h" +#include "mac.h" drivers/net/wireless/realtek/rtw88/wow.c line 20
Quoted 10 lines
drivers/net/wireless/realtek/rtw88/wow.c new file +10
-0+#include "ps.h" + +static void rtw_wow_show_wakeup_reason (struct rtw_dev *rtwdev) +{ +u8 reason; + + reason =rtw_read8 (rtwdev,REG_WOWLAN_WAKE_REASON ); + +if (reason ==RTW_WOW_RSN_RX_DEAUTH ) + rtw_dbg(rtwdev, RTW_DBG_WOW, "WOW: Rxdeauth\n");
drivers/net/wireless/realtek/rtw88/wow.c line 22
Quoted 2 lines
drivers/net/wireless/realtek/rtw88/wow.c new file +2
-0+else if (reason ==RTW_WOW_RSN_DISCONNECT ) + rtw_dbg(rtwdev, RTW_DBG_WOW, "WOW: AP isoff\n");
drivers/net/wireless/realtek/rtw88/wow.c line 24
Quoted 2 lines
drivers/net/wireless/realtek/rtw88/wow.c new file +2
-0+else if (reason ==RTW_WOW_RSN_RX_MAGIC_PKT ) + rtw_dbg(rtwdev, RTW_DBG_WOW, "WOW: Rx magicpacket\n");
drivers/net/wireless/realtek/rtw88/wow.c line 26
Quoted 2 lines
drivers/net/wireless/realtek/rtw88/wow.c new file +2
-0+else if (reason ==RTW_WOW_RSN_RX_GTK_REKEY ) + rtw_dbg(rtwdev, RTW_DBG_WOW, "WOW: Rx gtkrekey\n");
drivers/net/wireless/realtek/rtw88/wow.c line 28
Quoted 2 lines
drivers/net/wireless/realtek/rtw88/wow.c new file +2
-0+else if (reason ==RTW_WOW_RSN_RX_PTK_REKEY ) + rtw_dbg(rtwdev, RTW_DBG_WOW, "WOW: Rx ptkrekey\n");
drivers/net/wireless/realtek/rtw88/wow.c line 30
Quoted 2 lines
drivers/net/wireless/realtek/rtw88/wow.c new file +2
-0+else + rtw_warn(rtwdev, "Unknown wakeup reason %x\n",reason);
drivers/net/wireless/realtek/rtw88/wow.c
Quoted 10 lines
drivers/net/wireless/realtek/rtw88/wow.c new file +10
-0+} + +static void rtw_wow_bb_stop(struct rtw_dev *rtwdev) +{ + struct rtw_wow_param *rtw_wow = &rtwdev->wow; + + /* wait 100ms for firmware to finish TX */ + msleep(100); + + if (!rtw_read32_mask(rtwdev, REG_BCNQ_INFO,
BIT_MGQ_CPU_EMPTY))drivers/net/wireless/realtek/rtw88/wow.c line 41
Quoted 1 line
drivers/net/wireless/realtek/rtw88/wow.c new file +1
-0+ rtw_warn(rtwdev, "Wrong status of MGQ_CPUempty!\n");
Quoted 12 lines
drivers/net/wireless/realtek/rtw88/wow.c new file +12
-0+ + rtw_wow->txpause =rtw_read8 (rtwdev,REG_TXPAUSE ); +rtw_write8 (rtwdev,REG_TXPAUSE ,0xff ); +rtw_write8_clr (rtwdev,REG_SYS_FUNC_EN ,BIT_FEN_BB_RSTB ); +} + +static void rtw_wow_bb_start (struct rtw_dev *rtwdev) +{ +struct rtw_wow_param *rtw_wow = &rtwdev->wow; + +rtw_write8_set (rtwdev,REG_SYS_FUNC_EN ,BIT_FEN_BB_RSTB ); +rtw_write8 (rtwdev,REG_TXPAUSE , rtw_wow->txpause);drivers/net/wireless/realtek/rtw88/wow.c
Quoted 10 lines
drivers/net/wireless/realtek/rtw88/wow.c new file +10
-0+} + +static void rtw_wow_rx_dma_stop(struct rtw_dev *rtwdev) +{ + /* wait 100ms for HW to finish rx dma */ + msleep(100); + + rtw_write32_set(rtwdev, REG_RXPKT_NUM, BIT_RW_RELEASE); + + if (!check_hw_ready(rtwdev, REG_RXPKT_NUM,
BIT_RXDMA_IDLE, 1))drivers/net/wireless/realtek/rtw88/wow.c
Quoted 9 lines
drivers/net/wireless/realtek/rtw88/wow.c new file +9
-0+rtw_err (rtwdev,"failed to stop rx dma\n" ); +} + +static void rtw_wow_rx_dma_start (struct rtw_dev *rtwdev) +{ +rtw_write32_clr (rtwdev,REG_RXPKT_NUM ,BIT_RW_RELEASE ); +} + +static bool rtw_wow_check_fw_status(struct rtw_dev *rtwdev, bool
wow_enable)drivers/net/wireless/realtek/rtw88/wow.c
Quoted 8 lines
drivers/net/wireless/realtek/rtw88/wow.c new file +8
-0+{ + bool ret; + + /* wait 100ms for wow firmware to finish work */ + msleep(100); + + if (wow_enable) { + if (!rtw_read8(rtwdev,
REG_WOWLAN_WAKE_REASON))drivers/net/wireless/realtek/rtw88/wow.c
Quoted 3 lines
drivers/net/wireless/realtek/rtw88/wow.c new file +3
-0+ ret =0 ; + }else { + if (rtw_read32_mask(rtwdev, REG_FE1IMR,
BIT_FS_RXDONE) == 0 &&drivers/net/wireless/realtek/rtw88/wow.c line 84
Quoted 1 line
drivers/net/wireless/realtek/rtw88/wow.c new file +1
-0+ rtw_read32_mask(rtwdev, REG_RXPKT_NUM,
BIT_RW_RELEASE) == 0)drivers/net/wireless/realtek/rtw88/wow.c
Quoted 12 lines
drivers/net/wireless/realtek/rtw88/wow.c new file +12
-0+ ret =0 ; + } + +if (ret) +rtw_err (rtwdev,"failed to check wow status %s\n" , + wow_enable ?"enabled" :"disabled" ); + +return ret; +} + +static void rtw_wow_fw_security_type_iter (struct ieee80211_hw *hw, + struct ieee80211_vif*vif,
drivers/net/wireless/realtek/rtw88/wow.c line 97
Quoted 1 line
drivers/net/wireless/realtek/rtw88/wow.c new file +1
-0+struct ieee80211_sta *sta,
drivers/net/wireless/realtek/rtw88/wow.c line 98
Quoted 1 line
drivers/net/wireless/realtek/rtw88/wow.c new file +1
-0+ struct
ieee80211_key_conf*key,Quoted 16 lines
drivers/net/wireless/realtek/rtw88/wow.c new file +16
-0+ void *data) +{ +struct rtw_fw_key_type_iter_data *iter_data = data; +struct rtw_dev *rtwdev = hw->priv; +u8 hw_key_type; + +if (vif != rtwdev->wow.wow_vif) +return ; + +switch (key->cipher) { +case WLAN_CIPHER_SUITE_WEP40 : + hw_key_type =RTW_CAM_WEP40 ; +break ; +case WLAN_CIPHER_SUITE_WEP104 : + hw_key_type =RTW_CAM_WEP104 ; +break ;drivers/net/wireless/realtek/rtw88/wow.c
Quoted 10 lines
drivers/net/wireless/realtek/rtw88/wow.c new file +10
-0+case WLAN_CIPHER_SUITE_TKIP : + hw_key_type =RTW_CAM_TKIP ; + key->flags |=IEEE80211_KEY_FLAG_GENERATE_MMIC ; +break ; +case WLAN_CIPHER_SUITE_CCMP : + hw_key_type =RTW_CAM_AES ; + key->flags |=IEEE80211_KEY_FLAG_SW_MGMT_TX ; +break ; +default : + rtw_err(rtwdev, "Unsupported key type for wowlanmode\n");
Quoted 9 lines
drivers/net/wireless/realtek/rtw88/wow.c new file +9
-0+ hw_key_type =0 ; +break ; + } + +if (sta) + iter_data->pairwise_key_type = hw_key_type; +else + iter_data->group_key_type = hw_key_type; +}drivers/net/wireless/realtek/rtw88/wow.c
Quoted 10 lines
drivers/net/wireless/realtek/rtw88/wow.c new file +10
-0+ +static void rtw_wow_fw_security_type (struct rtw_dev *rtwdev) +{ +struct rtw_fw_key_type_iter_data data = {}; +struct ieee80211_vif *wow_vif = rtwdev->wow.wow_vif; + + data.rtwdev = rtwdev; +rtw_iterate_keys (rtwdev, wow_vif, + rtw_wow_fw_security_type_iter, &data); + rtw_fw_set_aoac_global_info_cmd(rtwdev,data.pairwise_key_type,
Quoted 32 lines
drivers/net/wireless/realtek/rtw88/wow.c new file +32
-0+ data.group_key_type); +} + +static int rtw_wow_fw_start (struct rtw_dev *rtwdev) +{ +if (rtw_wow_mgd_linked (rtwdev)) { +rtw_send_rsvd_page_h2c (rtwdev); +rtw_wow_fw_security_type (rtwdev); +rtw_fw_set_disconnect_decision_cmd (rtwdev, true); +rtw_fw_set_keep_alive_cmd (rtwdev, true); + } + +rtw_fw_set_wowlan_ctrl_cmd (rtwdev, true); +rtw_fw_set_remote_wake_ctrl_cmd (rtwdev, true); + +return rtw_wow_check_fw_status (rtwdev, true); +} + +static int rtw_wow_fw_stop (struct rtw_dev *rtwdev) +{ +if (rtw_wow_mgd_linked (rtwdev)) { +rtw_fw_set_disconnect_decision_cmd (rtwdev, false); +rtw_fw_set_keep_alive_cmd (rtwdev, false); + } + +rtw_fw_set_wowlan_ctrl_cmd (rtwdev, false); +rtw_fw_set_remote_wake_ctrl_cmd (rtwdev, false); + +return rtw_wow_check_fw_status (rtwdev, false); +} + +static void rtw_wow_avoid_reset_mac (struct rtw_dev *rtwdev)drivers/net/wireless/realtek/rtw88/wow.c line 186
Quoted 10 lines
drivers/net/wireless/realtek/rtw88/wow.c new file +10
-0+{ +/* When resuming from wowlan mode, some hosts issue signal +* (PCIE: PREST, USB: SE0RST) to device, and lead to reset +* mac core. If it happens, the connection to AP will be lost. +* Setting REG_RSV_CTRL Register can avoid this process. +*/ +switch (rtw_hci_type (rtwdev)) { +case RTW_HCI_TYPE_PCIE : +case RTW_HCI_TYPE_USB : + rtw_write8(rtwdev, REG_RSV_CTRL,
BIT_WLOCK_1C_B6);drivers/net/wireless/realtek/rtw88/wow.c
Quoted 5 lines
drivers/net/wireless/realtek/rtw88/wow.c new file +5
-0+rtw_write8 (rtwdev,REG_RSV_CTRL , +BIT_WLOCK_1C_B6 |BIT_R_DIS_PRST ); +break ; +default : + rtw_warn(rtwdev, "Unsupported hci type to disablereset MAC\n");
drivers/net/wireless/realtek/rtw88/wow.c
Quoted 5 lines
drivers/net/wireless/realtek/rtw88/wow.c new file +5
-0+break ; + } +} + +static void rtw_wow_fw_media_status_iter(void *data, struct
ieee80211_sta*sta)drivers/net/wireless/realtek/rtw88/wow.c
Quoted 6 lines
drivers/net/wireless/realtek/rtw88/wow.c new file +6
-0+{ +struct rtw_sta_info *si = (struct rtw_sta_info *)sta->drv_priv; +struct rtw_fw_media_status_iter_data *iter_data = data; +struct rtw_dev *rtwdev = iter_data->rtwdev; + + rtw_fw_media_status_report(rtwdev, si->mac_id,
iter_data->connect);drivers/net/wireless/realtek/rtw88/wow.c line 204
Quoted 3 lines
drivers/net/wireless/realtek/rtw88/wow.c new file +3
-0+} + +static void rtw_wow_fw_media_status(struct rtw_dev *rtwdev, boolconnect)
drivers/net/wireless/realtek/rtw88/wow.c
Quoted 7 lines
drivers/net/wireless/realtek/rtw88/wow.c new file +7
-0+{ +struct rtw_fw_media_status_iter_data data; + + data.rtwdev = rtwdev; + data.connect = connect; + + rtw_iterate_stas_atomic(rtwdev,
rtw_wow_fw_media_status_iter, &data);Quoted 19 lines
drivers/net/wireless/realtek/rtw88/wow.c new file +19
-0+} + +void __rtw_wow_config_linked_rsvd_page (struct rtw_dev *rtwdev) +{ +rtw_add_rsvd_page (rtwdev,RSVD_PS_POLL , true); +rtw_add_rsvd_page (rtwdev,RSVD_QOS_NULL , true); +rtw_add_rsvd_page (rtwdev,RSVD_NULL , true); +rtw_add_rsvd_page (rtwdev,RSVD_LPS_PG_DPK , true); +rtw_add_rsvd_page (rtwdev,RSVD_LPS_PG_INFO , true); +} + +static void rtw_wow_config_rsvd_page (struct rtw_dev *rtwdev) +{ +rtw_reset_rsvd_page (rtwdev); + +if (rtw_wow_mgd_linked (rtwdev)) +__rtw_wow_config_linked_rsvd_page (rtwdev); +} +drivers/net/wireless/realtek/rtw88/wow.c
Quoted 10 lines
drivers/net/wireless/realtek/rtw88/wow.c new file +10
-0+static int rtw_wow_dl_fw_rsvd_page (struct rtw_dev *rtwdev) +{ +struct ieee80211_vif *wow_vif = rtwdev->wow.wow_vif; + +rtw_wow_config_rsvd_page (rtwdev); + +return rtw_fw_download_rsvd_page (rtwdev, wow_vif); +} + +static int rtw_wow_swap_fw(struct rtw_dev *rtwdev, enum rtw_fw_typetype)
Quoted 5 lines
drivers/net/wireless/realtek/rtw88/wow.c new file +5
-0+{ +struct rtw_fw_state *fw; +int ret; + +switch (type) {drivers/net/wireless/realtek/rtw88/wow.c
Quoted 10 lines
drivers/net/wireless/realtek/rtw88/wow.c new file +10
-0+case RTW_WOWLAN_FW : + fw = &rtwdev->wow_fw; +break ; + +case RTW_NORMAL_FW : + fw = &rtwdev->fw; +break ; + +default : + rtw_warn(rtwdev, "unsupported firmware type toswap\n");
Quoted 9 lines
drivers/net/wireless/realtek/rtw88/wow.c new file +9
-0+return -ENOENT ; + } + + ret =rtw_download_firmware (rtwdev, fw); +if (ret) + goto out; + +rtw_fw_send_general_info (rtwdev); +rtw_fw_send_phydm_info (rtwdev);drivers/net/wireless/realtek/rtw88/wow.c line 275
Quoted 10 lines
drivers/net/wireless/realtek/rtw88/wow.c new file +10
-0+rtw_wow_fw_media_status (rtwdev, true); + +out: +return ret; +} + +static int __rtw_wow_leave_linked_ps (struct rtw_dev *rtwdev) +{ +if (!test_bit (RTW_FLAG_WOWLAN , rtwdev->flags)) +
cancel_delayed_work_sync(&rtwdev->watch_dog_work);Quoted 33 lines
drivers/net/wireless/realtek/rtw88/wow.c new file +33
-0+ +return 0 ; +} + +static int rtw_wow_leave_ps (struct rtw_dev *rtwdev) +{ +int ret =0 ; + +if (rtw_wow_mgd_linked (rtwdev)) + ret =__rtw_wow_leave_linked_ps (rtwdev); + +return ret; +} + +static int __rtw_wow_enter_linked_ps (struct rtw_dev *rtwdev) +{ +struct rtw_wow_param *rtw_wow = &rtwdev->wow; +struct ieee80211_vif *wow_vif = rtw_wow->wow_vif; +struct rtw_vif *rtwvif = (struct rtw_vif *)wow_vif->drv_priv; + +rtw_enter_lps (rtwdev, rtwvif->port); + +return 0 ; +} + +static int rtw_wow_enter_ps (struct rtw_dev *rtwdev) +{ +int ret =0 ; + +if (rtw_wow_mgd_linked (rtwdev)) + ret =__rtw_wow_enter_linked_ps (rtwdev); + +return ret;
Quoted 9 lines
drivers/net/wireless/realtek/rtw88/wow.c line 309
Quoted 2 lines
drivers/net/wireless/realtek/rtw88/wow.c new file +2
-0+} +I don't like
__underscore_means_inner_function(). The function void__rtw_wow_config_linked_rsvd_pagedoes not even prefix with static. I strongly preferfunction_has_a_proper_name()so please come up with something that describes what it is really doing and name it like that. The rest of the code looks OK to me.
I am fine with the double underscore, but indeed that should be static. And since it looks like we can just remove the underscores here safely, I can remove them.
Yan Hsuan
PATCH v2 5/6 rtw88: Add wowlan pattern match support
In reply to [email protected]From: Chin-Yen Lee <[email protected]>
Pattern match is an option of wowlan to allow the device to be woken up from suspend mode when receiving packets matched user-designed patterns.
The patterns are written into hardware cam in suspend flow if users have set up them. If packets matched designed pattern are received, wowlan firmware will get an interrupt and then wake up the device.
---
v1 -> v2
* no change
drivers/net/wireless/realtek/rtw88/fw.c | 6 + drivers/net/wireless/realtek/rtw88/fw.h | 4 + drivers/net/wireless/realtek/rtw88/main.h | 14 ++ drivers/net/wireless/realtek/rtw88/reg.h | 14 ++ drivers/net/wireless/realtek/rtw88/rtw8822c.c | 3 + drivers/net/wireless/realtek/rtw88/wow.c | 224 ++++++++++++++++++ drivers/net/wireless/realtek/rtw88/wow.h | 9 + 7 files changed, 274 insertions(+)
drivers/net/wireless/realtek/rtw88/fw.c +6 -0
@@ -538,6 +538,8 @@ void rtw_fw_set_wowlan_ctrl_cmd(struct rtw_dev *rtwdev, bool enable)SET_WOWLAN_DEAUTH_WAKEUP_ENABLE (h2c_pkt, enable);if (test_bit (RTW_WOW_FLAG_EN_REKEY_PKT , rtw_wow->flags))SET_WOWLAN_REKEY_WAKEUP_ENABLE (h2c_pkt, enable); +if (rtw_wow->pattern_cnt) +SET_WOWLAN_PATTERN_MATCH_ENABLE (h2c_pkt, enable); }rtw_fw_send_h2c_command (rtwdev, h2c_pkt);
@@ -596,6 +598,7 @@ void rtw_fw_set_pg_info(struct rtw_dev *rtwdev)LPS_PG_INFO_LOC (h2c_pkt, loc_pg);LPS_PG_DPK_LOC (h2c_pkt, loc_dpk);LPS_PG_SEC_CAM_EN (h2c_pkt, conf->sec_cam_backup); +LPS_PG_PATTERN_CAM_EN (h2c_pkt, conf->pattern_cam_backup);rtw_fw_send_h2c_command (rtwdev, h2c_pkt); }
@@ -677,6 +680,7 @@ static struct sk_buff *rtw_lps_pg_info_get(struct ieee80211_hw *hw,struct rtw_chip_info *chip = rtwdev->chip;struct rtw_lps_conf *conf = &rtwdev->lps_conf;struct rtw_lps_pg_info_hdr *pg_info_hdr; +struct rtw_wow_param *rtw_wow = &rtwdev->wow;struct sk_buff *skb;u32 size;
@@ -691,8 +695,10 @@ static struct sk_buff *rtw_lps_pg_info_get(struct ieee80211_hw *hw, pg_info_hdr->macid =find_first_bit (rtwdev->mac_id_map,RTW_MAX_MAC_ID_NUM ); pg_info_hdr->sec_cam_count =rtw_sec_cam_pg_backup (rtwdev, pg_info_hdr->sec_cam); + pg_info_hdr->pattern_count = rtw_wow->pattern_cnt; conf->sec_cam_backup = pg_info_hdr->sec_cam_count !=0 ; + conf->pattern_cam_backup = rtw_wow->pattern_cnt !=0 ;return skb; }
drivers/net/wireless/realtek/rtw88/fw.h +4 -0
@@ -246,6 +246,8 @@ static inline void rtw_h2c_pkt_set_header(u8 *h2c_pkt, u8 sub_id) le32p_replace_bits((__le32 *)(h2c_pkt) + 0x00, value, GENMASK(31, 24))#define LPS_PG_SEC_CAM_EN (h2c_pkt, value) \ le32p_replace_bits((__le32 *)(h2c_pkt) + 0x00, value, BIT(8)) +#define LPS_PG_PATTERN_CAM_EN (h2c_pkt, value) \ + le32p_replace_bits((__le32 *)(h2c_pkt) + 0x00, value, BIT(10))#define SET_RSSI_INFO_MACID (h2c_pkt, value) \ le32p_replace_bits((__le32 *)(h2c_pkt) + 0x00, value, GENMASK(15, 8))#define SET_RSSI_INFO_RSSI (h2c_pkt, value) \
@@ -343,6 +345,8 @@ static inline void rtw_h2c_pkt_set_header(u8 *h2c_pkt, u8 sub_id)#define SET_WOWLAN_FUNC_ENABLE (h2c_pkt, value) \ le32p_replace_bits((__le32 *)(h2c_pkt) + 0x00, value, BIT(8)) +#define SET_WOWLAN_PATTERN_MATCH_ENABLE (h2c_pkt, value) \ + le32p_replace_bits((__le32 *)(h2c_pkt) + 0x00, value, BIT(9))#define SET_WOWLAN_MAGIC_PKT_ENABLE (h2c_pkt, value) \ le32p_replace_bits((__le32 *)(h2c_pkt) + 0x00, value, BIT(10))#define SET_WOWLAN_UNICAST_PKT_ENABLE (h2c_pkt, value) \
drivers/net/wireless/realtek/rtw88/main.h +14 -0
@@ -19,6 +19,10 @@#define RTW_MAX_SEC_CAM_NUM 32#define MAX_PG_CAM_BACKUP_NUM 8 +#define RTW_MAX_PATTERN_NUM 12 +#define RTW_MAX_PATTERN_MASK_SIZE 16 +#define RTW_MAX_PATTERN_SIZE 128 +#define RTW_WATCH_DOG_DELAY_TIME round_jiffies_relative(HZ * 2)#define RFREG_MASK 0xfffff
@@ -623,6 +627,7 @@ struct rtw_lps_conf {u8 smart_ps;u8 port_id;bool sec_cam_backup; +bool pattern_cam_backup; };enum rtw_hw_key_type {
@@ -917,10 +922,19 @@ struct rtw_intf_phy_para {u16 platform; }; +struct rtw_wow_pattern { +u16 crc; +u8 type; +u8 valid; +u8 mask[RTW_MAX_PATTERN_MASK_SIZE ]; +}; +struct rtw_wow_param {struct ieee80211_vif *wow_vif; DECLARE_BITMAP(flags, RTW_WOW_FLAG_MAX);u8 txpause; +u8 pattern_cnt; +struct rtw_wow_pattern patterns[RTW_MAX_PATTERN_NUM ]; };struct rtw_intf_phy_para_table {
drivers/net/wireless/realtek/rtw88/reg.h +14 -0
@@ -336,6 +336,20 @@#define BIT_RFMOD_80M BIT(8)#define BIT_RFMOD_40M BIT(7)#define REG_WMAC_TRXPTCL_CTL_H 0x066C +#define REG_WKFMCAM_CMD 0x0698 +#define BIT_WKFCAM_POLLING_V1 BIT(31) +#define BIT_WKFCAM_CLR_V1 BIT(30) +#define BIT_WKFCAM_WE BIT(16) +#define BIT_SHIFT_WKFCAM_ADDR_V2 8 +#define BIT_MASK_WKFCAM_ADDR_V2 0xff +#define BIT_WKFCAM_ADDR_V2 (x) \ + (((x) & BIT_MASK_WKFCAM_ADDR_V2) << BIT_SHIFT_WKFCAM_ADDR_V2) +#define REG_WKFMCAM_RWD 0x069C +#define BIT_WKFMCAM_VALID BIT(31) +#define BIT_WKFMCAM_BC BIT(26) +#define BIT_WKFMCAM_MC BIT(25) +#define BIT_WKFMCAM_UC BIT(24) +#define REG_RXFLTMAP0 0x06A0#define REG_RXFLTMAP1 0x06A2#define REG_RXFLTMAP2 0x06A4
drivers/net/wireless/realtek/rtw88/rtw8822c.c +3 -0
@@ -4064,6 +4064,9 @@ static const struct rtw_pwr_track_tbl rtw8822c_rtw_pwr_track_tbl = {static const struct wiphy_wowlan_support rtw_wowlan_stub_8822c = { .flags =WIPHY_WOWLAN_MAGIC_PKT |WIPHY_WOWLAN_GTK_REKEY_FAILURE |WIPHY_WOWLAN_DISCONNECT |WIPHY_WOWLAN_SUPPORTS_GTK_REKEY , + .n_patterns =RTW_MAX_PATTERN_NUM , + .pattern_max_len =RTW_MAX_PATTERN_SIZE , + .pattern_min_len =1 , };#endif
drivers/net/wireless/realtek/rtw88/wow.c +224 -0
258 lines not on this page · raw message
drivers/net/wireless/realtek/rtw88/wow.h +9 -0
@@ -5,12 +5,21 @@#ifndef __RTW_WOW_H__#define __RTW_WOW_H__ +enum rtw_wow_pattern_type { +RTW_PATTERN_BROADCAST =0 , +RTW_PATTERN_MULTICAST , +RTW_PATTERN_UNICAST , +RTW_PATTERN_VALID , +RTW_PATTERN_INVALID , +}; +enum rtw_wake_reason {RTW_WOW_RSN_RX_PTK_REKEY =0x1 ,RTW_WOW_RSN_RX_GTK_REKEY =0x2 ,RTW_WOW_RSN_RX_DEAUTH =0x8 ,RTW_WOW_RSN_DISCONNECT =0x10 ,RTW_WOW_RSN_RX_MAGIC_PKT =0x21 , +RTW_WOW_RSN_RX_PATTERN_MATCH =0x23 , }; struct rtw_fw_media_status_iter_data {
Signature · 1 line
2.17.1
PATCH v2 6/6 rtw88: add wowlan net-detect support
In reply to [email protected]From: Chin-Yen Lee <[email protected]>
Net-detect is an option of wowlan to allow the device to be woken up from suspend mode when configured network is detected.
When user enables net-detect and lets the device enter suspend state, wowlan firmware will periodically scan until beacon or probe response of configured networks are received. Between two scans, wowlan firmware keeps wifi chip in idle mode to reduce power consumption. If configured networks are detected, wowlan firmware will trigger resume process.
---
v1 -> v2
* no change
drivers/net/wireless/realtek/rtw88/fw.c | 292 +++++++++++++++++- drivers/net/wireless/realtek/rtw88/fw.h | 113 +++++++ drivers/net/wireless/realtek/rtw88/main.c | 1 + drivers/net/wireless/realtek/rtw88/main.h | 25 ++ drivers/net/wireless/realtek/rtw88/rtw8822c.c | 5 +- drivers/net/wireless/realtek/rtw88/wow.c | 139 ++++++++- drivers/net/wireless/realtek/rtw88/wow.h | 11 + 7 files changed, 571 insertions(+), 15 deletions(-)
drivers/net/wireless/realtek/rtw88/fw.c +280 -12
@@ -567,6 +567,9 @@ void rtw_fw_set_remote_wake_ctrl_cmd(struct rtw_dev *rtwdev, bool enable)SET_REMOTE_WAKECTRL_ENABLE (h2c_pkt, enable); +if (rtw_wow_no_link (rtwdev)) +SET_REMOTE_WAKE_CTRL_NLO_OFFLOAD_EN (h2c_pkt, enable); +rtw_fw_send_h2c_command (rtwdev, h2c_pkt); }
@@ -584,6 +587,26 @@ static u8 rtw_get_rsvd_page_location(struct rtw_dev *rtwdev,return location; } +void rtw_fw_set_nlo_info (struct rtw_dev *rtwdev,bool enable) +{ +u8 h2c_pkt[H2C_PKT_SIZE ] = {0 }; +u8 loc_nlo; + + loc_nlo =rtw_get_rsvd_page_location (rtwdev,RSVD_NLO_INFO ); + +SET_H2C_CMD_ID_CLASS (h2c_pkt,H2C_CMD_NLO_INFO ); + +SET_NLO_FUN_EN (h2c_pkt, enable); +if (enable) { +if (rtw_fw_lps_deep_mode) +SET_NLO_PS_32K (h2c_pkt, enable); +SET_NLO_IGNORE_SECURITY (h2c_pkt, enable); +SET_NLO_LOC_NLO_INFO (h2c_pkt, loc_nlo); + } + +rtw_fw_send_h2c_command (rtwdev, h2c_pkt); +} +void rtw_fw_set_pg_info (struct rtw_dev *rtwdev) {struct rtw_lps_conf *conf = &rtwdev->lps_conf;
@@ -603,6 +626,40 @@ void rtw_fw_set_pg_info(struct rtw_dev *rtwdev)rtw_fw_send_h2c_command (rtwdev, h2c_pkt); } +u8 rtw_get_rsvd_page_probe_req_location (struct rtw_dev *rtwdev, +struct cfg80211_ssid *ssid) +{ +struct rtw_rsvd_page *rsvd_pkt; +u8 location =0 ; + +list_for_each_entry (rsvd_pkt, &rtwdev->rsvd_page_list, list) { +if (rsvd_pkt->type !=RSVD_PROBE_REQ ) +continue ; +if ((!ssid && !rsvd_pkt->ssid) || +rtw_ssid_equal (rsvd_pkt->ssid, ssid)) + location = rsvd_pkt->page; + } + +return location; +} + +u16 rtw_get_rsvd_page_probe_req_size (struct rtw_dev *rtwdev, +struct cfg80211_ssid *ssid) +{ +struct rtw_rsvd_page *rsvd_pkt; +u16 size =0 ; + +list_for_each_entry (rsvd_pkt, &rtwdev->rsvd_page_list, list) { +if (rsvd_pkt->type !=RSVD_PROBE_REQ ) +continue ; +if ((!ssid && !rsvd_pkt->ssid) || +rtw_ssid_equal (rsvd_pkt->ssid, ssid)) + size = rsvd_pkt->skb->len; + } + +return size; +} +void rtw_send_rsvd_page_h2c (struct rtw_dev *rtwdev) {u8 h2c_pkt[H2C_PKT_SIZE ] = {0 };
@@ -648,6 +705,95 @@ rtw_beacon_get(struct ieee80211_hw *hw, struct ieee80211_vif *vif)return skb_new; } +static struct sk_buff *rtw_nlo_info_get (struct ieee80211_hw *hw) +{ +struct rtw_dev *rtwdev = hw->priv; +struct rtw_chip_info *chip = rtwdev->chip; +struct rtw_pno_request *pno_req = &rtwdev->wow.pno_req; +struct rtw_nlo_info_hdr *nlo_hdr; +struct cfg80211_ssid *ssid; +struct sk_buff *skb; +u8 *pos, loc; +u32 size; +int i; + +if (!pno_req->inited || !pno_req->match_set_cnt) +return NULL ; + + size =sizeof (struct rtw_nlo_info_hdr ) + pno_req->match_set_cnt * +IEEE80211_MAX_SSID_LEN + chip->tx_pkt_desc_sz; + + skb =alloc_skb (size,GFP_KERNEL ); +if (!skb) +return NULL ; + +skb_reserve (skb, chip->tx_pkt_desc_sz); + + nlo_hdr =skb_put_zero (skb,sizeof (struct rtw_nlo_info_hdr )); + + nlo_hdr->nlo_count = pno_req->match_set_cnt; + nlo_hdr->hidden_ap_count = pno_req->match_set_cnt; + +/* pattern check for firmware */ +memset (nlo_hdr->pattern_check,0xA5 ,FW_NLO_INFO_CHECK_SIZE ); + +for (i =0 ; i < pno_req->match_set_cnt; i++) + nlo_hdr->ssid_len[i] = pno_req->match_sets[i].ssid.ssid_len; + +for (i =0 ; i < pno_req->match_set_cnt; i++) { + ssid = &pno_req->match_sets[i].ssid; + loc =rtw_get_rsvd_page_probe_req_location (rtwdev, ssid); +if (!loc) { +rtw_err (rtwdev,"failed to get probe req rsvd loc\n" ); +kfree (skb); +return NULL ; + } + nlo_hdr->location[i] = loc; + } + +for (i =0 ; i < pno_req->match_set_cnt; i++) { + pos =skb_put_zero (skb,IEEE80211_MAX_SSID_LEN ); +memcpy (pos, pno_req->match_sets[i].ssid.ssid, + pno_req->match_sets[i].ssid.ssid_len); + } + +return skb; +} + +static struct sk_buff *rtw_cs_channel_info_get (struct ieee80211_hw *hw) +{ +struct rtw_dev *rtwdev = hw->priv; +struct rtw_chip_info *chip = rtwdev->chip; +struct rtw_pno_request *pno_req = &rtwdev->wow.pno_req; +struct ieee80211_channel *channels = pno_req->channels; +struct sk_buff *skb; +int count = pno_req->channel_cnt; +u8 *pos; +int i =0 ; + + skb =alloc_skb (4 * count + chip->tx_pkt_desc_sz,GFP_KERNEL ); +if (!skb) +return NULL ; + +skb_reserve (skb, chip->tx_pkt_desc_sz); + +for (i =0 ; i < count; i++) { + pos =skb_put_zero (skb,4 ); + +CHSW_INFO_SET_CH (pos, channels[i].hw_value); + +if (channels[i].flags &IEEE80211_CHAN_RADAR ) +CHSW_INFO_SET_ACTION_ID (pos,0 ); +else +CHSW_INFO_SET_ACTION_ID (pos,1 ); +CHSW_INFO_SET_TIMEOUT (pos,1 ); +CHSW_INFO_SET_PRI_CH_IDX (pos,1 ); +CHSW_INFO_SET_BW (pos,0 ); + } + +return skb; +} +static struct sk_buff *rtw_lps_pg_dpk_get (struct ieee80211_hw *hw) {struct rtw_dev *rtwdev = hw->priv;
@@ -705,11 +851,12 @@ static struct sk_buff *rtw_lps_pg_info_get(struct ieee80211_hw *hw,static struct sk_buff *rtw_get_rsvd_page_skb (struct ieee80211_hw *hw,struct ieee80211_vif *vif, -enum rtw_rsvd_packet_type type) +struct rtw_rsvd_page *rsvd_pkt) {struct sk_buff *skb_new; +struct cfg80211_ssid *ssid; -switch (type) { +switch (rsvd_pkt->type) {case RSVD_BEACON : skb_new =rtw_beacon_get (hw, vif);break ;
@@ -731,6 +878,21 @@ static struct sk_buff *rtw_get_rsvd_page_skb(struct ieee80211_hw *hw,case RSVD_LPS_PG_INFO : skb_new =rtw_lps_pg_info_get (hw, vif);break ; +case RSVD_PROBE_REQ : + ssid = (struct cfg80211_ssid *)rsvd_pkt->ssid; +if (ssid) + skb_new =ieee80211_probereq_get (hw, vif->addr, + ssid->ssid, + ssid->ssid_len,0 ); +else + skb_new =ieee80211_probereq_get (hw, vif->addr,NULL ,0 ,0 ); +break ; +case RSVD_NLO_INFO : + skb_new =rtw_nlo_info_get (hw); +break ; +case RSVD_CH_INFO : + skb_new =rtw_cs_channel_info_get (hw); +break ;default :return NULL ; }
@@ -772,25 +934,53 @@ static void rtw_rsvd_page_list_to_buf(struct rtw_dev *rtwdev, u8 page_size,memcpy (buf, skb->data, skb->len); } +static struct rtw_rsvd_page *rtw_alloc_rsvd_page (struct rtw_dev *rtwdev, +enum rtw_rsvd_packet_type type, +bool txdesc) +{ +struct rtw_rsvd_page *rsvd_pkt =NULL ; + + rsvd_pkt =kzalloc (sizeof (*rsvd_pkt),GFP_KERNEL ); + +if (!rsvd_pkt) +return NULL ; + + rsvd_pkt->type = type; + rsvd_pkt->add_txdesc = txdesc; + +return rsvd_pkt; +} + +static void rtw_insert_rsvd_page (struct rtw_dev *rtwdev, +struct rtw_rsvd_page *rsvd_pkt) +{ +lockdep_assert_held (&rtwdev->mutex); +list_add_tail (&rsvd_pkt->list, &rtwdev->rsvd_page_list); +} +void rtw_add_rsvd_page (struct rtw_dev *rtwdev,enum rtw_rsvd_packet_type type,bool txdesc) {struct rtw_rsvd_page *rsvd_pkt; -lockdep_assert_held (&rtwdev->mutex); + rsvd_pkt =rtw_alloc_rsvd_page (rtwdev, type, txdesc); +if (!rsvd_pkt) +return ; -list_for_each_entry (rsvd_pkt, &rtwdev->rsvd_page_list, list) { -if (rsvd_pkt->type == type) -return ; - } +rtw_insert_rsvd_page (rtwdev, rsvd_pkt); +} - rsvd_pkt =kmalloc (sizeof (*rsvd_pkt),GFP_KERNEL ); +void rtw_add_rsvd_page_probe_req (struct rtw_dev *rtwdev, +struct cfg80211_ssid *ssid) +{ +struct rtw_rsvd_page *rsvd_pkt; + + rsvd_pkt =rtw_alloc_rsvd_page (rtwdev,RSVD_PROBE_REQ , true);if (!rsvd_pkt)return ; - rsvd_pkt->type = type; - rsvd_pkt->add_txdesc = txdesc; -list_add_tail (&rsvd_pkt->list, &rtwdev->rsvd_page_list); + rsvd_pkt->ssid = ssid; +rtw_insert_rsvd_page (rtwdev, rsvd_pkt); }void rtw_reset_rsvd_page (struct rtw_dev *rtwdev)
@@ -887,7 +1077,7 @@ static u8 *rtw_build_rsvd_page(struct rtw_dev *rtwdev, page_margin = page_size - tx_desc_sz;list_for_each_entry (rsvd_pkt, &rtwdev->rsvd_page_list, list) { - iter =rtw_get_rsvd_page_skb (hw, vif, rsvd_pkt->type); + iter =rtw_get_rsvd_page_skb (hw, vif, rsvd_pkt);if (!iter) {rtw_err (rtwdev,"failed to build rsvd packet\n" ); goto release_skb;
@@ -1065,3 +1255,81 @@ int rtw_dump_drv_rsvd_page(struct rtw_dev *rtwdev,rtw_write8 (rtwdev,REG_RCR +2 , rcr);return 0 ; } + +static void __rtw_fw_update_pkt (struct rtw_dev *rtwdev,u8 pkt_id,u16 size, +u8 location) +{ +u8 h2c_pkt[H2C_PKT_SIZE ] = {0 }; +u16 total_size =H2C_PKT_HDR_SIZE +H2C_PKT_UPDATE_PKT_LEN ; + +rtw_h2c_pkt_set_header (h2c_pkt,H2C_PKT_UPDATE_PKT ); + +SET_PKT_H2C_TOTAL_LEN (h2c_pkt, total_size); +UPDATE_PKT_SET_PKT_ID (h2c_pkt, pkt_id); +UPDATE_PKT_SET_LOCATION (h2c_pkt, location); + +/* include txdesc size */ +UPDATE_PKT_SET_SIZE (h2c_pkt, size); + +rtw_fw_send_h2c_packet (rtwdev, h2c_pkt); +} + +void rtw_fw_update_pkt_probe_req (struct rtw_dev *rtwdev, +struct cfg80211_ssid *ssid) +{ +u8 loc; +u32 size; + + loc =rtw_get_rsvd_page_probe_req_location (rtwdev, ssid); +if (!loc) { +rtw_err (rtwdev,"failed to get probe_req rsvd loc\n" ); +return ; + } + + size =rtw_get_rsvd_page_probe_req_size (rtwdev, ssid); +if (!size) { +rtw_err (rtwdev,"failed to get probe_req rsvd size\n" ); +return ; + } + +__rtw_fw_update_pkt (rtwdev,RTW_PACKET_PROBE_REQ , size, loc); +} + +void rtw_fw_channel_switch (struct rtw_dev *rtwdev,bool enable) +{ +struct rtw_pno_request *rtw_pno_req = &rtwdev->wow.pno_req; +u8 h2c_pkt[H2C_PKT_SIZE ] = {0 }; +u16 total_size =H2C_PKT_HDR_SIZE +H2C_PKT_CH_SWITCH_LEN ; +u8 loc_ch_info; +const struct rtw_ch_switch_option cs_option = { + .dest_ch_en =1 , + .dest_ch =1 , + .periodic_option =2 , + .normal_period =5 , + .normal_period_sel =0 , + .normal_cycle =10 , + .slow_period =1 , + .slow_period_sel =1 , + }; + +rtw_h2c_pkt_set_header (h2c_pkt,H2C_PKT_CH_SWITCH ); +SET_PKT_H2C_TOTAL_LEN (h2c_pkt, total_size); + +CH_SWITCH_SET_START (h2c_pkt, enable); +CH_SWITCH_SET_DEST_CH_EN (h2c_pkt, cs_option.dest_ch_en); +CH_SWITCH_SET_DEST_CH (h2c_pkt, cs_option.dest_ch); +CH_SWITCH_SET_NORMAL_PERIOD (h2c_pkt, cs_option.normal_period); +CH_SWITCH_SET_NORMAL_PERIOD_SEL (h2c_pkt, cs_option.normal_period_sel); +CH_SWITCH_SET_SLOW_PERIOD (h2c_pkt, cs_option.slow_period); +CH_SWITCH_SET_SLOW_PERIOD_SEL (h2c_pkt, cs_option.slow_period_sel); +CH_SWITCH_SET_NORMAL_CYCLE (h2c_pkt, cs_option.normal_cycle); +CH_SWITCH_SET_PERIODIC_OPT (h2c_pkt, cs_option.periodic_option); + +CH_SWITCH_SET_CH_NUM (h2c_pkt, rtw_pno_req->channel_cnt); +CH_SWITCH_SET_INFO_SIZE (h2c_pkt, rtw_pno_req->channel_cnt *4 ); + + loc_ch_info =rtw_get_rsvd_page_location (rtwdev,RSVD_CH_INFO ); +CH_SWITCH_SET_INFO_LOC (h2c_pkt, loc_ch_info); + +rtw_fw_send_h2c_packet (rtwdev, h2c_pkt); +}
drivers/net/wireless/realtek/rtw88/fw.h +113 -0
177 lines not on this page · raw message
drivers/net/wireless/realtek/rtw88/main.c +1 -0
@@ -1495,6 +1495,7 @@ int rtw_register_hw(struct rtw_dev *rtwdev, struct ieee80211_hw *hw)#ifdef CONFIG_PM hw->wiphy->wowlan = rtwdev->chip->wowlan_stub; + hw->wiphy->max_sched_scan_ssids = rtwdev->chip->max_sched_scan_ssids;#endif rtw_set_supported_band (hw, rtwdev->chip);SET_IEEE80211_PERM_ADDR (hw, rtwdev->efuse.addr);
drivers/net/wireless/realtek/rtw88/main.h +25 -0
@@ -929,12 +929,24 @@ struct rtw_wow_pattern {u8 mask[RTW_MAX_PATTERN_MASK_SIZE ]; }; +struct rtw_pno_request { +bool inited; +u32 match_set_cnt; +struct cfg80211_match_set *match_sets; +u8 channel_cnt; +struct ieee80211_channel *channels; +struct cfg80211_sched_scan_plan scan_plan; +}; +struct rtw_wow_param {struct ieee80211_vif *wow_vif; DECLARE_BITMAP(flags, RTW_WOW_FLAG_MAX);u8 txpause;u8 pattern_cnt;struct rtw_wow_pattern patterns[RTW_MAX_PATTERN_NUM ]; + +bool ips_enabled; +struct rtw_pno_request pno_req; };struct rtw_intf_phy_para_table {
@@ -1067,6 +1079,7 @@ struct rtw_chip_info {const char *wow_fw_name;const struct wiphy_wowlan_support *wowlan_stub; +const u8 max_sched_scan_ssids;/* coex paras */ u32 coex_para_ver;
@@ -1647,6 +1660,18 @@ static inline struct ieee80211_vif *rtwvif_to_vif(struct rtw_vif *rtwvif) return container_of(p, struct ieee80211_vif, drv_priv); } +static inline bool rtw_ssid_equal (struct cfg80211_ssid *a, +struct cfg80211_ssid *b) +{ +if (!a || !b || a->ssid_len != b->ssid_len) +return false; + +if (memcmp (a->ssid, b->ssid, a->ssid_len)) +return false; + +return true; +} +void rtw_get_channel_params (struct cfg80211_chan_def *chandef,struct rtw_channel_params *ch_param);bool check_hw_ready (struct rtw_dev *rtwdev,u32 addr,u32 mask,u32 target);
drivers/net/wireless/realtek/rtw88/rtw8822c.c +4 -1
@@ -4063,10 +4063,12 @@ static const struct rtw_pwr_track_tbl rtw8822c_rtw_pwr_track_tbl = {#ifdef CONFIG_PM static const struct wiphy_wowlan_support rtw_wowlan_stub_8822c = { .flags =WIPHY_WOWLAN_MAGIC_PKT |WIPHY_WOWLAN_GTK_REKEY_FAILURE | -WIPHY_WOWLAN_DISCONNECT |WIPHY_WOWLAN_SUPPORTS_GTK_REKEY , +WIPHY_WOWLAN_DISCONNECT |WIPHY_WOWLAN_SUPPORTS_GTK_REKEY | +WIPHY_WOWLAN_NET_DETECT , .n_patterns =RTW_MAX_PATTERN_NUM , .pattern_max_len =RTW_MAX_PATTERN_SIZE , .pattern_min_len =1 , + .max_nd_match_sets =4 , };#endif
@@ -4119,6 +4121,7 @@ struct rtw_chip_info rtw8822c_hw_spec = {#ifdef CONFIG_PM .wow_fw_name = "rtw88/rtw8822c_wow_fw.bin", .wowlan_stub = &rtw_wowlan_stub_8822c, + .max_sched_scan_ssids = 4, #endif .coex_para_ver = 0x19062706, .bt_desired_ver = 0x6,
drivers/net/wireless/realtek/rtw88/wow.c +137 -2
230 lines not on this page · raw message
drivers/net/wireless/realtek/rtw88/wow.h +11 -0
@@ -5,6 +5,8 @@#ifndef __RTW_WOW_H__#define __RTW_WOW_H__ +#define PNO_CHECK_BYTE 4 +enum rtw_wow_pattern_type {RTW_PATTERN_BROADCAST =0 , RTW_PATTERN_MULTICAST,
@@ -20,6 +22,7 @@ enum rtw_wake_reason {RTW_WOW_RSN_DISCONNECT =0x10 ,RTW_WOW_RSN_RX_MAGIC_PKT =0x21 ,RTW_WOW_RSN_RX_PATTERN_MATCH =0x23 , + RTW_WOW_RSN_RX_NLO = 0x55, }; struct rtw_fw_media_status_iter_data {
@@ -41,6 +44,14 @@ static inline bool rtw_wow_mgd_linked(struct rtw_dev *rtwdev)return (rtwvif->net_type ==RTW_NET_MGD_LINKED ); } +static inline bool rtw_wow_no_link (struct rtw_dev *rtwdev) +{ +struct ieee80211_vif *wow_vif = rtwdev->wow.wow_vif; +struct rtw_vif *rtwvif = (struct rtw_vif *)wow_vif->drv_priv; + +return (rtwvif->net_type ==RTW_NET_NO_LINK ); +} +int rtw_wow_suspend (struct rtw_dev *rtwdev,struct cfg80211_wowlan *wowlan);int rtw_wow_resume (struct rtw_dev *rtwdev);
Signature · 1 line
2.17.1