bcmdhd: disable some more debug flags

Reduce the logs output by the wifi driver for FSI, and also fix the few
issues that came with having some config flags disabled.

Test: Manual
Bug: 188463502
Bug: 209911949

Signed-off-by: Florian Muller <mullerf@google.com>
Change-Id: Ie7971efa28c5797b3861b9a5a0ebea1901543579

4 files changed, 9 insertions, 9 deletions

diff --git a/net/wireless/bcmdhd/Makefile b/net/wireless/bcmdhd/Makefile
index eedc6a4..e51a361 100644
--- a/net/wireless/bcmdhd/Makefile
+++ b/net/wireless/bcmdhd/Makefile
@@ -35,8 +35,7 @@ KBUILD_FLAGS += -DANDROID_PLATFORM_VERSION=11
 
 # Debug flag. This flag is only used in KBuild.
 # Comment out to disable debugging logs and processes.
-# STOPSHIP: 188463502 disable CONFIG_BCMDHD_DEBUG.
-KBUILD_OPTIONS += CONFIG_BCMDHD_DEBUG=y
+#KBUILD_OPTIONS += CONFIG_BCMDHD_DEBUG=y
 
 all:
 	$(MAKE) -C $(KERNEL_SRC) M=$(M) modules $(KBUILD_OPTIONS) KCFLAGS='$(KBUILD_FLAGS)'
diff --git a/net/wireless/bcmdhd/dhd_common.c b/net/wireless/bcmdhd/dhd_common.c
index 49bdd9a..fa98acd 100644
--- a/net/wireless/bcmdhd/dhd_common.c
+++ b/net/wireless/bcmdhd/dhd_common.c
@@ -113,9 +113,8 @@
 int log_print_threshold = 0;
 #endif /* DHD_LOG_PRINT_RATE_LIMIT */
 
-// TODO (mullerf): b/180659832: Revert DHD_PNO_VAL when done debugging
 /* For CUSTOMER_HW4/Hikey do not enable DHD_ERROR_MEM_VAL by default */
-int dhd_msg_level = DHD_ERROR_VAL | DHD_PNO_VAL
+int dhd_msg_level = DHD_ERROR_VAL
 	/* For CUSTOMER_HW4 do not enable DHD_IOVAR_MEM_VAL by default */
 #if !defined(CUSTOMER_HW4) && !defined(BOARD_HIKEY) && !defined(BOARD_EXYNOS)
 	| DHD_IOVAR_MEM_VAL
diff --git a/net/wireless/bcmdhd/dhd_linux.c b/net/wireless/bcmdhd/dhd_linux.c
index f923b2b..1b45944 100644
--- a/net/wireless/bcmdhd/dhd_linux.c
+++ b/net/wireless/bcmdhd/dhd_linux.c
@@ -716,6 +716,10 @@ static int dhd_init_static_strs_array(osl_t *osh, dhd_event_log_t *temp, char *s
 #define DHD_MEMDUMP_TYPE_LONGSTR_LEN 180
 #define DHD_MEMDUMP_PATH_STR_LEN 128
 
+#if defined(WL_CFGVENDOR_SEND_HANG_EVENT)
+char hang_reason_str[DHD_MEMDUMP_TYPE_LONGSTR_LEN];
+#endif
+
 #ifdef DHD_TX_PROFILE
 /* process layer 3 headers, to ultimately determine if a
  * dhd_tx_profile_protocol_t matches
@@ -18348,9 +18352,7 @@ void dhd_schedule_memdump(dhd_pub_t *dhdp, uint8 *buf, uint32 size)
 	dhd_deferred_schedule_work(dhdp->info->dhd_deferred_wq, (void *)dump,
 		DHD_WQ_WORK_SOC_RAM_DUMP, (void *)dhd_mem_dump, DHD_WQ_WORK_PRIORITY_HIGH);
 }
-#if defined(WL_CFGVENDOR_SEND_HANG_EVENT)
-char hang_reason_str[DHD_MEMDUMP_TYPE_LONGSTR_LEN];
-#endif
+
 static int
 dhd_mem_dump(void *handle, void *event_info, u8 event)
 {
diff --git a/net/wireless/bcmdhd/wl_cfgvendor.c b/net/wireless/bcmdhd/wl_cfgvendor.c
index 4886076..378fe61 100644
--- a/net/wireless/bcmdhd/wl_cfgvendor.c
+++ b/net/wireless/bcmdhd/wl_cfgvendor.c
@@ -1317,14 +1317,14 @@ wl_cfgvendor_get_wake_reason_stats(struct wiphy *wiphy,
 	struct net_device *ndev = wdev_to_ndev(wdev);
 	wake_counts_t *pwake_count_info;
 	int ret, mem_needed;
-#if defined(DHD_DEBUG) && defined(DHD_WAKE_EVENT_STATUS)
+#ifdef DHD_WAKE_EVENT_STATUS
 	int flowid;
 #ifdef CUSTOM_WAKE_REASON_STATS
 	int tmp_rc_event[MAX_WAKE_REASON_STATS];
 	int rc_event_used_cnt = 0;
 	int front = 0;
 #endif /* CUSTOM_WAKE_REASON_STATS */
-#endif /* DHD_DEBUG && DHD_WAKE_EVENT_STATUS */
+#endif /* DHD_WAKE_EVENT_STATUS */
 	struct sk_buff *skb = NULL;
 	dhd_pub_t *dhdp = wl_cfg80211_get_dhdp(ndev);