| Message ID | 20230906082948.18452-2-quic_wgong@quicinc.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | wifi: ath12k: add 11d scan offload support and handle country code for WCN7850 | expand |
On 9/6/2023 1:29 AM, Wen Gong wrote: > Add handler to send WMI_SET_CURRENT_COUNTRY_CMDID to firmware which > is used for WCN7850. > > Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0-03427-QCAHMTSWPL_V1.0_V2.0_SILICONZ-1.15378.4 > > Signed-off-by: Wen Gong <quic_wgong@quicinc.com> > --- > drivers/net/wireless/ath/ath12k/wmi.c | 36 +++++++++++++++++++++++++++ > drivers/net/wireless/ath/ath12k/wmi.h | 13 ++++++++++ > 2 files changed, 49 insertions(+) > > diff --git a/drivers/net/wireless/ath/ath12k/wmi.c b/drivers/net/wireless/ath/ath12k/wmi.c > index 9ed33e2d6da0..aa87b559eff1 100644 > --- a/drivers/net/wireless/ath/ath12k/wmi.c > +++ b/drivers/net/wireless/ath/ath12k/wmi.c > @@ -2844,6 +2844,42 @@ int ath12k_wmi_send_init_country_cmd(struct ath12k *ar, > return ret; > } > > +int ath12k_wmi_send_set_current_country_cmd(struct ath12k *ar, > + struct wmi_set_current_country_params *param) > +{ > + struct ath12k_wmi_pdev *wmi = ar->wmi; > + struct wmi_set_current_country_cmd *cmd; > + struct sk_buff *skb; > + int ret; > + > + skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, sizeof(*cmd)); > + if (!skb) > + return -ENOMEM; > + > + cmd = (struct wmi_set_current_country_cmd *)skb->data; > + cmd->tlv_header = > + ath12k_wmi_tlv_cmd_hdr(WMI_TAG_SET_CURRENT_COUNTRY_CMD, > + sizeof(*cmd)); > + > + cmd->pdev_id = cpu_to_le32(ar->pdev->pdev_id); > + memcpy(&cmd->new_alpha2, ¶m->alpha2, 3); > + ret = ath12k_wmi_cmd_send(wmi, skb, WMI_SET_CURRENT_COUNTRY_CMDID); > + > + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, > + "set current country pdev id %d alpha2 %c%c\n", > + ar->pdev->pdev_id, > + param->alpha2[0], > + param->alpha2[1]); > + > + if (ret) { > + ath12k_warn(ar->ab, > + "failed to send WMI_SET_CURRENT_COUNTRY_CMDID: %d\n", ret); > + dev_kfree_skb(skb); > + } > + > + return ret; > +} > + > int > ath12k_wmi_send_twt_enable_cmd(struct ath12k *ar, u32 pdev_id) > { > diff --git a/drivers/net/wireless/ath/ath12k/wmi.h b/drivers/net/wireless/ath/ath12k/wmi.h > index 8c047a9623f9..8940b8154091 100644 > --- a/drivers/net/wireless/ath/ath12k/wmi.h > +++ b/drivers/net/wireless/ath/ath12k/wmi.h > @@ -3749,6 +3749,16 @@ struct ath12k_wmi_ap_ps_arg { > u32 value; > }; > > +struct wmi_set_current_country_params { > + u8 alpha2[3]; having looked though the set of patches, I'm curious why this is [3] and not [2] (or IMO more correctly, [REG_ALPHA2_LEN]). Isn't this read/written as two octets everywhere and never treated as a NUL-terminated string? > +}; > + > +struct wmi_set_current_country_cmd { > + __le32 tlv_header; > + __le32 pdev_id; > + __le32 new_alpha2; > +} __packed; > + > enum set_init_cc_type { > WMI_COUNTRY_INFO_TYPE_ALPHA, > WMI_COUNTRY_INFO_TYPE_COUNTRY_CODE, > @@ -4879,6 +4889,9 @@ int ath12k_wmi_send_bcn_offload_control_cmd(struct ath12k *ar, > u32 vdev_id, u32 bcn_ctrl_op); > int ath12k_wmi_send_init_country_cmd(struct ath12k *ar, > struct ath12k_wmi_init_country_arg *arg); > +int > +ath12k_wmi_send_set_current_country_cmd(struct ath12k *ar, > + struct wmi_set_current_country_params *param); > int ath12k_wmi_peer_rx_reorder_queue_setup(struct ath12k *ar, > int vdev_id, const u8 *addr, > dma_addr_t paddr, u8 tid,
diff --git a/drivers/net/wireless/ath/ath12k/wmi.c b/drivers/net/wireless/ath/ath12k/wmi.c index 9ed33e2d6da0..aa87b559eff1 100644 --- a/drivers/net/wireless/ath/ath12k/wmi.c +++ b/drivers/net/wireless/ath/ath12k/wmi.c @@ -2844,6 +2844,42 @@ int ath12k_wmi_send_init_country_cmd(struct ath12k *ar, return ret; } +int ath12k_wmi_send_set_current_country_cmd(struct ath12k *ar, + struct wmi_set_current_country_params *param) +{ + struct ath12k_wmi_pdev *wmi = ar->wmi; + struct wmi_set_current_country_cmd *cmd; + struct sk_buff *skb; + int ret; + + skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, sizeof(*cmd)); + if (!skb) + return -ENOMEM; + + cmd = (struct wmi_set_current_country_cmd *)skb->data; + cmd->tlv_header = + ath12k_wmi_tlv_cmd_hdr(WMI_TAG_SET_CURRENT_COUNTRY_CMD, + sizeof(*cmd)); + + cmd->pdev_id = cpu_to_le32(ar->pdev->pdev_id); + memcpy(&cmd->new_alpha2, ¶m->alpha2, 3); + ret = ath12k_wmi_cmd_send(wmi, skb, WMI_SET_CURRENT_COUNTRY_CMDID); + + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, + "set current country pdev id %d alpha2 %c%c\n", + ar->pdev->pdev_id, + param->alpha2[0], + param->alpha2[1]); + + if (ret) { + ath12k_warn(ar->ab, + "failed to send WMI_SET_CURRENT_COUNTRY_CMDID: %d\n", ret); + dev_kfree_skb(skb); + } + + return ret; +} + int ath12k_wmi_send_twt_enable_cmd(struct ath12k *ar, u32 pdev_id) { diff --git a/drivers/net/wireless/ath/ath12k/wmi.h b/drivers/net/wireless/ath/ath12k/wmi.h index 8c047a9623f9..8940b8154091 100644 --- a/drivers/net/wireless/ath/ath12k/wmi.h +++ b/drivers/net/wireless/ath/ath12k/wmi.h @@ -3749,6 +3749,16 @@ struct ath12k_wmi_ap_ps_arg { u32 value; }; +struct wmi_set_current_country_params { + u8 alpha2[3]; +}; + +struct wmi_set_current_country_cmd { + __le32 tlv_header; + __le32 pdev_id; + __le32 new_alpha2; +} __packed; + enum set_init_cc_type { WMI_COUNTRY_INFO_TYPE_ALPHA, WMI_COUNTRY_INFO_TYPE_COUNTRY_CODE, @@ -4879,6 +4889,9 @@ int ath12k_wmi_send_bcn_offload_control_cmd(struct ath12k *ar, u32 vdev_id, u32 bcn_ctrl_op); int ath12k_wmi_send_init_country_cmd(struct ath12k *ar, struct ath12k_wmi_init_country_arg *arg); +int +ath12k_wmi_send_set_current_country_cmd(struct ath12k *ar, + struct wmi_set_current_country_params *param); int ath12k_wmi_peer_rx_reorder_queue_setup(struct ath12k *ar, int vdev_id, const u8 *addr, dma_addr_t paddr, u8 tid,
Add handler to send WMI_SET_CURRENT_COUNTRY_CMDID to firmware which is used for WCN7850. Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0-03427-QCAHMTSWPL_V1.0_V2.0_SILICONZ-1.15378.4 Signed-off-by: Wen Gong <quic_wgong@quicinc.com> --- drivers/net/wireless/ath/ath12k/wmi.c | 36 +++++++++++++++++++++++++++ drivers/net/wireless/ath/ath12k/wmi.h | 13 ++++++++++ 2 files changed, 49 insertions(+)