From cf7c6b0af849b95018c5a960e869ecaaaabe0f5c Mon Sep 17 00:00:00 2001 From: Isaac Hermida Date: Tue, 5 Jul 2016 18:33:30 +0200 Subject: [PATCH] kernel-module-qualcomm: compile the driver without debug messages By default the driver was being compiled with debug messages. Disabled it but leave the option there so it can be enabled by user. Signed-off-by: Isaac Hermida --- .../kernel-module-qualcomm.bb | 4 ++ ...mpile-the-DEBUG-version-inconditiona.patch | 25 ++++++++++ ...p-most-of-the-relevant-DEBUG-options.patch | 48 +++++++++++++++++++ 3 files changed, 77 insertions(+) create mode 100644 meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/0014-Kbuild-do-not-compile-the-DEBUG-version-inconditiona.patch create mode 100644 meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/0015-Kbuild-Group-most-of-the-relevant-DEBUG-options.patch diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb index 9f742e3f7..c59fe3693 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb +++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb @@ -30,6 +30,8 @@ SRC_URI = " \ file://0011-osdep_adf.h-fix-for-undefined-ath_sysctl_pktlog_size.patch \ file://0012-Kbuild-Add-compilation-flag-based-on-kernel-support.patch \ file://0013-Kbuild-do-not-create-an-auxiliar-p2p-on-init.patch \ + file://0014-Kbuild-do-not-compile-the-DEBUG-version-inconditiona.patch \ + file://0015-Kbuild-Group-most-of-the-relevant-DEBUG-options.patch \ " S = "${WORKDIR}/${PV}" @@ -39,6 +41,8 @@ EXTRA_OEMAKE += "CONFIG_CLD_HL_SDIO_CORE=y CONFIG_LINUX_QCMBR=y WLAN_OPEN_SOURCE # memory that is not allowed in ARMv6 (kernel commit # 309caa9cc6ff39d261264ec4ff10e29489afc8f8) EXTRA_OEMAKE += "CONFIG_NON_QC_PLATFORM=y" +# Flag to compile the debug version (1 - enabled, rest of values - disabled) +EXTRA_OEMAKE += "BUILD_DEBUG_VERSION=0" do_compile_prepend() { export BUILD_VER=${PV} diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/0014-Kbuild-do-not-compile-the-DEBUG-version-inconditiona.patch b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/0014-Kbuild-do-not-compile-the-DEBUG-version-inconditiona.patch new file mode 100644 index 000000000..98eb059b5 --- /dev/null +++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/0014-Kbuild-do-not-compile-the-DEBUG-version-inconditiona.patch @@ -0,0 +1,25 @@ +From: Isaac Hermida +Date: Tue, 5 Jul 2016 17:57:07 +0200 +Subject: [PATCH] Kbuild: do not compile the DEBUG version inconditionally + +Do not compile the DEBUG version inconditionally by adding the posibility to +define the DEBUG version as a flag parameter. + +Signed-off-by: Isaac Hermida +--- + Kbuild | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Kbuild b/Kbuild +index b14417a558cd..a0e203ce5493 100644 +--- a/Kbuild ++++ b/Kbuild +@@ -121,7 +121,7 @@ endif + # Feature flags which are not (currently) configurable via Kconfig + + #Whether to build debug version +-BUILD_DEBUG_VERSION := 1 ++BUILD_DEBUG_VERSION ?= 1 + + #Enable this flag to build driver in diag version + BUILD_DIAG_VERSION := 1 diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/0015-Kbuild-Group-most-of-the-relevant-DEBUG-options.patch b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/0015-Kbuild-Group-most-of-the-relevant-DEBUG-options.patch new file mode 100644 index 000000000..0c9c91943 --- /dev/null +++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/0015-Kbuild-Group-most-of-the-relevant-DEBUG-options.patch @@ -0,0 +1,48 @@ +From: Isaac Hermida +Date: Tue, 5 Jul 2016 17:52:44 +0200 +Subject: [PATCH] Kbuild: Group most of the relevant DEBUG options + +The value of BUILD_DEBUG_VERSION will be used to compile the driver with most +of the relevant DEBUG flags. Use that variable to compile the debug version. + +Signed-off-by: Isaac Hermida +--- + Kbuild | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Kbuild b/Kbuild +index a0e203ce5493..e5f2e8ebd4ad 100644 +--- a/Kbuild ++++ b/Kbuild +@@ -896,9 +896,7 @@ CDEFINES := -DANI_LITTLE_BYTE_ENDIAN \ + -DWLAN_FEATURE_PACKET_FILTERING \ + -DWLAN_FEATURE_VOWIFI \ + -DWLAN_FEATURE_11AC \ +- -DWLAN_FEATURE_P2P_DEBUG \ + -DWLAN_ENABLE_AGEIE_ON_SCAN_RESULTS \ +- -DWLANTL_DEBUG\ + -DWLAN_NS_OFFLOAD \ + -DWLAN_ACTIVEMODE_OFFLOAD_FEATURE \ + -DWLAN_FEATURE_HOLD_RX_WAKELOCK \ +@@ -936,8 +934,7 @@ CDEFINES += -DCONFIG_HL_SUPPORT \ + -DSDIO_3_0 \ + -DHIF_SDIO \ + -DCONFIG_ATH_PROCFS_DIAG_SUPPORT \ +- -DFEATURE_HL_GROUP_CREDIT_FLOW_CONTROL \ +- -DDEBUG_HL_LOGGING ++ -DFEATURE_HL_GROUP_CREDIT_FLOW_CONTROL + endif + + ifeq ($(CONFIG_QCA_WIFI_SDIO), 1) +@@ -974,8 +971,11 @@ CDEFINES += -DTRACE_RECORD \ + + ifeq ($(BUILD_DEBUG_VERSION),1) + CDEFINES += -DWLAN_DEBUG \ ++ -DWLAN_FEATURE_P2P_DEBUG \ ++ -DWLANTL_DEBUG\ + -DPE_DEBUG_LOGW \ + -DPE_DEBUG_LOGE \ ++ -DDEBUG_HL_LOGGING \ + -DDEBUG + endif +