From nobody Mon Sep 29 21:26:13 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0C317C32792 for ; Mon, 15 Aug 2022 23:56:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355449AbiHOX4L (ORCPT ); Mon, 15 Aug 2022 19:56:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48948 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354608AbiHOXu1 (ORCPT ); Mon, 15 Aug 2022 19:50:27 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C71D94A81A; Mon, 15 Aug 2022 13:15:59 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 89846B80EB1; Mon, 15 Aug 2022 20:15:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EAA3CC433C1; Mon, 15 Aug 2022 20:15:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660594557; bh=X329r6wmBI0wUSI135mAcQkm3pmBkGtk8axD/agkwcM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hsdtwasRN0+NpLanMI9AfFxHNyYrYbVwMmQA4rkTbBpwQthRkslDb+lLFFQaFJ75g j95VnYbiaU5IIM4UPE2sXGoAHAJ6vhjmqmljS8SGuKIDYxKoU/wXAvY89IE5Tld2aO Q8qzsrncjNN/9Cly5Kefl3NxYzAAbcI2P1p6woOc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Felix Fietkau , Sasha Levin Subject: [PATCH 5.19 0486/1157] mt76: mt7615: fix throughput regression on DFS channels Date: Mon, 15 Aug 2022 19:57:22 +0200 Message-Id: <20220815180459.056740184@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180439.416659447@linuxfoundation.org> References: <20220815180439.416659447@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Felix Fietkau [ Upstream commit aac86cebb4a09e3fa2c07589f79f7d0e07e8c9a4 ] For some reason, mt7615 reacts badly to repeatedly enabling/disabling the r= adar detector without also switching the channel. This results in very bad throughput on DFS channels, because hw->conf.radar_enabled can get toggled a few times after CAC ends. Fix this by always leaving the DFS detector enabled on DFS channels and ins= tead suppress unwanted detection events. Fixes: 2c86f6752046 ("mt76: mt7615: fix/rewrite the dfs state handling logi= c") Signed-off-by: Felix Fietkau Signed-off-by: Sasha Levin --- .../net/wireless/mediatek/mt76/mt7615/mac.c | 7 ++++--- .../net/wireless/mediatek/mt76/mt7615/main.c | 21 ------------------- .../net/wireless/mediatek/mt76/mt7615/mcu.c | 3 +++ .../wireless/mediatek/mt76/mt7615/mt7615.h | 1 - 4 files changed, 7 insertions(+), 25 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c b/drivers/net/= wireless/mediatek/mt76/mt7615/mac.c index bd687f7de628..9e832b27170f 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c @@ -2282,6 +2282,7 @@ mt7615_dfs_init_radar_specs(struct mt7615_phy *phy) =20 int mt7615_dfs_init_radar_detector(struct mt7615_phy *phy) { + struct cfg80211_chan_def *chandef =3D &phy->mt76->chandef; struct mt7615_dev *dev =3D phy->dev; bool ext_phy =3D phy !=3D &dev->phy; enum mt76_dfs_state dfs_state, prev_state; @@ -2292,13 +2293,13 @@ int mt7615_dfs_init_radar_detector(struct mt7615_ph= y *phy) =20 prev_state =3D phy->mt76->dfs_state; dfs_state =3D mt76_phy_dfs_state(phy->mt76); + if ((chandef->chan->flags & IEEE80211_CHAN_RADAR) && + dfs_state < MT_DFS_STATE_CAC) + dfs_state =3D MT_DFS_STATE_ACTIVE; =20 if (prev_state =3D=3D dfs_state) return 0; =20 - if (prev_state =3D=3D MT_DFS_STATE_UNKNOWN) - mt7615_dfs_stop_radar_detector(phy); - if (dfs_state =3D=3D MT_DFS_STATE_DISABLED) goto stop; =20 diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/main.c b/drivers/net= /wireless/mediatek/mt76/mt7615/main.c index a9c9b97d173e..d722c3c177be 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/main.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/main.c @@ -282,26 +282,6 @@ static void mt7615_remove_interface(struct ieee80211_h= w *hw, mt76_packet_id_flush(&dev->mt76, &mvif->sta.wcid); } =20 -static void mt7615_init_dfs_state(struct mt7615_phy *phy) -{ - struct mt76_phy *mphy =3D phy->mt76; - struct ieee80211_hw *hw =3D mphy->hw; - struct cfg80211_chan_def *chandef =3D &hw->conf.chandef; - - if (hw->conf.flags & IEEE80211_CONF_OFFCHANNEL) - return; - - if (!(chandef->chan->flags & IEEE80211_CHAN_RADAR) && - !(mphy->chandef.chan->flags & IEEE80211_CHAN_RADAR)) - return; - - if (mphy->chandef.chan->center_freq =3D=3D chandef->chan->center_freq && - mphy->chandef.width =3D=3D chandef->width) - return; - - phy->dfs_state =3D -1; -} - int mt7615_set_channel(struct mt7615_phy *phy) { struct mt7615_dev *dev =3D phy->dev; @@ -314,7 +294,6 @@ int mt7615_set_channel(struct mt7615_phy *phy) =20 set_bit(MT76_RESET, &phy->mt76->state); =20 - mt7615_init_dfs_state(phy); mt76_set_channel(phy->mt76); =20 if (is_mt7615(&dev->mt76) && dev->flash_eeprom) { diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c b/drivers/net/= wireless/mediatek/mt76/mt7615/mcu.c index d2dd1260382c..8a7bc78da954 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c @@ -403,6 +403,9 @@ mt7615_mcu_rx_radar_detected(struct mt7615_dev *dev, st= ruct sk_buff *skb) if (r->band_idx && dev->mt76.phy2) mphy =3D dev->mt76.phy2; =20 + if (mt76_phy_dfs_state(mphy) < MT_DFS_STATE_CAC) + return; + ieee80211_radar_detected(mphy->hw); dev->hw_pattern++; } diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h b/drivers/n= et/wireless/mediatek/mt76/mt7615/mt7615.h index 2e91f6a27d0f..082c73b571ae 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h +++ b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h @@ -177,7 +177,6 @@ struct mt7615_phy { =20 u8 chfreq; u8 rdd_state; - int dfs_state; =20 u32 rx_ampdu_ts; u32 ampdu_ref; --=20 2.35.1