From patchwork Wed Nov 1 11:35:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Antipov X-Patchwork-Id: 742217 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 7628EC4332F for ; Wed, 1 Nov 2023 11:36:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235193AbjKALgH (ORCPT ); Wed, 1 Nov 2023 07:36:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235192AbjKALgF (ORCPT ); Wed, 1 Nov 2023 07:36:05 -0400 Received: from forward102a.mail.yandex.net (forward102a.mail.yandex.net [178.154.239.85]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C92C3F4 for ; Wed, 1 Nov 2023 04:35:58 -0700 (PDT) Received: from mail-nwsmtp-smtp-production-main-85.iva.yp-c.yandex.net (mail-nwsmtp-smtp-production-main-85.iva.yp-c.yandex.net [IPv6:2a02:6b8:c0c:1f22:0:640:93cc:0]) by forward102a.mail.yandex.net (Yandex) with ESMTP id 62D8F60AD6; Wed, 1 Nov 2023 14:35:55 +0300 (MSK) Received: by mail-nwsmtp-smtp-production-main-85.iva.yp-c.yandex.net (smtp/Yandex) with ESMTPSA id rZUntIRDWGk0-XIMUE0WG; Wed, 01 Nov 2023 14:35:54 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1698838554; bh=q7XayJDp2EEfGYhA/wtHBezPXBoFzojBE8mxq90BAzc=; h=Message-ID:Date:Cc:Subject:To:From; b=kEYD2XLUz5bikrh+rP+0ZyDwurSCsg/Cepd9nLyy+vv+X1BebC+u49NvgSRByuifq JLB0O265zZPTKUfkxRm7TlelxT1FCNFKQ3tBQEoyJQqYMggSXeMIB3dFAoSATW83PQ OiRT+2fh4vd1gELQZPGcKezuuf3y2pq1nz/tboZU= Authentication-Results: mail-nwsmtp-smtp-production-main-85.iva.yp-c.yandex.net; dkim=pass header.i=@yandex.ru From: Dmitry Antipov To: Ping-Ke Shih Cc: Kalle Valo , linux-wireless@vger.kernel.org, lvc-project@linuxtesting.org, Dmitry Antipov Subject: [PATCH 1/2] wifi: rtlwifi: remove dead code in phy_get_tx_swing_8812A() Date: Wed, 1 Nov 2023 14:35:06 +0300 Message-ID: <20231101113510.51290-1-dmantipov@yandex.ru> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Since 'reg_swing_2g', 'swing_2g', 'reg_swing_5g', and 'swing_5g' are compile-time constants, mark all of them as such and remove never executed blocks in 'phy_get_tx_swing_8812A()'. Minor style adjustments, compile tested only. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Antipov --- .../wireless/realtek/rtlwifi/rtl8821ae/phy.c | 77 ++++--------------- 1 file changed, 16 insertions(+), 61 deletions(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c index 5323ead30db0..c262770fea29 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c @@ -437,12 +437,11 @@ u32 phy_get_tx_swing_8812A(struct ieee80211_hw *hw, u8 band, struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw)); struct rtl_dm *rtldm = rtl_dm(rtlpriv); struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw)); - s8 reg_swing_2g = -1;/* 0xff; */ - s8 reg_swing_5g = -1;/* 0xff; */ - s8 swing_2g = -1 * reg_swing_2g; - s8 swing_5g = -1 * reg_swing_5g; - u32 out = 0x200; - const s8 auto_temp = -1; + const s8 reg_swing_2g = -1; /* 0xff; */ + const s8 reg_swing_5g = -1; /* 0xff; */ + const s8 swing_2g = -1 * reg_swing_2g; + const s8 swing_5g = -1 * reg_swing_5g; + u32 out = 0x200; rtl_dbg(rtlpriv, COMP_SCAN, DBG_LOUD, "===> PHY_GetTXBBSwing_8812A, bbSwing_2G: %d, bbSwing_5G: %d,autoload_failflag=%d.\n", @@ -452,36 +451,16 @@ u32 phy_get_tx_swing_8812A(struct ieee80211_hw *hw, u8 band, if (rtlefuse->autoload_failflag) { if (band == BAND_ON_2_4G) { rtldm->swing_diff_2g = swing_2g; - if (swing_2g == 0) { - out = 0x200; /* 0 dB */ - } else if (swing_2g == -3) { - out = 0x16A; /* -3 dB */ - } else if (swing_2g == -6) { - out = 0x101; /* -6 dB */ - } else if (swing_2g == -9) { - out = 0x0B6; /* -9 dB */ - } else { - rtldm->swing_diff_2g = 0; - out = 0x200; - } + rtldm->swing_diff_2g = 0; + out = 0x200; } else if (band == BAND_ON_5G) { rtldm->swing_diff_5g = swing_5g; - if (swing_5g == 0) { - out = 0x200; /* 0 dB */ - } else if (swing_5g == -3) { - out = 0x16A; /* -3 dB */ - } else if (swing_5g == -6) { - out = 0x101; /* -6 dB */ - } else if (swing_5g == -9) { - out = 0x0B6; /* -9 dB */ + if (rtlhal->hw_type == HARDWARE_TYPE_RTL8821AE) { + rtldm->swing_diff_5g = -3; + out = 0x16A; } else { - if (rtlhal->hw_type == HARDWARE_TYPE_RTL8821AE) { - rtldm->swing_diff_5g = -3; - out = 0x16A; - } else { - rtldm->swing_diff_5g = 0; - out = 0x200; - } + rtldm->swing_diff_5g = 0; + out = 0x200; } } else { rtldm->swing_diff_2g = -3; @@ -492,35 +471,11 @@ u32 phy_get_tx_swing_8812A(struct ieee80211_hw *hw, u8 band, u32 swing = 0, swing_a = 0, swing_b = 0; if (band == BAND_ON_2_4G) { - if (reg_swing_2g == auto_temp) { - efuse_shadow_read(hw, 1, 0xC6, (u32 *)&swing); - swing = (swing == 0xFF) ? 0x00 : swing; - } else if (swing_2g == 0) { - swing = 0x00; /* 0 dB */ - } else if (swing_2g == -3) { - swing = 0x05; /* -3 dB */ - } else if (swing_2g == -6) { - swing = 0x0A; /* -6 dB */ - } else if (swing_2g == -9) { - swing = 0xFF; /* -9 dB */ - } else { - swing = 0x00; - } + efuse_shadow_read(hw, 1, 0xC6, (u32 *)&swing); + swing = (swing == 0xFF) ? 0x00 : swing; } else { - if (reg_swing_5g == auto_temp) { - efuse_shadow_read(hw, 1, 0xC7, (u32 *)&swing); - swing = (swing == 0xFF) ? 0x00 : swing; - } else if (swing_5g == 0) { - swing = 0x00; /* 0 dB */ - } else if (swing_5g == -3) { - swing = 0x05; /* -3 dB */ - } else if (swing_5g == -6) { - swing = 0x0A; /* -6 dB */ - } else if (swing_5g == -9) { - swing = 0xFF; /* -9 dB */ - } else { - swing = 0x00; - } + efuse_shadow_read(hw, 1, 0xC7, (u32 *)&swing); + swing = (swing == 0xFF) ? 0x00 : swing; } swing_a = (swing & 0x3) >> 0; /* 0xC6/C7[1:0] */ From patchwork Wed Nov 1 11:35:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Antipov X-Patchwork-Id: 740328 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 E3FD6C4167B for ; Wed, 1 Nov 2023 11:36:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235225AbjKALgJ (ORCPT ); Wed, 1 Nov 2023 07:36:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235212AbjKALgI (ORCPT ); Wed, 1 Nov 2023 07:36:08 -0400 Received: from forward102a.mail.yandex.net (forward102a.mail.yandex.net [IPv6:2a02:6b8:c0e:500:1:45:d181:d102]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B669FD for ; Wed, 1 Nov 2023 04:36:01 -0700 (PDT) Received: from mail-nwsmtp-smtp-production-main-85.iva.yp-c.yandex.net (mail-nwsmtp-smtp-production-main-85.iva.yp-c.yandex.net [IPv6:2a02:6b8:c0c:1f22:0:640:93cc:0]) by forward102a.mail.yandex.net (Yandex) with ESMTP id 03D9160A63; Wed, 1 Nov 2023 14:35:56 +0300 (MSK) Received: by mail-nwsmtp-smtp-production-main-85.iva.yp-c.yandex.net (smtp/Yandex) with ESMTPSA id rZUntIRDWGk0-f3LJ4w82; Wed, 01 Nov 2023 14:35:55 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1698838555; bh=BgMIquzgr2FzCtVMNyQVnh6Qc0UW+oo58AAmi9AQHKI=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=d8CZB/P7YyOCnourIKWkUOUFRAgKaD3sk/zOdRZp1gMpJm6X1+4jTDTd/DofbrfyY nu5fG3q5cJ32E5oGjwbs+HK42IF7FeGCSVVj5SUZj7owBXTXE3h6QZCsb0lDmuWT1C hHWtd15J618lxnJiCPFRVD/BVzHsll3BQMIWNn20= Authentication-Results: mail-nwsmtp-smtp-production-main-85.iva.yp-c.yandex.net; dkim=pass header.i=@yandex.ru From: Dmitry Antipov To: Ping-Ke Shih Cc: Kalle Valo , linux-wireless@vger.kernel.org, lvc-project@linuxtesting.org, Dmitry Antipov Subject: [PATCH 2/2] wifi: rtlwifi: simplify _rtl8812ae_phy_get_txpower_limit() Date: Wed, 1 Nov 2023 14:35:07 +0300 Message-ID: <20231101113510.51290-2-dmantipov@yandex.ru> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231101113510.51290-1-dmantipov@yandex.ru> References: <20231101113510.51290-1-dmantipov@yandex.ru> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Since 'regulation' is a compile-time constant equal to 'TXPWR_LMT_WW', mark it as such and simplify few branches in '_rtl8812ae_phy_get_txpower_limit()'. Compile tested only. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Antipov --- .../wireless/realtek/rtlwifi/rtl8821ae/phy.c | 24 +++++++------------ 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c index c262770fea29..27e256a82f00 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c @@ -2278,16 +2278,15 @@ static s8 _rtl8812ae_phy_get_txpower_limit(struct ieee80211_hw *hw, struct rtl_priv *rtlpriv = rtl_priv(hw); struct rtl_efuse *rtlefuse = rtl_efuse(rtlpriv); struct rtl_phy *rtlphy = &rtlpriv->phy; - short band_temp = -1, regulation = -1, bandwidth_temp = -1, - rate_section = -1, channel_temp = -1; - u16 regu, bdwidth, sec, chnl; + short band_temp = -1, bandwidth_temp = -1, + rate_section = -1, channel_temp = -1; + u16 bdwidth, sec, chnl; s8 power_limit = MAX_POWER_INDEX; + const short regulation = TXPWR_LMT_WW; if (rtlefuse->eeprom_regulatory == 2) return MAX_POWER_INDEX; - regulation = TXPWR_LMT_WW; - if (band == BAND_ON_2_4G) band_temp = 0; else if (band == BAND_ON_5G) @@ -2393,8 +2392,8 @@ static s8 _rtl8812ae_phy_get_txpower_limit(struct ieee80211_hw *hw, ;/* BAND_ON_BOTH don't care temporarily */ } - if (band_temp == -1 || regulation == -1 || bandwidth_temp == -1 || - rate_section == -1 || channel_temp == -1) { + if (band_temp == -1 || bandwidth_temp == -1 || + rate_section == -1 || channel_temp == -1) { rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD, "Wrong index value to access power limit table [band %d][regulation %d][bandwidth %d][rf_path %d][rate_section %d][chnl %d]\n", band_temp, regulation, bandwidth_temp, rf_path, @@ -2402,7 +2401,6 @@ static s8 _rtl8812ae_phy_get_txpower_limit(struct ieee80211_hw *hw, return MAX_POWER_INDEX; } - regu = regulation; bdwidth = bandwidth_temp; sec = rate_section; chnl = channel_temp; @@ -2415,10 +2413,7 @@ static s8 _rtl8812ae_phy_get_txpower_limit(struct ieee80211_hw *hw, limits[i] = rtlphy->txpwr_limit_2_4g[i][bdwidth] [sec][chnl][rf_path]; - power_limit = (regulation == TXPWR_LMT_WW) ? - _rtl8812ae_phy_get_world_wide_limit(limits) : - rtlphy->txpwr_limit_2_4g[regu][bdwidth] - [sec][chnl][rf_path]; + power_limit = _rtl8812ae_phy_get_world_wide_limit(limits); } else if (band == BAND_ON_5G) { s8 limits[10] = {0}; u8 i; @@ -2427,10 +2422,7 @@ static s8 _rtl8812ae_phy_get_txpower_limit(struct ieee80211_hw *hw, limits[i] = rtlphy->txpwr_limit_5g[i][bdwidth] [sec][chnl][rf_path]; - power_limit = (regulation == TXPWR_LMT_WW) ? - _rtl8812ae_phy_get_world_wide_limit(limits) : - rtlphy->txpwr_limit_5g[regu][chnl] - [sec][chnl][rf_path]; + power_limit = _rtl8812ae_phy_get_world_wide_limit(limits); } else { rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "No power limit table of the specified band\n");