mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 23:12:32 +00:00
76 lines
2.9 KiB
Diff
76 lines
2.9 KiB
Diff
|
From 5bd2ced044bb95029d5c44cf7d23ced73e0fc05b Mon Sep 17 00:00:00 2001
|
||
|
|
From: Muna Sinada <quic_msinada@quicinc.com>
|
||
|
|
Date: Sat, 26 Aug 2023 08:42:46 +0300
|
||
|
|
Subject: [PATCH] wifi: ath11k: move references from rsvd2 to info fields
|
||
|
|
|
||
|
|
Remove references to reserved fields and add new info fields for
|
||
|
|
struct hal_rx_ppdu_end_user_stats. Reserved fields should not be
|
||
|
|
accessed, therefore existing references to it are to be changed to
|
||
|
|
referencing specific info fields.
|
||
|
|
|
||
|
|
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.4.0.1-00356-QCAHKSWPL_SILICONZ-1
|
||
|
|
|
||
|
|
Signed-off-by: Muna Sinada <quic_msinada@quicinc.com>
|
||
|
|
Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
|
||
|
|
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
|
||
|
|
Link: https://lore.kernel.org/r/1692827868-15667-1-git-send-email-quic_msinada@quicinc.com
|
||
|
|
---
|
||
|
|
drivers/net/wireless/ath/ath11k/hal_rx.c | 10 +++++-----
|
||
|
|
drivers/net/wireless/ath/ath11k/hal_rx.h | 11 ++++++++---
|
||
|
|
2 files changed, 13 insertions(+), 8 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/net/wireless/ath/ath11k/hal_rx.c
|
||
|
|
+++ b/drivers/net/wireless/ath/ath11k/hal_rx.c
|
||
|
|
@@ -814,7 +814,7 @@ ath11k_hal_rx_handle_ofdma_info(void *rx
|
||
|
|
|
||
|
|
rx_user_status->ul_ofdma_user_v0_word0 = __le32_to_cpu(ppdu_end_user->info6);
|
||
|
|
|
||
|
|
- rx_user_status->ul_ofdma_user_v0_word1 = __le32_to_cpu(ppdu_end_user->rsvd2[10]);
|
||
|
|
+ rx_user_status->ul_ofdma_user_v0_word1 = __le32_to_cpu(ppdu_end_user->info9);
|
||
|
|
}
|
||
|
|
|
||
|
|
static inline void
|
||
|
|
@@ -825,11 +825,11 @@ ath11k_hal_rx_populate_byte_count(void *
|
||
|
|
(struct hal_rx_ppdu_end_user_stats *)rx_tlv;
|
||
|
|
|
||
|
|
rx_user_status->mpdu_ok_byte_count =
|
||
|
|
- FIELD_GET(HAL_RX_PPDU_END_USER_STATS_RSVD2_6_MPDU_OK_BYTE_COUNT,
|
||
|
|
- __le32_to_cpu(ppdu_end_user->rsvd2[6]));
|
||
|
|
+ FIELD_GET(HAL_RX_PPDU_END_USER_STATS_INFO8_MPDU_OK_BYTE_COUNT,
|
||
|
|
+ __le32_to_cpu(ppdu_end_user->info7));
|
||
|
|
rx_user_status->mpdu_err_byte_count =
|
||
|
|
- FIELD_GET(HAL_RX_PPDU_END_USER_STATS_RSVD2_8_MPDU_ERR_BYTE_COUNT,
|
||
|
|
- __le32_to_cpu(ppdu_end_user->rsvd2[8]));
|
||
|
|
+ FIELD_GET(HAL_RX_PPDU_END_USER_STATS_INFO9_MPDU_ERR_BYTE_COUNT,
|
||
|
|
+ __le32_to_cpu(ppdu_end_user->info8));
|
||
|
|
}
|
||
|
|
|
||
|
|
static inline void
|
||
|
|
--- a/drivers/net/wireless/ath/ath11k/hal_rx.h
|
||
|
|
+++ b/drivers/net/wireless/ath/ath11k/hal_rx.h
|
||
|
|
@@ -222,8 +222,8 @@ struct hal_rx_ppdu_start {
|
||
|
|
#define HAL_RX_PPDU_END_USER_STATS_INFO6_TID_BITMAP GENMASK(15, 0)
|
||
|
|
#define HAL_RX_PPDU_END_USER_STATS_INFO6_TID_EOSP_BITMAP GENMASK(31, 16)
|
||
|
|
|
||
|
|
-#define HAL_RX_PPDU_END_USER_STATS_RSVD2_6_MPDU_OK_BYTE_COUNT GENMASK(24, 0)
|
||
|
|
-#define HAL_RX_PPDU_END_USER_STATS_RSVD2_8_MPDU_ERR_BYTE_COUNT GENMASK(24, 0)
|
||
|
|
+#define HAL_RX_PPDU_END_USER_STATS_INFO7_MPDU_OK_BYTE_COUNT GENMASK(24, 0)
|
||
|
|
+#define HAL_RX_PPDU_END_USER_STATS_INFO8_MPDU_ERR_BYTE_COUNT GENMASK(24, 0)
|
||
|
|
|
||
|
|
struct hal_rx_ppdu_end_user_stats {
|
||
|
|
__le32 rsvd0[2];
|
||
|
|
@@ -236,7 +236,12 @@ struct hal_rx_ppdu_end_user_stats {
|
||
|
|
__le32 info4;
|
||
|
|
__le32 info5;
|
||
|
|
__le32 info6;
|
||
|
|
- __le32 rsvd2[11];
|
||
|
|
+ __le32 rsvd2[5];
|
||
|
|
+ __le32 info7;
|
||
|
|
+ __le32 rsvd3;
|
||
|
|
+ __le32 info8;
|
||
|
|
+ __le32 rsvd3[2];
|
||
|
|
+ __le32 info9;
|
||
|
|
} __packed;
|
||
|
|
|
||
|
|
struct hal_rx_ppdu_end_user_stats_ext {
|