From 1c055e55a242a33e574e48be530e06770a210dcd Mon Sep 17 00:00:00 2001 From: hc <hc@nodka.com> Date: Mon, 19 Feb 2024 03:26:26 +0000 Subject: [PATCH] add r8169 read mac form eeprom --- kernel/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile | 117 ++++++++++++++++++---------------------------------------- 1 files changed, 36 insertions(+), 81 deletions(-) diff --git a/kernel/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile b/kernel/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile old mode 100644 new mode 100755 index 071b8d4..efc77d7 --- a/kernel/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile +++ b/kernel/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile @@ -2,9 +2,9 @@ # bcmdhd MODULE_NAME := bcmdhd -CONFIG_AP6XXX ?= m +CONFIG_BCMDHD ?= m -CONFIG_BCMDHD_SDIO := y +#CONFIG_BCMDHD_SDIO := y #CONFIG_BCMDHD_PCIE := y #CONFIG_BCMDHD_USB := y @@ -14,51 +14,47 @@ CONFIG_BCMDHD_PROPTXSTATUS := y CONFIG_BCMDHD_AG := y CONFIG_DHD_USE_STATIC_BUF := y -CONFIG_BCMDHD_STATIC_BUF_IN_DHD := y -CONFIG_BCMDHD_ANDROID_VERSION := 11 +#CONFIG_BCMDHD_STATIC_BUF_IN_DHD := y +CONFIG_BCMDHD_ANDROID_VERSION := 12 CONFIG_BCMDHD_AUTO_SELECT := y CONFIG_BCMDHD_DEBUG := y -#CONFIG_BCMDHD_RECONNECT := y #CONFIG_BCMDHD_TIMESTAMP := y #CONFIG_BCMDHD_WAPI := y #CONFIG_BCMDHD_RANDOM_MAC := y -#CONFIG_BCMDHD_REQUEST_FW := y +CONFIG_BCMDHD_REQUEST_FW := y +#CONFIG_BCMDHD_MULTIPLE_DRIVER := y #CONFIG_BCMDHD_DWDS := y CONFIG_BCMDHD_TPUT := y - -#CONFIG_BCMDHD_MULTIPLE_DRIVER := y -#CONFIG_BCMDHD_ADAPTER_INDEX := 0 CONFIG_MACH_PLATFORM := y #CONFIG_BCMDHD_DTS := y DHDCFLAGS = -Wall -Wstrict-prototypes -Wno-date-time \ -Wno-implicit-fallthrough -Wno-declaration-after-statement \ - -Wno-fortify-source -Wframe-larger-than=4096 \ + -Wno-vla -Wno-vla-extension \ -Dlinux -DLINUX -DBCMDRIVER \ -DBCMDONGLEHOST -DBCMDMA32 -DBCMFILEIMAGE \ -DDHDTHREAD -DDHD_DEBUG -DSHOW_EVENTS -DGET_OTP_MAC_ENABLE \ -DWIFI_ACT_FRAME -DARP_OFFLOAD_SUPPORT -DSUPPORT_PM2_ONLY \ - -DPKTPRIO_OVERRIDE \ -DKEEP_ALIVE -DPKT_FILTER_SUPPORT -DDHDTCPACK_SUPPRESS \ -DDHD_DONOT_FORWARD_BCMEVENT_AS_NETWORK_PKT -DOEM_ANDROID \ -DMULTIPLE_SUPPLICANT -DTSQ_MULTIPLIER -DMFP -DDHD_8021X_DUMP \ -DPOWERUP_MAX_RETRY=0 -DIFACE_HANG_FORCE_DEV_CLOSE -DWAIT_DEQUEUE \ - -DUSE_NEW_RSPEC_DEFS \ + -DUSE_NEW_RSPEC_DEFS -DBCM_USE_PLATFORM_STRLCPY \ -DWL_EXT_IAPSTA -DWL_ESCAN -DCCODE_LIST -DSUSPEND_EVENT \ - -DKEY_INSTALL_CHECK \ - -DENABLE_INSMOD_NO_FW_LOAD + -DEAPOL_RESEND -DEAPOL_DYNAMATIC_RESEND -DWL_SCHED_SCAN \ + -DENABLE_INSMOD_NO_FW_LOAD -Wframe-larger-than=2048 \ + -DSCHED_SCAN_DELAYED_WORK -DDHD_PNO_FLAG -DHDOFILES = aiutils.o siutils.o sbutils.o \ - bcmutils.o bcmwifi_channels.o bcmxtlv.o bcm_app_utils.o bcmstdlib_s.o \ +DHDOFILES = aiutils.o siutils.o sbutils.o bcmutils.o bcmwifi_channels.o \ dhd_linux.o dhd_linux_platdev.o dhd_linux_sched.o dhd_pno.o \ dhd_common.o dhd_ip.o dhd_linux_wq.o dhd_custom_gpio.o \ bcmevent.o hndpmu.o linux_osl.o wldev_common.o wl_android.o \ dhd_debug_linux.o dhd_debug.o dhd_mschdbg.o dhd_dbg_ring.o \ - hnd_pktq.o hnd_pktpool.o linux_pkt.o frag.o \ + hnd_pktq.o hnd_pktpool.o bcmxtlv.o linux_pkt.o bcmstdlib_s.o frag.o \ dhd_linux_exportfs.o dhd_linux_pktdump.o dhd_mschdbg.o \ dhd_config.o dhd_ccode.o wl_event.o wl_android_ext.o \ - wl_iapsta.o wl_escan.o wl_timer.o + wl_iapsta.o wl_escan.o ifneq ($(CONFIG_WIRELESS_EXT),) DHDOFILES += wl_iw.o @@ -67,9 +63,8 @@ ifneq ($(CONFIG_CFG80211),) DHDOFILES += wl_cfg80211.o wl_cfgscan.o wl_cfgp2p.o DHDOFILES += wl_linux_mon.o wl_cfg_btcoex.o wl_cfgvendor.o - DHDOFILES += dhd_cfg80211.o wl_cfgvif.o wl_roam.o + DHDOFILES += dhd_cfg80211.o wl_cfgvif.o DHDCFLAGS += -DWL_CFG80211 -DWLP2P -DWL_CFG80211_STA_EVENT - DHDCFLAGS += -DWL_CAP_HE # DHDCFLAGS += -DWL_IFACE_COMB_NUM_CHANNELS DHDCFLAGS += -DCUSTOM_PNO_EVENT_LOCK_xTIME=10 DHDCFLAGS += -DWL_SUPPORT_AUTO_CHANNEL @@ -77,17 +72,14 @@ DHDCFLAGS += -DESCAN_RESULT_PATCH -DESCAN_BUF_OVERFLOW_MGMT DHDCFLAGS += -DVSDB -DWL_CFG80211_VSDB_PRIORITIZE_SCAN_REQUEST DHDCFLAGS += -DWLTDLS -DMIRACAST_AMPDU_SIZE=8 -# DHDCFLAGS += -DHOSTAPD_BW_SUPPORT -# DHDCFLAGS += -DHOSTAPD_EID_EXTENSION_SUPPORT - DHDCFLAGS += -DWL_VIRTUAL_APSTA -DSTA_MGMT + DHDCFLAGS += -DWL_VIRTUAL_APSTA DHDCFLAGS += -DPNO_SUPPORT -DEXPLICIT_DISCIF_CLEANUP DHDCFLAGS += -DDHD_USE_SCAN_WAKELOCK DHDCFLAGS += -DSPECIFIC_MAC_GEN_SCHEME DHDCFLAGS += -DWL_IFACE_MGMT - DHDCFLAGS += -DSUPPORT_RSSI_SUM_REPORT DHDCFLAGS += -DWLFBT -DWL_GCMP_SUPPORT - DHDCFLAGS += -DROAM_CHANNEL_CACHE -DDHD_LOSSLESS_ROAMING -DWL_ROAM_WAR -# DHDCFLAGS += -DVNDR_IE_WAR -DGET_FW_IE_DATA + DHDCFLAGS += -DWL_EXT_RECONNECT + DHDCFLAGS += -DDHD_LOSSLESS_ROAMING DHDCFLAGS += -DGTK_OFFLOAD_SUPPORT DHDCFLAGS += -DRESTART_AP_WAR # DHDCFLAGS += -DWL_STATIC_IF @@ -96,12 +88,12 @@ #BCMDHD_SDIO ifneq ($(CONFIG_BCMDHD_SDIO),) -BUS_TYPE := sdio -DHDCFLAGS += -DBCMSDIO -DMMC_SDIO_ABORT -DMMC_HW_RESET -DBCMLXSDMMC \ +BUS_TYPE := "sdio" +DHDCFLAGS += -DBCMSDIO -DMMC_SDIO_ABORT -DMMC_SW_RESET -DBCMLXSDMMC \ -DUSE_SDIOFIFO_IOVAR -DSDTEST \ -DBDC -DDHD_USE_IDLECOUNT -DCUSTOM_SDIO_F2_BLKSIZE=256 \ - -DBCMSDIOH_TXGLOM -DBCMSDIOH_TXGLOM_EXT -DBCMSDIOH_STATIC_COPY_BUF \ - -DRXFRAME_THREAD -DDHDENABLE_TAILPAD -DSUPPORT_P2P_GO_PS \ + -DBCMSDIOH_TXGLOM -DBCMSDIOH_TXGLOM_EXT -DRXFRAME_THREAD \ + -DDHDENABLE_TAILPAD -DSUPPORT_P2P_GO_PS \ -DBCMSDIO_RXLIM_POST -DBCMSDIO_TXSEQ_SYNC -DCONSOLE_DPC \ -DBCMSDIO_INTSTATUS_WAR ifeq ($(CONFIG_BCMDHD_OOB),y) @@ -118,15 +110,15 @@ #BCMDHD_PCIE ifneq ($(CONFIG_BCMDHD_PCIE),) -BUS_TYPE := pcie +BUS_TYPE := "pcie" DHDCFLAGS += -DPCIE_FULL_DONGLE -DBCMPCIE -DCUSTOM_DPC_PRIO_SETTING=-1 \ -DDONGLE_ENABLE_ISOLATION DHDCFLAGS += -DDHD_LB -DDHD_LB_RXP -DDHD_LB_STATS -DDHD_LB_TXP -DHDCFLAGS += -DDHD_PKTID_AUDIT_ENABLED +#DHDCFLAGS += -DDHD_PKTID_AUDIT_ENABLED DHDCFLAGS += -DINSMOD_FW_LOAD -DHDCFLAGS += -DCONFIG_HAS_WAKELOCK #-DDHD_DEBUG_WAKE_LOCK -DHDCFLAGS += -DDHD_PACKET_TIMEOUT_MS=50 -DMAX_TX_TIMEOUT=50 +DHDCFLAGS += -DCHIP_INTR_CONTROL #DHDCFLAGS += -DDHD_PCIE_RUNTIMEPM -DMAX_IDLE_COUNT=11 -DCUSTOM_DHD_RUNTIME_MS=100 +DHDCFLAGS += -DDHD_CONTROL_PCIE_ASPM_WIFI_TURNON ifeq ($(CONFIG_BCMDHD_OOB),y) DHDCFLAGS += -DCUSTOMER_OOB -DBCMPCIE_OOB_HOST_WAKE -DHW_OOB endif @@ -139,16 +131,10 @@ #BCMDHD_USB ifneq ($(CONFIG_BCMDHD_USB),) -BUS_TYPE := usb +BUS_TYPE := "usb" DHDCFLAGS += -DUSBOS_TX_THREAD -DBCMDBUS -DBCMTRXV2 -DDBUS_USB_LOOPBACK \ -DBDC -DHDCFLAGS += -DINSMOD_FW_LOAD -DHDCFLAGS += -DBCM_REQUEST_FW -DHDCFLAGS += -DSHOW_LOGTRACE -DHDCFLAGS += -DWL_EXT_WOWL -ifneq ($(CONFIG_BCMDHD_REQUEST_FW),y) - DHDCFLAGS += -DEXTERNAL_FW_PATH -endif +DHDCFLAGS += -DBCM_REQUEST_FW -DEXTERNAL_FW_PATH ifneq ($(CONFIG_BCMDHD_CUSB),) DHDCFLAGS += -DBCMUSBDEV_COMPOSITE CONFIG_BCMDHD_NO_POWER_OFF := y @@ -163,17 +149,9 @@ ifeq ($(CONFIG_BCMDHD_MULTIPLE_DRIVER),y) DHDCFLAGS += -DBCMDHD_MDRIVER -ifneq ($(CONFIG_BCMDHD_ADAPTER_INDEX),) - CONFIG_BCMDHD_STATIC_BUF_IN_DHD := y - MODULE_NAME := dhd$(BUS_TYPE)_$(CONFIG_BCMDHD_ADAPTER_INDEX) - DHDCFLAGS += -DADAPTER_IDX=$(CONFIG_BCMDHD_ADAPTER_INDEX) - DHDCFLAGS += -DBUS_TYPE=\"-$(BUS_TYPE)-$(CONFIG_BCMDHD_ADAPTER_INDEX)\" - DHDCFLAGS += -DDHD_LOG_PREFIX=\"[dhd-$(BUS_TYPE)-$(CONFIG_BCMDHD_ADAPTER_INDEX)]\" -else - MODULE_NAME := dhd$(BUS_TYPE) DHDCFLAGS += -DBUS_TYPE=\"-$(BUS_TYPE)\" DHDCFLAGS += -DDHD_LOG_PREFIX=\"[dhd-$(BUS_TYPE)]\" -endif + MODULE_NAME := dhd$(BUS_TYPE) else DHDCFLAGS += -DBUS_TYPE=\"\" endif @@ -205,16 +183,18 @@ ifneq ($(CONFIG_BCMDHD_ANDROID_VERSION),) DHDCFLAGS += -DANDROID_VERSION=$(CONFIG_BCMDHD_ANDROID_VERSION) DHDCFLAGS += -DDHD_NOTIFY_MAC_CHANGED -# DHDCFLAGS += -DANDROID_BKPORT ifneq ($(CONFIG_CFG80211),) - DHDCFLAGS += -DGSCAN_SUPPORT -DRTT_SUPPORT -DLINKSTAT_SUPPORT + DHDCFLAGS += -DGSCAN_SUPPORT -DRTT_SUPPORT + DHDCFLAGS += -DWL_SAR_TX_POWER +# DHDCFLAGS += -DLINKSTAT_SUPPORT DHDCFLAGS += -DCUSTOM_COUNTRY_CODE -DDHD_GET_VALID_CHANNELS DHDCFLAGS += -DDEBUGABILITY -DDBG_PKT_MON # DHDCFLAGS += -DDHD_LOG_DUMP DHDCFLAGS += -DDHD_FW_COREDUMP + DHDCFLAGS += -DWL_P2P_RAND DHDCFLAGS += -DAPF -DNDO_CONFIG_SUPPORT -DRSSI_MONITOR_SUPPORT DHDCFLAGS += -DDHD_WAKE_STATUS -DWL_LATENCY_MODE - DHDOFILES += dhd_rtt.o + DHDOFILES += dhd_rtt.o bcm_app_utils.o endif else DHDCFLAGS += -DANDROID_VERSION=0 @@ -283,15 +263,6 @@ DHDOFILES += dhd_csi.o endif -# For CONNECTION_IMPROVE -ifeq ($(CONFIG_BCMDHD_RECONNECT),y) - DHDCFLAGS += -DEAPOL_RESEND -DEAPOL_RESEND_M4 -ifneq ($(CONFIG_CFG80211),) - DHDCFLAGS += -DWL_EXT_RECONNECT -DWL_REASSOC_BCAST - DHDCFLAGS += -DWL_EXT_DISCONNECT_RECONNECT -endif -endif - # For TPUT_IMPROVE ifeq ($(CONFIG_BCMDHD_TPUT),y) DHDCFLAGS += -DDHD_TPUT_PATCH @@ -337,19 +308,11 @@ # For Module auto-selection ifeq ($(CONFIG_BCMDHD_AUTO_SELECT),y) DHDCFLAGS += -DUPDATE_MODULE_NAME -ifeq ($(CONFIG_BCMDHD_REQUEST_FW),y) -# DHDCFLAGS += -DFW_AMPAK_PATH="\"ampak\"" -# DHDCFLAGS += -DMODULE_PATH -endif ifneq ($(CONFIG_BCMDHD_SDIO),) DHDCFLAGS += -DGET_OTP_MODULE_NAME -DCOMPAT_OLD_MODULE endif endif -ifeq ($(CONFIG_AP6XXX),y) - DHDCFLAGS += -DUSE_LATE_INITCALL_SYNC - DHDCFLAGS += -DBCM_USE_PLATFORM_STRLCPY -endif ifeq ($(CONFIG_AP6XXX),m) DHDCFLAGS += -DBCMDHD_MODULAR endif @@ -361,14 +324,6 @@ endif DHDCFLAGS += -DCUSTOMER_HW -DDHD_OF_SUPPORT DHDCFLAGS += -DCUSTOMER_HW_ROCKCHIP -# DHDCFLAGS += -DCUSTOMER_HW_ROCKCHIP_RK3588 - DHDCFLAGS += -DBCM_USE_PLATFORM_STRLCPY -endif - -ifneq ($(CONFIG_BCMDHD_PCIE),) -ifneq ($(filter -DCUSTOMER_HW_ROCKCHIP_RK3588, $(DHDCFLAGS)),) - DHDCFLAGS += -DDHD_CONTROL_PCIE_ASPM_WIFI_TURNON -endif endif ifeq ($(CONFIG_BCMDHD_REQUEST_FW),y) @@ -377,7 +332,6 @@ DHDCFLAGS += -DDHD_NVRAM_NAME="\"nvram.txt\"" DHDCFLAGS += -DDHD_CLM_NAME="\"clm_bcmdhd.blob\"" else - DHDCFLAGS += -DDHD_SUPPORT_VFS_CALL ifeq ($(CONFIG_BCMDHD_FW_PATH),) DHDCFLAGS += -DCONFIG_BCMDHD_FW_PATH="\"/system/etc/firmware/fw_bcmdhd.bin\"" DHDCFLAGS += -DCONFIG_BCMDHD_NVRAM_PATH="\"/system/etc/firmware/nvram.txt\"" @@ -409,7 +363,8 @@ #$(warning "BCMDHD_ROOT=$(BCMDHD_ROOT)") EXTRA_CFLAGS = $(DHDCFLAGS) EXTRA_CFLAGS += -DDHD_COMPILED=\"$(BCMDHD_ROOT)\" -EXTRA_CFLAGS += -I$(BCMDHD_ROOT)/include/ -I$(BCMDHD_ROOT)/ +EXTRA_CFLAGS += -I$(srctree)/$(BCMDHD_ROOT)/include/ -I$(srctree)/$(BCMDHD_ROOT)/ +EXTRA_CFLAGS += $(call cc-disable-warning, unused-but-set-variable) ifeq ($(CONFIG_AP6XXX),m) EXTRA_LDFLAGS += --strip-debug endif -- Gitblit v1.6.2