@@ -14,7 +14,8 @@ ath11k-y += core.o \
dp_tx.o \
dp_rx.o \
debug.o \
- ce.o
+ ce.o \
+ peer.o
ath11k-$(CONFIG_ATH11K_DEBUGFS) += debug_htt_stats.o
ath11k-$(CONFIG_MAC80211_DEBUGFS) += debugfs_sta.o
@@ -324,107 +324,6 @@ int ath11k_core_fetch_bdf(struct ath11k_base *sc, struct ath11k_board_data *bd)
}
-struct ath11k_peer *ath11k_peer_find(struct ath11k_base *ab, int vdev_id,
- const u8 *addr)
-{
- struct ath11k_peer *peer;
-
- lockdep_assert_held(&ab->data_lock);
-
- list_for_each_entry(peer, &ab->peers, list) {
- if (peer->vdev_id != vdev_id)
- continue;
- if (memcmp(peer->addr, addr, ETH_ALEN))
- continue;
-
- return peer;
- }
-
- return NULL;
-}
-
-struct ath11k_peer *ath11k_peer_find_by_addr(struct ath11k_base *ab,
- const u8 *addr)
-{
- struct ath11k_peer *peer;
-
- lockdep_assert_held(&ab->data_lock);
-
- list_for_each_entry(peer, &ab->peers, list) {
- if (memcmp(peer->addr, addr, ETH_ALEN))
- continue;
-
- return peer;
- }
-
- return NULL;
-}
-
-struct ath11k_peer *ath11k_peer_find_by_id(struct ath11k_base *ab,
- int peer_id)
-{
- struct ath11k_peer *peer;
-
- lockdep_assert_held(&ab->data_lock);
-
- list_for_each_entry(peer, &ab->peers, list)
- if (peer_id == peer->peer_id)
- return peer;
-
- return NULL;
-}
-
-void ath11k_peer_unmap_event(struct ath11k_base *ab, u16 peer_id)
-{
- struct ath11k_peer *peer;
-
- spin_lock_bh(&ab->data_lock);
-
- peer = ath11k_peer_find_by_id(ab, peer_id);
- if (!peer) {
- ath11k_warn(ab, "peer-unmap-event: unknown peer id %d\n",
- peer_id);
- goto exit;
- }
-
- ath11k_dbg(ab, ATH11K_DBG_DP_HTT, "htt peer unmap vdev %d peer %pM id %d\n",
- peer->vdev_id, peer->addr, peer_id);
-
- list_del(&peer->list);
- kfree(peer);
- wake_up(&ab->peer_mapping_wq);
-
-exit:
- spin_unlock_bh(&ab->data_lock);
-}
-
-void ath11k_peer_map_event(struct ath11k_base *ab, u8 vdev_id, u16 peer_id,
- u8 *mac_addr, u16 ast_hash)
-{
- struct ath11k_peer *peer;
-
- spin_lock_bh(&ab->data_lock);
- peer = ath11k_peer_find(ab, vdev_id, mac_addr);
- if (!peer) {
- peer = kzalloc(sizeof(*peer), GFP_ATOMIC);
- if (!peer)
- goto exit;
-
- peer->vdev_id = vdev_id;
- peer->peer_id = peer_id;
- peer->ast_hash = ast_hash;
- ether_addr_copy(peer->addr, mac_addr);
- list_add(&peer->list, &ab->peers);
- wake_up(&ab->peer_mapping_wq);
- }
-
- ath11k_dbg(ab, ATH11K_DBG_DP_HTT, "htt peer map vdev %d peer %pM id %d\n",
- vdev_id, mac_addr, peer_id);
-
-exit:
- spin_unlock_bh(&ab->data_lock);
-}
-
static void ath11k_core_stop(struct ath11k_base *sc)
{
if (!test_bit(ATH11K_FLAG_CRASH_FLUSH, &sc->dev_flags))
@@ -240,19 +240,6 @@ struct ath11k_rx_peer_stats {
u64 reception_type[HAL_RX_RECEPTION_TYPE_MAX];
};
-struct ath11k_peer {
- struct list_head list;
- struct ieee80211_sta *sta;
- int vdev_id;
- u8 addr[ETH_ALEN];
- int peer_id;
- u16 ast_hash;
-
- /* protected by ab->data_lock */
- struct ieee80211_key_conf *keys[WMI_MAX_KEY_INDEX + 1];
- struct dp_rx_tid rx_tid[IEEE80211_NUM_TIDS + 1];
-};
-
#define ATH11K_HE_MCS_NUM 12
#define ATH11K_VHT_MCS_NUM 10
#define ATH11K_BW_NUM 4
@@ -790,15 +777,6 @@ struct ath11k_fw_stats_peer_extd {
u32 rx_mc_bc_cnt;
};
-void ath11k_peer_unmap_event(struct ath11k_base *ab, u16 peer_id);
-void ath11k_peer_map_event(struct ath11k_base *ab, u8 vdev_id, u16 peer_id,
- u8 *mac_addr, u16 ast_hash);
-struct ath11k_peer *ath11k_peer_find(struct ath11k_base *ab, int vdev_id,
- const u8 *addr);
-struct ath11k_peer *ath11k_peer_find_by_addr(struct ath11k_base *ab,
- const u8 *addr);
-struct ath11k_peer *ath11k_peer_find_by_id(struct ath11k_base *ab,
- int peer_id);
int ath11k_core_qmi_firmware_ready(struct ath11k_base *ab);
int ath11k_core_init(struct ath11k_base *ath11k);
void ath11k_core_deinit(struct ath11k_base *ath11k);
@@ -10,6 +10,7 @@
#include "hal_rx.h"
#include "dp_tx.h"
#include "debug_htt_stats.h"
+#include "peer.h"
void ath11k_info(struct ath11k_base *sc, const char *fmt, ...)
{
@@ -4,6 +4,7 @@
*/
#include "core.h"
+#include "peer.h"
#include "debug.h"
void ath11k_sta_update_rx_duration(struct ath11k *ar,
@@ -9,6 +9,7 @@
#include "hal_tx.h"
#include "debug.h"
#include "dp_rx.h"
+#include "peer.h"
static void ath11k_dp_htt_htc_tx_complete(struct ath11k_base *sc,
struct sk_buff *skb)
@@ -11,6 +11,7 @@
#include "dp_rx.h"
#include "hal_rx.h"
#include "dp_tx.h"
+#include "peer.h"
static u8 *ath11k_dp_rx_h_80211_hdr(u8 *desc)
{
@@ -13,6 +13,7 @@
#include "dp_tx.h"
#include "dp_rx.h"
#include "testmode.h"
+#include "peer.h"
#define CHAN2G(_channel, _freq, _flags) { \
.band = NL80211_BAND_2GHZ, \
@@ -604,113 +605,6 @@ static int ath11k_mac_set_kickout(struct ath11k_vif *arvif)
return 0;
}
-static int ath11k_wait_for_peer_common(struct ath11k_base *ab, int vdev_id,
- const u8 *addr, bool expect_mapped)
-{
- int ret;
-
- ret = wait_event_timeout(ab->peer_mapping_wq, ({
- bool mapped;
-
- spin_lock_bh(&ab->data_lock);
- mapped = !!ath11k_peer_find(ab, vdev_id, addr);
- spin_unlock_bh(&ab->data_lock);
-
- (mapped == expect_mapped ||
- test_bit(ATH11K_FLAG_CRASH_FLUSH, &ab->dev_flags));
- }), 3 * HZ);
-
- if (ret <= 0)
- return -ETIMEDOUT;
-
- return 0;
-}
-
-static int
-ath11k_wait_for_peer_created(struct ath11k *ar, int vdev_id, const u8 *addr)
-{
- return ath11k_wait_for_peer_common(ar->ab, vdev_id, addr, true);
-}
-
-static int
-ath11k_wait_for_peer_deleted(struct ath11k *ar, int vdev_id, const u8 *addr)
-{
- return ath11k_wait_for_peer_common(ar->ab, vdev_id, addr, false);
-}
-
-static int ath11k_peer_create(struct ath11k *ar, struct ath11k_vif *arvif,
- struct ieee80211_sta *sta,
- struct peer_create_params *param)
-{
- struct ath11k_peer *peer;
- int ret;
-
- lockdep_assert_held(&ar->conf_mutex);
-
- if (ar->num_peers > (ar->max_num_peers - 1)) {
- ath11k_warn(ar->ab,
- "failed to create peer due to insufficient peer entry resource in firmware\n");
- return -ENOBUFS;
- }
-
- ret = ath11k_wmi_send_peer_create_cmd(ar, param);
- if (ret) {
- ath11k_warn(ar->ab,
- "failed to send peer create vdev_id %d ret %d\n",
- param->vdev_id, ret);
- return ret;
- }
-
- ret = ath11k_wait_for_peer_created(ar, param->vdev_id,
- param->peer_addr);
- if (ret)
- return ret;
-
- spin_lock_bh(&ar->ab->data_lock);
-
- peer = ath11k_peer_find(ar->ab, param->vdev_id, param->peer_addr);
- if (!peer) {
- spin_unlock_bh(&ar->ab->data_lock);
- ath11k_warn(ar->ab, "failed to find peer %pM on vdev %i after creation\n",
- param->peer_addr, param->vdev_id);
- ath11k_wmi_send_peer_delete_cmd(ar, param->peer_addr,
- param->vdev_id);
- return -ENOENT;
- }
-
- peer->sta = sta;
- arvif->ast_hash = peer->ast_hash;
-
- ar->num_peers++;
-
- spin_unlock_bh(&ar->ab->data_lock);
-
- return 0;
-}
-
-static int ath11k_peer_delete(struct ath11k *ar, u32 vdev_id, u8 *addr)
-{
- int ret;
-
- lockdep_assert_held(&ar->conf_mutex);
-
- ret = ath11k_wmi_send_peer_delete_cmd(ar, addr, vdev_id);
- if (ret) {
- ath11k_warn(ar->ab,
- "failed to delete peer vdev_id %d addr %pM ret %d\n",
- vdev_id, addr, ret);
- return ret;
- }
-
- ret = ath11k_wait_for_peer_deleted(ar, vdev_id, addr);
- if (ret)
- return ret;
-
- ar->num_peers--;
-
- return 0;
-}
-
void ath11k_mac_peer_cleanup_all(struct ath11k *ar)
{
struct ath11k_peer *peer, *tmp;
@@ -730,29 +624,6 @@ void ath11k_mac_peer_cleanup_all(struct ath11k *ar)
ar->num_stations = 0;
}
-static void ath11k_peer_cleanup(struct ath11k *ar, u32 vdev_id)
-{
- struct ath11k_peer *peer, *tmp;
- struct ath11k_base *ab = ar->ab;
-
- lockdep_assert_held(&ar->conf_mutex);
-
- spin_lock_bh(&ab->data_lock);
- list_for_each_entry_safe(peer, tmp, &ab->peers, list) {
- if (peer->vdev_id != vdev_id)
- continue;
-
- ath11k_warn(ab, "removing stale peer %pM from vdev_id %d\n",
- peer->addr, vdev_id);
-
- list_del(&peer->list);
- kfree(peer);
- ar->num_peers--;
- }
-
- spin_unlock_bh(&ab->data_lock);
-}
-
static int ath11k_monitor_vdev_up(struct ath11k *ar, int vdev_id)
{
int ret = 0;
new file mode 100644
@@ -0,0 +1,236 @@
+// SPDX-License-Identifier: ISC
+/*
+ * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.
+ */
+
+#include "core.h"
+#include "peer.h"
+#include "debug.h"
+
+struct ath11k_peer *ath11k_peer_find(struct ath11k_base *ab, int vdev_id,
+ const u8 *addr)
+{
+ struct ath11k_peer *peer;
+
+ lockdep_assert_held(&ab->data_lock);
+
+ list_for_each_entry(peer, &ab->peers, list) {
+ if (peer->vdev_id != vdev_id)
+ continue;
+ if (memcmp(peer->addr, addr, ETH_ALEN))
+ continue;
+
+ return peer;
+ }
+
+ return NULL;
+}
+
+struct ath11k_peer *ath11k_peer_find_by_addr(struct ath11k_base *ab,
+ const u8 *addr)
+{
+ struct ath11k_peer *peer;
+
+ lockdep_assert_held(&ab->data_lock);
+
+ list_for_each_entry(peer, &ab->peers, list) {
+ if (memcmp(peer->addr, addr, ETH_ALEN))
+ continue;
+
+ return peer;
+ }
+
+ return NULL;
+}
+
+struct ath11k_peer *ath11k_peer_find_by_id(struct ath11k_base *ab,
+ int peer_id)
+{
+ struct ath11k_peer *peer;
+
+ lockdep_assert_held(&ab->data_lock);
+
+ list_for_each_entry(peer, &ab->peers, list)
+ if (peer_id == peer->peer_id)
+ return peer;
+
+ return NULL;
+}
+
+void ath11k_peer_unmap_event(struct ath11k_base *ab, u16 peer_id)
+{
+ struct ath11k_peer *peer;
+
+ spin_lock_bh(&ab->data_lock);
+
+ peer = ath11k_peer_find_by_id(ab, peer_id);
+ if (!peer) {
+ ath11k_warn(ab, "peer-unmap-event: unknown peer id %d\n",
+ peer_id);
+ goto exit;
+ }
+
+ ath11k_dbg(ab, ATH11K_DBG_DP_HTT, "htt peer unmap vdev %d peer %pM id %d\n",
+ peer->vdev_id, peer->addr, peer_id);
+
+ list_del(&peer->list);
+ kfree(peer);
+ wake_up(&ab->peer_mapping_wq);
+
+exit:
+ spin_unlock_bh(&ab->data_lock);
+}
+
+void ath11k_peer_map_event(struct ath11k_base *ab, u8 vdev_id, u16 peer_id,
+ u8 *mac_addr, u16 ast_hash)
+{
+ struct ath11k_peer *peer;
+
+ spin_lock_bh(&ab->data_lock);
+ peer = ath11k_peer_find(ab, vdev_id, mac_addr);
+ if (!peer) {
+ peer = kzalloc(sizeof(*peer), GFP_ATOMIC);
+ if (!peer)
+ goto exit;
+
+ peer->vdev_id = vdev_id;
+ peer->peer_id = peer_id;
+ peer->ast_hash = ast_hash;
+ ether_addr_copy(peer->addr, mac_addr);
+ list_add(&peer->list, &ab->peers);
+ wake_up(&ab->peer_mapping_wq);
+ }
+
+ ath11k_dbg(ab, ATH11K_DBG_DP_HTT, "htt peer map vdev %d peer %pM id %d\n",
+ vdev_id, mac_addr, peer_id);
+
+exit:
+ spin_unlock_bh(&ab->data_lock);
+}
+
+static int ath11k_wait_for_peer_common(struct ath11k_base *ab, int vdev_id,
+ const u8 *addr, bool expect_mapped)
+{
+ int ret;
+
+ ret = wait_event_timeout(ab->peer_mapping_wq, ({
+ bool mapped;
+
+ spin_lock_bh(&ab->data_lock);
+ mapped = !!ath11k_peer_find(ab, vdev_id, addr);
+ spin_unlock_bh(&ab->data_lock);
+
+ (mapped == expect_mapped ||
+ test_bit(ATH11K_FLAG_CRASH_FLUSH, &ab->dev_flags));
+ }), 3 * HZ);
+
+ if (ret <= 0)
+ return -ETIMEDOUT;
+
+ return 0;
+}
+
+void ath11k_peer_cleanup(struct ath11k *ar, u32 vdev_id)
+{
+ struct ath11k_peer *peer, *tmp;
+ struct ath11k_base *ab = ar->ab;
+
+ lockdep_assert_held(&ar->conf_mutex);
+
+ spin_lock_bh(&ab->data_lock);
+ list_for_each_entry_safe(peer, tmp, &ab->peers, list) {
+ if (peer->vdev_id != vdev_id)
+ continue;
+
+ ath11k_warn(ab, "removing stale peer %pM from vdev_id %d\n",
+ peer->addr, vdev_id);
+
+ list_del(&peer->list);
+ kfree(peer);
+ ar->num_peers--;
+ }
+
+ spin_unlock_bh(&ab->data_lock);
+}
+
+static int ath11k_wait_for_peer_deleted(struct ath11k *ar, int vdev_id, const u8 *addr)
+{
+ return ath11k_wait_for_peer_common(ar->ab, vdev_id, addr, false);
+}
+
+int ath11k_peer_delete(struct ath11k *ar, u32 vdev_id, u8 *addr)
+{
+ int ret;
+
+ lockdep_assert_held(&ar->conf_mutex);
+
+ ret = ath11k_wmi_send_peer_delete_cmd(ar, addr, vdev_id);
+ if (ret) {
+ ath11k_warn(ar->ab,
+ "failed to delete peer vdev_id %d addr %pM ret %d\n",
+ vdev_id, addr, ret);
+ return ret;
+ }
+
+ ret = ath11k_wait_for_peer_deleted(ar, vdev_id, addr);
+ if (ret)
+ return ret;
+
+ ar->num_peers--;
+
+ return 0;
+}
+
+static int ath11k_wait_for_peer_created(struct ath11k *ar, int vdev_id, const u8 *addr)
+{
+ return ath11k_wait_for_peer_common(ar->ab, vdev_id, addr, true);
+}
+
+int ath11k_peer_create(struct ath11k *ar, struct ath11k_vif *arvif,
+ struct ieee80211_sta *sta, struct peer_create_params *param)
+{
+ struct ath11k_peer *peer;
+ int ret;
+
+ lockdep_assert_held(&ar->conf_mutex);
+
+ if (ar->num_peers > (ar->max_num_peers - 1)) {
+ ath11k_warn(ar->ab,
+ "failed to create peer due to insufficient peer entry resource in firmware\n");
+ return -ENOBUFS;
+ }
+
+ ret = ath11k_wmi_send_peer_create_cmd(ar, param);
+ if (ret) {
+ ath11k_warn(ar->ab,
+ "failed to send peer create vdev_id %d ret %d\n",
+ param->vdev_id, ret);
+ return ret;
+ }
+
+ ret = ath11k_wait_for_peer_created(ar, param->vdev_id,
+ param->peer_addr);
+ if (ret)
+ return ret;
+
+ spin_lock_bh(&ar->ab->data_lock);
+
+ peer = ath11k_peer_find(ar->ab, param->vdev_id, param->peer_addr);
+ if (!peer) {
+ spin_unlock_bh(&ar->ab->data_lock);
+ ath11k_warn(ar->ab, "failed to find peer %pM on vdev %i after creation\n",
+ param->peer_addr, param->vdev_id);
+ ath11k_wmi_send_peer_delete_cmd(ar, param->peer_addr,
+ param->vdev_id);
+ return -ENOENT;
+ }
+
+ peer->sta = sta;
+ arvif->ast_hash = peer->ast_hash;
+
+ ar->num_peers++;
+
+ spin_unlock_bh(&ar->ab->data_lock);
+
+ return 0;
+}
new file mode 100644
@@ -0,0 +1,35 @@
+/* SPDX-License-Identifier: ISC */
+/*
+ * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.
+ */
+
+#ifndef ATH11K_PEER_H
+#define ATH11K_PEER_H
+
+struct ath11k_peer {
+ struct list_head list;
+ struct ieee80211_sta *sta;
+ int vdev_id;
+ u8 addr[ETH_ALEN];
+ int peer_id;
+ u16 ast_hash;
+
+ /* protected by ab->data_lock */
+ struct ieee80211_key_conf *keys[WMI_MAX_KEY_INDEX + 1];
+ struct dp_rx_tid rx_tid[IEEE80211_NUM_TIDS + 1];
+};
+
+void ath11k_peer_unmap_event(struct ath11k_base *ab, u16 peer_id);
+void ath11k_peer_map_event(struct ath11k_base *ab, u8 vdev_id, u16 peer_id,
+ u8 *mac_addr, u16 ast_hash);
+struct ath11k_peer *ath11k_peer_find(struct ath11k_base *ab, int vdev_id,
+ const u8 *addr);
+struct ath11k_peer *ath11k_peer_find_by_addr(struct ath11k_base *ab,
+ const u8 *addr);
+struct ath11k_peer *ath11k_peer_find_by_id(struct ath11k_base *ab, int peer_id);
+void ath11k_peer_cleanup(struct ath11k *ar, u32 vdev_id);
+int ath11k_peer_delete(struct ath11k *ar, u32 vdev_id, u8 *addr);
+int ath11k_peer_create(struct ath11k *ar, struct ath11k_vif *arvif,
+ struct ieee80211_sta *sta, struct peer_create_params *param);
+
+#endif /* _PEER_H_ */
@@ -17,6 +17,7 @@
#include "debug.h"
#include "mac.h"
#include "hw.h"
+#include "peer.h"
struct wmi_tlv_policy {
size_t min_len;
Move peer util functions from mac.c and core.c to peer.c Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@codeaurora.org> --- drivers/net/wireless/ath/ath11k/Makefile | 3 +- drivers/net/wireless/ath/ath11k/core.c | 101 ----------- drivers/net/wireless/ath/ath11k/core.h | 22 --- drivers/net/wireless/ath/ath11k/debug.c | 1 + drivers/net/wireless/ath/ath11k/debugfs_sta.c | 1 + drivers/net/wireless/ath/ath11k/dp.c | 1 + drivers/net/wireless/ath/ath11k/dp_rx.c | 1 + drivers/net/wireless/ath/ath11k/mac.c | 131 +------------- drivers/net/wireless/ath/ath11k/peer.c | 236 ++++++++++++++++++++++++++ drivers/net/wireless/ath/ath11k/peer.h | 35 ++++ drivers/net/wireless/ath/ath11k/wmi.c | 1 + 11 files changed, 279 insertions(+), 254 deletions(-) create mode 100644 drivers/net/wireless/ath/ath11k/peer.c create mode 100644 drivers/net/wireless/ath/ath11k/peer.h