From 102cf51d2c6e00c8564cd00b0b78d3a2dd78ee4a Mon Sep 17 00:00:00 2001 From: Shobek Attupurath Date: Tue, 20 Feb 2024 02:07:45 +0000 Subject: [PATCH] rtl8822ce: Add Nvidia change on v5.14.0.4-203 1. Add custom roam parameters 2. Add path for power file 3. Add source tree path for Makefile 4. Add section in Makefile for TEGRA platform 5. Update permissions from 0755 to 0644 for files Bug 4213654 Bug 3961963 Change-Id: Ib160d11285c093efe04fc5cb932b770585ad6bb3 Signed-off-by: Shobek Attupurath Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3079869 (cherry picked from commit 4a31d7ed614d90231062202dbc1146dec7efcf66) Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3095804 Tested-by: Revanth Kumar Uppala Reviewed-by: Revanth Kumar Uppala GVS: Gerrit_Virtual_Submit Reviewed-by: Brad Griffis --- .../net/wireless/realtek/rtl8822ce/Makefile | 31 +++++++++++++------ .../realtek/rtl8822ce/core/mesh/rtw_mesh.c | 0 .../wireless/realtek/rtl8822ce/core/rtw_ap.c | 0 .../realtek/rtl8822ce/core/rtw_debug.c | 0 .../wireless/realtek/rtl8822ce/core/rtw_ft.c | 0 .../realtek/rtl8822ce/core/rtw_ieee80211.c | 0 .../wireless/realtek/rtl8822ce/core/rtw_mbo.c | 0 .../realtek/rtl8822ce/core/rtw_mlme.c | 8 ++--- .../realtek/rtl8822ce/core/rtw_mlme_ext.c | 0 .../wireless/realtek/rtl8822ce/core/rtw_mp.c | 0 .../realtek/rtl8822ce/core/rtw_pwrctrl.c | 0 .../realtek/rtl8822ce/core/rtw_recv.c | 0 .../wireless/realtek/rtl8822ce/core/rtw_vht.c | 0 .../realtek/rtl8822ce/core/rtw_wlan_util.c | 0 .../wireless/realtek/rtl8822ce/core/rtw_wnm.c | 0 .../realtek/rtl8822ce/hal/btc/halbtc8822c.h | 0 .../rtl8822ce/hal/btc/halbtc8822cwifionly.c | 0 .../rtl8822ce/hal/btc/halbtc8822cwifionly.h | 0 .../efuse/rtl8822c/HalEfuseMask8822C_PCIE.c | 0 .../efuse/rtl8822c/HalEfuseMask8822C_PCIE.h | 0 .../efuse/rtl8822c/HalEfuseMask8822C_SDIO.c | 0 .../efuse/rtl8822c/HalEfuseMask8822C_SDIO.h | 0 .../efuse/rtl8822c/HalEfuseMask8822C_USB.c | 0 .../efuse/rtl8822c/HalEfuseMask8822C_USB.h | 0 .../wireless/realtek/rtl8822ce/hal/hal_com.c | 0 .../wireless/realtek/rtl8822ce/hal/hal_dm.c | 0 .../wireless/realtek/rtl8822ce/hal/hal_mp.c | 0 .../realtek/rtl8822ce/hal/phydm/phydm.mk | 4 +-- .../realtek/rtl8822ce/include/autoconf.h | 2 +- .../rtl8822ce/os_dep/linux/ioctl_cfg80211.c | 0 .../rtl8822ce/os_dep/linux/recv_linux.c | 0 .../rtl8822ce/os_dep/linux/rtw_android.c | 0 .../realtek/rtl8822ce/os_dep/linux/rtw_proc.c | 0 .../realtek/rtl8822ce/os_dep/linux/rtw_proc.h | 0 .../wireless/realtek/rtl8822ce/rtl8822c.mk | 2 +- 35 files changed, 30 insertions(+), 17 deletions(-) mode change 100755 => 100644 drivers/net/wireless/realtek/rtl8822ce/core/mesh/rtw_mesh.c mode change 100755 => 100644 drivers/net/wireless/realtek/rtl8822ce/core/rtw_ap.c mode change 100755 => 100644 drivers/net/wireless/realtek/rtl8822ce/core/rtw_debug.c mode change 100755 => 100644 drivers/net/wireless/realtek/rtl8822ce/core/rtw_ft.c mode change 100755 => 100644 drivers/net/wireless/realtek/rtl8822ce/core/rtw_ieee80211.c mode change 100755 => 100644 drivers/net/wireless/realtek/rtl8822ce/core/rtw_mbo.c mode change 100755 => 100644 drivers/net/wireless/realtek/rtl8822ce/core/rtw_mlme.c mode change 100755 => 100644 drivers/net/wireless/realtek/rtl8822ce/core/rtw_mlme_ext.c mode change 100755 => 100644 drivers/net/wireless/realtek/rtl8822ce/core/rtw_mp.c mode change 100755 => 100644 drivers/net/wireless/realtek/rtl8822ce/core/rtw_pwrctrl.c mode change 100755 => 100644 drivers/net/wireless/realtek/rtl8822ce/core/rtw_recv.c mode change 100755 => 100644 drivers/net/wireless/realtek/rtl8822ce/core/rtw_vht.c mode change 100755 => 100644 drivers/net/wireless/realtek/rtl8822ce/core/rtw_wlan_util.c mode change 100755 => 100644 drivers/net/wireless/realtek/rtl8822ce/core/rtw_wnm.c mode change 100755 => 100644 drivers/net/wireless/realtek/rtl8822ce/hal/btc/halbtc8822c.h mode change 100755 => 100644 drivers/net/wireless/realtek/rtl8822ce/hal/btc/halbtc8822cwifionly.c mode change 100755 => 100644 drivers/net/wireless/realtek/rtl8822ce/hal/btc/halbtc8822cwifionly.h mode change 100755 => 100644 drivers/net/wireless/realtek/rtl8822ce/hal/efuse/rtl8822c/HalEfuseMask8822C_PCIE.c mode change 100755 => 100644 drivers/net/wireless/realtek/rtl8822ce/hal/efuse/rtl8822c/HalEfuseMask8822C_PCIE.h mode change 100755 => 100644 drivers/net/wireless/realtek/rtl8822ce/hal/efuse/rtl8822c/HalEfuseMask8822C_SDIO.c mode change 100755 => 100644 drivers/net/wireless/realtek/rtl8822ce/hal/efuse/rtl8822c/HalEfuseMask8822C_SDIO.h mode change 100755 => 100644 drivers/net/wireless/realtek/rtl8822ce/hal/efuse/rtl8822c/HalEfuseMask8822C_USB.c mode change 100755 => 100644 drivers/net/wireless/realtek/rtl8822ce/hal/efuse/rtl8822c/HalEfuseMask8822C_USB.h mode change 100755 => 100644 drivers/net/wireless/realtek/rtl8822ce/hal/hal_com.c mode change 100755 => 100644 drivers/net/wireless/realtek/rtl8822ce/hal/hal_dm.c mode change 100755 => 100644 drivers/net/wireless/realtek/rtl8822ce/hal/hal_mp.c mode change 100755 => 100644 drivers/net/wireless/realtek/rtl8822ce/os_dep/linux/ioctl_cfg80211.c mode change 100755 => 100644 drivers/net/wireless/realtek/rtl8822ce/os_dep/linux/recv_linux.c mode change 100755 => 100644 drivers/net/wireless/realtek/rtl8822ce/os_dep/linux/rtw_android.c mode change 100755 => 100644 drivers/net/wireless/realtek/rtl8822ce/os_dep/linux/rtw_proc.c mode change 100755 => 100644 drivers/net/wireless/realtek/rtl8822ce/os_dep/linux/rtw_proc.h diff --git a/drivers/net/wireless/realtek/rtl8822ce/Makefile b/drivers/net/wireless/realtek/rtl8822ce/Makefile index 20c90fec..3cab6b3b 100755 --- a/drivers/net/wireless/realtek/rtl8822ce/Makefile +++ b/drivers/net/wireless/realtek/rtl8822ce/Makefile @@ -14,13 +14,15 @@ EXTRA_CFLAGS += -Wno-unused-variable #EXTRA_CFLAGS += -Wno-unused-function #EXTRA_CFLAGS += -Wno-unused #EXTRA_CFLAGS += -Wno-uninitialized +EXTRA_CFLAGS += -Wno-missing-prototypes GCC_VER_49 := $(shell echo `$(CC) -dumpversion | cut -f1-2 -d.` \>= 4.9 | bc ) ifeq ($(GCC_VER_49),1) EXTRA_CFLAGS += -Wno-date-time # Fix compile error && warning on gcc 4.9 and later endif -EXTRA_CFLAGS += -I$(src)/include +SOURCETREE = $(srctree.nvidia-oot)/drivers/net/wireless/realtek/rtl8822ce +EXTRA_CFLAGS += -I$(SOURCETREE)/include EXTRA_LDFLAGS += --strip-debug @@ -107,7 +109,7 @@ endif CONFIG_RTW_DEBUG = y # default log level is _DRV_INFO_ = 4, # please refer to "How_to_set_driver_debug_log_level.doc" to set the available level. -CONFIG_RTW_LOG_LEVEL = 4 +CONFIG_RTW_LOG_LEVEL = 0 # enable /proc/net/rtlxxxx/ debug interfaces CONFIG_PROC_DEBUG = y @@ -147,7 +149,8 @@ CONFIG_SECURITY_MEM = n CONFIG_SECURITY_MEM_ADDR = 0 CONFIG_SECURITY_MEM_SIZE = 3686400 ###################### Platform Related ####################### -CONFIG_PLATFORM_I386_PC = y +CONFIG_PLATFORM_TEGRA = y +CONFIG_PLATFORM_I386_PC = n CONFIG_PLATFORM_ANDROID_X86 = n CONFIG_PLATFORM_ANDROID_INTEL_X86 = n CONFIG_PLATFORM_JB_X86 = n @@ -280,10 +283,10 @@ _HAL_INTFS_FILES := hal/hal_intf.o \ hal/led/hal_$(HCI_NAME)_led.o -EXTRA_CFLAGS += -I$(src)/platform +EXTRA_CFLAGS += -I$(SOURCETREE)/platform _PLATFORM_FILES := platform/platform_ops.o -EXTRA_CFLAGS += -I$(src)/hal/btc +EXTRA_CFLAGS += -I$(SOURCETREE)/hal/btc ########### HAL_RTL8188E ################################# ifeq ($(CONFIG_RTL8188E), y) @@ -1365,6 +1368,16 @@ EXTRA_CFLAGS += -DSECURITY_MEM_ADDR=$(CONFIG_SECURITY_MEM_ADDR) EXTRA_CFLAGS += -DSECURITY_MEM_SIZE=$(CONFIG_SECURITY_MEM_SIZE) endif +ifeq ($(CONFIG_PLATFORM_TEGRA), y) +ARCH = arm +KVER := $(shell uname -r) +KSRC := /lib/modules/$(KVER)/build +EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT +EXTRA_CFLAGS += -Wno-error=date-time +MODULE_NAME = rtl8822ce +endif + ifeq ($(CONFIG_PLATFORM_I386_PC), y) EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT @@ -2366,7 +2379,7 @@ endif ifneq ($(KERNELRELEASE),) ########### this part for *.mk ############################ -include $(src)/hal/phydm/phydm.mk +include $(SOURCETREE)/hal/phydm/phydm.mk ########### HAL_RTL8822B ################################# ifeq ($(CONFIG_RTL8822B), y) @@ -2380,7 +2393,7 @@ endif ########### HAL_RTL8822C ################################# ifeq ($(CONFIG_RTL8822C), y) -include $(src)/rtl8822c.mk +include $(SOURCETREE)/rtl8822c.mk endif ########### HAL_RTL8814B ################################# @@ -2443,7 +2456,7 @@ ifeq ($(CONFIG_SDIO_HCI), y) rtk_core += core/rtw_sdio.o endif -EXTRA_CFLAGS += -I$(src)/core/crypto +EXTRA_CFLAGS += -I$(SOURCETREE)/core/crypto rtk_core += \ core/crypto/aes-internal.o \ core/crypto/aes-internal-enc.o \ @@ -2477,7 +2490,7 @@ ifeq ($(CONFIG_RTL8723B), y) $(MODULE_NAME)-$(CONFIG_MP_INCLUDED)+= core/rtw_bt_mp.o endif -obj-$(CONFIG_RTL8822CE) := $(MODULE_NAME).o +obj-m := $(MODULE_NAME).o else diff --git a/drivers/net/wireless/realtek/rtl8822ce/core/mesh/rtw_mesh.c b/drivers/net/wireless/realtek/rtl8822ce/core/mesh/rtw_mesh.c old mode 100755 new mode 100644 diff --git a/drivers/net/wireless/realtek/rtl8822ce/core/rtw_ap.c b/drivers/net/wireless/realtek/rtl8822ce/core/rtw_ap.c old mode 100755 new mode 100644 diff --git a/drivers/net/wireless/realtek/rtl8822ce/core/rtw_debug.c b/drivers/net/wireless/realtek/rtl8822ce/core/rtw_debug.c old mode 100755 new mode 100644 diff --git a/drivers/net/wireless/realtek/rtl8822ce/core/rtw_ft.c b/drivers/net/wireless/realtek/rtl8822ce/core/rtw_ft.c old mode 100755 new mode 100644 diff --git a/drivers/net/wireless/realtek/rtl8822ce/core/rtw_ieee80211.c b/drivers/net/wireless/realtek/rtl8822ce/core/rtw_ieee80211.c old mode 100755 new mode 100644 diff --git a/drivers/net/wireless/realtek/rtl8822ce/core/rtw_mbo.c b/drivers/net/wireless/realtek/rtl8822ce/core/rtw_mbo.c old mode 100755 new mode 100644 diff --git a/drivers/net/wireless/realtek/rtl8822ce/core/rtw_mlme.c b/drivers/net/wireless/realtek/rtl8822ce/core/rtw_mlme.c old mode 100755 new mode 100644 index 6621dc50..71436ea1 --- a/drivers/net/wireless/realtek/rtl8822ce/core/rtw_mlme.c +++ b/drivers/net/wireless/realtek/rtl8822ce/core/rtw_mlme.c @@ -144,12 +144,12 @@ sint _rtw_init_mlme_priv(_adapter *padapter) #endif #ifdef CONFIG_LAYER2_ROAMING -#define RTW_ROAM_SCAN_RESULT_EXP_MS (5*1000) +#define RTW_ROAM_SCAN_RESULT_EXP_MS (10*1000) #define RTW_ROAM_IDLE_RSSI_DIFF_TH 5 #define RTW_ROAM_BUSY_RSSI_DIFF_TH 10 -#define RTW_ROAM_SCAN_INTERVAL (5) /* 5*(2 second)*/ -#define RTW_ROAM_IDLE_RSSI_THRESHOLD 35 -#define RTW_ROAM_BUSY_RSSI_THRESHOLD 30 +#define RTW_ROAM_SCAN_INTERVAL (2) /* 5*(2 second)*/ +#define RTW_ROAM_IDLE_RSSI_THRESHOLD 40 +#define RTW_ROAM_BUSY_RSSI_THRESHOLD 40 #define RTW_ROAM_DICONNECT_DELAY 20 _rtw_spinlock_init(&pmlmepriv->clnt_auth_lock); pmlmepriv->roam_flags = CONFIG_ROAMING_FLAG; diff --git a/drivers/net/wireless/realtek/rtl8822ce/core/rtw_mlme_ext.c b/drivers/net/wireless/realtek/rtl8822ce/core/rtw_mlme_ext.c old mode 100755 new mode 100644 diff --git a/drivers/net/wireless/realtek/rtl8822ce/core/rtw_mp.c b/drivers/net/wireless/realtek/rtl8822ce/core/rtw_mp.c old mode 100755 new mode 100644 diff --git a/drivers/net/wireless/realtek/rtl8822ce/core/rtw_pwrctrl.c b/drivers/net/wireless/realtek/rtl8822ce/core/rtw_pwrctrl.c old mode 100755 new mode 100644 diff --git a/drivers/net/wireless/realtek/rtl8822ce/core/rtw_recv.c b/drivers/net/wireless/realtek/rtl8822ce/core/rtw_recv.c old mode 100755 new mode 100644 diff --git a/drivers/net/wireless/realtek/rtl8822ce/core/rtw_vht.c b/drivers/net/wireless/realtek/rtl8822ce/core/rtw_vht.c old mode 100755 new mode 100644 diff --git a/drivers/net/wireless/realtek/rtl8822ce/core/rtw_wlan_util.c b/drivers/net/wireless/realtek/rtl8822ce/core/rtw_wlan_util.c old mode 100755 new mode 100644 diff --git a/drivers/net/wireless/realtek/rtl8822ce/core/rtw_wnm.c b/drivers/net/wireless/realtek/rtl8822ce/core/rtw_wnm.c old mode 100755 new mode 100644 diff --git a/drivers/net/wireless/realtek/rtl8822ce/hal/btc/halbtc8822c.h b/drivers/net/wireless/realtek/rtl8822ce/hal/btc/halbtc8822c.h old mode 100755 new mode 100644 diff --git a/drivers/net/wireless/realtek/rtl8822ce/hal/btc/halbtc8822cwifionly.c b/drivers/net/wireless/realtek/rtl8822ce/hal/btc/halbtc8822cwifionly.c old mode 100755 new mode 100644 diff --git a/drivers/net/wireless/realtek/rtl8822ce/hal/btc/halbtc8822cwifionly.h b/drivers/net/wireless/realtek/rtl8822ce/hal/btc/halbtc8822cwifionly.h old mode 100755 new mode 100644 diff --git a/drivers/net/wireless/realtek/rtl8822ce/hal/efuse/rtl8822c/HalEfuseMask8822C_PCIE.c b/drivers/net/wireless/realtek/rtl8822ce/hal/efuse/rtl8822c/HalEfuseMask8822C_PCIE.c old mode 100755 new mode 100644 diff --git a/drivers/net/wireless/realtek/rtl8822ce/hal/efuse/rtl8822c/HalEfuseMask8822C_PCIE.h b/drivers/net/wireless/realtek/rtl8822ce/hal/efuse/rtl8822c/HalEfuseMask8822C_PCIE.h old mode 100755 new mode 100644 diff --git a/drivers/net/wireless/realtek/rtl8822ce/hal/efuse/rtl8822c/HalEfuseMask8822C_SDIO.c b/drivers/net/wireless/realtek/rtl8822ce/hal/efuse/rtl8822c/HalEfuseMask8822C_SDIO.c old mode 100755 new mode 100644 diff --git a/drivers/net/wireless/realtek/rtl8822ce/hal/efuse/rtl8822c/HalEfuseMask8822C_SDIO.h b/drivers/net/wireless/realtek/rtl8822ce/hal/efuse/rtl8822c/HalEfuseMask8822C_SDIO.h old mode 100755 new mode 100644 diff --git a/drivers/net/wireless/realtek/rtl8822ce/hal/efuse/rtl8822c/HalEfuseMask8822C_USB.c b/drivers/net/wireless/realtek/rtl8822ce/hal/efuse/rtl8822c/HalEfuseMask8822C_USB.c old mode 100755 new mode 100644 diff --git a/drivers/net/wireless/realtek/rtl8822ce/hal/efuse/rtl8822c/HalEfuseMask8822C_USB.h b/drivers/net/wireless/realtek/rtl8822ce/hal/efuse/rtl8822c/HalEfuseMask8822C_USB.h old mode 100755 new mode 100644 diff --git a/drivers/net/wireless/realtek/rtl8822ce/hal/hal_com.c b/drivers/net/wireless/realtek/rtl8822ce/hal/hal_com.c old mode 100755 new mode 100644 diff --git a/drivers/net/wireless/realtek/rtl8822ce/hal/hal_dm.c b/drivers/net/wireless/realtek/rtl8822ce/hal/hal_dm.c old mode 100755 new mode 100644 diff --git a/drivers/net/wireless/realtek/rtl8822ce/hal/hal_mp.c b/drivers/net/wireless/realtek/rtl8822ce/hal/hal_mp.c old mode 100755 new mode 100644 diff --git a/drivers/net/wireless/realtek/rtl8822ce/hal/phydm/phydm.mk b/drivers/net/wireless/realtek/rtl8822ce/hal/phydm/phydm.mk index 2c007b79..f512d2f7 100644 --- a/drivers/net/wireless/realtek/rtl8822ce/hal/phydm/phydm.mk +++ b/drivers/net/wireless/realtek/rtl8822ce/hal/phydm/phydm.mk @@ -1,4 +1,4 @@ -EXTRA_CFLAGS += -I$(src)/hal/phydm +EXTRA_CFLAGS += -I$(SOURCETREE)/hal/phydm _PHYDM_FILES := hal/phydm/phydm_debug.o \ hal/phydm/phydm_antdiv.o\ @@ -256,4 +256,4 @@ _PHYDM_FILES += hal/phydm/$(RTL871X)/halhwimg8723f_bb.o\ hal/phydm/halrf/$(RTL871X)/halrf_txgapk_8723f.o\ hal/phydm/halrf/$(RTL871X)/halrf_rfk_init_8723f.o\ hal/phydm/halrf/$(RTL871X)/halhwimg8723f_rf.o -endif \ No newline at end of file +endif diff --git a/drivers/net/wireless/realtek/rtl8822ce/include/autoconf.h b/drivers/net/wireless/realtek/rtl8822ce/include/autoconf.h index 57bb5eb3..3bf22b2d 100644 --- a/drivers/net/wireless/realtek/rtl8822ce/include/autoconf.h +++ b/drivers/net/wireless/realtek/rtl8822ce/include/autoconf.h @@ -16,7 +16,7 @@ #define CONFIG_HEXFILE_CHANNEL_PLAN #define CONFIG_HEXFILE_POWER_LIMIT #define RTW_HEXFILE_LEN 3072 -#define RTW_HEXFILE_NAME "setting.bin" +#define RTW_HEXFILE_NAME "/lib/firmware/rtl8822_setting.bin" #define CONFIG_SINGLE_IMG /* #define CONFIG_DISABLE_ODM */ diff --git a/drivers/net/wireless/realtek/rtl8822ce/os_dep/linux/ioctl_cfg80211.c b/drivers/net/wireless/realtek/rtl8822ce/os_dep/linux/ioctl_cfg80211.c old mode 100755 new mode 100644 diff --git a/drivers/net/wireless/realtek/rtl8822ce/os_dep/linux/recv_linux.c b/drivers/net/wireless/realtek/rtl8822ce/os_dep/linux/recv_linux.c old mode 100755 new mode 100644 diff --git a/drivers/net/wireless/realtek/rtl8822ce/os_dep/linux/rtw_android.c b/drivers/net/wireless/realtek/rtl8822ce/os_dep/linux/rtw_android.c old mode 100755 new mode 100644 diff --git a/drivers/net/wireless/realtek/rtl8822ce/os_dep/linux/rtw_proc.c b/drivers/net/wireless/realtek/rtl8822ce/os_dep/linux/rtw_proc.c old mode 100755 new mode 100644 diff --git a/drivers/net/wireless/realtek/rtl8822ce/os_dep/linux/rtw_proc.h b/drivers/net/wireless/realtek/rtl8822ce/os_dep/linux/rtw_proc.h old mode 100755 new mode 100644 diff --git a/drivers/net/wireless/realtek/rtl8822ce/rtl8822c.mk b/drivers/net/wireless/realtek/rtl8822ce/rtl8822c.mk index ee62bcdf..90962071 100644 --- a/drivers/net/wireless/realtek/rtl8822ce/rtl8822c.mk +++ b/drivers/net/wireless/realtek/rtl8822ce/rtl8822c.mk @@ -49,7 +49,7 @@ _HAL_INTFS_FILES +=hal/efuse/rtl8822c/HalEfuseMask8822C_SDIO.o _HAL_INTFS_FILES +=hal/hal_hci/hal_sdio_coex.o endif -include $(src)/halmac.mk +include $(SOURCETREE)/halmac.mk _BTC_FILES += hal/btc/halbtc8822cwifionly.o ifeq ($(CONFIG_BT_COEXIST), y)