ath11k: add configure country code for QCA6390 and WCN6855

Add handler to send WMI_SET_CURRENT_COUNTRY_CMDID to firmware which
is used for QCA6390 and WCN6855.

Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-01720.1-QCAHSPSWPL_V1_V2_SILICONZ_LITE-1
Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1

Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20211201071745.17746-3-quic_wgong@quicinc.com

diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c
index 3be6bbc..3ef7f9e 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/wmi.c
+++ b/drivers/net/wireless/ath/ath11k/wmi.c
@@ -2798,6 +2798,42 @@ out:
        return ret;
 }
 
+int ath11k_wmi_send_set_current_country_cmd(struct ath11k *ar,
+                                           struct wmi_set_current_country_params *param)
+{
+       struct ath11k_pdev_wmi *wmi = ar->wmi;
+       struct wmi_set_current_country_cmd *cmd;
+       struct sk_buff *skb;
+       int ret;
+
+       skb = ath11k_wmi_alloc_skb(wmi->wmi_ab, sizeof(*cmd));
+       if (!skb)
+               return -ENOMEM;
+
+       cmd = (struct wmi_set_current_country_cmd *)skb->data;
+       cmd->tlv_header =
+               FIELD_PREP(WMI_TLV_TAG, WMI_TAG_SET_CURRENT_COUNTRY_CMD) |
+               FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);
+
+       cmd->pdev_id = ar->pdev->pdev_id;
+       memcpy(&cmd->new_alpha2, &param->alpha2, 3);
+       ret = ath11k_wmi_cmd_send(wmi, skb, WMI_SET_CURRENT_COUNTRY_CMDID);
+
+       ath11k_dbg(ar->ab, ATH11K_DBG_WMI,
+                  "set current country pdev id %d alpha2 %c%c\n",
+                  ar->pdev->pdev_id,
+                  param->alpha2[0],
+                  param->alpha2[1]);
+
+       if (ret) {
+               ath11k_warn(ar->ab,
+                           "failed to send WMI_SET_CURRENT_COUNTRY_CMDID: %d\n", ret);
+               dev_kfree_skb(skb);
+       }
+
+       return ret;
+}
+
 int
 ath11k_wmi_send_thermal_mitigation_param_cmd(struct ath11k *ar,
                                             struct thermal_mitigation_params *param)

diff --git a/drivers/net/wireless/ath/ath11k/wmi.h b/drivers/net/wireless/ath/ath11k/wmi.h
index 35f5432..5b8158b 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/wmi.h
+++ b/drivers/net/wireless/ath/ath11k/wmi.h
@@ -3769,6 +3769,16 @@ struct stats_request_params {
        u32 pdev_id;
 };
 
+struct wmi_set_current_country_params {
+       u8 alpha2[3];
+};
+
+struct wmi_set_current_country_cmd {
+       u32 tlv_header;
+       u32 pdev_id;
+       u32 new_alpha2;
+} __packed;
+
 enum set_init_cc_type {
        WMI_COUNTRY_INFO_TYPE_ALPHA,
        WMI_COUNTRY_INFO_TYPE_COUNTRY_CODE,
@@ -5432,6 +5442,8 @@ int ath11k_wmi_delba_send(struct ath11k *ar, u32 vdev_id, const u8 *mac,
                          u32 tid, u32 initiator, u32 reason);
 int ath11k_wmi_send_bcn_offload_control_cmd(struct ath11k *ar,
                                            u32 vdev_id, u32 bcn_ctrl_op);
+int ath11k_wmi_send_set_current_country_cmd(struct ath11k *ar,
+                                           struct wmi_set_current_country_params *param);
 int
 ath11k_wmi_send_init_country_cmd(struct ath11k *ar,
                                 struct wmi_init_country_params init_cc_param);