Browse Source

qcacmn: Change CONFIG_SLUB_DEBUG_ON define to HIF_CONFIG_SLUB_DEBUG_ON

Change CONFIG_SLUB_DEBUG_ON to HIF_CONFIG_SLUB_DEBUG_ON to differentiate
kernel CONFIG_SLUB_DEBUG_ON macro with hif specific debug option.

Change-Id: I8922d5c37363da382f3f0b23489f8fd3544eed7d
CRs-Fixed: 1088928
Venkateswara Swamy Bandaru 8 years ago
parent
commit
814094e9c2
4 changed files with 11 additions and 5 deletions
  1. 6 0
      hif/inc/hif.h
  2. 2 2
      hif/src/ce/ce_service.c
  3. 1 1
      hif/src/ce/ce_tasklet.c
  4. 2 2
      hif/src/pcie/if_pci.c

+ 6 - 0
hif/inc/hif.h

@@ -148,6 +148,12 @@ struct CE_state;
 #define HIF_MAX_GROUP 8
 
 #ifdef CONFIG_SLUB_DEBUG_ON
+#ifndef CONFIG_WIN
+#define HIF_CONFIG_SLUB_DEBUG_ON
+#endif
+#endif
+
+#ifdef HIF_CONFIG_SLUB_DEBUG_ON
 #define QCA_NAPI_BUDGET    64
 #define QCA_NAPI_DEF_SCALE  2
 #else  /* PERF build */

+ 2 - 2
hif/src/ce/ce_service.c

@@ -97,7 +97,7 @@ void hif_ce_war_enable(void)
 	hif_ce_war1 = 1;
 }
 
-#ifdef CONFIG_SLUB_DEBUG_ON
+#ifdef HIF_CONFIG_SLUB_DEBUG_ON
 
 /**
  * struct hif_ce_event - structure for detailing a ce event
@@ -294,7 +294,7 @@ void war_ce_src_ring_write_idx_set(struct hif_softc *scn,
 	}
 }
 
-#ifdef CONFIG_SLUB_DEBUG_ON
+#ifdef HIF_CONFIG_SLUB_DEBUG_ON
 /**
  * ce_validate_nbytes() - validate nbytes for slub builds on tx descriptors
  * @nbytes: nbytes value being written into a send descriptor

+ 1 - 1
hif/src/ce/ce_tasklet.c

@@ -121,7 +121,7 @@ void init_tasklet_workers(struct hif_opaque_softc *scn)
 	work_initialized = true;
 }
 
-#ifdef CONFIG_SLUB_DEBUG_ON
+#ifdef HIF_CONFIG_SLUB_DEBUG_ON
 /**
  * ce_schedule_tasklet() - schedule ce tasklet
  * @tasklet_entry: struct ce_tasklet_entry

+ 2 - 2
hif/src/pcie/if_pci.c

@@ -863,7 +863,7 @@ static irqreturn_t ce_per_engine_handler(int irq, void *arg)
 	return IRQ_HANDLED;
 }
 
-#ifdef CONFIG_SLUB_DEBUG_ON
+#ifdef HIF_CONFIG_SLUB_DEBUG_ON
 
 /* worker thread to schedule wlan_tasklet in SLUB debug build */
 static void reschedule_tasklet_work_handler(void *arg)
@@ -899,7 +899,7 @@ static void hif_init_reschedule_tasklet_work(struct hif_pci_softc *sc)
 }
 #else
 static void hif_init_reschedule_tasklet_work(struct hif_pci_softc *sc) { }
-#endif /* CONFIG_SLUB_DEBUG_ON */
+#endif /* HIF_CONFIG_SLUB_DEBUG_ON */
 
 void wlan_tasklet(unsigned long data)
 {