Browse Source

qcacld-3.0: Fix the regression issue for pktlog failure with ROME module

The pktlog will fail with ROME module due to the change IDs:
I24776caa3b78ec38d94421f243ec72d81ee3102d
Ifb70ac0993f2402201f88758845f730cf677b1a0

Define new macro PKTLOG_LEGACY for HELIUM/ROME to avoid the ROME PKTLOG
failure.

Change-Id: Ibaa20b7af208a261e0fd8682de45ad8eb4a69212
CRs-Fixed: 2520696
Tiger Yu 5 years ago
parent
commit
be6e775e9a
3 changed files with 30 additions and 0 deletions
  1. 3 0
      Kbuild
  2. 23 0
      configs/default_defconfig
  3. 4 0
      configs/qca6174_defconfig

+ 3 - 0
Kbuild

@@ -2341,6 +2341,9 @@ cppflags-$(CONFIG_ATH_SUPPORT_FLOWMAC_MODULE) += -DATH_SUPPORT_FLOWMAC_MODULE
 #Enable spectral support
 cppflags-$(CONFIG_ATH_SUPPORT_SPECTRAL) += -DATH_SUPPORT_SPECTRAL
 
+#Enable legacy pktlog
+cppflags-$(CONFIG_PKTLOG_LEGACY) += -DPKTLOG_LEGACY
+
 #Enable WDI Event support
 cppflags-$(CONFIG_WDI_EVENT_ENABLE) += -DWDI_EVENT_ENABLE
 

+ 23 - 0
configs/default_defconfig

@@ -515,6 +515,29 @@ CONFIG_ATH_SUPPORT_FLOWMAC_MODULE := n
 #Enable spectral support
 CONFIG_ATH_SUPPORT_SPECTRAL := n
 
+#Define the legacy pktlog
+ifeq ($(CONFIG_REMOVE_PKT_LOG), n)
+ifeq ($(CONFIG_HELIUMPLUS), y)
+CONFIG_PKTLOG_LEGACY := y
+endif
+
+ifeq ($(CONFIG_ROME_IF), sdio)
+CONFIG_PKTLOG_LEGACY := y
+endif
+
+ifeq ($(CONFIG_ROME_IF), pci)
+CONFIG_PKTLOG_LEGACY := y
+endif
+
+ifeq ($(CONFIG_ROME_IF), usb)
+CONFIG_PKTLOG_LEGACY := y
+endif
+
+ifeq ($(CONFIG_ROME_IF), snoc)
+CONFIG_PKTLOG_LEGACY := y
+endif
+endif
+
 #Enable WDI Event support
 ifeq ($(CONFIG_REMOVE_PKT_LOG), y)
 CONFIG_WDI_EVENT_ENABLE := n

+ 4 - 0
configs/qca6174_defconfig

@@ -422,6 +422,10 @@ else
 CONFIG_WDI_EVENT_ENABLE := y
 endif
 
+ifeq ($(CONFIG_REMOVE_PKT_LOG), n)
+CONFIG_PKTLOG_LEGACY := y
+endif
+
 #Endianness selection
 CONFIG_LITTLE_ENDIAN := y