[PATCH mt76 6/6] wifi: mt76: mt7996: fix issues with manually triggered radar detection

[Shayne Chen]

On Thu, 2026-03-12 at 11:56 +0100, Lorenzo Bianconi wrote:
> > From: StanleyYP Wang <StanleyYP.Wang at mediatek.com>
> > 
> > Disallow triggering radar detection on non-DFS channels to prevent
> > paused
> > TX queues from failing to resume, as a channel switch is not
> > performed in
> > this case.
> 
> I guess we are missing a Fixes tag here.
> 
> > 
> > Signed-off-by: StanleyYP Wang <StanleyYP.Wang at mediatek.com>
> > Signed-off-by: Shayne Chen <shayne.chen at mediatek.com>
> > ---
> >  .../wireless/mediatek/mt76/mt7996/debugfs.c   | 22
> > +++++++++++++++----
> >  1 file changed, 18 insertions(+), 4 deletions(-)
> > 
> > diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/debugfs.c
> > b/drivers/net/wireless/mediatek/mt76/mt7996/debugfs.c
> > index 76d623b2cafb..e26bed6b97e7 100644
> > --- a/drivers/net/wireless/mediatek/mt76/mt7996/debugfs.c
> > +++ b/drivers/net/wireless/mediatek/mt76/mt7996/debugfs.c
> > @@ -226,14 +226,23 @@ mt7996_radar_trigger(void *data, u64 val)
> >  #define RADAR_BACKGROUND	2
> >  	struct mt7996_dev *dev = data;
> >  	struct mt7996_phy *phy = mt7996_band_phy(dev,
> > NL80211_BAND_5GHZ);
> > -	int rdd_idx;
> > +	struct cfg80211_chan_def *chandef;
> > +	int rdd_idx, ret;
> >  
> >  	if (!phy || !val || val > RADAR_BACKGROUND)
> >  		return -EINVAL;
> >  
> > -	if (val == RADAR_BACKGROUND && !dev->rdd2_phy) {
> > -		dev_err(dev->mt76.dev, "Background radar is not
> > enabled\n");
> > -		return -EINVAL;
> > +	if (test_bit(MT76_SCANNING, &phy->mt76->state))
> > +		return -EBUSY;
> > +
> > +	if (val == RADAR_BACKGROUND) {
> > +		if (!dev->rdd2_phy ||
> > !cfg80211_chandef_valid(&dev->rdd2_chandef)) {
> > +			dev_err(dev->mt76.dev, "Background radar
> > is not enabled\n");
> 
> nit: I guess it is better to specify a different error message if
> rdd2_chandef
> is  invalid.
> 
Will split the error message in v2.

Thanks,
Shayne

> Regards,
> Lorenzo
> 
> > +			return -EINVAL;
> > +		}
> > +		chandef = &dev->rdd2_chandef;
> > +	} else {
> > +		chandef = &phy->mt76->chandef;
> >  	}
> >  
> >  	rdd_idx = mt7996_get_rdd_idx(phy, val ==
> > RADAR_BACKGROUND);
> > @@ -242,6 +251,11 @@ mt7996_radar_trigger(void *data, u64 val)
> >  		return -EINVAL;
> >  	}
> >  
> > +	ret = cfg80211_chandef_dfs_required(dev->mt76.hw->wiphy,
> > chandef,
> > +					    NL80211_IFTYPE_AP);
> > +	if (ret <= 0)
> > +		return ret;
> > +
> >  	return mt7996_mcu_rdd_cmd(dev, RDD_RADAR_EMULATE, rdd_idx,
> > 0);
> >  }
> >  
> > -- 
> > 2.51.0
> >