| Message ID | 20230419100145.159191-4-martin.kaistra@linutronix.de (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | wifi: rtl8xxxu: Add AP mode support for 8188f | expand |
> -----Original Message----- > From: Martin Kaistra <martin.kaistra@linutronix.de> > Sent: Wednesday, April 19, 2023 6:02 PM > To: linux-wireless@vger.kernel.org > Cc: Jes Sorensen <Jes.Sorensen@gmail.com>; Kalle Valo <kvalo@kernel.org>; Ping-Ke Shih > <pkshih@realtek.com>; Bitterblue Smith <rtl8821cerfe2@gmail.com>; Sebastian Andrzej Siewior > <bigeasy@linutronix.de> > Subject: [PATCH v2 03/18] wifi: rtl8xxxu: Add beacon functions > > Add a workqueue to update the beacon contents asynchronously and > implement downloading the beacon to the HW and starting beacon tx like > the vendor driver. > > Signed-off-by: Martin Kaistra <martin.kaistra@linutronix.de> [...] > @@ -4885,6 +4903,22 @@ rtl8xxxu_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif, > dev_dbg(dev, "Changed BASIC_RATES!\n"); > rtl8xxxu_set_basic_rates(priv, bss_conf->basic_rates); > } > + > + if (changed & BSS_CHANGED_BEACON || > + (changed & BSS_CHANGED_BEACON_ENABLED && > + bss_conf->enable_beacon)) { > + if (!priv->beacon_enabled) { Is it possible to rely on bss_conf->enable_beacon only? Then, we don't need priv->beacon_enabled. Like if (changed & BSS_CHANGED_BEACON_ENABLED && bss_conf->enable_beacon) rtl8xxxu_start_tx_beacon(priv); if (changed & BSS_CHANGED_BEACON) schedule_work(&priv->update_beacon_work); if (changed & BSS_CHANGED_BEACON_ENABLED && !bss_conf->enable_beacon) rtl8xxxu_stop_tx_beacon(priv); > + dev_dbg(dev, "BSS_CHANGED_BEACON_ENABLED\n"); > + rtl8xxxu_start_tx_beacon(priv); > + } > + schedule_work(&priv->update_beacon_work); > + } > + > + if (changed & BSS_CHANGED_BEACON_ENABLED && !bss_conf->enable_beacon) { > + if (priv->beacon_enabled) > + rtl8xxxu_stop_tx_beacon(priv); > + } > + > error: > return; > } [...]
Am 24.04.23 um 04:29 schrieb Ping-Ke Shih: > > >> -----Original Message----- >> From: Martin Kaistra <martin.kaistra@linutronix.de> >> Sent: Wednesday, April 19, 2023 6:02 PM >> To: linux-wireless@vger.kernel.org >> Cc: Jes Sorensen <Jes.Sorensen@gmail.com>; Kalle Valo <kvalo@kernel.org>; Ping-Ke Shih >> <pkshih@realtek.com>; Bitterblue Smith <rtl8821cerfe2@gmail.com>; Sebastian Andrzej Siewior >> <bigeasy@linutronix.de> >> Subject: [PATCH v2 03/18] wifi: rtl8xxxu: Add beacon functions >> >> Add a workqueue to update the beacon contents asynchronously and >> implement downloading the beacon to the HW and starting beacon tx like >> the vendor driver. >> >> Signed-off-by: Martin Kaistra <martin.kaistra@linutronix.de> > > [...] > >> @@ -4885,6 +4903,22 @@ rtl8xxxu_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif, >> dev_dbg(dev, "Changed BASIC_RATES!\n"); >> rtl8xxxu_set_basic_rates(priv, bss_conf->basic_rates); >> } >> + >> + if (changed & BSS_CHANGED_BEACON || >> + (changed & BSS_CHANGED_BEACON_ENABLED && >> + bss_conf->enable_beacon)) { >> + if (!priv->beacon_enabled) { > > Is it possible to rely on bss_conf->enable_beacon only? Then, we don't need > priv->beacon_enabled. Like > > if (changed & BSS_CHANGED_BEACON_ENABLED && bss_conf->enable_beacon) > rtl8xxxu_start_tx_beacon(priv); > > if (changed & BSS_CHANGED_BEACON) > schedule_work(&priv->update_beacon_work); > > if (changed & BSS_CHANGED_BEACON_ENABLED && !bss_conf->enable_beacon) > rtl8xxxu_stop_tx_beacon(priv); Looking at the the mac80211 code which calls ops->bss_info_changed(), this seems fine to me. I will implement your suggestion and do some testing. > >> + dev_dbg(dev, "BSS_CHANGED_BEACON_ENABLED\n"); >> + rtl8xxxu_start_tx_beacon(priv); >> + } >> + schedule_work(&priv->update_beacon_work); >> + } >> + >> + if (changed & BSS_CHANGED_BEACON_ENABLED && !bss_conf->enable_beacon) { >> + if (priv->beacon_enabled) >> + rtl8xxxu_stop_tx_beacon(priv); >> + } >> + >> error: >> return; >> } > > [...] >
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h index cb8c019b63372..93f744cd8d6d8 100644 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h @@ -1745,6 +1745,8 @@ struct rtl8xxxu_priv { bool shutdown; struct work_struct rx_urb_wq; + bool beacon_enabled; + u8 mac_addr[ETH_ALEN]; char chip_name[8]; char chip_vendor[8]; @@ -1851,6 +1853,7 @@ struct rtl8xxxu_priv { struct delayed_work ra_watchdog; struct work_struct c2hcmd_work; struct sk_buff_head c2hcmd_queue; + struct work_struct update_beacon_work; struct rtl8xxxu_btcoex bt_coex; struct rtl8xxxu_ra_report ra_report; struct rtl8xxxu_cfo_tracking cfo_tracking; diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c index 2c2513cee3a63..960e3efcb0ee2 100644 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c @@ -1104,6 +1104,24 @@ static void rtl8xxxu_stop_tx_beacon(struct rtl8xxxu_priv *priv) val8 = rtl8xxxu_read8(priv, REG_TBTT_PROHIBIT + 2); val8 &= ~BIT(0); rtl8xxxu_write8(priv, REG_TBTT_PROHIBIT + 2, val8); + + priv->beacon_enabled = false; +} + +static void rtl8xxxu_start_tx_beacon(struct rtl8xxxu_priv *priv) +{ + u8 val8; + + val8 = rtl8xxxu_read8(priv, REG_FWHW_TXQ_CTRL + 2); + val8 |= EN_BCNQ_DL >> 16; + rtl8xxxu_write8(priv, REG_FWHW_TXQ_CTRL + 2, val8); + + rtl8xxxu_write8(priv, REG_TBTT_PROHIBIT + 1, 0x80); + val8 = rtl8xxxu_read8(priv, REG_TBTT_PROHIBIT + 2); + val8 &= 0xF0; + rtl8xxxu_write8(priv, REG_TBTT_PROHIBIT + 2, val8); + + priv->beacon_enabled = true; } @@ -4885,6 +4903,22 @@ rtl8xxxu_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif, dev_dbg(dev, "Changed BASIC_RATES!\n"); rtl8xxxu_set_basic_rates(priv, bss_conf->basic_rates); } + + if (changed & BSS_CHANGED_BEACON || + (changed & BSS_CHANGED_BEACON_ENABLED && + bss_conf->enable_beacon)) { + if (!priv->beacon_enabled) { + dev_dbg(dev, "BSS_CHANGED_BEACON_ENABLED\n"); + rtl8xxxu_start_tx_beacon(priv); + } + schedule_work(&priv->update_beacon_work); + } + + if (changed & BSS_CHANGED_BEACON_ENABLED && !bss_conf->enable_beacon) { + if (priv->beacon_enabled) + rtl8xxxu_stop_tx_beacon(priv); + } + error: return; } @@ -5466,6 +5500,55 @@ static void rtl8xxxu_tx(struct ieee80211_hw *hw, dev_kfree_skb(skb); } +static void rtl8xxxu_send_beacon_frame(struct ieee80211_hw *hw, + struct ieee80211_vif *vif) +{ + struct rtl8xxxu_priv *priv = hw->priv; + struct sk_buff *skb = ieee80211_beacon_get(hw, vif, 0); + struct device *dev = &priv->udev->dev; + int retry; + u8 val8; + + /* BCN_VALID, write 1 to clear, cleared by SW */ + val8 = rtl8xxxu_read8(priv, REG_TDECTRL + 2); + val8 |= BIT_BCN_VALID >> 16; + rtl8xxxu_write8(priv, REG_TDECTRL + 2, val8); + + /* SW_BCN_SEL - Port0 */ + val8 = rtl8xxxu_read8(priv, REG_DWBCN1_CTRL_8723B + 2); + val8 &= ~(BIT_SW_BCN_SEL >> 16); + rtl8xxxu_write8(priv, REG_DWBCN1_CTRL_8723B + 2, val8); + + if (skb) + rtl8xxxu_tx(hw, NULL, skb); + + retry = 100; + do { + val8 = rtl8xxxu_read8(priv, REG_TDECTRL + 2); + if (val8 & (BIT_BCN_VALID >> 16)) + break; + usleep_range(10, 20); + } while (--retry); + + if (!retry) + dev_err(dev, "%s: Failed to read beacon valid bit\n", __func__); +} + +static void rtl8xxxu_update_beacon_work_callback(struct work_struct *work) +{ + struct rtl8xxxu_priv *priv = + container_of(work, struct rtl8xxxu_priv, update_beacon_work); + struct ieee80211_hw *hw = priv->hw; + struct ieee80211_vif *vif = priv->vif; + + if (!vif) { + WARN_ONCE(true, "no vif to update beacon\n"); + return; + } + + rtl8xxxu_send_beacon_frame(hw, vif); +} + void rtl8723au_rx_parse_phystats(struct rtl8xxxu_priv *priv, struct ieee80211_rx_status *rx_status, struct rtl8723au_phy_stats *phy_stats, @@ -7234,6 +7317,7 @@ static int rtl8xxxu_probe(struct usb_interface *interface, spin_lock_init(&priv->rx_urb_lock); INIT_WORK(&priv->rx_urb_wq, rtl8xxxu_rx_urb_work); INIT_DELAYED_WORK(&priv->ra_watchdog, rtl8xxxu_watchdog_callback); + INIT_WORK(&priv->update_beacon_work, rtl8xxxu_update_beacon_work_callback); skb_queue_head_init(&priv->c2hcmd_queue); usb_set_intfdata(interface, hw); diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h index 4dffbab494c3b..ad285e4ac0ec4 100644 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h @@ -456,6 +456,7 @@ #define REG_FIFOPAGE 0x0204 #define REG_TDECTRL 0x0208 +#define BIT_BCN_VALID BIT(16) #define REG_DWBCN0_CTRL_8188F REG_TDECTRL @@ -470,6 +471,7 @@ #define AUTO_LLT_INIT_LLT BIT(16) #define REG_DWBCN1_CTRL_8723B 0x0228 +#define BIT_SW_BCN_SEL BIT(20) /* 0x0280 ~ 0x02FF RXDMA Configuration */ #define REG_RXDMA_AGG_PG_TH 0x0280 /* 0-7 : USB DMA size bits @@ -516,6 +518,7 @@ #define REG_FWHW_TXQ_CTRL 0x0420 #define FWHW_TXQ_CTRL_AMPDU_RETRY BIT(7) #define FWHW_TXQ_CTRL_XMIT_MGMT_ACK BIT(12) +#define EN_BCNQ_DL BIT(22) #define REG_HWSEQ_CTRL 0x0423 #define REG_TXPKTBUF_BCNQ_BDNY 0x0424
Add a workqueue to update the beacon contents asynchronously and implement downloading the beacon to the HW and starting beacon tx like the vendor driver. Signed-off-by: Martin Kaistra <martin.kaistra@linutronix.de> --- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 3 + .../wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 84 +++++++++++++++++++ .../wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h | 3 + 3 files changed, 90 insertions(+)