On 1/29/2024 8:02 PM, Kang Yang wrote:
> P2P Element is a necessary component of P2P protocol communication.
> It contains the Vendor Specific Information Element which includes
> the WFA OUI and an OUI Type indicating P2P.
>
> Add P2P IE in beacon template, and implement WMI interface for it.
>
> Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
> Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1
>
> Signed-off-by: Kang Yang <quic_kangyang@xxxxxxxxxxx>
> ---
>
> v6: no change.
> v5: no change.
> v4: no change.
> v3: no change.
> v2:
> 1. add Tested-on tag of QCN9274.
> 2. update copyright.
>
> ---
> drivers/net/wireless/ath/ath12k/mac.c | 85 ++++++++++++++++++++++++++-
> drivers/net/wireless/ath/ath12k/wmi.c | 39 ++++++++++++
> drivers/net/wireless/ath/ath12k/wmi.h | 10 +++-
> 3 files changed, 131 insertions(+), 3 deletions(-)
...
> --- a/drivers/net/wireless/ath/ath12k/wmi.c
> +++ b/drivers/net/wireless/ath/ath12k/wmi.c
> @@ -1713,6 +1713,45 @@ int ath12k_wmi_send_bcn_offload_control_cmd(struct ath12k *ar,
> return ret;
> }
>
> +int ath12k_wmi_p2p_go_bcn_ie(struct ath12k *ar, u32 vdev_id,
> + const u8 *p2p_ie)
> +{
...
> + ptr = skb->data;
> + cmd = ptr;
> + cmd->tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_P2P_GO_SET_BEACON_IE,
> + sizeof(*cmd));
> + cmd->vdev_id = cpu_to_le32(vdev_id);
> + cmd->ie_buf_len = cpu_to_le32(p2p_ie_len);
> +
> + ptr = skb->data + sizeof(*cmd);
IMO better would be: ptr += sizeof(*cmd);
Kalle can probably adjust this in the pending branch
> + tlv = ptr;
> + tlv->header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_ARRAY_BYTE,
> + aligned_len);
> + memcpy(tlv->value, p2p_ie, p2p_ie_len);
> +
> + ret = ath12k_wmi_cmd_send(wmi, skb, WMI_P2P_GO_SET_BEACON_IE);
> + if (ret) {
> + ath12k_warn(ar->ab, "failed to send WMI_P2P_GO_SET_BEACON_IE\n");
> + dev_kfree_skb(skb);
> + }
> +
> + return ret;
> +}
Acked-by: Jeff Johnson <quic_jjohnson@xxxxxxxxxxx>
