Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp4758163pxv; Tue, 27 Jul 2021 16:00:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzRXNFwg6knc8JcK3skd+91BMg9C/QUvafy+xfG+N92mDGtcGLP5ukLfCfgdeL/Q/z9V3Pe X-Received: by 2002:a05:6638:33a6:: with SMTP id h38mr23545552jav.130.1627426843845; Tue, 27 Jul 2021 16:00:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627426843; cv=none; d=google.com; s=arc-20160816; b=eT/2NU+YCwfUgcom1rbuoq+w0ZTxVr0+fwr3GlMW7+A02ZVOv31G7YeDsq+RdZswUI ZeQ2T3eILXg9IxDiialw9/5LTpXpnw1lSWfSoCmChWkgDru1yJ9/UFdJeOLXy5JXeOHt mewm2bMJf+RqrxW0e4TlnBJZNQ3Egf45kgDPUA5es/T3VUL9XLUZKPIdRux0yA8UYniR 5L447zvy3Wg8BluOODBK689Szy7Q+WXeARDsb3XKMwDIofSzcMnm/95QAN7qOEDLTPjg uuRpH37dfiaL4MIYUPMlEavoZjXVtFupYXgHmJBZR6O2rNvq3N/ZztO+iH40cWjJ/6ks 3/7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=inkq0t0qFj50OYX5FHY4lN/T+2UNRRO/tQnmWHQkFL4=; b=FwvBPQyywNvKbJkMcgLE6cedjJPTH24TUg6klFpdzbcR/desB77MFILUR1SPTiauV4 SJoweS5eZU44tQiyoJI+icgCVu00gV4HNt2QJLpELJ4TiCgsVCejdfIjaeqg5Cd395Om 99p0tsv450SFc5Zvd6QovYFnFIHTAHa6j4hOJprwyAjFoAB2CszR7tVVCNHkEPK83vCS LDEIWbKGVvWYIfuq1MuFaJKKKdKoLNDzpE73Bdi7RluWHGvDTVyw0ObpcdnrSmr/4GwV 4YXez5Nb9YKtIRjD/wOlH5T17V+PR8fN/O6O3zgYwk9ycZmGQiGHGbgYRAqDzoytf050 aNAQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mediatek.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t9si4680898jaj.20.2021.07.27.16.00.23; Tue, 27 Jul 2021 16:00:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mediatek.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232376AbhG0W7a (ORCPT + 99 others); Tue, 27 Jul 2021 18:59:30 -0400 Received: from mailgw01.mediatek.com ([60.244.123.138]:45976 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S232827AbhG0W7W (ORCPT ); Tue, 27 Jul 2021 18:59:22 -0400 X-UUID: eaab0206780947719879ba3d7699a363-20210728 X-UUID: eaab0206780947719879ba3d7699a363-20210728 Received: from mtkcas07.mediatek.inc [(172.21.101.84)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 201437277; Wed, 28 Jul 2021 06:59:20 +0800 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by mtkmbs06n2.mediatek.inc (172.21.101.130) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 28 Jul 2021 06:59:19 +0800 Received: from mtkswgap22.mediatek.inc (172.21.77.33) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 28 Jul 2021 06:59:19 +0800 From: To: , CC: , , , , , , , , , , , , , , , Subject: [PATCH 2/2] mt76: connac: add support maximum regulatory Tx power Date: Wed, 28 Jul 2021 06:59:17 +0800 Message-ID: <1627426757-14811-2-git-send-email-sean.wang@mediatek.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1627426757-14811-1-git-send-email-sean.wang@mediatek.com> References: <1627426757-14811-1-git-send-email-sean.wang@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: YN Chen Consider .max_reg_power in struct ieee80211_channel to limit the maximum power the wireless device allowed to transmit on the corresponding channel according to the regulatory domain. Co-developed-by: Sean Wang Signed-off-by: Sean Wang Signed-off-by: YN Chen --- .../wireless/mediatek/mt76/mt76_connac_mcu.c | 43 ++++++++++++++++++- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c index d71393b1c5e6..84f42ce12626 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c @@ -1773,6 +1773,43 @@ static s8 mt76_connac_get_sar_power(struct mt76_phy *phy, return target_power; } +static s8 mt76_connac_get_ch_power(struct mt76_phy *phy, + struct ieee80211_channel *chan, + s8 target_power) +{ + struct mt76_dev *dev = phy->dev; + struct ieee80211_supported_band *sband; + int i; + + switch (chan->band) { + case NL80211_BAND_2GHZ: + sband = &phy->sband_2g.sband; + break; + case NL80211_BAND_5GHZ: + sband = &phy->sband_5g.sband; + break; + default: + return target_power; + } + + for (i = 0; i < sband->n_channels; i++) { + struct ieee80211_channel *ch = &sband->channels[i]; + + if (ch->hw_value == chan->hw_value) { + if (!(ch->flags & IEEE80211_CHAN_DISABLED)) { + int power = 2 * ch->max_reg_power; + + if (power > 127 || power < -127) + power = 127; + target_power = min_t(s8, power, target_power); + } + break; + } + } + + return target_power; +} + static int mt76_connac_mcu_rate_txpower_band(struct mt76_phy *phy, enum nl80211_band band) @@ -1840,10 +1877,12 @@ mt76_connac_mcu_rate_txpower_band(struct mt76_phy *phy, .hw_value = ch_list[idx], .band = band, }; - s8 sar_power; + s8 reg_power, sar_power; + reg_power = mt76_connac_get_ch_power(phy, &chan, + tx_power); sar_power = mt76_connac_get_sar_power(phy, &chan, - tx_power); + reg_power); mt76_get_rate_power_limits(phy, &chan, &limits, sar_power); -- 2.25.1