Received: by 2002:a05:6358:11c7:b0:104:8066:f915 with SMTP id i7csp6423252rwl; Wed, 22 Mar 2023 10:22:37 -0700 (PDT) X-Google-Smtp-Source: AK7set9JsrFlavoK5y02dWW2NfgxKZ6kxfO6Dbz7PxX4xb5baL32B/IDqNbd6/Lm7uLW5kYUKsoB X-Received: by 2002:a17:906:4356:b0:7c0:e30a:d3e5 with SMTP id z22-20020a170906435600b007c0e30ad3e5mr8055218ejm.18.1679505756940; Wed, 22 Mar 2023 10:22:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679505756; cv=none; d=google.com; s=arc-20160816; b=Cn1KyomCbezHSNSK/prh2qI1FPHsQrNh24qVlH0RspBhgogMsH/2gH7ktj/1CW6aCt crsc+TiilHAGYUe5vW4DQHZeRbhn53SM3t5ey9ELUhejiUE/KQTb4DkuRH8z/lTi4VSM Mw2ECZoD11ax35jN/I2zb5nzjrnBqT5Fqlg7FjF38MS+rT3ejPusne0Ac75Mfr32M6Sn 7fWYClouUGIkm19hZdj3Zv87tRspizsBuRgrxHzTkYy1b4rMcKVNXmOmYfR5HWF5YcyS ug9sJjbGzmeBiGz3dpJ7S5oXLibquNXt+Jvb5owUeO5LKNI3DG3UmWkb2noXeEpcR6df daAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:dkim-signature :dkim-signature:from; bh=06JVnKPGcjm138RMW9ygs+XwQ7xVPOPm09tI8DuOMQE=; b=D+bGTPKKmKDm1apU9BJ5Gyk7F0gSfxFr87CM3qCkfTqzshh8oKdkQi8s/FOy47mOWz xR9e9qK3FdAiQsooPvAsqic+eALOnYQQdoT5i7mXYZATxG8J2kpOhgD0PTpIjby2Qxcd 2I73KGV2BaPygqsN2YYGW8WIRS5yRBTHh2TEpqN0JXPPlKby+HYkrpsY2Qt1XFrmfFco YrWIN6RxVFC3tNu2mfRctJ0RSy2FgjbMILsglLtbuR4jrmfStJHIffwEawzoekRHv1vr CuIlxuh4oFoODpFvDOrvQVNwLK9OeY4ELL+UpT/I8kuQTqqMX4qcBZSJ51Mjkg1kor1l SqSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=LCW078+G; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y11-20020a1709060a8b00b00925e996c00fsi9997566ejf.787.2023.03.22.10.22.22; Wed, 22 Mar 2023 10:22:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=LCW078+G; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230371AbjCVRTq (ORCPT + 60 others); Wed, 22 Mar 2023 13:19:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230304AbjCVRTa (ORCPT ); Wed, 22 Mar 2023 13:19:30 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5DFCB66D3A for ; Wed, 22 Mar 2023 10:19:15 -0700 (PDT) From: Martin Kaistra DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1679505551; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=06JVnKPGcjm138RMW9ygs+XwQ7xVPOPm09tI8DuOMQE=; b=LCW078+GDCc7XFRkSVXTDntjmuVe98zi1KivwZk/8t/esDaiQX4E4X2JgfGkc4dDpiOFAR /WetV9K6b469bbCUuC1of3ufcdDV4qzilJ/rVYOUi7qVl6wHzww+0v4M6+7nKftBamWIRJ O/y14ZbiJPQTv+uNAMnT5WrpphzYl4ADk7JB4akk2qgCHnfJvW4m18S0KWJoSNpFUZ/kYO wfQum6LuRlqdoxaoOP3ulSExsRWciFBJ666stQAKmCj7dYGqMCYcihIm/ztIbFNwQAoyNk kYYTbMji21Us5V6p+9r/TKfeIdJixTMOYRDYKhf3hB99voOosJMztEe52rmwww== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1679505551; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=06JVnKPGcjm138RMW9ygs+XwQ7xVPOPm09tI8DuOMQE=; b=b2qFr8I5HsEJ2NKeeIC+NobUJ2FXz7UmvhlvplD5CHcuCsKqc0pZnX4QFR+Ib+6JSxXwLW rAuOzul6A5cS+qBw== To: linux-wireless@vger.kernel.org Cc: Jes Sorensen , Kalle Valo , Ping-Ke Shih , Bitterblue Smith , Sebastian Andrzej Siewior Subject: [RFC PATCH 03/14] wifi: rtl8xxxu: Add beacon functions Date: Wed, 22 Mar 2023 18:18:54 +0100 Message-Id: <20230322171905.492855-4-martin.kaistra@linutronix.de> In-Reply-To: <20230322171905.492855-1-martin.kaistra@linutronix.de> References: <20230322171905.492855-1-martin.kaistra@linutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.5 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org 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 --- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 3 + .../wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 81 +++++++++++++++++++ 2 files changed, 84 insertions(+) diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h index 9d48c69ffece1..cac985271628c 100644 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h @@ -1744,6 +1744,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]; @@ -1850,6 +1852,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 daeaa7d6864f9..404fa6e322f58 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 |= BIT(6); + 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; } @@ -4895,6 +4913,17 @@ 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); + } + } + error: return; } @@ -5476,6 +5505,57 @@ 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, BIT16 of REG_TDECTRL = BIT0 of REG_TDECTRL+2, + * write 1 to clear, cleared by SW. + */ + val8 = rtl8xxxu_read8(priv, REG_TDECTRL + 2); + val8 |= BIT(0); + rtl8xxxu_write8(priv, REG_TDECTRL + 2, val8); + + /* SW_BCN_SEL - Port0 */ + val8 = rtl8xxxu_read8(priv, REG_DWBCN1_CTRL_8723B + 2); + val8 &= ~BIT(4); + 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(0)) + 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, @@ -7244,6 +7324,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); -- 2.30.2