|
@@ -3833,9 +3833,258 @@ void ath10k_wmi_event_dcs_interference(struct ath10k *ar, struct sk_buff *skb)
|
|
|
ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_DCS_INTERFERENCE_EVENTID\n");
|
|
|
}
|
|
|
|
|
|
+static u8 ath10k_tpc_config_get_rate(struct ath10k *ar,
|
|
|
+ struct wmi_pdev_tpc_config_event *ev,
|
|
|
+ u32 rate_idx, u32 num_chains,
|
|
|
+ u32 rate_code, u8 type)
|
|
|
+{
|
|
|
+ u8 tpc, num_streams, preamble, ch, stm_idx;
|
|
|
+
|
|
|
+ num_streams = ATH10K_HW_NSS(rate_code);
|
|
|
+ preamble = ATH10K_HW_PREAMBLE(rate_code);
|
|
|
+ ch = num_chains - 1;
|
|
|
+
|
|
|
+ tpc = min_t(u8, ev->rates_array[rate_idx], ev->max_reg_allow_pow[ch]);
|
|
|
+
|
|
|
+ if (__le32_to_cpu(ev->num_tx_chain) <= 1)
|
|
|
+ goto out;
|
|
|
+
|
|
|
+ if (preamble == WMI_RATE_PREAMBLE_CCK)
|
|
|
+ goto out;
|
|
|
+
|
|
|
+ stm_idx = num_streams - 1;
|
|
|
+ if (num_chains <= num_streams)
|
|
|
+ goto out;
|
|
|
+
|
|
|
+ switch (type) {
|
|
|
+ case WMI_TPC_TABLE_TYPE_STBC:
|
|
|
+ tpc = min_t(u8, tpc,
|
|
|
+ ev->max_reg_allow_pow_agstbc[ch - 1][stm_idx]);
|
|
|
+ break;
|
|
|
+ case WMI_TPC_TABLE_TYPE_TXBF:
|
|
|
+ tpc = min_t(u8, tpc,
|
|
|
+ ev->max_reg_allow_pow_agtxbf[ch - 1][stm_idx]);
|
|
|
+ break;
|
|
|
+ case WMI_TPC_TABLE_TYPE_CDD:
|
|
|
+ tpc = min_t(u8, tpc,
|
|
|
+ ev->max_reg_allow_pow_agcdd[ch - 1][stm_idx]);
|
|
|
+ break;
|
|
|
+ default:
|
|
|
+ ath10k_warn(ar, "unknown wmi tpc table type: %d\n", type);
|
|
|
+ tpc = 0;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+
|
|
|
+out:
|
|
|
+ return tpc;
|
|
|
+}
|
|
|
+
|
|
|
+static void ath10k_tpc_config_disp_tables(struct ath10k *ar,
|
|
|
+ struct wmi_pdev_tpc_config_event *ev,
|
|
|
+ struct ath10k_tpc_stats *tpc_stats,
|
|
|
+ u8 *rate_code, u16 *pream_table, u8 type)
|
|
|
+{
|
|
|
+ u32 i, j, pream_idx, flags;
|
|
|
+ u8 tpc[WMI_TPC_TX_N_CHAIN];
|
|
|
+ char tpc_value[WMI_TPC_TX_N_CHAIN * WMI_TPC_BUF_SIZE];
|
|
|
+ char buff[WMI_TPC_BUF_SIZE];
|
|
|
+
|
|
|
+ flags = __le32_to_cpu(ev->flags);
|
|
|
+
|
|
|
+ switch (type) {
|
|
|
+ case WMI_TPC_TABLE_TYPE_CDD:
|
|
|
+ if (!(flags & WMI_TPC_CONFIG_EVENT_FLAG_TABLE_CDD)) {
|
|
|
+ ath10k_dbg(ar, ATH10K_DBG_WMI, "CDD not supported\n");
|
|
|
+ tpc_stats->flag[type] = ATH10K_TPC_TABLE_TYPE_FLAG;
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ break;
|
|
|
+ case WMI_TPC_TABLE_TYPE_STBC:
|
|
|
+ if (!(flags & WMI_TPC_CONFIG_EVENT_FLAG_TABLE_STBC)) {
|
|
|
+ ath10k_dbg(ar, ATH10K_DBG_WMI, "STBC not supported\n");
|
|
|
+ tpc_stats->flag[type] = ATH10K_TPC_TABLE_TYPE_FLAG;
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ break;
|
|
|
+ case WMI_TPC_TABLE_TYPE_TXBF:
|
|
|
+ if (!(flags & WMI_TPC_CONFIG_EVENT_FLAG_TABLE_TXBF)) {
|
|
|
+ ath10k_dbg(ar, ATH10K_DBG_WMI, "TXBF not supported\n");
|
|
|
+ tpc_stats->flag[type] = ATH10K_TPC_TABLE_TYPE_FLAG;
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ break;
|
|
|
+ default:
|
|
|
+ ath10k_dbg(ar, ATH10K_DBG_WMI,
|
|
|
+ "invalid table type in wmi tpc event: %d\n", type);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ pream_idx = 0;
|
|
|
+ for (i = 0; i < __le32_to_cpu(ev->rate_max); i++) {
|
|
|
+ memset(tpc_value, 0, sizeof(tpc_value));
|
|
|
+ memset(buff, 0, sizeof(buff));
|
|
|
+ if (i == pream_table[pream_idx])
|
|
|
+ pream_idx++;
|
|
|
+
|
|
|
+ for (j = 0; j < WMI_TPC_TX_N_CHAIN; j++) {
|
|
|
+ if (j >= __le32_to_cpu(ev->num_tx_chain))
|
|
|
+ break;
|
|
|
+
|
|
|
+ tpc[j] = ath10k_tpc_config_get_rate(ar, ev, i, j + 1,
|
|
|
+ rate_code[i],
|
|
|
+ type);
|
|
|
+ snprintf(buff, sizeof(buff), "%8d ", tpc[j]);
|
|
|
+ strncat(tpc_value, buff, strlen(buff));
|
|
|
+ }
|
|
|
+ tpc_stats->tpc_table[type].pream_idx[i] = pream_idx;
|
|
|
+ tpc_stats->tpc_table[type].rate_code[i] = rate_code[i];
|
|
|
+ memcpy(tpc_stats->tpc_table[type].tpc_value[i],
|
|
|
+ tpc_value, sizeof(tpc_value));
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
void ath10k_wmi_event_pdev_tpc_config(struct ath10k *ar, struct sk_buff *skb)
|
|
|
{
|
|
|
- ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_PDEV_TPC_CONFIG_EVENTID\n");
|
|
|
+ u32 i, j, pream_idx, num_tx_chain;
|
|
|
+ u8 rate_code[WMI_TPC_RATE_MAX], rate_idx;
|
|
|
+ u16 pream_table[WMI_TPC_PREAM_TABLE_MAX];
|
|
|
+ struct wmi_pdev_tpc_config_event *ev;
|
|
|
+ struct ath10k_tpc_stats *tpc_stats;
|
|
|
+
|
|
|
+ ev = (struct wmi_pdev_tpc_config_event *)skb->data;
|
|
|
+
|
|
|
+ tpc_stats = kzalloc(sizeof(*tpc_stats), GFP_ATOMIC);
|
|
|
+ if (!tpc_stats)
|
|
|
+ return;
|
|
|
+
|
|
|
+ /* Create the rate code table based on the chains supported */
|
|
|
+ rate_idx = 0;
|
|
|
+ pream_idx = 0;
|
|
|
+
|
|
|
+ /* Fill CCK rate code */
|
|
|
+ for (i = 0; i < 4; i++) {
|
|
|
+ rate_code[rate_idx] =
|
|
|
+ ATH10K_HW_RATECODE(i, 0, WMI_RATE_PREAMBLE_CCK);
|
|
|
+ rate_idx++;
|
|
|
+ }
|
|
|
+ pream_table[pream_idx] = rate_idx;
|
|
|
+ pream_idx++;
|
|
|
+
|
|
|
+ /* Fill OFDM rate code */
|
|
|
+ for (i = 0; i < 8; i++) {
|
|
|
+ rate_code[rate_idx] =
|
|
|
+ ATH10K_HW_RATECODE(i, 0, WMI_RATE_PREAMBLE_OFDM);
|
|
|
+ rate_idx++;
|
|
|
+ }
|
|
|
+ pream_table[pream_idx] = rate_idx;
|
|
|
+ pream_idx++;
|
|
|
+
|
|
|
+ num_tx_chain = __le32_to_cpu(ev->num_tx_chain);
|
|
|
+
|
|
|
+ /* Fill HT20 rate code */
|
|
|
+ for (i = 0; i < num_tx_chain; i++) {
|
|
|
+ for (j = 0; j < 8; j++) {
|
|
|
+ rate_code[rate_idx] =
|
|
|
+ ATH10K_HW_RATECODE(j, i, WMI_RATE_PREAMBLE_HT);
|
|
|
+ rate_idx++;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ pream_table[pream_idx] = rate_idx;
|
|
|
+ pream_idx++;
|
|
|
+
|
|
|
+ /* Fill HT40 rate code */
|
|
|
+ for (i = 0; i < num_tx_chain; i++) {
|
|
|
+ for (j = 0; j < 8; j++) {
|
|
|
+ rate_code[rate_idx] =
|
|
|
+ ATH10K_HW_RATECODE(j, i, WMI_RATE_PREAMBLE_HT);
|
|
|
+ rate_idx++;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ pream_table[pream_idx] = rate_idx;
|
|
|
+ pream_idx++;
|
|
|
+
|
|
|
+ /* Fill VHT20 rate code */
|
|
|
+ for (i = 0; i < __le32_to_cpu(ev->num_tx_chain); i++) {
|
|
|
+ for (j = 0; j < 10; j++) {
|
|
|
+ rate_code[rate_idx] =
|
|
|
+ ATH10K_HW_RATECODE(j, i, WMI_RATE_PREAMBLE_VHT);
|
|
|
+ rate_idx++;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ pream_table[pream_idx] = rate_idx;
|
|
|
+ pream_idx++;
|
|
|
+
|
|
|
+ /* Fill VHT40 rate code */
|
|
|
+ for (i = 0; i < num_tx_chain; i++) {
|
|
|
+ for (j = 0; j < 10; j++) {
|
|
|
+ rate_code[rate_idx] =
|
|
|
+ ATH10K_HW_RATECODE(j, i, WMI_RATE_PREAMBLE_VHT);
|
|
|
+ rate_idx++;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ pream_table[pream_idx] = rate_idx;
|
|
|
+ pream_idx++;
|
|
|
+
|
|
|
+ /* Fill VHT80 rate code */
|
|
|
+ for (i = 0; i < num_tx_chain; i++) {
|
|
|
+ for (j = 0; j < 10; j++) {
|
|
|
+ rate_code[rate_idx] =
|
|
|
+ ATH10K_HW_RATECODE(j, i, WMI_RATE_PREAMBLE_VHT);
|
|
|
+ rate_idx++;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ pream_table[pream_idx] = rate_idx;
|
|
|
+ pream_idx++;
|
|
|
+
|
|
|
+ rate_code[rate_idx++] =
|
|
|
+ ATH10K_HW_RATECODE(0, 0, WMI_RATE_PREAMBLE_CCK);
|
|
|
+ rate_code[rate_idx++] =
|
|
|
+ ATH10K_HW_RATECODE(0, 0, WMI_RATE_PREAMBLE_OFDM);
|
|
|
+ rate_code[rate_idx++] =
|
|
|
+ ATH10K_HW_RATECODE(0, 0, WMI_RATE_PREAMBLE_CCK);
|
|
|
+ rate_code[rate_idx++] =
|
|
|
+ ATH10K_HW_RATECODE(0, 0, WMI_RATE_PREAMBLE_OFDM);
|
|
|
+ rate_code[rate_idx++] =
|
|
|
+ ATH10K_HW_RATECODE(0, 0, WMI_RATE_PREAMBLE_OFDM);
|
|
|
+
|
|
|
+ pream_table[pream_idx] = ATH10K_TPC_PREAM_TABLE_END;
|
|
|
+
|
|
|
+ tpc_stats->chan_freq = __le32_to_cpu(ev->chan_freq);
|
|
|
+ tpc_stats->phy_mode = __le32_to_cpu(ev->phy_mode);
|
|
|
+ tpc_stats->ctl = __le32_to_cpu(ev->ctl);
|
|
|
+ tpc_stats->reg_domain = __le32_to_cpu(ev->reg_domain);
|
|
|
+ tpc_stats->twice_antenna_gain = a_sle32_to_cpu(ev->twice_antenna_gain);
|
|
|
+ tpc_stats->twice_antenna_reduction =
|
|
|
+ __le32_to_cpu(ev->twice_antenna_reduction);
|
|
|
+ tpc_stats->power_limit = __le32_to_cpu(ev->power_limit);
|
|
|
+ tpc_stats->twice_max_rd_power = __le32_to_cpu(ev->twice_max_rd_power);
|
|
|
+ tpc_stats->num_tx_chain = __le32_to_cpu(ev->num_tx_chain);
|
|
|
+ tpc_stats->rate_max = __le32_to_cpu(ev->rate_max);
|
|
|
+
|
|
|
+ ath10k_tpc_config_disp_tables(ar, ev, tpc_stats,
|
|
|
+ rate_code, pream_table,
|
|
|
+ WMI_TPC_TABLE_TYPE_CDD);
|
|
|
+ ath10k_tpc_config_disp_tables(ar, ev, tpc_stats,
|
|
|
+ rate_code, pream_table,
|
|
|
+ WMI_TPC_TABLE_TYPE_STBC);
|
|
|
+ ath10k_tpc_config_disp_tables(ar, ev, tpc_stats,
|
|
|
+ rate_code, pream_table,
|
|
|
+ WMI_TPC_TABLE_TYPE_TXBF);
|
|
|
+
|
|
|
+ ath10k_debug_tpc_stats_process(ar, tpc_stats);
|
|
|
+
|
|
|
+ ath10k_dbg(ar, ATH10K_DBG_WMI,
|
|
|
+ "wmi event tpc config channel %d mode %d ctl %d regd %d gain %d %d limit %d max_power %d tx_chanins %d rates %d\n",
|
|
|
+ __le32_to_cpu(ev->chan_freq),
|
|
|
+ __le32_to_cpu(ev->phy_mode),
|
|
|
+ __le32_to_cpu(ev->ctl),
|
|
|
+ __le32_to_cpu(ev->reg_domain),
|
|
|
+ a_sle32_to_cpu(ev->twice_antenna_gain),
|
|
|
+ __le32_to_cpu(ev->twice_antenna_reduction),
|
|
|
+ __le32_to_cpu(ev->power_limit),
|
|
|
+ __le32_to_cpu(ev->twice_max_rd_power) / 2,
|
|
|
+ __le32_to_cpu(ev->num_tx_chain),
|
|
|
+ __le32_to_cpu(ev->rate_max));
|
|
|
}
|
|
|
|
|
|
void ath10k_wmi_event_pdev_ftm_intg(struct ath10k *ar, struct sk_buff *skb)
|
|
@@ -6354,6 +6603,24 @@ ath10k_wmi_op_gen_delba_send(struct ath10k *ar, u32 vdev_id, const u8 *mac,
|
|
|
return skb;
|
|
|
}
|
|
|
|
|
|
+static struct sk_buff *
|
|
|
+ath10k_wmi_10_2_4_op_gen_pdev_get_tpc_config(struct ath10k *ar, u32 param)
|
|
|
+{
|
|
|
+ struct wmi_pdev_get_tpc_config_cmd *cmd;
|
|
|
+ struct sk_buff *skb;
|
|
|
+
|
|
|
+ skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd));
|
|
|
+ if (!skb)
|
|
|
+ return ERR_PTR(-ENOMEM);
|
|
|
+
|
|
|
+ cmd = (struct wmi_pdev_get_tpc_config_cmd *)skb->data;
|
|
|
+ cmd->param = __cpu_to_le32(param);
|
|
|
+
|
|
|
+ ath10k_dbg(ar, ATH10K_DBG_WMI,
|
|
|
+ "wmi pdev get tcp config param:%d\n", param);
|
|
|
+ return skb;
|
|
|
+}
|
|
|
+
|
|
|
static const struct wmi_ops wmi_ops = {
|
|
|
.rx = ath10k_wmi_op_rx,
|
|
|
.map_svc = wmi_main_svc_map,
|
|
@@ -6604,6 +6871,7 @@ static const struct wmi_ops wmi_10_2_4_ops = {
|
|
|
.gen_addba_send = ath10k_wmi_op_gen_addba_send,
|
|
|
.gen_addba_set_resp = ath10k_wmi_op_gen_addba_set_resp,
|
|
|
.gen_delba_send = ath10k_wmi_op_gen_delba_send,
|
|
|
+ .gen_pdev_get_tpc_config = ath10k_wmi_10_2_4_op_gen_pdev_get_tpc_config,
|
|
|
/* .gen_bcn_tmpl not implemented */
|
|
|
/* .gen_prb_tmpl not implemented */
|
|
|
/* .gen_p2p_go_bcn_ie not implemented */
|