samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "qca-wifi: Use atomic operation in peer tid queue init"

Browse Source
This commit is contained in:
Linux Build Service Account
2020-08-31 03:05:49 -07:00
committed by Gerrit - the friendly Code Review server
parent 97a5cab7a5 2de00c0bd2
commit 30d7518fef
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dp/wifi3.0/dp_tx_capture.c
View File

@@ -115,6 +115,8 @@
/* Maximum number of retries */ /* Maximum number of retries */
#define MAX_RETRY_Q_COUNT 20 #define MAX_RETRY_Q_COUNT 20
#define DP_PEER_TX_TID_INIT_DONE_BIT 0
#ifdef WLAN_TX_PKT_CAPTURE_ENH #ifdef WLAN_TX_PKT_CAPTURE_ENH
/* stats counter */ /* stats counter */
@@ -489,8 +491,11 @@ void dp_peer_tid_queue_init(struct dp_peer *peer)
for (tid = 0; tid < DP_MAX_TIDS; tid++) { for (tid = 0; tid < DP_MAX_TIDS; tid++) {
tx_tid = &peer->tx_capture.tx_tid[tid]; tx_tid = &peer->tx_capture.tx_tid[tid];
if (tx_tid->init_done)
if (qdf_atomic_test_and_set_bit(DP_PEER_TX_TID_INIT_DONE_BIT,
&tx_tid->tid_flags))
continue; continue;
tx_tid->tid = tid; tx_tid->tid = tid;
qdf_nbuf_queue_init(&tx_tid->defer_msdu_q); qdf_nbuf_queue_init(&tx_tid->defer_msdu_q);
qdf_nbuf_queue_init(&tx_tid->msdu_comp_q); qdf_nbuf_queue_init(&tx_tid->msdu_comp_q);
@@ -510,6 +515,8 @@ void dp_peer_tid_queue_init(struct dp_peer *peer)
for (i = 0; i < tid; i++) { for (i = 0; i < tid; i++) {
tx_tid = &peer->tx_capture.tx_tid[i]; tx_tid = &peer->tx_capture.tx_tid[i];
qdf_mem_free(tx_tid->xretry_ppdu); qdf_mem_free(tx_tid->xretry_ppdu);
qdf_atomic_clear_bit(DP_PEER_TX_TID_INIT_DONE_BIT,
&tx_tid->tid_flags);
} }
QDF_ASSERT(0); QDF_ASSERT(0);
return; return;
@@ -518,7 +525,6 @@ void dp_peer_tid_queue_init(struct dp_peer *peer)
/* spinlock create */ /* spinlock create */
qdf_spinlock_create(&tx_tid->tid_lock); qdf_spinlock_create(&tx_tid->tid_lock);
qdf_spinlock_create(&tx_tid->tasklet_tid_lock); qdf_spinlock_create(&tx_tid->tasklet_tid_lock);
tx_tid->init_done = 1;
} }
peer->tx_capture.is_tid_initialized = 1; peer->tx_capture.is_tid_initialized = 1;
@@ -572,6 +578,11 @@ void dp_peer_tid_queue_cleanup(struct dp_peer *peer)
for (tid = 0; tid < DP_MAX_TIDS; tid++) { for (tid = 0; tid < DP_MAX_TIDS; tid++) {
tx_tid = &peer->tx_capture.tx_tid[tid]; tx_tid = &peer->tx_capture.tx_tid[tid];
if (!qdf_atomic_test_and_clear_bit(DP_PEER_TX_TID_INIT_DONE_BIT,
&tx_tid->tid_flags))
continue;
xretry_ppdu = tx_tid->xretry_ppdu; xretry_ppdu = tx_tid->xretry_ppdu;
xretry_user = &xretry_ppdu->user[0]; xretry_user = &xretry_ppdu->user[0];

2
dp/wifi3.0/dp_tx_capture.h
View File

@@ -161,7 +161,7 @@ struct dp_tx_tid {
uint16_t first_data_seq_ctrl; uint16_t first_data_seq_ctrl;
uint32_t mpdu_cnt; uint32_t mpdu_cnt;
uint32_t mpdu_fcs_ok_bitmap[QDF_MON_STATUS_MPDU_FCS_BMAP_NWORDS]; uint32_t mpdu_fcs_ok_bitmap[QDF_MON_STATUS_MPDU_FCS_BMAP_NWORDS];
uint8_t init_done; unsigned long tid_flags;
}; };
struct dp_peer_tx_capture { struct dp_peer_tx_capture {