From 3535797e674f7d5815ce20ec82266e282b117b98 Mon Sep 17 00:00:00 2001 From: Aditya Kumar Singh Date: Thu, 1 Sep 2022 15:51:25 +0530 Subject: [PATCH 2/5] Revert "ath12k: remove debugfs.h" This reverts commit cb0c65e98f9148be757795133c807b31942aa397. Signed-off-by: Aditya Kumar Singh --- drivers/net/wireless/ath/ath12k/debug.h | 1 + drivers/net/wireless/ath/ath12k/debugfs.h | 26 +++++++++++++++++++++++ drivers/net/wireless/ath/ath12k/dp_rx.h | 11 ---------- drivers/net/wireless/ath/ath12k/mac.h | 3 --- 4 files changed, 27 insertions(+), 14 deletions(-) create mode 100644 drivers/net/wireless/ath/ath12k/debugfs.h --- a/drivers/net/wireless/ath/ath12k/debug.h +++ b/drivers/net/wireless/ath/ath12k/debug.h @@ -8,6 +8,7 @@ #define _ATH12K_DEBUG_H_ #include "trace.h" +#include "debugfs.h" enum ath12k_debug_mask { ATH12K_DBG_AHB = 0x00000001, --- /dev/null +++ b/drivers/net/wireless/ath/ath12k/debugfs.h @@ -0,0 +1,26 @@ +/* SPDX-License-Identifier: BSD-3-Clause-Clear */ +/* + * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved. + * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#ifndef _ATH12K_DEBUGFS_H_ +#define _ATH12K_DEBUGFS_H_ + +#define ATH12K_TX_POWER_MAX_VAL 70 +#define ATH12K_TX_POWER_MIN_VAL 0 + +struct ath_pktlog_hdr { + u16 flags; + u16 missed_cnt; + u16 log_type; + u16 size; + u32 timestamp; + u32 type_specific_data; + struct mlo_timestamp m_timestamp; + u8 payload[]; +}; + +#define ATH12K_FW_STATS_BUF_SIZE (1024 * 1024) + +#endif /* _ATH12K_DEBUGFS_H_ */ --- a/drivers/net/wireless/ath/ath12k/dp_rx.h +++ b/drivers/net/wireless/ath/ath12k/dp_rx.h @@ -65,17 +65,6 @@ struct ath12k_dp_rx_rfc1042_hdr { __be16 snap_type; } __packed; -struct ath_pktlog_hdr { - u16 flags; - u16 missed_cnt; - u16 log_type; - u16 size; - u32 timestamp; - u32 type_specific_data; - struct mlo_timestamp m_timestamp; - u8 payload[]; -}; - static inline u32 ath12k_he_gi_to_nl80211_he_gi(u8 sgi) { u32 ret = 0; --- a/drivers/net/wireless/ath/ath12k/mac.h +++ b/drivers/net/wireless/ath/ath12k/mac.h @@ -117,9 +117,6 @@ struct ath12k_generic_iter { #define ATH12K_CHAN_WIDTH_NUM 8 -#define ATH12K_TX_POWER_MAX_VAL 70 -#define ATH12K_TX_POWER_MIN_VAL 0 - extern const struct htt_rx_ring_tlv_filter ath12k_mac_mon_status_filter_default; void ath12k_mac_destroy(struct ath12k_base *ab); --- a/local-symbols +++ b/local-symbols @@ -137,4 +137,5 @@ ATH11K_CFR= ATH11K_SMART_ANT_ALG= ATH12K= ATH12K_DEBUG= +ATH12K_DEBUGFS= ATH12K_TRACING=