From 49496d088a4f95bf4af30d4e439615f9038ad4ee Mon Sep 17 00:00:00 2001 From: Rajeev Kumar Date: Tue, 3 Jul 2018 14:45:23 -0700 Subject: [PATCH] qcacmn: Enable CE scheduling logging feature Enable CE schedulign logging feature such that each CE activity can be recorded for debug purpose. Previous commit I68a765c6219a2ff2a6a7adc7e8ed031f8957d243 has broken this debug feature. Fix the CE scheduling logging feature properly such that its available in SLUB debug enabled builds. Change-Id: I24ca711378ecda8a8563fe3899fae16ca032f29d CRs-Fixed: 2272459 --- hif/inc/hif.h | 2 +- hif/src/ce/ce_internal.h | 2 +- hif/src/ce/ce_service.c | 4 ++-- hif/src/hif_main.h | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hif/inc/hif.h b/hif/inc/hif.h index e6c01302ce..49a671843a 100644 --- a/hif/inc/hif.h +++ b/hif/inc/hif.h @@ -932,7 +932,7 @@ void hif_set_initial_wakeup_cb(struct hif_opaque_softc *hif_ctx, * Note: For MCL, #if defined (HIF_CONFIG_SLUB_DEBUG_ON) needs to be checked * for defined here */ -#if HIF_CE_DEBUG_DATA_BUF +#if defined(HIF_CONFIG_SLUB_DEBUG_ON) || defined(HIF_CE_DEBUG_DATA_BUF) ssize_t hif_dump_desc_trace_buf(struct device *dev, struct device_attribute *attr, char *buf); ssize_t hif_input_desc_trace_buf_index(struct hif_softc *scn, diff --git a/hif/src/ce/ce_internal.h b/hif/src/ce/ce_internal.h index 1a4557a248..5390982124 100644 --- a/hif/src/ce/ce_internal.h +++ b/hif/src/ce/ce_internal.h @@ -515,7 +515,7 @@ int hif_get_wake_ce_id(struct hif_softc *scn, uint8_t *ce_id); * Note: For MCL, #if defined (HIF_CONFIG_SLUB_DEBUG_ON) needs to be checked * for defined here */ -#if HIF_CE_DEBUG_DATA_BUF +#if defined(HIF_CONFIG_SLUB_DEBUG_ON) || defined(HIF_CE_DEBUG_DATA_BUF) #ifndef HIF_CE_HISTORY_MAX #define HIF_CE_HISTORY_MAX 512 diff --git a/hif/src/ce/ce_service.c b/hif/src/ce/ce_service.c index ed94b77140..e39414ca09 100644 --- a/hif/src/ce/ce_service.c +++ b/hif/src/ce/ce_service.c @@ -94,7 +94,7 @@ void hif_ce_war_enable(void) * Note: For MCL, #if defined (HIF_CONFIG_SLUB_DEBUG_ON) needs to be checked * for defined here */ -#if HIF_CE_DEBUG_DATA_BUF +#if defined(HIF_CONFIG_SLUB_DEBUG_ON) || defined(HIF_CE_DEBUG_DATA_BUF) #define CE_DEBUG_PRINT_BUF_SIZE(x) (((x) * 3) - 1) #define CE_DEBUG_DATA_PER_ROW 16 @@ -2792,7 +2792,7 @@ static uint32_t hif_dump_desc_data_buf(uint8_t *buf, ssize_t pos, * Note: For MCL, #if defined (HIF_CONFIG_SLUB_DEBUG_ON) needs to be checked * for defined here */ -#if HIF_CE_DEBUG_DATA_BUF +#if defined(HIF_CONFIG_SLUB_DEBUG_ON) || defined(HIF_CE_DEBUG_DATA_BUF) static const char *ce_event_type_to_str(enum hif_ce_event_type type) { switch (type) { diff --git a/hif/src/hif_main.h b/hif/src/hif_main.h index 40b91292ef..5e6c4e1f8b 100644 --- a/hif/src/hif_main.h +++ b/hif/src/hif_main.h @@ -118,7 +118,7 @@ struct hif_ce_stats { * Note: For MCL, #if defined (HIF_CONFIG_SLUB_DEBUG_ON) needs to be checked * for defined here */ -#if HIF_CE_DEBUG_DATA_BUF +#if defined(HIF_CONFIG_SLUB_DEBUG_ON) || defined(HIF_CE_DEBUG_DATA_BUF) struct ce_desc_hist { qdf_atomic_t history_index[CE_COUNT_MAX]; uint32_t enable[CE_COUNT_MAX]; @@ -194,7 +194,7 @@ struct hif_softc { * Note: For MCL, #if defined (HIF_CONFIG_SLUB_DEBUG_ON) needs to be checked * for defined here */ -#if HIF_CE_DEBUG_DATA_BUF +#if defined(HIF_CONFIG_SLUB_DEBUG_ON) || defined(HIF_CE_DEBUG_DATA_BUF) struct ce_desc_hist hif_ce_desc_hist; #endif /* #if defined(HIF_CONFIG_SLUB_DEBUG_ON) || HIF_CE_DEBUG_DATA_BUF */ #ifdef IPA_OFFLOAD