mirror of
git://nv-tegra.nvidia.com/linux-nv-oot.git
synced 2025-12-22 17:25:35 +03:00
rtl8852ce: Add Nvidia changes to driver v126
- Update paths for sourcetree - Reduce log level - Update roam parameters Bug 5023692 Bug 4957055 Change-Id: I9b6eed09790bc94d6976d4d680a2aa080085130a Signed-off-by: Shobek Attupurath <sattupurath@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3284274 GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com> Reviewed-by: Revanth Kumar Uppala <ruppala@nvidia.com> Reviewed-by: Ashutosh Jha <ajha@nvidia.com>
This commit is contained in:
committed by
mobile promotions
parent
88c9f54b6f
commit
d641168e9e
@@ -14,6 +14,9 @@ EXTRA_CFLAGS += -Wno-unused-label
|
|||||||
#EXTRA_CFLAGS += -Wno-unused-function
|
#EXTRA_CFLAGS += -Wno-unused-function
|
||||||
EXTRA_CFLAGS += -Wno-unused
|
EXTRA_CFLAGS += -Wno-unused
|
||||||
#EXTRA_CFLAGS += -Wno-uninitialized
|
#EXTRA_CFLAGS += -Wno-uninitialized
|
||||||
|
EXTRA_CFLAGS += -Wno-missing-prototypes
|
||||||
|
EXTRA_CFLAGS += -Wno-missing-declarations
|
||||||
|
EXTRA_CFLAGS += -Wno-enum-conversion
|
||||||
|
|
||||||
############ ANDROID COMMON KERNEL ############
|
############ ANDROID COMMON KERNEL ############
|
||||||
# clang
|
# clang
|
||||||
@@ -35,7 +38,8 @@ ifeq ($(GCC_VER_49),1)
|
|||||||
EXTRA_CFLAGS += -Wno-date-time # Fix compile error && warning on gcc 4.9 and later
|
EXTRA_CFLAGS += -Wno-date-time # Fix compile error && warning on gcc 4.9 and later
|
||||||
endif
|
endif
|
||||||
|
|
||||||
EXTRA_CFLAGS += -I$(src)/include
|
SOURCETREE = $(srctree.nvidia-oot)/drivers/net/wireless/realtek/rtl8852ce
|
||||||
|
EXTRA_CFLAGS += -I$(SOURCETREE)/include
|
||||||
|
|
||||||
EXTRA_LDFLAGS += --strip-debug
|
EXTRA_LDFLAGS += --strip-debug
|
||||||
|
|
||||||
@@ -238,7 +242,8 @@ CONFIG_ROAMING_FLAG = 0x3f
|
|||||||
CONFIG_ROAM_SCAN_ORDER = 526
|
CONFIG_ROAM_SCAN_ORDER = 526
|
||||||
|
|
||||||
###################### Platform Related #######################
|
###################### Platform Related #######################
|
||||||
CONFIG_PLATFORM_I386_PC = y
|
CONFIG_PLATFORM_TEGRA = y
|
||||||
|
CONFIG_PLATFORM_I386_PC = n
|
||||||
CONFIG_PLATFORM_RTL8198D = n
|
CONFIG_PLATFORM_RTL8198D = n
|
||||||
CONFIG_PLATFORM_ANDROID_X86 = n
|
CONFIG_PLATFORM_ANDROID_X86 = n
|
||||||
CONFIG_PLATFORM_ANDROID_INTEL_X86 = n
|
CONFIG_PLATFORM_ANDROID_INTEL_X86 = n
|
||||||
@@ -768,6 +773,16 @@ ifeq ($(CONFIG_DBG_AX_CAM), y)
|
|||||||
EXTRA_CFLAGS += -DCONFIG_DBG_AX_CAM
|
EXTRA_CFLAGS += -DCONFIG_DBG_AX_CAM
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(CONFIG_PLATFORM_TEGRA), y)
|
||||||
|
ARCH = arm64
|
||||||
|
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 = rtl8852ce
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(CONFIG_I386_BUILD_VERIFY), y)
|
ifeq ($(CONFIG_I386_BUILD_VERIFY), y)
|
||||||
EXTRA_CFLAGS += -DCONFIG_I386_BUILD_VERIFY
|
EXTRA_CFLAGS += -DCONFIG_I386_BUILD_VERIFY
|
||||||
endif
|
endif
|
||||||
@@ -784,8 +799,18 @@ endif
|
|||||||
include $(wildcard $(DRV_PATH)/platform/*.mk)
|
include $(wildcard $(DRV_PATH)/platform/*.mk)
|
||||||
|
|
||||||
# Import platform specific compile options
|
# Import platform specific compile options
|
||||||
EXTRA_CFLAGS += -I$(src)/platform
|
EXTRA_CFLAGS += -I$(SOURCETREE)/platform
|
||||||
#_PLATFORM_FILES := platform/platform_ops.o
|
#_PLATFORM_FILES := platform/platform_ops.o
|
||||||
|
ifeq ($(CONFIG_PCI_HCI), y)
|
||||||
|
EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS
|
||||||
|
_PLATFORM_FILES := platform/platform_linux_pc_pci.o
|
||||||
|
OBJS += $(_PLATFORM_FILES)
|
||||||
|
# Core Config
|
||||||
|
CONFIG_MSG_NUM = 128
|
||||||
|
EXTRA_CFLAGS += -DCONFIG_MSG_NUM=$(CONFIG_MSG_NUM)
|
||||||
|
#EXTRA_CFLAGS += -DCONFIG_TX_SKB_ORPHAN
|
||||||
|
endif
|
||||||
|
_PLATFORM_FILES += platform/platform_ops.o
|
||||||
OBJS += $(_PLATFORM_FILES)
|
OBJS += $(_PLATFORM_FILES)
|
||||||
|
|
||||||
########### CUSTOMER ################################
|
########### CUSTOMER ################################
|
||||||
@@ -805,7 +830,7 @@ endif
|
|||||||
|
|
||||||
ifneq ($(KERNELRELEASE),)
|
ifneq ($(KERNELRELEASE),)
|
||||||
########### COMMON #################################
|
########### COMMON #################################
|
||||||
include $(src)/common.mk
|
include $(SOURCETREE)/common.mk
|
||||||
|
|
||||||
EXTRA_CFLAGS += -DPHL_PLATFORM_LINUX
|
EXTRA_CFLAGS += -DPHL_PLATFORM_LINUX
|
||||||
EXTRA_CFLAGS += -DCONFIG_PHL_ARCH
|
EXTRA_CFLAGS += -DCONFIG_PHL_ARCH
|
||||||
@@ -826,11 +851,10 @@ ifeq ($(DIRTY_FOR_WORK), y)
|
|||||||
EXTRA_CFLAGS += -DDIRTY_FOR_WORK
|
EXTRA_CFLAGS += -DDIRTY_FOR_WORK
|
||||||
endif
|
endif
|
||||||
|
|
||||||
include $(src)/phl/phl.mk
|
include $(SOURCETREE)/phl/phl.mk
|
||||||
|
|
||||||
|
obj-m := $(MODULE_NAME).o
|
||||||
|
|
||||||
obj-$(CONFIG_RTL8852CE) := $(MODULE_NAME).o
|
|
||||||
obj-$(CONFIG_RTL8852CE) := $(MODULE_NAME).o
|
|
||||||
$(MODULE_NAME)-y = $(OBJS)
|
$(MODULE_NAME)-y = $(OBJS)
|
||||||
|
|
||||||
############# MEMORY MANAGMENT #############
|
############# MEMORY MANAGMENT #############
|
||||||
|
|||||||
@@ -99,7 +99,7 @@ _CORE_FILES := core/rtw_fsm.o \
|
|||||||
_CORE_FILES += core/rtw_phl.o \
|
_CORE_FILES += core/rtw_phl.o \
|
||||||
core/rtw_phl_cmd.o
|
core/rtw_phl_cmd.o
|
||||||
|
|
||||||
EXTRA_CFLAGS += -I$(src)/core/crypto
|
EXTRA_CFLAGS += -I$(SOURCETREE)/core/crypto
|
||||||
_CORE_FILES += core/crypto/aes-internal.o \
|
_CORE_FILES += core/crypto/aes-internal.o \
|
||||||
core/crypto/aes-internal-enc.o \
|
core/crypto/aes-internal-enc.o \
|
||||||
core/crypto/aes-gcm.o \
|
core/crypto/aes-gcm.o \
|
||||||
|
|||||||
@@ -177,8 +177,8 @@ sint _rtw_init_mlme_priv(_adapter *padapter)
|
|||||||
#else
|
#else
|
||||||
#define RTW_ROAM_SCAN_RESULT_EXP_MS (10*1000)
|
#define RTW_ROAM_SCAN_RESULT_EXP_MS (10*1000)
|
||||||
#endif
|
#endif
|
||||||
#define RTW_ROAM_SCAN_INTERVAL (5) /* 5*(2 second)*/
|
#define RTW_ROAM_SCAN_INTERVAL (2) /* 5*(2 second)*/
|
||||||
#define RTW_ROAM_RSSI_THRESHOLD 30
|
#define RTW_ROAM_RSSI_THRESHOLD 45
|
||||||
|
|
||||||
#define RTW_ROAM_RSSI_IDLE_TH RTW_ROAM_RSSI_THRESHOLD
|
#define RTW_ROAM_RSSI_IDLE_TH RTW_ROAM_RSSI_THRESHOLD
|
||||||
#define RTW_ROAM_RSSI_BUSY_TH RTW_ROAM_RSSI_THRESHOLD + 5
|
#define RTW_ROAM_RSSI_BUSY_TH RTW_ROAM_RSSI_THRESHOLD + 5
|
||||||
|
|||||||
@@ -7,10 +7,10 @@
|
|||||||
|
|
||||||
ifeq ($(CONFIG_PHL_ARCH), y)
|
ifeq ($(CONFIG_PHL_ARCH), y)
|
||||||
phl_path := phl/$(HAL)
|
phl_path := phl/$(HAL)
|
||||||
phl_path_d1 := $(src)/phl/$(HAL)
|
phl_path_d1 := $(SOURCETREE)/phl/$(HAL)
|
||||||
else
|
else
|
||||||
phl_path := $(HAL)
|
phl_path := $(HAL)
|
||||||
phl_path_d1 := $(src)/$(HAL)
|
phl_path_d1 := $(SOURCETREE)/$(HAL)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Base directory
|
# Base directory
|
||||||
|
|||||||
@@ -2,10 +2,10 @@
|
|||||||
|
|
||||||
ifeq ($(CONFIG_PHL_ARCH), y)
|
ifeq ($(CONFIG_PHL_ARCH), y)
|
||||||
phl_path := phl/
|
phl_path := phl/
|
||||||
phl_path_d1 := $(src)/phl/$(HAL)
|
phl_path_d1 := $(SOURCETREE)/phl/$(HAL)
|
||||||
else
|
else
|
||||||
phl_path :=
|
phl_path :=
|
||||||
phl_path_d1 := $(src)/$(HAL)
|
phl_path_d1 := $(SOURCETREE)/$(HAL)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
_HAL_FILES := $(phl_path)$(HAL)/hal_api_mac.o \
|
_HAL_FILES := $(phl_path)$(HAL)/hal_api_mac.o \
|
||||||
|
|||||||
@@ -7,10 +7,10 @@ HAL = hal_g6
|
|||||||
|
|
||||||
ifeq ($(CONFIG_PHL_ARCH), y)
|
ifeq ($(CONFIG_PHL_ARCH), y)
|
||||||
phl_path := phl/hal_g6
|
phl_path := phl/hal_g6
|
||||||
phl_path_d1 := $(src)/phl/$(HAL)
|
phl_path_d1 := $(SOURCETREE)/phl/$(HAL)
|
||||||
else
|
else
|
||||||
phl_path := hal_g6
|
phl_path := hal_g6
|
||||||
phl_path_d1 := $(src)/$(HAL)
|
phl_path_d1 := $(SOURCETREE)/$(HAL)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Base directory
|
# Base directory
|
||||||
|
|||||||
@@ -7,10 +7,10 @@
|
|||||||
|
|
||||||
ifeq ($(CONFIG_PHL_ARCH), y)
|
ifeq ($(CONFIG_PHL_ARCH), y)
|
||||||
phl_path := phl/$(HAL)
|
phl_path := phl/$(HAL)
|
||||||
phl_path_d1 := $(src)/phl/$(HAL)
|
phl_path_d1 := $(SOURCETREE)/phl/$(HAL)
|
||||||
else
|
else
|
||||||
phl_path := $(HAL)
|
phl_path := $(HAL)
|
||||||
phl_path_d1 := $(src)/$(HAL)
|
phl_path_d1 := $(SOURCETREE)/$(HAL)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Base directory
|
# Base directory
|
||||||
|
|||||||
@@ -7,10 +7,10 @@
|
|||||||
|
|
||||||
ifeq ($(CONFIG_PHL_ARCH), y)
|
ifeq ($(CONFIG_PHL_ARCH), y)
|
||||||
phl_path := phl/$(HAL)
|
phl_path := phl/$(HAL)
|
||||||
phl_path_d1 := $(src)/phl/$(HAL)
|
phl_path_d1 := $(SOURCETREE)/phl/$(HAL)
|
||||||
else
|
else
|
||||||
phl_path := $(HAL)
|
phl_path := $(HAL)
|
||||||
phl_path_d1 := $(src)/$(HAL)
|
phl_path_d1 := $(SOURCETREE)/$(HAL)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Base directory
|
# Base directory
|
||||||
|
|||||||
@@ -11,10 +11,10 @@ endif
|
|||||||
|
|
||||||
ifeq ($(CONFIG_PHL_ARCH), y)
|
ifeq ($(CONFIG_PHL_ARCH), y)
|
||||||
phl_path := phl/
|
phl_path := phl/
|
||||||
phl_path_d1 := $(src)/phl/$(HAL)
|
phl_path_d1 := $(SOURCETREE)/phl/$(HAL)
|
||||||
else
|
else
|
||||||
phl_path :=
|
phl_path :=
|
||||||
phl_path_d1 := $(src)/$(HAL)
|
phl_path_d1 := $(SOURCETREE)/$(HAL)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
_PHL_FILES := $(phl_path)phl_init.o \
|
_PHL_FILES := $(phl_path)phl_init.o \
|
||||||
|
|||||||
@@ -343,12 +343,12 @@ next_ch:
|
|||||||
goto next_ch;
|
goto next_ch;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
printk("%s: scan done\n", __func__);
|
PHL_INFO("%s: scan done\n", __func__);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
param->done_num = param->ch_num - sctrl->chlist.cnt;
|
param->done_num = param->ch_num - sctrl->chlist.cnt;
|
||||||
printk("%s:[%d] idx=%d, r=%d, ch=%d, p=%d\n", __func__,
|
PHL_INFO("%s:[%d] idx=%d, r=%d, ch=%d, p=%d\n", __func__,
|
||||||
band_idx, sctrl->ch_idx, sctrl->chlist.cnt, sctrl->scan_ch->channel,
|
band_idx, sctrl->ch_idx, sctrl->chlist.cnt, sctrl->scan_ch->channel,
|
||||||
phl_get_passing_time_ms(param->start_time));
|
phl_get_passing_time_ms(param->start_time));
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user