From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 85F74C0044C for ; Wed, 31 Oct 2018 13:30:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3ED372054F for ; Wed, 31 Oct 2018 13:30:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3ED372054F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-wireless-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729083AbeJaW2K (ORCPT ); Wed, 31 Oct 2018 18:28:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48868 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728789AbeJaW2K (ORCPT ); Wed, 31 Oct 2018 18:28:10 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A7DFD315487C; Wed, 31 Oct 2018 13:30:07 +0000 (UTC) Received: from localhost (unknown [10.40.205.83]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3BCC661080; Wed, 31 Oct 2018 13:30:07 +0000 (UTC) Date: Wed, 31 Oct 2018 14:30:06 +0100 From: Stanislaw Gruszka To: Felix Fietkau Cc: Lorenzo Bianconi , linux-wireless@vger.kernel.org Subject: Re: [PATCH v2] mt76x0: run calibration after scanning Message-ID: <20181031133005.GC29511@redhat.com> References: <1540991486-1948-1-git-send-email-sgruszka@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1540991486-1948-1-git-send-email-sgruszka@redhat.com> User-Agent: Mutt/1.8.3 (2017-05-23) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Wed, 31 Oct 2018 13:30:07 +0000 (UTC) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org On Wed, Oct 31, 2018 at 02:11:26PM +0100, Stanislaw Gruszka wrote: > If we are associated and scanning is performed, sw_scan_complete callback > is done after we get back to operating channel, so we do not perform > queue cal work. Fix this queue cal work from sw_scan_complete(). > > We have to restore gain in MT_BBP(AGC, 8) register after scanning, as > it was multiple times modified by channel switch code. So queue cal work > without any delay and reset dev->cal.low_gain to assure calibration > code will AGC gain value. > > Note patch was not tested on mt76x2, but should work and be needed > fix as well. > > Fixes: bbd10586f0df ("mt76x0: phy: do not run calibration during channel switch") > Signed-off-by: Stanislaw Gruszka > --- > v1 -> v2: > only queue cal work with 0 delay an reset dev->cal.low_gain > > drivers/net/wireless/mediatek/mt76/mt76x02_util.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c > index 9f083008dbd4..747fd2c9ec45 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c > +++ b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c > @@ -553,6 +553,12 @@ void mt76x02_sw_scan_complete(struct ieee80211_hw *hw, > clear_bit(MT76_SCANNING, &dev->mt76.state); > if (mt76_is_mmio(dev)) > tasklet_enable(&dev->pre_tbtt_tasklet); > + > + if (vif->bss_conf.assoc) { > + /* Restore AGC gain and resume calibration after scanning. */ > + dev->cal.low_gain = -1; > + ieee80211_queue_delayed_work(hw, &dev->cal_work, 0); > + } > } > EXPORT_SYMBOL_GPL(mt76x02_sw_scan_complete); I think this can not be sufficient fix. Something like seems to be needed as wall to force AGC gain write to register: diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c b/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c index 1af2a1227924..fc4085ef3e16 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c @@ -833,7 +833,7 @@ mt76x0_phy_update_channel_gain(struct mt76x02_dev *dev) low_gain = (dev->cal.avg_rssi_all > mt76x02_get_rssi_gain_thresh(dev)) + (dev->cal.avg_rssi_all > mt76x02_get_low_rssi_gain_thresh(dev)); - gain_change = (dev->cal.low_gain & 2) ^ (low_gain & 2); + gain_change = log_gain != dev->cal.low_gain; dev->cal.low_gain = low_gain; but I do not fully understand this xor logic, so I'm not sure. Thanks Stanislaw