rtw88: add set antenna support
cover rtw88: add set antenna support
From: Yan-Hsuan Chuang <[email protected]>
Add support for ieee80211_ops::set_antenna to allow user space to
set the TX/RX antenna path. This is useful for a user wants to see the output of different antenna/path.
Yan-Hsuan Chuang (2):
rtw88: make rtw_chip_ops::set_antenna return int
rtw88: add support for set/get antennas
drivers/net/wireless/realtek/rtw88/mac80211.c | 33 +++++++++++++++++ drivers/net/wireless/realtek/rtw88/main.c | 3 ++ drivers/net/wireless/realtek/rtw88/main.h | 9 ++--- drivers/net/wireless/realtek/rtw88/rtw8822b.c | 18 ++++++---- drivers/net/wireless/realtek/rtw88/rtw8822c.c | 35 +++++++++++++++++++ 5 files changed, 88 insertions(+), 10 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/2 rtw88: make rtw_chip_ops::set_antenna return int
From: Yan-Hsuan Chuang <[email protected]>
To support ieee80211_ops::set_antenna, the driver can decide if the antenna mask is accepted, otherwise it can return an error code. Because each chip could have different limitations, let the chip check the mask and return.
Also the antenna mask for TRX from upper space is 32-bit long. Change the antenna mask for rtw_chip_ops::set_antenna from u8 to u32.
--- drivers/net/wireless/realtek/rtw88/main.h | 9 +++++---- drivers/net/wireless/realtek/rtw88/rtw8822b.c | 18 ++++++++++++------ 2 files changed, 17 insertions(+), 10 deletions(-)
drivers/net/wireless/realtek/rtw88/main.h +5 -4
@@ -798,8 +798,9 @@ struct rtw_chip_ops {void (*set_tx_power_index)(struct rtw_dev *rtwdev);int (*rsvd_page_dump)(struct rtw_dev *rtwdev,u8 *buf,u32 offset,u32 size); -void (*set_antenna)(struct rtw_dev *rtwdev,u8 antenna_tx, -u8 antenna_rx); +int (*set_antenna)(struct rtw_dev *rtwdev, +u32 antenna_tx, +u32 antenna_rx);void (*cfg_ldo25)(struct rtw_dev *rtwdev,bool enable);void (*false_alarm_statistics)(struct rtw_dev *rtwdev);void (*phy_calibration)(struct rtw_dev *rtwdev);
@@ -1567,8 +1568,8 @@ struct rtw_hal {u8 sec_ch_offset;u8 rf_type;u8 rf_path_num; -u8 antenna_tx; -u8 antenna_rx; +u32 antenna_tx; +u32 antenna_rx;u8 bfee_sts_cap;/* protect tx power section */
drivers/net/wireless/realtek/rtw88/rtw8822b.c +12 -6
@@ -998,8 +998,9 @@ static bool rtw8822b_check_rf_path(u8 antenna) } } -static void rtw8822b_set_antenna (struct rtw_dev *rtwdev,u8 antenna_tx, -u8 antenna_rx) +static int rtw8822b_set_antenna (struct rtw_dev *rtwdev, +u32 antenna_tx, +u32 antenna_rx) {struct rtw_hal *hal = &rtwdev->hal;
@@ -1007,16 +1008,21 @@ static void rtw8822b_set_antenna(struct rtw_dev *rtwdev, u8 antenna_tx, antenna_tx, antenna_rx);if (!rtw8822b_check_rf_path (antenna_tx)) { -rtw_info (rtwdev,"unsupport tx path, set to default path ab\n" ); - antenna_tx =BB_PATH_AB ; +rtw_info (rtwdev,"unsupport tx path 0x%x\n" , antenna_tx); +return -EINVAL ; } +if (!rtw8822b_check_rf_path (antenna_rx)) { -rtw_info (rtwdev,"unsupport rx path, set to default path ab\n" ); - antenna_rx =BB_PATH_AB ; +rtw_info (rtwdev,"unsupport rx path 0x%x\n" , antenna_rx); +return -EINVAL ; } + hal->antenna_tx = antenna_tx; hal->antenna_rx = antenna_rx; +rtw8822b_config_trx_mode (rtwdev, antenna_tx, antenna_rx, false); + +return 0 ; }static void rtw8822b_cfg_ldo25 (struct rtw_dev *rtwdev,bool enable)
Signature · 1 line
2.17.1
Re: [PATCH 1/2] rtw88: make rtw_chip_ops::set_antenna return int
Quoted 11 lines · <[email protected]> wrote:
From: Yan-Hsuan Chuang <[email protected]>
To support
ieee80211_ops::set_antenna, the driver can decide if the antenna mask is accepted, otherwise it can return an error code. Because each chip could have different limitations, let the chip check the mask and return.Also the antenna mask for TRX from upper space is 32-bit long. Change the antenna mask for
rtw_chip_ops::set_antennafrom u8 to u32.Signed-off-by Yan-Hsuan Chuang <[email protected]>
2 patches applied to wireless-drivers-next.git, thanks.
b9ed7e9505ba rtw88: make rtw_chip_ops::set_antenna return int 297bcf8222f2 rtw88: add support for set/get antennas
Signature · 3 lines
https://patchwork.kernel.org/patch/11483097/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
PATCH 2/2 rtw88: add support for set/get antennas
In reply to [email protected]From: Yan-Hsuan Chuang <[email protected]>
User space program such as iw can set antenna mask for the device. So add set antenna support by configure the trx mode.
This is useful for some tests want to see the output of different antenna configuration (e.g. path A v.s. path B).
--- drivers/net/wireless/realtek/rtw88/mac80211.c | 33 +++++++++++++++++ drivers/net/wireless/realtek/rtw88/main.c | 3 ++ drivers/net/wireless/realtek/rtw88/rtw8822c.c | 35 +++++++++++++++++++ 3 files changed, 71 insertions(+)
drivers/net/wireless/realtek/rtw88/mac80211.c +33 -0
@@ -754,6 +754,37 @@ static int rtw_ops_set_bitrate_mask(struct ieee80211_hw *hw,return 0 ; } +static int rtw_ops_set_antenna (struct ieee80211_hw *hw, +u32 tx_antenna, +u32 rx_antenna) +{ +struct rtw_dev *rtwdev = hw->priv; +struct rtw_chip_info *chip = rtwdev->chip; +int ret; + +if (!chip->ops->set_antenna) +return -EOPNOTSUPP ; + +mutex_lock (&rtwdev->mutex); + ret = chip->ops->set_antenna (rtwdev, tx_antenna, rx_antenna); +mutex_unlock (&rtwdev->mutex); + +return ret; +} + +static int rtw_ops_get_antenna (struct ieee80211_hw *hw, +u32 *tx_antenna, +u32 *rx_antenna) +{ +struct rtw_dev *rtwdev = hw->priv; +struct rtw_hal *hal = &rtwdev->hal; + + *tx_antenna = hal->antenna_tx; + *rx_antenna = hal->antenna_rx; + +return 0 ; +} +#ifdef CONFIG_PM static int rtw_ops_suspend (struct ieee80211_hw *hw,struct cfg80211_wowlan *wowlan)
@@ -815,6 +846,8 @@ const struct ieee80211_ops rtw_ops = { .sta_statistics = rtw_ops_sta_statistics, .flush = rtw_ops_flush, .set_bitrate_mask = rtw_ops_set_bitrate_mask, + .set_antenna = rtw_ops_set_antenna, + .get_antenna = rtw_ops_get_antenna, #ifdef CONFIG_PM .suspend = rtw_ops_suspend, .resume = rtw_ops_resume,
drivers/net/wireless/realtek/rtw88/main.c +3 -0
@@ -1450,6 +1450,7 @@ EXPORT_SYMBOL(rtw_core_deinit);int rtw_register_hw (struct rtw_dev *rtwdev,struct ieee80211_hw *hw) { +struct rtw_hal *hal = &rtwdev->hal;int max_tx_headroom =0 ;int ret;
@@ -1478,6 +1479,8 @@ int rtw_register_hw(struct rtw_dev *rtwdev, struct ieee80211_hw *hw)BIT (NL80211_IFTYPE_AP ) |BIT (NL80211_IFTYPE_ADHOC ) |BIT (NL80211_IFTYPE_MESH_POINT ); + hw->wiphy->available_antennas_tx = hal->antenna_tx; + hw->wiphy->available_antennas_rx = hal->antenna_rx; hw->wiphy->flags |=WIPHY_FLAG_SUPPORTS_TDLS |WIPHY_FLAG_TDLS_EXTERNAL_SETUP ;
drivers/net/wireless/realtek/rtw88/rtw8822c.c +35 -0
@@ -1890,6 +1890,40 @@ static void rtw8822c_set_tx_power_index(struct rtw_dev *rtwdev) } } +static int rtw8822c_set_antenna (struct rtw_dev *rtwdev, +u32 antenna_tx, +u32 antenna_rx) +{ +struct rtw_hal *hal = &rtwdev->hal; + +switch (antenna_tx) { +case BB_PATH_A : +case BB_PATH_B : +case BB_PATH_AB : +break ; +default : +rtw_info (rtwdev,"unsupport tx path 0x%x\n" , antenna_tx); +return -EINVAL ; + } + +/* path B only is not available for RX */ +switch (antenna_rx) { +case BB_PATH_A : +case BB_PATH_AB : +break ; +default : +rtw_info (rtwdev,"unsupport rx path 0x%x\n" , antenna_rx); +return -EINVAL ; + } + + hal->antenna_tx = antenna_tx; + hal->antenna_rx = antenna_rx; + +rtw8822c_config_trx_mode (rtwdev, antenna_tx, antenna_rx, false); + +return 0 ; +} +static void rtw8822c_cfg_ldo25 (struct rtw_dev *rtwdev,bool enable) {u8 ldo_pwr;
@@ -3794,6 +3828,7 @@ static struct rtw_chip_ops rtw8822c_ops = { .read_rf = rtw_phy_read_rf, .write_rf = rtw_phy_write_rf_reg_mix, .set_tx_power_index = rtw8822c_set_tx_power_index, + .set_antenna = rtw8822c_set_antenna, .cfg_ldo25 = rtw8822c_cfg_ldo25, .false_alarm_statistics = rtw8822c_false_alarm_statistics, .dpk_track = rtw8822c_dpk_track,
Signature · 1 line
2.17.1