On 2/25/2024 10:02 PM, Kang Yang wrote:
> The NoA(Notice of Absence) attribute is used by the P2P Group Owner to
> signal its absence due to power save timing, concurrent operation, or
> off-channel scanning. It is also used in the P2P Presence Request-Response
> mechanism.
>
> The NoA attribute shall be present in the P2P IE in the beacon frames
> transmitted by a P2P Group Owner when a NoA schedule is being advertised,
> or when the CTWindow is non-zero.
>
> So add support to update P2P information after P2P GO is up through
> event WMI_P2P_NOA_EVENTID, and always put it in probe resp.
>
> Create p2p.c and p2p.h for P2P related functions and definitions.
>
> Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.37
> Tested-on: QCA2066 hw2.1 PCI WLAN.HSP.1.1-03926.13-QCAHSPSWPL_V2_SILICONZ_CE-2.52297.2
>
> Signed-off-by: Kang Yang <quic_kangyang@xxxxxxxxxxx>
> ---
> drivers/net/wireless/ath/ath11k/Makefile | 3 +-
> drivers/net/wireless/ath/ath11k/p2p.c | 145 +++++++++++++++++++++++
> drivers/net/wireless/ath/ath11k/p2p.h | 23 ++++
> drivers/net/wireless/ath/ath11k/wmi.c | 57 ++++++++-
> drivers/net/wireless/ath/ath11k/wmi.h | 31 +++++
> 5 files changed, 257 insertions(+), 2 deletions(-)
> create mode 100644 drivers/net/wireless/ath/ath11k/p2p.c
> create mode 100644 drivers/net/wireless/ath/ath11k/p2p.h
>
> diff --git a/drivers/net/wireless/ath/ath11k/Makefile b/drivers/net/wireless/ath/ath11k/Makefile
> index 2c94d50ae36f..43d2d8ddcdc0 100644
> --- a/drivers/net/wireless/ath/ath11k/Makefile
> +++ b/drivers/net/wireless/ath/ath11k/Makefile
> @@ -18,7 +18,8 @@ ath11k-y += core.o \
> dbring.o \
> hw.o \
> pcic.o \
> - fw.o
> + fw.o \
> + p2p.o
>
> ath11k-$(CONFIG_ATH11K_DEBUGFS) += debugfs.o debugfs_htt_stats.o debugfs_sta.o
> ath11k-$(CONFIG_NL80211_TESTMODE) += testmode.o
> diff --git a/drivers/net/wireless/ath/ath11k/p2p.c b/drivers/net/wireless/ath/ath11k/p2p.c
> new file mode 100644
> index 000000000000..bfaeea12bc09
> --- /dev/null
> +++ b/drivers/net/wireless/ath/ath11k/p2p.c
> @@ -0,0 +1,145 @@
> +// SPDX-License-Identifier: BSD-3-Clause-Clear
> +/*
> + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
> + */
> +
> +#include "core.h"
> +#include "wmi.h"
> +#include "mac.h"
> +#include "p2p.h"
> +
> +static void ath11k_p2p_noa_ie_fill(u8 *data, size_t len,
> + const struct ath11k_wmi_p2p_noa_info *noa)
> +{
> + struct ieee80211_p2p_noa_attr *noa_attr;
> + u8 ctwindow = u32_get_bits(noa->noa_attr, WMI_P2P_NOA_INFO_CTWIN_TU);
> + bool oppps = u32_get_bits(noa->noa_attr, WMI_P2P_NOA_INFO_OPP_PS);
> + __le16 *noa_attr_len;
> + u16 attr_len;
> + u8 noa_descriptors = u32_get_bits(noa->noa_attr,
> + WMI_P2P_NOA_INFO_DESC_NUM);
do you need to validate that this doesn't exceed
WMI_P2P_MAX_NOA_DESCRIPTORS?
> + int i;
> +
> + /* P2P IE */
> + data[0] = WLAN_EID_VENDOR_SPECIFIC;
> + data[1] = len - 2;
> + data[2] = (WLAN_OUI_WFA >> 16) & 0xff;
> + data[3] = (WLAN_OUI_WFA >> 8) & 0xff;
> + data[4] = (WLAN_OUI_WFA >> 0) & 0xff;
> + data[5] = WLAN_OUI_TYPE_WFA_P2P;
> +
> + /* NOA ATTR */
> + data[6] = IEEE80211_P2P_ATTR_ABSENCE_NOTICE;
> + noa_attr_len = (__le16 *)&data[7]; /* 2 bytes */
> + noa_attr = (struct ieee80211_p2p_noa_attr *)&data[9];
> +
> + noa_attr->index = u32_get_bits(noa->noa_attr,
> + WMI_P2P_NOA_INFO_INDEX);
> + noa_attr->oppps_ctwindow = ctwindow;
> + if (oppps)
> + noa_attr->oppps_ctwindow |= IEEE80211_P2P_OPPPS_ENABLE_BIT;
> +
> + for (i = 0; i < noa_descriptors; i++) {
> + noa_attr->desc[i].count = noa->descriptors[i].type_count;
> + noa_attr->desc[i].duration =
> + cpu_to_le32(noa->descriptors[i].duration);
> + noa_attr->desc[i].interval =
> + cpu_to_le32(noa->descriptors[i].interval);
> + noa_attr->desc[i].start_time =
> + cpu_to_le32(noa->descriptors[i].start_time);
> + }
> +
> + attr_len = 2; /* index + oppps_ctwindow */
> + attr_len += noa_descriptors * sizeof(struct ieee80211_p2p_noa_desc);
> + *noa_attr_len = __cpu_to_le16(attr_len);
> +}
> +
> +static size_t
> +ath11k_p2p_noa_ie_len_compute(const struct ath11k_wmi_p2p_noa_info *noa)
> +{
> + size_t len = 0;
> +
> + if (!(u32_get_bits(noa->noa_attr, WMI_P2P_NOA_INFO_DESC_NUM)) &&
> + !(u32_get_bits(noa->noa_attr, WMI_P2P_NOA_INFO_OPP_PS)))
> + return 0;
> +
> + len += 1 + 1 + 4; /* EID + len + OUI */
> + len += 1 + 2; /* noa attr + attr len */
> + len += 1 + 1; /* index + oppps_ctwindow */
> + len += u32_get_bits(noa->noa_attr, WMI_P2P_NOA_INFO_DESC_NUM) *
here again do you need to validate that this doesn't exceed
WMI_P2P_MAX_NOA_DESCRIPTORS?
also rather than call u32_get_bits() twice for the same field, call it
once and cache the result
> + sizeof(struct ieee80211_p2p_noa_desc);
> +
> + return len;
> +}
> +
> +static void ath11k_p2p_noa_ie_assign(struct ath11k_vif *arvif, void *ie,
> + size_t len)
> +{
> + struct ath11k *ar = arvif->ar;
> +
> + lockdep_assert_held(&ar->data_lock);
> +
> + kfree(arvif->u.ap.noa_data);
> +
> + arvif->u.ap.noa_data = ie;
> + arvif->u.ap.noa_len = len;
> +}
> +
> +static void __ath11k_p2p_noa_update(struct ath11k_vif *arvif,
> + const struct ath11k_wmi_p2p_noa_info *noa)
> +{
> + struct ath11k *ar = arvif->ar;
> + void *ie;
> + size_t len;
> +
> + lockdep_assert_held(&ar->data_lock);
> +
> + ath11k_p2p_noa_ie_assign(arvif, NULL, 0);
> +
> + len = ath11k_p2p_noa_ie_len_compute(noa);
> + if (!len)
> + return;
> +
> + ie = kmalloc(len, GFP_ATOMIC);
> + if (!ie)
> + return;
> +
> + ath11k_p2p_noa_ie_fill(ie, len, noa);
> + ath11k_p2p_noa_ie_assign(arvif, ie, len); }
> +
> +void ath11k_p2p_noa_update(struct ath11k_vif *arvif,
> + const struct ath11k_wmi_p2p_noa_info *noa)
> +{
> + struct ath11k *ar = arvif->ar;
> +
> + spin_lock_bh(&ar->data_lock);
> + __ath11k_p2p_noa_update(arvif, noa);
> + spin_unlock_bh(&ar->data_lock);
> +}
> +
> +static void ath11k_p2p_noa_update_vdev_iter(void *data, u8 *mac,
> + struct ieee80211_vif *vif)
> +{
> + struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);
> + struct ath11k_p2p_noa_arg *arg = data;
> +
> + if (arvif->vdev_id != arg->vdev_id)
> + return;
> +
> + ath11k_p2p_noa_update(arvif, arg->noa);
> +}
> +
> +void ath11k_p2p_noa_update_by_vdev_id(struct ath11k *ar, u32 vdev_id,
> + const struct ath11k_wmi_p2p_noa_info *noa)
> +{
> + struct ath11k_p2p_noa_arg arg = {
> + .vdev_id = vdev_id,
> + .noa = noa,
> + };
> +
> + ieee80211_iterate_active_interfaces_atomic(ar->hw,
> + IEEE80211_IFACE_ITER_NORMAL,
> + ath11k_p2p_noa_update_vdev_iter,
> + &arg);
> +}
> +
As part of "b4 shazam" I'm getting:
ath/.git/rebase-apply/patch:175: new blank line at EOF.
+
which I think comes from here. so remove the blank line at the end of file
> diff --git a/drivers/net/wireless/ath/ath11k/p2p.h b/drivers/net/wireless/ath/ath11k/p2p.h
> new file mode 100644
> index 000000000000..ebd076f7fe7f
> --- /dev/null
> +++ b/drivers/net/wireless/ath/ath11k/p2p.h
> @@ -0,0 +1,23 @@
> +/* SPDX-License-Identifier: BSD-3-Clause-Clear */
> +/*
> + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
> + */
> +
> +#ifndef ATH11K_P2P_H
> +#define ATH11K_P2P_H
> +
> +#include "wmi.h"
> +
> +struct ath11k_wmi_p2p_noa_info;
> +
> +struct ath11k_p2p_noa_arg {
> + u32 vdev_id;
> + const struct ath11k_wmi_p2p_noa_info *noa;
> +};
> +
> +void ath11k_p2p_noa_update(struct ath11k_vif *arvif,
> + const struct ath11k_wmi_p2p_noa_info *noa);
> +void ath11k_p2p_noa_update_by_vdev_id(struct ath11k *ar, u32 vdev_id,
> + const struct ath11k_wmi_p2p_noa_info *noa);
> +#endif
> +
ditto here:
ath/.git/rebase-apply/patch:204: new blank line at EOF.
+
> diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c
> index d86fcdd374c6..bbccddd7d729 100644
> --- a/drivers/net/wireless/ath/ath11k/wmi.c
> +++ b/drivers/net/wireless/ath/ath11k/wmi.c
> @@ -20,6 +20,7 @@
> #include "hw.h"
> #include "peer.h"
> #include "testmode.h"
> +#include "p2p.h"
>
> struct wmi_tlv_policy {
> size_t min_len;
> @@ -154,6 +155,10 @@ static const struct wmi_tlv_policy wmi_tlv_policies[] = {
> .min_len = sizeof(struct wmi_per_chain_rssi_stats) },
> [WMI_TAG_TWT_ADD_DIALOG_COMPLETE_EVENT] = {
> .min_len = sizeof(struct wmi_twt_add_dialog_event) },
> + [WMI_TAG_P2P_NOA_INFO] = {
> + .min_len = sizeof(struct ath11k_wmi_p2p_noa_info) },
> + [WMI_TAG_P2P_NOA_EVENT] = {
> + .min_len = sizeof(struct wmi_p2p_noa_event) },
> };
>
> #define PRIMAP(_hw_mode_) \
> @@ -981,7 +986,7 @@ int ath11k_wmi_vdev_start(struct ath11k *ar, struct wmi_vdev_start_req_arg *arg,
> FIELD_PREP(WMI_TLV_LEN, 0);
>
> /* Note: This is a nested TLV containing:
> - * [wmi_tlv][wmi_p2p_noa_descriptor][wmi_tlv]..
> + * [wmi_tlv][ath11k_wmi_p2p_noa_descriptor][wmi_tlv]..
> */
>
> ptr += sizeof(*tlv);
> @@ -8645,6 +8650,53 @@ static void ath11k_wmi_gtk_offload_status_event(struct ath11k_base *ab,
> kfree(tb);
> }
>
> +static int ath11k_wmi_p2p_noa_event(struct ath11k_base *ab,
> + struct sk_buff *skb)
> +{
> + const void **tb;
> + const struct wmi_p2p_noa_event *ev;
> + const struct ath11k_wmi_p2p_noa_info *noa;
> + struct ath11k *ar;
> + int ret, vdev_id;
> +
> + tb = ath11k_wmi_tlv_parse_alloc(ab, skb, GFP_ATOMIC);
> + if (IS_ERR(tb)) {
> + ret = PTR_ERR(tb);
> + ath11k_warn(ab, "failed to parse tlv: %d\n", ret);
> + return ret;
> + }
> +
> + ev = tb[WMI_TAG_P2P_NOA_EVENT];
> + noa = tb[WMI_TAG_P2P_NOA_INFO];
> +
> + if (!ev || !noa) {
> + ret = -EPROTO;
> + goto out;
> + }
> +
> + vdev_id = ev->vdev_id;
> +
> + ath11k_dbg(ab, ATH11K_DBG_WMI,
> + "wmi tlv p2p noa vdev_id %i descriptors %u\n",
> + vdev_id, u32_get_bits(noa->noa_attr, WMI_P2P_NOA_INFO_DESC_NUM));
> + rcu_read_lock();
> + ar = ath11k_mac_get_ar_by_vdev_id(ab, vdev_id);
> + if (!ar) {
> + ath11k_warn(ab, "invalid vdev id %d in P2P NoA event\n",
> + vdev_id);
> + ret = -EINVAL;
> + goto unlock;
> + }
> +
> + ath11k_p2p_noa_update_by_vdev_id(ar, vdev_id, noa);
> +
> +unlock:
> + rcu_read_unlock();
> +out:
> + kfree(tb);
> + return 0;
> +}
> +
> static void ath11k_wmi_tlv_op_rx(struct ath11k_base *ab, struct sk_buff *skb)
> {
> struct wmi_cmd_hdr *cmd_hdr;
> @@ -8772,6 +8824,9 @@ static void ath11k_wmi_tlv_op_rx(struct ath11k_base *ab, struct sk_buff *skb)
> case WMI_GTK_OFFLOAD_STATUS_EVENTID:
> ath11k_wmi_gtk_offload_status_event(ab, skb);
> break;
> + case WMI_P2P_NOA_EVENTID:
> + ath11k_wmi_p2p_noa_event(ab, skb);
> + break;
> default:
> ath11k_dbg(ab, ATH11K_DBG_WMI, "unsupported event id 0x%x\n", id);
> break;
> diff --git a/drivers/net/wireless/ath/ath11k/wmi.h b/drivers/net/wireless/ath/ath11k/wmi.h
> index 4c20202947c7..564f4a9ac8ce 100644
> --- a/drivers/net/wireless/ath/ath11k/wmi.h
> +++ b/drivers/net/wireless/ath/ath11k/wmi.h
drivers/net/wireless/ath/ath11k/wmi.h QuIC copyright missing 2024
> @@ -3630,6 +3630,37 @@ struct wmi_ftm_event_msg {
> u8 data[];
> } __packed;
>
> +#define WMI_P2P_MAX_NOA_DESCRIPTORS 4
> +
> +struct wmi_p2p_noa_event {
> + u32 vdev_id;
> +} __packed;
> +
> +struct ath11k_wmi_p2p_noa_descriptor {
> + u32 type_count; /* 255: continuous schedule, 0: reserved */
> + u32 duration; /* Absent period duration in micro seconds */
> + u32 interval; /* Absent period interval in micro seconds */
> + u32 start_time; /* 32 bit tsf time when in starts */
> +} __packed;
> +
> +#define WMI_P2P_NOA_INFO_CHANGED_FLAG BIT(0)
> +#define WMI_P2P_NOA_INFO_INDEX GENMASK(15, 8)
> +#define WMI_P2P_NOA_INFO_OPP_PS BIT(16)
> +#define WMI_P2P_NOA_INFO_CTWIN_TU GENMASK(23, 17)
> +#define WMI_P2P_NOA_INFO_DESC_NUM GENMASK(31, 24)
> +
> +struct ath11k_wmi_p2p_noa_info {
> + /* Bit 0 - Flag to indicate an update in NOA schedule
> + * Bits 7-1 - Reserved
> + * Bits 15-8 - Index (identifies the instance of NOA sub element)
> + * Bit 16 - Opp PS state of the AP
> + * Bits 23-17 - Ctwindow in TUs
> + * Bits 31-24 - Number of NOA descriptors
> + */
> + u32 noa_attr;
> + struct ath11k_wmi_p2p_noa_descriptor descriptors[WMI_P2P_MAX_NOA_DESCRIPTORS];
so firmware always sends the max number of records even if Bits 31-24 -
Number of NOA descriptors indicates a smaller number?
> +} __packed;
> +
> #define WMI_BEACON_TX_BUFFER_SIZE 512
>
> #define WMI_EMA_TMPL_IDX_SHIFT 8
I'm seeing things today I probably missed in the ath12k review, so let's
make sure that when this is merged that ath12k si updated as well.
/jeff
