Skip to content

L
linux
Commit 43712199 authored by Yan-Hsuan Chuang's avatar Yan-Hsuan Chuang Committed by Kalle Valo
Browse files
Options

rtw88: unify prefixes for tx power setting routine 

Rename the function names to make them have the same prefix "rtw_phy"
for the tx power setting routines. Only the function names and
corresponding identation are modified.
Signed-off-by: default avatarYan-Hsuan Chuang <yhchuang@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 226746fd
Show whitespace changes
Inline Side-by-side
Showing with 66 additions and 66 deletions
drivers/net/wireless/realtek/rtw88/main.c
View file @ 43712199
...@@ -1047,7 +1047,7 @@ static int rtw_chip_board_info_setup(struct rtw_dev *rtwdev) ...@@ -1047,7 +1047,7 @@ static int rtw_chip_board_info_setup(struct rtw_dev *rtwdev)
rtw_phy_setup_phy_cond(rtwdev, 0); rtw_phy_setup_phy_cond(rtwdev, 0);
rtw_hw_init_tx_power(hal); rtw_phy_init_tx_power(hal);
rtw_load_table(rtwdev, rfe_def->phy_pg_tbl); rtw_load_table(rtwdev, rfe_def->phy_pg_tbl);
rtw_load_table(rtwdev, rfe_def->txpwr_lmt_tbl); rtw_load_table(rtwdev, rfe_def->txpwr_lmt_tbl);
rtw_phy_tx_power_by_rate_config(hal); rtw_phy_tx_power_by_rate_config(hal);
......
drivers/net/wireless/realtek/rtw88/phy.c
View file @ 43712199
...@@ -779,9 +779,9 @@ static u8 tbl_to_dec_pwr_by_rate(struct rtw_dev *rtwdev, u32 hex, u8 i) ...@@ -779,9 +779,9 @@ static u8 tbl_to_dec_pwr_by_rate(struct rtw_dev *rtwdev, u32 hex, u8 i)
return (hex >> (i * 8)) & 0xFF; return (hex >> (i * 8)) & 0xFF;
} }
static void phy_get_rate_values_of_txpwr_by_rate(struct rtw_dev *rtwdev, static void
u32 addr, u32 mask, rtw_phy_get_rate_values_of_txpwr_by_rate(struct rtw_dev *rtwdev,
u32 val, u8 *rate, u32 addr, u32 mask, u32 val, u8 *rate,
u8 *pwr_by_rate, u8 *rate_num) u8 *pwr_by_rate, u8 *rate_num)
{ {
int i; int i;
...@@ -1084,7 +1084,7 @@ static void phy_get_rate_values_of_txpwr_by_rate(struct rtw_dev *rtwdev, ...@@ -1084,7 +1084,7 @@ static void phy_get_rate_values_of_txpwr_by_rate(struct rtw_dev *rtwdev,
} }
} }
static void phy_store_tx_power_by_rate(struct rtw_dev *rtwdev, static void rtw_phy_store_tx_power_by_rate(struct rtw_dev *rtwdev,
u32 band, u32 rfpath, u32 txnum, u32 band, u32 rfpath, u32 txnum,
u32 regaddr, u32 bitmask, u32 data) u32 regaddr, u32 bitmask, u32 data)
{ {
...@@ -1096,7 +1096,7 @@ static void phy_store_tx_power_by_rate(struct rtw_dev *rtwdev, ...@@ -1096,7 +1096,7 @@ static void phy_store_tx_power_by_rate(struct rtw_dev *rtwdev,
s8 pwr_by_rate[RTW_RF_PATH_MAX] = {0}; s8 pwr_by_rate[RTW_RF_PATH_MAX] = {0};
int i; int i;
phy_get_rate_values_of_txpwr_by_rate(rtwdev, regaddr, bitmask, data, rtw_phy_get_rate_values_of_txpwr_by_rate(rtwdev, regaddr, bitmask, data,
rates, pwr_by_rate, &rate_num); rates, pwr_by_rate, &rate_num);
if (WARN_ON(rfpath >= RTW_RF_PATH_MAX || if (WARN_ON(rfpath >= RTW_RF_PATH_MAX ||
...@@ -1128,7 +1128,7 @@ void rtw_parse_tbl_bb_pg(struct rtw_dev *rtwdev, const struct rtw_table *tbl) ...@@ -1128,7 +1128,7 @@ void rtw_parse_tbl_bb_pg(struct rtw_dev *rtwdev, const struct rtw_table *tbl)
msleep(50); msleep(50);
continue; continue;
} }
phy_store_tx_power_by_rate(rtwdev, p->band, p->rf_path, rtw_phy_store_tx_power_by_rate(rtwdev, p->band, p->rf_path,
p->tx_num, p->addr, p->bitmask, p->tx_num, p->addr, p->bitmask,
p->data); p->data);
} }
...@@ -1166,7 +1166,7 @@ static int rtw_channel_to_idx(u8 band, u8 channel) ...@@ -1166,7 +1166,7 @@ static int rtw_channel_to_idx(u8 band, u8 channel)
return ch_idx; return ch_idx;
} }
static void phy_set_tx_power_limit(struct rtw_dev *rtwdev, u8 regd, u8 band, 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) u8 bw, u8 rs, u8 ch, s8 pwr_limit)
{ {
struct rtw_hal *hal = &rtwdev->hal; struct rtw_hal *hal = &rtwdev->hal;
...@@ -1199,9 +1199,8 @@ void rtw_parse_tbl_txpwr_lmt(struct rtw_dev *rtwdev, ...@@ -1199,9 +1199,8 @@ void rtw_parse_tbl_txpwr_lmt(struct rtw_dev *rtwdev,
BUILD_BUG_ON(sizeof(struct txpwr_lmt_cfg_pair) != sizeof(u8) * 6); BUILD_BUG_ON(sizeof(struct txpwr_lmt_cfg_pair) != sizeof(u8) * 6);
for (; p < end; p++) { for (; p < end; p++) {
phy_set_tx_power_limit(rtwdev, p->regd, p->band, rtw_phy_set_tx_power_limit(rtwdev, p->regd, p->band,
p->bw, p->rs, p->bw, p->rs, p->ch, p->txpwr_lmt);
p->ch, p->txpwr_lmt);
} }
} }
...@@ -1366,7 +1365,7 @@ static u8 rtw_get_channel_group(u8 channel) ...@@ -1366,7 +1365,7 @@ static u8 rtw_get_channel_group(u8 channel)
} }
} }
static u8 phy_get_2g_tx_power_index(struct rtw_dev *rtwdev, static u8 rtw_phy_get_2g_tx_power_index(struct rtw_dev *rtwdev,
struct rtw_2g_txpwr_idx *pwr_idx_2g, struct rtw_2g_txpwr_idx *pwr_idx_2g,
enum rtw_bandwidth bandwidth, enum rtw_bandwidth bandwidth,
u8 rate, u8 group) u8 rate, u8 group)
...@@ -1413,7 +1412,7 @@ static u8 phy_get_2g_tx_power_index(struct rtw_dev *rtwdev, ...@@ -1413,7 +1412,7 @@ static u8 phy_get_2g_tx_power_index(struct rtw_dev *rtwdev,
return tx_power; return tx_power;
} }
static u8 phy_get_5g_tx_power_index(struct rtw_dev *rtwdev, static u8 rtw_phy_get_5g_tx_power_index(struct rtw_dev *rtwdev,
struct rtw_5g_txpwr_idx *pwr_idx_5g, struct rtw_5g_txpwr_idx *pwr_idx_5g,
enum rtw_bandwidth bandwidth, enum rtw_bandwidth bandwidth,
u8 rate, u8 group) u8 rate, u8 group)
...@@ -1467,7 +1466,8 @@ static u8 phy_get_5g_tx_power_index(struct rtw_dev *rtwdev, ...@@ -1467,7 +1466,8 @@ static u8 phy_get_5g_tx_power_index(struct rtw_dev *rtwdev,
return tx_power; return tx_power;
} }
static s8 get_tx_power_limit(struct rtw_hal *hal, u8 bw, u8 rs, u8 ch, u8 regd) static s8 __rtw_phy_get_tx_power_limit(struct rtw_hal *hal,
u8 bw, u8 rs, u8 ch, u8 regd)
{ {
if (regd > RTW_REGD_WW) if (regd > RTW_REGD_WW)
return RTW_MAX_POWER_INDEX; return RTW_MAX_POWER_INDEX;
...@@ -1475,7 +1475,7 @@ static s8 get_tx_power_limit(struct rtw_hal *hal, u8 bw, u8 rs, u8 ch, u8 regd) ...@@ -1475,7 +1475,7 @@ static s8 get_tx_power_limit(struct rtw_hal *hal, u8 bw, u8 rs, u8 ch, u8 regd)
return hal->tx_pwr_limit_2g[regd][bw][rs][ch]; return hal->tx_pwr_limit_2g[regd][bw][rs][ch];
} }
static s8 phy_get_tx_power_limit(struct rtw_dev *rtwdev, u8 band, static s8 rtw_phy_get_tx_power_limit(struct rtw_dev *rtwdev, u8 band,
enum rtw_bandwidth bw, u8 rf_path, enum rtw_bandwidth bw, u8 rf_path,
u8 rate, u8 channel, u8 regd) u8 rate, u8 channel, u8 regd)
{ {
...@@ -1503,7 +1503,7 @@ static s8 phy_get_tx_power_limit(struct rtw_dev *rtwdev, u8 band, ...@@ -1503,7 +1503,7 @@ static s8 phy_get_tx_power_limit(struct rtw_dev *rtwdev, u8 band,
if (ch_idx < 0) if (ch_idx < 0)
goto err; goto err;
power_limit = get_tx_power_limit(hal, bw, rs, ch_idx, regd); power_limit = __rtw_phy_get_tx_power_limit(hal, bw, rs, ch_idx, regd);
return power_limit; return power_limit;
...@@ -1513,8 +1513,8 @@ static s8 phy_get_tx_power_limit(struct rtw_dev *rtwdev, u8 band, ...@@ -1513,8 +1513,8 @@ static s8 phy_get_tx_power_limit(struct rtw_dev *rtwdev, u8 band,
return RTW_MAX_POWER_INDEX; return RTW_MAX_POWER_INDEX;
} }
static static u8
u8 phy_get_tx_power_index(struct rtw_dev *rtwdev, u8 rf_path, u8 rate, rtw_phy_get_tx_power_index(struct rtw_dev *rtwdev, u8 rf_path, u8 rate,
enum rtw_bandwidth bandwidth, u8 channel, u8 regd) enum rtw_bandwidth bandwidth, u8 channel, u8 regd)
{ {
struct rtw_hal *hal = &rtwdev->hal; struct rtw_hal *hal = &rtwdev->hal;
...@@ -1530,19 +1530,19 @@ u8 phy_get_tx_power_index(struct rtw_dev *rtwdev, u8 rf_path, u8 rate, ...@@ -1530,19 +1530,19 @@ u8 phy_get_tx_power_index(struct rtw_dev *rtwdev, u8 rf_path, u8 rate,
/* base power index for 2.4G/5G */ /* base power index for 2.4G/5G */
if (channel <= 14) { if (channel <= 14) {
band = PHY_BAND_2G; band = PHY_BAND_2G;
tx_power = phy_get_2g_tx_power_index(rtwdev, tx_power = rtw_phy_get_2g_tx_power_index(rtwdev,
&pwr_idx->pwr_idx_2g, &pwr_idx->pwr_idx_2g,
bandwidth, rate, group); bandwidth, rate, group);
offset = hal->tx_pwr_by_rate_offset_2g[rf_path][rate]; offset = hal->tx_pwr_by_rate_offset_2g[rf_path][rate];
} else { } else {
band = PHY_BAND_5G; band = PHY_BAND_5G;
tx_power = phy_get_5g_tx_power_index(rtwdev, tx_power = rtw_phy_get_5g_tx_power_index(rtwdev,
&pwr_idx->pwr_idx_5g, &pwr_idx->pwr_idx_5g,
bandwidth, rate, group); bandwidth, rate, group);
offset = hal->tx_pwr_by_rate_offset_5g[rf_path][rate]; offset = hal->tx_pwr_by_rate_offset_5g[rf_path][rate];
} }
limit = phy_get_tx_power_limit(rtwdev, band, bandwidth, rf_path, limit = rtw_phy_get_tx_power_limit(rtwdev, band, bandwidth, rf_path,
rate, channel, regd); rate, channel, regd);
if (offset > limit) if (offset > limit)
...@@ -1556,7 +1556,7 @@ u8 phy_get_tx_power_index(struct rtw_dev *rtwdev, u8 rf_path, u8 rate, ...@@ -1556,7 +1556,7 @@ u8 phy_get_tx_power_index(struct rtw_dev *rtwdev, u8 rf_path, u8 rate,
return tx_power; return tx_power;
} }
static void phy_set_tx_power_index_by_rs(struct rtw_dev *rtwdev, static void rtw_phy_set_tx_power_index_by_rs(struct rtw_dev *rtwdev,
u8 ch, u8 path, u8 rs) u8 ch, u8 path, u8 rs)
{ {
struct rtw_hal *hal = &rtwdev->hal; struct rtw_hal *hal = &rtwdev->hal;
...@@ -1576,8 +1576,8 @@ static void phy_set_tx_power_index_by_rs(struct rtw_dev *rtwdev, ...@@ -1576,8 +1576,8 @@ static void phy_set_tx_power_index_by_rs(struct rtw_dev *rtwdev,
bw = hal->current_band_width; bw = hal->current_band_width;
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
rate = rates[i]; rate = rates[i];
pwr_idx = phy_get_tx_power_index(rtwdev, path, rate, bw, ch, pwr_idx = rtw_phy_get_tx_power_index(rtwdev, path, rate,
regd); bw, ch, regd);
hal->tx_pwr_tbl[path][rate] = pwr_idx; hal->tx_pwr_tbl[path][rate] = pwr_idx;
} }
} }
...@@ -1587,8 +1587,8 @@ static void phy_set_tx_power_index_by_rs(struct rtw_dev *rtwdev, ...@@ -1587,8 +1587,8 @@ static void phy_set_tx_power_index_by_rs(struct rtw_dev *rtwdev,
* power index into a four-byte power index register, and calls set_tx_agc to * power index into a four-byte power index register, and calls set_tx_agc to
* write these values into hardware * write these values into hardware
*/ */
static static void rtw_phy_set_tx_power_level_by_path(struct rtw_dev *rtwdev,
void phy_set_tx_power_level_by_path(struct rtw_dev *rtwdev, u8 ch, u8 path) u8 ch, u8 path)
{ {
struct rtw_hal *hal = &rtwdev->hal; struct rtw_hal *hal = &rtwdev->hal;
u8 rs; u8 rs;
...@@ -1600,7 +1600,7 @@ void phy_set_tx_power_level_by_path(struct rtw_dev *rtwdev, u8 ch, u8 path) ...@@ -1600,7 +1600,7 @@ void phy_set_tx_power_level_by_path(struct rtw_dev *rtwdev, u8 ch, u8 path)
rs = RTW_RATE_SECTION_OFDM; rs = RTW_RATE_SECTION_OFDM;
for (; rs < RTW_RATE_SECTION_MAX; rs++) for (; rs < RTW_RATE_SECTION_MAX; rs++)
phy_set_tx_power_index_by_rs(rtwdev, ch, path, rs); rtw_phy_set_tx_power_index_by_rs(rtwdev, ch, path, rs);
} }
void rtw_phy_set_tx_power_level(struct rtw_dev *rtwdev, u8 channel) void rtw_phy_set_tx_power_level(struct rtw_dev *rtwdev, u8 channel)
...@@ -1612,14 +1612,14 @@ void rtw_phy_set_tx_power_level(struct rtw_dev *rtwdev, u8 channel) ...@@ -1612,14 +1612,14 @@ void rtw_phy_set_tx_power_level(struct rtw_dev *rtwdev, u8 channel)
mutex_lock(&hal->tx_power_mutex); mutex_lock(&hal->tx_power_mutex);
for (path = 0; path < hal->rf_path_num; path++) for (path = 0; path < hal->rf_path_num; path++)
phy_set_tx_power_level_by_path(rtwdev, channel, path); rtw_phy_set_tx_power_level_by_path(rtwdev, channel, path);
chip->ops->set_tx_power_index(rtwdev); chip->ops->set_tx_power_index(rtwdev);
mutex_unlock(&hal->tx_power_mutex); mutex_unlock(&hal->tx_power_mutex);
} }
static static void
void phy_tx_power_by_rate_config_by_path(struct rtw_hal *hal, u8 path, rtw_phy_tx_power_by_rate_config_by_path(struct rtw_hal *hal, u8 path,
u8 rs, u8 size, u8 *rates) u8 rs, u8 size, u8 *rates)
{ {
u8 rate; u8 rate;
...@@ -1646,29 +1646,29 @@ void rtw_phy_tx_power_by_rate_config(struct rtw_hal *hal) ...@@ -1646,29 +1646,29 @@ void rtw_phy_tx_power_by_rate_config(struct rtw_hal *hal)
u8 path; u8 path;
for (path = 0; path < RTW_RF_PATH_MAX; path++) { for (path = 0; path < RTW_RF_PATH_MAX; path++) {
phy_tx_power_by_rate_config_by_path(hal, path, rtw_phy_tx_power_by_rate_config_by_path(hal, path,
RTW_RATE_SECTION_CCK, RTW_RATE_SECTION_CCK,
rtw_cck_size, rtw_cck_rates); rtw_cck_size, rtw_cck_rates);
phy_tx_power_by_rate_config_by_path(hal, path, rtw_phy_tx_power_by_rate_config_by_path(hal, path,
RTW_RATE_SECTION_OFDM, RTW_RATE_SECTION_OFDM,
rtw_ofdm_size, rtw_ofdm_rates); rtw_ofdm_size, rtw_ofdm_rates);
phy_tx_power_by_rate_config_by_path(hal, path, rtw_phy_tx_power_by_rate_config_by_path(hal, path,
RTW_RATE_SECTION_HT_1S, RTW_RATE_SECTION_HT_1S,
rtw_ht_1s_size, rtw_ht_1s_rates); rtw_ht_1s_size, rtw_ht_1s_rates);
phy_tx_power_by_rate_config_by_path(hal, path, rtw_phy_tx_power_by_rate_config_by_path(hal, path,
RTW_RATE_SECTION_HT_2S, RTW_RATE_SECTION_HT_2S,
rtw_ht_2s_size, rtw_ht_2s_rates); rtw_ht_2s_size, rtw_ht_2s_rates);
phy_tx_power_by_rate_config_by_path(hal, path, rtw_phy_tx_power_by_rate_config_by_path(hal, path,
RTW_RATE_SECTION_VHT_1S, RTW_RATE_SECTION_VHT_1S,
rtw_vht_1s_size, rtw_vht_1s_rates); rtw_vht_1s_size, rtw_vht_1s_rates);
phy_tx_power_by_rate_config_by_path(hal, path, rtw_phy_tx_power_by_rate_config_by_path(hal, path,
RTW_RATE_SECTION_VHT_2S, RTW_RATE_SECTION_VHT_2S,
rtw_vht_2s_size, rtw_vht_2s_rates); rtw_vht_2s_size, rtw_vht_2s_rates);
} }
} }
static void static void
phy_tx_power_limit_config(struct rtw_hal *hal, u8 regd, u8 bw, u8 rs) __rtw_phy_tx_power_limit_config(struct rtw_hal *hal, u8 regd, u8 bw, u8 rs)
{ {
s8 base, orig; s8 base, orig;
u8 ch; u8 ch;
...@@ -1692,11 +1692,11 @@ void rtw_phy_tx_power_limit_config(struct rtw_hal *hal) ...@@ -1692,11 +1692,11 @@ void rtw_phy_tx_power_limit_config(struct rtw_hal *hal)
for (regd = 0; regd < RTW_REGD_MAX; regd++) for (regd = 0; regd < RTW_REGD_MAX; regd++)
for (bw = 0; bw < RTW_CHANNEL_WIDTH_MAX; bw++) for (bw = 0; bw < RTW_CHANNEL_WIDTH_MAX; bw++)
for (rs = 0; rs < RTW_RATE_SECTION_MAX; rs++) for (rs = 0; rs < RTW_RATE_SECTION_MAX; rs++)
phy_tx_power_limit_config(hal, regd, bw, rs); __rtw_phy_tx_power_limit_config(hal, regd, bw, rs);
} }
static static void rtw_phy_init_tx_power_limit(struct rtw_hal *hal,
void rtw_hw_tx_power_limit_init(struct rtw_hal *hal, u8 regd, u8 bw, u8 rs) u8 regd, u8 bw, u8 rs)
{ {
u8 ch; u8 ch;
...@@ -1709,7 +1709,7 @@ void rtw_hw_tx_power_limit_init(struct rtw_hal *hal, u8 regd, u8 bw, u8 rs) ...@@ -1709,7 +1709,7 @@ void rtw_hw_tx_power_limit_init(struct rtw_hal *hal, u8 regd, u8 bw, u8 rs)
hal->tx_pwr_limit_5g[regd][bw][rs][ch] = RTW_MAX_POWER_INDEX; hal->tx_pwr_limit_5g[regd][bw][rs][ch] = RTW_MAX_POWER_INDEX;
} }
void rtw_hw_init_tx_power(struct rtw_hal *hal) void rtw_phy_init_tx_power(struct rtw_hal *hal)
{ {
u8 regd, path, rate, rs, bw; u8 regd, path, rate, rs, bw;
...@@ -1725,5 +1725,5 @@ void rtw_hw_init_tx_power(struct rtw_hal *hal) ...@@ -1725,5 +1725,5 @@ void rtw_hw_init_tx_power(struct rtw_hal *hal)
for (regd = 0; regd < RTW_REGD_MAX; regd++) for (regd = 0; regd < RTW_REGD_MAX; regd++)
for (bw = 0; bw < RTW_CHANNEL_WIDTH_MAX; bw++) for (bw = 0; bw < RTW_CHANNEL_WIDTH_MAX; bw++)
for (rs = 0; rs < RTW_RATE_SECTION_MAX; rs++) for (rs = 0; rs < RTW_RATE_SECTION_MAX; rs++)
rtw_hw_tx_power_limit_init(hal, regd, bw, rs); rtw_phy_init_tx_power_limit(hal, regd, bw, rs);
} }
drivers/net/wireless/realtek/rtw88/phy.h
View file @ 43712199
...@@ -41,7 +41,7 @@ void rtw_phy_cfg_bb(struct rtw_dev *rtwdev, const struct rtw_table *tbl, ...@@ -41,7 +41,7 @@ void rtw_phy_cfg_bb(struct rtw_dev *rtwdev, const struct rtw_table *tbl,
u32 addr, u32 data); u32 addr, u32 data);
void rtw_phy_cfg_rf(struct rtw_dev *rtwdev, const struct rtw_table *tbl, void rtw_phy_cfg_rf(struct rtw_dev *rtwdev, const struct rtw_table *tbl,
u32 addr, u32 data); u32 addr, u32 data);
void rtw_hw_init_tx_power(struct rtw_hal *hal); void rtw_phy_init_tx_power(struct rtw_hal *hal);
void rtw_phy_load_tables(struct rtw_dev *rtwdev); void rtw_phy_load_tables(struct rtw_dev *rtwdev);
void rtw_phy_set_tx_power_level(struct rtw_dev *rtwdev, u8 channel); void rtw_phy_set_tx_power_level(struct rtw_dev *rtwdev, u8 channel);
void rtw_phy_tx_power_by_rate_config(struct rtw_hal *hal); void rtw_phy_tx_power_by_rate_config(struct rtw_hal *hal);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7