From 5bf41736b93dd8dac4c0b82149b86473beb0f84e Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Sun, 1 Mar 2020 21:56:29 +0100 Subject: [PATCH] [ wireless drivers ] disable debug on 3rd party wifi drivers --- lib/compilation-prepare.sh | 27 +++++++++++++------ ... wireless-fail-if-debug-is-disabled.patch} | 4 +-- .../wireless-rtl8188eu-disable-efuse.patch | 24 +++++++++++++++++ 3 files changed, 45 insertions(+), 10 deletions(-) rename patch/misc/{wireless-rtl8811cu-disable-debug.patch => wireless-fail-if-debug-is-disabled.patch} (85%) create mode 100644 patch/misc/wireless-rtl8188eu-disable-efuse.patch diff --git a/lib/compilation-prepare.sh b/lib/compilation-prepare.sh index 1d6dfaeeee..d626c5d7e8 100644 --- a/lib/compilation-prepare.sh +++ b/lib/compilation-prepare.sh @@ -201,15 +201,19 @@ compilation_prepare() cp -R ${SRC}/cache/sources/rtl8811cu/${rtl8811cuver#*:}/{core,hal,include,os_dep,platform,rtl8821c.mk} \ ${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8811cu - # Patch - process_patch_file "${SRC}/patch/misc/wireless-rtl8811cu-disable-debug.patch" "applying" - # Makefile cp ${SRC}/cache/sources/rtl8811cu/${rtl8811cuver#*:}/Makefile \ ${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8811cu/Makefile cp ${SRC}/cache/sources/rtl8811cu/${rtl8811cuver#*:}/Kconfig \ ${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8811cu/Kconfig + # Disable debug + sed -i "s/^CONFIG_RTW_DEBUG.*/CONFIG_RTW_DEBUG = n/" ${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8811cu/Makefile + + cd ${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8811cu/ + process_patch_file "${SRC}/patch/misc/wireless-fail-if-debug-is-disabled.patch" "applying" + cd ${SRC}/cache/sources/${LINUXSOURCEDIR} + # Address ARM related bug https://github.com/aircrack-ng/rtl8812au/issues/233 sed -i "s/^CONFIG_MP_VHT_HW_TX_MODE.*/CONFIG_MP_VHT_HW_TX_MODE = n/" \ ${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8811cu/Makefile @@ -229,25 +233,26 @@ compilation_prepare() if linux-version compare $version ge 3.14 && [ "$EXTRAWIFI" == yes ]; then # attach to specifics tag or branch - local rtl8811euver="branch:v5.7.6.1" + local rtl8188euver="branch:v5.7.6.1" display_alert "Adding" "Wireless drivers for Realtek 8188EU 8188EUS and 8188ETV chipsets ${rtl8811euver}" "info" - fetch_from_repo "https://github.com/aircrack-ng/rtl8188eus" "rtl8188eu" "${rtl8811euver}" "yes" + fetch_from_repo "https://github.com/aircrack-ng/rtl8188eus" "rtl8188eu" "${rtl8188euver}" "yes" cd ${SRC}/cache/sources/${LINUXSOURCEDIR} rm -rf ${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8188eu mkdir -p ${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8188eu/ - cp -R ${SRC}/cache/sources/rtl8188eu/${rtl8811euver#*:}/{core,hal,include,os_dep,platform} \ + cp -R ${SRC}/cache/sources/rtl8188eu/${rtl8188euver#*:}/{core,hal,include,os_dep,platform} \ ${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8188eu # Makefile - cp ${SRC}/cache/sources/rtl8188eu/${rtl8811euver#*:}/Makefile \ + cp ${SRC}/cache/sources/rtl8188eu/${rtl8188euver#*:}/Makefile \ ${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8188eu/Makefile - cp ${SRC}/cache/sources/rtl8188eu/${rtl8811euver#*:}/Kconfig \ + cp ${SRC}/cache/sources/rtl8188eu/${rtl8188euver#*:}/Kconfig \ ${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8188eu/Kconfig # Disable debug sed -i "s/^CONFIG_RTW_DEBUG.*/CONFIG_RTW_DEBUG = n/" ${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8188eu/Makefile + process_patch_file "${SRC}/patch/misc/wireless-rtl8188eu-disable-efuse.patch" "applying" # Add to section Makefile echo "obj-\$(CONFIG_RTL8188EU) += rtl8188eu/" >> $SRC/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/Makefile @@ -285,6 +290,12 @@ compilation_prepare() sed -i 's/include $(src)\/rtl8822b.mk /include $(TopDIR)\/drivers\/net\/wireless\/rtl88x2bu\/rtl8822b.mk/' \ ${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl88x2bu/Makefile + # Disable debug + sed -i "s/^CONFIG_RTW_DEBUG.*/CONFIG_RTW_DEBUG = n/" ${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl88x2bu/Makefile + cd ${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl88x2bu/ + process_patch_file "${SRC}/patch/misc/wireless-fail-if-debug-is-disabled.patch" "applying" + cd ${SRC}/cache/sources/${LINUXSOURCEDIR} + # Add to section Makefile echo "obj-\$(CONFIG_RTL8822BU) += rtl88x2bu/" >> $SRC/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/Makefile sed -i '/source "drivers\/net\/wireless\/ti\/Kconfig"/a source "drivers\/net\/wireless\/rtl88x2bu\/Kconfig"' \ diff --git a/patch/misc/wireless-rtl8811cu-disable-debug.patch b/patch/misc/wireless-fail-if-debug-is-disabled.patch similarity index 85% rename from patch/misc/wireless-rtl8811cu-disable-debug.patch rename to patch/misc/wireless-fail-if-debug-is-disabled.patch index e69999a85c..ed766af0d7 100644 --- a/patch/misc/wireless-rtl8811cu-disable-debug.patch +++ b/patch/misc/wireless-fail-if-debug-is-disabled.patch @@ -1,7 +1,7 @@ diff --git a/drivers/net/wireless/rtl8811cu/core/rtw_debug.c b/drivers/net/wireless/rtl8811cu/core/rtw_debug.c index ddc96eb4f..634c5adb8 100755 ---- a/drivers/net/wireless/rtl8811cu/core/rtw_debug.c -+++ b/drivers/net/wireless/rtl8811cu/core/rtw_debug.c +--- a/core/rtw_debug.c ++++ b/core/rtw_debug.c @@ -6358,6 +6358,7 @@ ssize_t proc_set_lck(struct file *file, const char __user *buffer, size_t count, inline void RTW_BUF_DUMP_SEL(uint _loglevel, void *sel, u8 *_titlestring, bool _idx_show, const u8 *_hexdata, int _hexdatalen) diff --git a/patch/misc/wireless-rtl8188eu-disable-efuse.patch b/patch/misc/wireless-rtl8188eu-disable-efuse.patch new file mode 100644 index 0000000000..bc771d5b69 --- /dev/null +++ b/patch/misc/wireless-rtl8188eu-disable-efuse.patch @@ -0,0 +1,24 @@ +From 5f0aa06dc64586890f19bf4c388b096227a0b954 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= + +Date: Thu, 27 Feb 2020 00:00:27 +0100 +Subject: [PATCH] drop annoying rtl8188e_iol_efuse_patch message + +when switching MAC +--- + hal/rtl8188e/rtl8188e_hal_init.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/rtl8188eu/hal/rtl8188e/rtl8188e_hal_init.c b/drivers/net/wireless/rtl8188eu/hal/rtl8188e/rtl8188e_hal_init.c +index 83e7777..cf2f8d1 100644 +--- a/drivers/net/wireless/rtl8188eu/hal/rtl8188e/rtl8188e_hal_init.c ++++ b/drivers/net/wireless/rtl8188eu/hal/rtl8188e/rtl8188e_hal_init.c +@@ -421,7 +421,7 @@ static s32 iol_read_efuse( + s32 rtl8188e_iol_efuse_patch(PADAPTER padapter) + { + s32 result = _SUCCESS; +- printk("==> %s\n", __FUNCTION__); ++ /* printk("==> %s\n", __FUNCTION__); */ + + if (rtw_IOL_applied(padapter)) { + iol_mode_enable(padapter, 1);