Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp5996727ybi; Wed, 29 May 2019 00:55:28 -0700 (PDT) X-Google-Smtp-Source: APXvYqx7PNk/am/zcTKAzluWVYfE1SJ9qfEZAbVqtWOuaQXzC3MWLoIDoYQOX3+eiIhtSHij9K1K X-Received: by 2002:a63:1460:: with SMTP id 32mr137689719pgu.319.1559116528745; Wed, 29 May 2019 00:55:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559116528; cv=none; d=google.com; s=arc-20160816; b=AKF1C92zwX7bQQ8p5rKSgddyQ7c+7/Es07YkO8H6hcao0wjZbrxp7iJNgIWxDByplg RZQMFq9EOhVJyIPh4bs46bu5+I4SQ/LTr7JaYcqSss6uMl7MLMHkH/4YWi6PoKDc5kCD X9++J4xYnYos/K8H/ftU5aJLsGRKhCx+37DhS2WTnnEPz0nMbga4rUE4szZAhDztVK3c m1hxUW27JlnzjPfy5b1iCLtBML8R5OYYMHX5mmmHAzuTlx3PAnMRow9d0Uf0RoFqACSZ Mu5BY/O4zQSHqxmEjTx2Kd4AnLiWm6sDH+OF/8JNKhhCnD10eVPLo1uUL+TCXmABlaSa yOAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:authenticated-by; bh=+5URx3pUQWJsokM4oKv2mSdZcVoz0tqVt5b6TcTUI14=; b=aDpXrJ1UpQP3DPqlZ6u21brQLiMV0oypLPJ/jn7pDLjZD8a63bXIduwNGdYG75vLW3 84QoVr2Ucn4WH8RTfkMkjRR1TsNLquXBZloBDrpfriOgJUSwTd5eRPKt577PIi2FgvGG UDXvoFfaOZDrM47FthB/qZlGJ9AdW4ojVhqUbXJ2KSVeHmMQ1/XyX5OVNijkMNfqFs42 Jm/qvOoPG163zdH7kQCW/+Zg2eYAuCKn8hNKI4U0P1uf2Ekf4V3EcT0oA1wZ4jkjB7y0 /2YDeL+gJPEvWNIJjslOu2K03yhcPOKGkLEZX4PQr2QwNxWI1k1RzwwvzcUovFlz/yqz 7bpg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a91si24496414pld.10.2019.05.29.00.55.11; Wed, 29 May 2019 00:55:28 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726323AbfE2Hy7 (ORCPT + 99 others); Wed, 29 May 2019 03:54:59 -0400 Received: from rtits2.realtek.com ([211.75.126.72]:37207 "EHLO rtits2.realtek.com.tw" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726139AbfE2Hy6 (ORCPT ); Wed, 29 May 2019 03:54:58 -0400 Authenticated-By: X-SpamFilter-By: BOX Solutions SpamTrap 5.62 with qID x4T7ssrV005568, This message is accepted by code: ctloc85258 Received: from mail.realtek.com (rtitcasv01.realtek.com.tw[172.21.6.18]) by rtits2.realtek.com.tw (8.15.2/2.57/5.78) with ESMTPS id x4T7ssrV005568 (version=TLSv1 cipher=AES256-SHA bits=256 verify=NOT); Wed, 29 May 2019 15:54:54 +0800 Received: from localhost.localdomain (172.21.68.126) by RTITCASV01.realtek.com.tw (172.21.6.18) with Microsoft SMTP Server id 14.3.408.0; Wed, 29 May 2019 15:54:54 +0800 From: To: CC: Subject: [PATCH 06/11] rtw88: choose the lowest as world-wide power limit Date: Wed, 29 May 2019 15:54:42 +0800 Message-ID: <1559116487-5244-7-git-send-email-yhchuang@realtek.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1559116487-5244-1-git-send-email-yhchuang@realtek.com> References: <1559116487-5244-1-git-send-email-yhchuang@realtek.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [172.21.68.126] Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Yan-Hsuan Chuang When we are loading tx power limit from the power limit table, compare the world-wide limit with the current limit and choose the lowest power limit for the world-wide power settings. Signed-off-by: Yan-Hsuan Chuang --- drivers/net/wireless/realtek/rtw88/phy.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/realtek/rtw88/phy.c b/drivers/net/wireless/realtek/rtw88/phy.c index ac6912a..91f8b61 100644 --- a/drivers/net/wireless/realtek/rtw88/phy.c +++ b/drivers/net/wireless/realtek/rtw88/phy.c @@ -1165,6 +1165,7 @@ static void rtw_phy_set_tx_power_limit(struct rtw_dev *rtwdev, u8 regd, u8 band, u8 bw, u8 rs, u8 ch, s8 pwr_limit) { struct rtw_hal *hal = &rtwdev->hal; + s8 ww; int ch_idx; pwr_limit = clamp_t(s8, pwr_limit, @@ -1179,10 +1180,17 @@ static void rtw_phy_set_tx_power_limit(struct rtw_dev *rtwdev, u8 regd, u8 band, return; } - if (band == PHY_BAND_2G) + if (band == PHY_BAND_2G) { hal->tx_pwr_limit_2g[regd][bw][rs][ch_idx] = pwr_limit; - else if (band == PHY_BAND_5G) + ww = hal->tx_pwr_limit_2g[RTW_REGD_WW][bw][rs][ch_idx]; + ww = min_t(s8, ww, pwr_limit); + hal->tx_pwr_limit_2g[RTW_REGD_WW][bw][rs][ch_idx] = ww; + } else if (band == PHY_BAND_5G) { hal->tx_pwr_limit_5g[regd][bw][rs][ch_idx] = pwr_limit; + ww = hal->tx_pwr_limit_5g[RTW_REGD_WW][bw][rs][ch_idx]; + ww = min_t(s8, ww, pwr_limit); + hal->tx_pwr_limit_5g[RTW_REGD_WW][bw][rs][ch_idx] = ww; + } } void rtw_parse_tbl_txpwr_lmt(struct rtw_dev *rtwdev, -- 2.7.4