Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2024-12-28 16:52:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

wifi: mac80211: get tx power per link

Browse Source 
ML interfaces can have multiple affiliated links to it and
hence there is a need to report tx power of specified link
rather deflink.

Add changes to report tx power of requested link from mac80211,
also pass link id as an argument in get_tx_power op so that supported
drivers can use it to report link's tx power.

Co-developed-by: Aaradhana Sahu <quic_aarasahu@quicinc.com>
Signed-off-by: Aaradhana Sahu <quic_aarasahu@quicinc.com>
Signed-off-by: Rameshkumar Sundaram <quic_ramess@quicinc.com>
Link: https://patch.msgid.link/20241125083217.216095-3-quic_ramess@quicinc.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Rameshkumar Sundaram 2024-11-25 14:02:17 +05:30 committed by Johannes Berg
parent 7a53af85d3
commit 24dab555ad
8 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/wireless/ath/ath11k/mac.c
View File

@ -9356,6 +9356,7 @@ static int ath11k_fw_stats_request(struct ath11k *ar,
static int ath11k_mac_op_get_txpower(struct ieee80211_hw *hw,
struct ieee80211_vif *vif,
unsigned int link_id,
int *dbm)
{
struct ath11k *ar = hw->priv;

2
drivers/net/wireless/ath/ath9k/main.c
View File

@ -2767,7 +2767,7 @@ void ath9k_fill_chanctx_ops(void)
#endif
static int ath9k_get_txpower(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
int *dbm)
unsigned int link_id, int *dbm)
{
struct ath_softc *sc = hw->priv;
struct ath_vif *avp = (void *)vif->drv_priv;

2
drivers/net/wireless/mediatek/mt76/mac80211.c
View File

@ -1596,7 +1596,7 @@ void mt76_wcid_cleanup(struct mt76_dev *dev, struct mt76_wcid *wcid)
EXPORT_SYMBOL_GPL(mt76_wcid_cleanup);
int mt76_get_txpower(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
int *dbm)
unsigned int link_id, int *dbm)
{
struct mt76_phy *phy = hw->priv;
int n_chains = hweight16(phy->chainmask);

2
drivers/net/wireless/mediatek/mt76/mt76.h
View File

@ -1431,7 +1431,7 @@ void mt76_sta_pre_rcu_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
int mt76_get_min_avg_rssi(struct mt76_dev *dev, bool ext_phy);
int mt76_get_txpower(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
int *dbm);
unsigned int link_id, int *dbm);
int mt76_init_sar_power(struct ieee80211_hw *hw,
const struct cfg80211_sar_specs *sar);
int mt76_get_sar_power(struct mt76_phy *phy,

2
include/net/mac80211.h
View File

@ -4759,7 +4759,7 @@ struct ieee80211_ops {
u32 (*get_expected_throughput)(struct ieee80211_hw *hw,
struct ieee80211_sta *sta);
int (*get_txpower)(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
int *dbm);
unsigned int link_id, int *dbm);
int (*tdls_channel_switch)(struct ieee80211_hw *hw,
struct ieee80211_vif *vif,

15
net/mac80211/cfg.c
View File

@ -3195,15 +3195,22 @@ static int ieee80211_get_tx_power(struct wiphy *wiphy,
{
struct ieee80211_local *local = wiphy_priv(wiphy);
struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);
struct ieee80211_link_data *link_data;
if (local->ops->get_txpower &&
(sdata->flags & IEEE80211_SDATA_IN_DRIVER))
return drv_get_txpower(local, sdata, dbm);
return drv_get_txpower(local, sdata, link_id, dbm);
if (local->emulate_chanctx)
if (local->emulate_chanctx) {
*dbm = local->hw.conf.power_level;
else
*dbm = sdata->vif.bss_conf.txpower;
} else {
link_data = wiphy_dereference(wiphy, sdata->link[link_id]);
if (link_data)
*dbm = link_data->conf->txpower;
else
return -ENOLINK;
}
/* INT_MIN indicates no power level was set yet */
if (*dbm == INT_MIN)

7
net/mac80211/driver-ops.h
View File

@ -1273,7 +1273,8 @@ static inline u32 drv_get_expected_throughput(struct ieee80211_local *local,
}
static inline int drv_get_txpower(struct ieee80211_local *local,
struct ieee80211_sub_if_data *sdata, int *dbm)
struct ieee80211_sub_if_data *sdata,
unsigned int link_id, int *dbm)
{
int ret;
@ -1283,8 +1284,8 @@ static inline int drv_get_txpower(struct ieee80211_local *local,
if (!local->ops->get_txpower)
return -EOPNOTSUPP;
ret = local->ops->get_txpower(&local->hw, &sdata->vif, dbm);
trace_drv_get_txpower(local, sdata, *dbm, ret);
ret = local->ops->get_txpower(&local->hw, &sdata->vif, link_id, dbm);
trace_drv_get_txpower(local, sdata, link_id, *dbm, ret);
return ret;
}

10
net/mac80211/trace.h
View File

@ -2173,13 +2173,14 @@ DEFINE_EVENT(chanswitch_evt, drv_channel_switch_rx_beacon,
TRACE_EVENT(drv_get_txpower,
TP_PROTO(struct ieee80211_local *local,
struct ieee80211_sub_if_data *sdata,
int dbm, int ret),
unsigned int link_id, int dbm, int ret),
TP_ARGS(local, sdata, dbm, ret),
TP_ARGS(local, sdata, link_id, dbm, ret),
TP_STRUCT__entry(
LOCAL_ENTRY
VIF_ENTRY
__field(unsigned int, link_id)
__field(int, dbm)
__field(int, ret)
),
@ -2187,13 +2188,14 @@ TRACE_EVENT(drv_get_txpower,
TP_fast_assign(
LOCAL_ASSIGN;
VIF_ASSIGN;
__entry->link_id = link_id;
__entry->dbm = dbm;
__entry->ret = ret;
),
TP_printk(
LOCAL_PR_FMT VIF_PR_FMT " dbm:%d ret:%d",
LOCAL_PR_ARG, VIF_PR_ARG, __entry->dbm, __entry->ret
LOCAL_PR_FMT VIF_PR_FMT " link_id:%d dbm:%d ret:%d",
LOCAL_PR_ARG, VIF_PR_ARG, __entry->link_id, __entry->dbm, __entry->ret
)
);