wifi: ath10k: add support to allow broadcast action frame RX

Broadcast action frames are needed for the Device Provisioning
Protocol (DPP) for Presence and PKEX Exchange requests. Currently
just ath9k has this capability so this is being enabled for
ath10k (for at least one hardware variant).

Add a new capability flag in ath10k_hw_params to indicate support
for receiving multicast action frames. This bit is then checked
when configuring the RX filter and (if set) multicast action frame
registration is enabled.

Until more hardware can be tested only the "qca6174 hw3.2" variant
is enabling this feature.

Note: I went ahead and removed the 'changed_flags' mask operation
since it had no effect, that parameter was not being used anywhere.

Tested-on: QCA6174 hw3.2 WLAN.RM.4.4.1-00288-

Signed-off-by: James Prestwood <prestwoj@gmail.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20231116173246.40458-1-prestwoj@gmail.com

diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index e9a434f1eb42d841d2a898a77ae7de14e62d8ea1..0032f8aa892ffa2724ec40f45ca24e0435d2b254 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -101,6 +101,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
                .hw_restart_disconnect = false,
                .use_fw_tx_credits = true,
                .delay_unmap_buffer = false,
+               .mcast_frame_registration = false,
        },
        {
                .id = QCA988X_HW_2_0_VERSION,
@@ -141,6 +142,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
                .hw_restart_disconnect = false,
                .use_fw_tx_credits = true,
                .delay_unmap_buffer = false,
+               .mcast_frame_registration = false,
        },
        {
                .id = QCA9887_HW_1_0_VERSION,
@@ -182,6 +184,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
                .hw_restart_disconnect = false,
                .use_fw_tx_credits = true,
                .delay_unmap_buffer = false,
+               .mcast_frame_registration = false,
        },
        {
                .id = QCA6174_HW_3_2_VERSION,
@@ -218,6 +221,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
                .hw_restart_disconnect = false,
                .use_fw_tx_credits = true,
                .delay_unmap_buffer = false,
+               .mcast_frame_registration = false,
        },
        {
                .id = QCA6174_HW_2_1_VERSION,
@@ -258,6 +262,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
                .hw_restart_disconnect = false,
                .use_fw_tx_credits = true,
                .delay_unmap_buffer = false,
+               .mcast_frame_registration = false,
        },
        {
                .id = QCA6174_HW_2_1_VERSION,
@@ -298,6 +303,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
                .hw_restart_disconnect = false,
                .use_fw_tx_credits = true,
                .delay_unmap_buffer = false,
+               .mcast_frame_registration = false,
        },
        {
                .id = QCA6174_HW_3_0_VERSION,
@@ -338,6 +344,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
                .hw_restart_disconnect = false,
                .use_fw_tx_credits = true,
                .delay_unmap_buffer = false,
+               .mcast_frame_registration = false,
        },
        {
                .id = QCA6174_HW_3_2_VERSION,
@@ -382,6 +389,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
                .hw_restart_disconnect = false,
                .use_fw_tx_credits = true,
                .delay_unmap_buffer = false,
+               .mcast_frame_registration = true,
        },
        {
                .id = QCA99X0_HW_2_0_DEV_VERSION,
@@ -428,6 +436,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
                .hw_restart_disconnect = false,
                .use_fw_tx_credits = true,
                .delay_unmap_buffer = false,
+               .mcast_frame_registration = false,
        },
        {
                .id = QCA9984_HW_1_0_DEV_VERSION,
@@ -481,6 +490,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
                .hw_restart_disconnect = false,
                .use_fw_tx_credits = true,
                .delay_unmap_buffer = false,
+               .mcast_frame_registration = false,
        },
        {
                .id = QCA9888_HW_2_0_DEV_VERSION,
@@ -531,6 +541,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
                .hw_restart_disconnect = false,
                .use_fw_tx_credits = true,
                .delay_unmap_buffer = false,
+               .mcast_frame_registration = false,
        },
        {
                .id = QCA9377_HW_1_0_DEV_VERSION,
@@ -571,6 +582,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
                .hw_restart_disconnect = false,
                .use_fw_tx_credits = true,
                .delay_unmap_buffer = false,
+               .mcast_frame_registration = false,
        },
        {
                .id = QCA9377_HW_1_1_DEV_VERSION,
@@ -613,6 +625,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
                .hw_restart_disconnect = false,
                .use_fw_tx_credits = true,
                .delay_unmap_buffer = false,
+               .mcast_frame_registration = false,
        },
        {
                .id = QCA9377_HW_1_1_DEV_VERSION,
@@ -646,6 +659,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
                .hw_restart_disconnect = false,
                .use_fw_tx_credits = true,
                .delay_unmap_buffer = false,
+               .mcast_frame_registration = false,
        },
        {
                .id = QCA4019_HW_1_0_DEV_VERSION,
@@ -693,6 +707,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
                .hw_restart_disconnect = false,
                .use_fw_tx_credits = true,
                .delay_unmap_buffer = false,
+               .mcast_frame_registration = false,
        },
        {
                .id = WCN3990_HW_1_0_DEV_VERSION,
@@ -726,6 +741,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
                .hw_restart_disconnect = true,
                .use_fw_tx_credits = false,
                .delay_unmap_buffer = true,
+               .mcast_frame_registration = false,
        },
 };
 

diff --git a/drivers/net/wireless/ath/ath10k/hw.h b/drivers/net/wireless/ath/ath10k/hw.h
index 2e65902f8b21e048d02ff1a733fda89362ae0921..93c0730919966dd0e12373a004ceaae35ee161a9 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/hw.h
+++ b/drivers/net/wireless/ath/ath10k/hw.h
@@ -640,6 +640,9 @@ struct ath10k_hw_params {
        bool use_fw_tx_credits;
 
        bool delay_unmap_buffer;
+
+       /* The hardware support multicast frame registrations */
+       bool mcast_frame_registration;
 };
 
 struct htt_resp;

diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index ed2db79b7b18b87f1a519d4fa56e8fb4027f4e8b..090bcf148d0c75a4ce9abcecd1d8ee419acbd691 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -1243,7 +1243,7 @@ static bool ath10k_mac_monitor_vdev_is_needed(struct ath10k *ar)
        return ar->monitor ||
               (!test_bit(ATH10K_FW_FEATURE_ALLOWS_MESH_BCAST,
                          ar->running_fw->fw_file.fw_features) &&
-               (ar->filter_flags & FIF_OTHER_BSS)) ||
+               (ar->filter_flags & (FIF_OTHER_BSS | FIF_MCAST_ACTION))) ||
               test_bit(ATH10K_CAC_RUNNING, &ar->dev_flags);
 }
 
@@ -6026,10 +6026,15 @@ static void ath10k_configure_filter(struct ieee80211_hw *hw,
 {
        struct ath10k *ar = hw->priv;
        int ret;
+       unsigned int supported = SUPPORTED_FILTERS;
 
        mutex_lock(&ar->conf_mutex);
 
-       *total_flags &= SUPPORTED_FILTERS;
+       if (ar->hw_params.mcast_frame_registration)
+               supported |= FIF_MCAST_ACTION;
+
+       *total_flags &= supported;
+
        ar->filter_flags = *total_flags;
 
        ret = ath10k_monitor_recalc(ar);
@@ -10118,6 +10123,10 @@ int ath10k_mac_register(struct ath10k *ar)
                              NL80211_EXT_FEATURE_SET_SCAN_DWELL);
        wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_AQL);
 
+       if (ar->hw_params.mcast_frame_registration)
+               wiphy_ext_feature_set(ar->hw->wiphy,
+                                     NL80211_EXT_FEATURE_MULTICAST_REGISTRATIONS);
+
        if (test_bit(WMI_SERVICE_TX_DATA_ACK_RSSI, ar->wmi.svc_map) ||
            test_bit(WMI_SERVICE_HTT_MGMT_TX_COMP_VALID_FLAGS, ar->wmi.svc_map))
                wiphy_ext_feature_set(ar->hw->wiphy,