mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-29 19:27:13 -04:00
wifi: ath11k: add handler for WMI_VDEV_SET_TPC_POWER_CMDID
Add the handler for WMI_VDEV_SET_TPC_POWER_CMDID, it is for 6 GHz band. Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23 Signed-off-by: Wen Gong <quic_wgong@quicinc.com> Signed-off-by: Baochen Qiang <quic_bqiang@quicinc.com> Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com> Link: https://msgid.link/20231218085844.2658-12-quic_bqiang@quicinc.com
This commit is contained in:
@@ -2379,6 +2379,70 @@ int ath11k_wmi_send_scan_start_cmd(struct ath11k *ar,
|
||||
return ret;
|
||||
}
|
||||
|
||||
int ath11k_wmi_send_vdev_set_tpc_power(struct ath11k *ar,
|
||||
u32 vdev_id,
|
||||
struct ath11k_reg_tpc_power_info *param)
|
||||
{
|
||||
struct ath11k_pdev_wmi *wmi = ar->wmi;
|
||||
struct wmi_vdev_set_tpc_power_cmd *cmd;
|
||||
struct wmi_vdev_ch_power_info *ch;
|
||||
struct sk_buff *skb;
|
||||
struct wmi_tlv *tlv;
|
||||
u8 *ptr;
|
||||
int i, ret, len, array_len;
|
||||
|
||||
array_len = sizeof(*ch) * param->num_pwr_levels;
|
||||
len = sizeof(*cmd) + TLV_HDR_SIZE + array_len;
|
||||
|
||||
skb = ath11k_wmi_alloc_skb(wmi->wmi_ab, len);
|
||||
if (!skb)
|
||||
return -ENOMEM;
|
||||
|
||||
ptr = skb->data;
|
||||
|
||||
cmd = (struct wmi_vdev_set_tpc_power_cmd *)ptr;
|
||||
cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_VDEV_SET_TPC_POWER_CMD) |
|
||||
FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);
|
||||
cmd->vdev_id = vdev_id;
|
||||
cmd->psd_power = param->is_psd_power;
|
||||
cmd->eirp_power = param->eirp_power;
|
||||
cmd->power_type_6ghz = param->ap_power_type;
|
||||
|
||||
ath11k_dbg(ar->ab, ATH11K_DBG_WMI,
|
||||
"tpc vdev id %d is psd power %d eirp power %d 6 ghz power type %d\n",
|
||||
vdev_id, param->is_psd_power, param->eirp_power, param->ap_power_type);
|
||||
|
||||
ptr += sizeof(*cmd);
|
||||
tlv = (struct wmi_tlv *)ptr;
|
||||
tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_STRUCT) |
|
||||
FIELD_PREP(WMI_TLV_LEN, array_len);
|
||||
|
||||
ptr += TLV_HDR_SIZE;
|
||||
ch = (struct wmi_vdev_ch_power_info *)ptr;
|
||||
|
||||
for (i = 0; i < param->num_pwr_levels; i++, ch++) {
|
||||
ch->tlv_header = FIELD_PREP(WMI_TLV_TAG,
|
||||
WMI_TAG_VDEV_CH_POWER_INFO) |
|
||||
FIELD_PREP(WMI_TLV_LEN,
|
||||
sizeof(*ch) - TLV_HDR_SIZE);
|
||||
|
||||
ch->chan_cfreq = param->chan_power_info[i].chan_cfreq;
|
||||
ch->tx_power = param->chan_power_info[i].tx_power;
|
||||
|
||||
ath11k_dbg(ar->ab, ATH11K_DBG_WMI, "tpc chan freq %d TX power %d\n",
|
||||
ch->chan_cfreq, ch->tx_power);
|
||||
}
|
||||
|
||||
ret = ath11k_wmi_cmd_send(wmi, skb, WMI_VDEV_SET_TPC_POWER_CMDID);
|
||||
if (ret) {
|
||||
ath11k_warn(ar->ab, "failed to send WMI_VDEV_SET_TPC_POWER_CMDID\n");
|
||||
dev_kfree_skb(skb);
|
||||
return ret;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int ath11k_wmi_send_scan_stop_cmd(struct ath11k *ar,
|
||||
struct scan_cancel_param *param)
|
||||
{
|
||||
|
||||
@@ -15,6 +15,7 @@ struct ath11k;
|
||||
struct ath11k_fw_stats;
|
||||
struct ath11k_fw_dbglog;
|
||||
struct ath11k_vif;
|
||||
struct ath11k_reg_tpc_power_info;
|
||||
|
||||
#define PSOC_HOST_MAX_NUM_SS (8)
|
||||
|
||||
@@ -327,6 +328,22 @@ enum wmi_tlv_cmd_id {
|
||||
WMI_VDEV_SET_CUSTOM_AGGR_SIZE_CMDID,
|
||||
WMI_VDEV_ENCRYPT_DECRYPT_DATA_REQ_CMDID,
|
||||
WMI_VDEV_ADD_MAC_ADDR_TO_RX_FILTER_CMDID,
|
||||
WMI_VDEV_SET_ARP_STAT_CMDID,
|
||||
WMI_VDEV_GET_ARP_STAT_CMDID,
|
||||
WMI_VDEV_GET_TX_POWER_CMDID,
|
||||
WMI_VDEV_LIMIT_OFFCHAN_CMDID,
|
||||
WMI_VDEV_SET_CUSTOM_SW_RETRY_TH_CMDID,
|
||||
WMI_VDEV_CHAINMASK_CONFIG_CMDID,
|
||||
WMI_VDEV_GET_BCN_RECEPTION_STATS_CMDID,
|
||||
WMI_VDEV_GET_MWS_COEX_INFO_CMDID,
|
||||
WMI_VDEV_DELETE_ALL_PEER_CMDID,
|
||||
WMI_VDEV_BSS_MAX_IDLE_TIME_CMDID,
|
||||
WMI_VDEV_AUDIO_SYNC_TRIGGER_CMDID,
|
||||
WMI_VDEV_AUDIO_SYNC_QTIMER_CMDID,
|
||||
WMI_VDEV_SET_PCL_CMDID,
|
||||
WMI_VDEV_GET_BIG_DATA_CMDID,
|
||||
WMI_VDEV_GET_BIG_DATA_P2_CMDID,
|
||||
WMI_VDEV_SET_TPC_POWER_CMDID,
|
||||
WMI_PEER_CREATE_CMDID = WMI_TLV_CMD(WMI_GRP_PEER),
|
||||
WMI_PEER_DELETE_CMDID,
|
||||
WMI_PEER_FLUSH_TIDS_CMDID,
|
||||
@@ -1880,6 +1897,8 @@ enum wmi_tlv_tag {
|
||||
WMI_TAG_PDEV_NON_SRG_OBSS_BSSID_ENABLE_BITMAP_CMD,
|
||||
WMI_TAG_REGULATORY_RULE_EXT_STRUCT = 0x3A9,
|
||||
WMI_TAG_REG_CHAN_LIST_CC_EXT_EVENT,
|
||||
WMI_TAG_VDEV_SET_TPC_POWER_CMD = 0x3B5,
|
||||
WMI_TAG_VDEV_CH_POWER_INFO,
|
||||
WMI_TAG_PDEV_SET_BIOS_SAR_TABLE_CMD = 0x3D8,
|
||||
WMI_TAG_PDEV_SET_BIOS_GEO_TABLE_CMD,
|
||||
WMI_TAG_MAX
|
||||
@@ -3169,6 +3188,41 @@ struct wlan_ssid {
|
||||
u8 ssid[WLAN_SSID_MAX_LEN];
|
||||
};
|
||||
|
||||
struct wmi_vdev_ch_power_info {
|
||||
u32 tlv_header;
|
||||
|
||||
/* Channel center frequency (MHz) */
|
||||
u32 chan_cfreq;
|
||||
|
||||
/* Unit: dBm, either PSD/EIRP power for this frequency or
|
||||
* incremental for non-PSD BW
|
||||
*/
|
||||
u32 tx_power;
|
||||
} __packed;
|
||||
|
||||
struct wmi_vdev_set_tpc_power_cmd {
|
||||
u32 tlv_header;
|
||||
u32 vdev_id;
|
||||
|
||||
/* Value: 0 or 1, is PSD power or not */
|
||||
u32 psd_power;
|
||||
|
||||
/* Maximum EIRP power (dBm units), valid only if power is PSD */
|
||||
u32 eirp_power;
|
||||
|
||||
/* Type: WMI_6GHZ_REG_TYPE, used for halphy CTL lookup */
|
||||
u32 power_type_6ghz;
|
||||
|
||||
/* This fixed_param TLV is followed by the below TLVs:
|
||||
* num_pwr_levels of wmi_vdev_ch_power_info
|
||||
* For PSD power, it is the PSD/EIRP power of the frequency (20 MHz chunks).
|
||||
* For non-PSD power, the power values are for 20, 40, and till
|
||||
* BSS BW power levels.
|
||||
* The num_pwr_levels will be checked by sw how many elements present
|
||||
* in the variable-length array.
|
||||
*/
|
||||
} __packed;
|
||||
|
||||
#define WMI_IE_BITMAP_SIZE 8
|
||||
|
||||
/* prefix used by scan requestor ids on the host */
|
||||
@@ -6483,5 +6537,8 @@ int ath11k_wmi_pdev_set_bios_geo_table_param(struct ath11k *ar);
|
||||
int ath11k_wmi_sta_keepalive(struct ath11k *ar,
|
||||
const struct wmi_sta_keepalive_arg *arg);
|
||||
bool ath11k_wmi_supports_6ghz_cc_ext(struct ath11k *ar);
|
||||
int ath11k_wmi_send_vdev_set_tpc_power(struct ath11k *ar,
|
||||
u32 vdev_id,
|
||||
struct ath11k_reg_tpc_power_info *param);
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user