diff --git a/defconfig/mt7981-ax3000.config b/defconfig/mt7981-ax3000.config index 76b9249895..367b1b13d8 100644 --- a/defconfig/mt7981-ax3000.config +++ b/defconfig/mt7981-ax3000.config @@ -275,4 +275,3 @@ CONFIG_first_card_name="MT7981" # CONFIG_MTK_SNIFFER_RADIOTAP_SUPPORT is not set CONFIG_PACKAGE_kmod-ipt-offload=y CONFIG_PACKAGE_kmod-nf-flow=y -# CONFIG_WARP_ATC_SUPPORT is not set diff --git a/defconfig/mt7986-ax6000.config b/defconfig/mt7986-ax6000.config index 6280ef5de5..863dc2a933 100644 --- a/defconfig/mt7986-ax6000.config +++ b/defconfig/mt7986-ax6000.config @@ -279,4 +279,3 @@ CONFIG_first_card_name="MT7986" # CONFIG_MTK_SNIFFER_RADIOTAP_SUPPORT is not set CONFIG_PACKAGE_kmod-ipt-offload=y CONFIG_PACKAGE_kmod-nf-flow=y -# CONFIG_WARP_ATC_SUPPORT is not set diff --git a/dl/mt7981-7.6.7.0-20221209-b9c02f-obj.tar.xz b/dl/mt7981-7.6.7.0-20221209-b9c02f-obj.tar.xz new file mode 100644 index 0000000000..af372b5a5d Binary files /dev/null and b/dl/mt7981-7.6.7.0-20221209-b9c02f-obj.tar.xz differ diff --git a/dl/mt7981_warp-20221209-3e6ae1-obj.tar.xz b/dl/mt7981_warp-20221209-3e6ae1-obj.tar.xz new file mode 100644 index 0000000000..f64f2ae317 Binary files /dev/null and b/dl/mt7981_warp-20221209-3e6ae1-obj.tar.xz differ diff --git a/dl/mt7986-7.6.7.0-20221209-b9c02f-obj.tar.xz b/dl/mt7986-7.6.7.0-20221209-b9c02f-obj.tar.xz new file mode 100644 index 0000000000..fae25cd358 Binary files /dev/null and b/dl/mt7986-7.6.7.0-20221209-b9c02f-obj.tar.xz differ diff --git a/dl/mt7986_warp-20221209-3e6ae1-obj.tar.xz b/dl/mt7986_warp-20221209-3e6ae1-obj.tar.xz new file mode 100644 index 0000000000..ec6c402b85 Binary files /dev/null and b/dl/mt7986_warp-20221209-3e6ae1-obj.tar.xz differ diff --git a/package/mtk/drivers/mt_wifi/Makefile b/package/mtk/drivers/mt_wifi/Makefile index b23f6f0667..7218e2009a 100644 --- a/package/mtk/drivers/mt_wifi/Makefile +++ b/package/mtk/drivers/mt_wifi/Makefile @@ -9,12 +9,12 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=mt_wifi ifeq ($(CONFIG_MTK_CHIP_MT7981),y) -PKG_VERSION:=7.6.6.1-mt7981 -PKG_SOURCE:=mt7981-7.6.6.1-obj.tar.xz +PKG_VERSION:=7.6.7.0-mt7981 +PKG_SOURCE:=mt7981-7.6.7.0-20221209-b9c02f-obj.tar.xz else ifeq ($(CONFIG_MTK_CHIP_MT7986),y) -PKG_VERSION:=7.6.6.1-mt7986 -PKG_SOURCE:=mt7986-7.6.6.1-obj.tar.xz +PKG_VERSION:=7.6.7.0-mt7986 +PKG_SOURCE:=mt7986-7.6.7.0-20221209-b9c02f-obj.tar.xz endif endif @@ -169,6 +169,7 @@ PKG_KCONFIG:= \ ZERO_LOSS_CSA_SUPPORT \ VLAN_SUPPORT \ DYNAMIC_VLAN_SUPPORT \ + IAP_VENDOR1_FEATURE_SUPPORT \ CUSTOMISED_HOSTAPD_SUPPORT \ HOSTAPD_WPA3_SUPPORT \ HOSTAPD_WPA3R3_SUPPORT \ @@ -255,14 +256,19 @@ PKG_KCONFIG:= \ WIFI_SYSDVT \ WARP_V2 \ OCE_SUPPORT \ + WTBL_TDD_SUPPORT \ + SW_CONNECT_SUPPORT \ 6G_SUPPORT \ + BSSMGR_CROSS_MODULE_SUPPORT \ WIFI_FW_BIN_LOAD \ CONNINFRA_APSOC \ MLME_MULTI_QUEUE_SUPPORT \ WIFI_SKU_TYPE \ MAP_R2_6E_SUPPORT \ + MAP_R3_6E_SUPPORT \ WIFI_SKB_USES_SLAB \ WIFI_CSI_CN_INFO_SUPPORT \ + 6G_AFC_SUPPORT \ PKG_CONFIG_DEPENDS:=$(foreach c, $(PKG_KCONFIG),$(if $(CONFIG_MTK_$c),CONFIG_$(c))) diff --git a/package/mtk/drivers/mt_wifi/config.in b/package/mtk/drivers/mt_wifi/config.in index b3ae0db9cf..c60550b9e8 100644 --- a/package/mtk/drivers/mt_wifi/config.in +++ b/package/mtk/drivers/mt_wifi/config.in @@ -630,6 +630,20 @@ config MTK_OCE_SUPPORT depends on MTK_CHIP_MT7915 || MTK_CHIP_MT7986 default y +config MTK_WTBL_TDD_SUPPORT + bool "S/W WTBL TDD SWAP Support" + depends on MTK_WIFI_DRIVER + depends on MTK_MT_AP_SUPPORT + depends on MTK_CHIP_MT7915 || MTK_CHIP_MT7916 || MTK_CHIP_MT7986 || MTK_CHIP_MT7981 + default n + +config MTK_SW_CONNECT_SUPPORT + bool "Pure S/W STA Increase Connection Support" + depends on MTK_WIFI_DRIVER + depends on MTK_MT_AP_SUPPORT + depends on MTK_CHIP_MT7915 || MTK_CHIP_MT7916 || MTK_CHIP_MT7986 || MTK_CHIP_MT7981 + default n + config MTK_MAP_SUPPORT bool "MAP Support" depends on MTK_WIFI_DRIVER @@ -656,6 +670,11 @@ config MTK_MAP_R2_6E_SUPPORT depends on MTK_MAP_SUPPORT default n +config MTK_MAP_R3_6E_SUPPORT + bool "Multi-AP R3 6E support" + depends on MTK_MAP_SUPPORT + depends on MTK_MAP_R2_6E_SUPPORT + default n #config TRACE_TCP_PKT # bool "TCP DATA/ACK packets trace log" @@ -1013,7 +1032,7 @@ config MTK_RADIUS_MAC_AUTH_SUPPORT depends on MTK_CFG80211_SUPPORT default n -config ZERO_LOSS_CSA_SUPPORT +config MTK_ZERO_LOSS_CSA_SUPPORT bool "Zero Loss CSA Support" depends on MTK_MT_AP_SUPPORT default n @@ -1029,6 +1048,11 @@ config MTK_CFG80211_SUPPORT depends on MTK_MT_AP_SUPPORT default n +config MTK_IAP_VENDOR1_FEATURE_SUPPORT + bool "IAP Vendor1 Feature enable" + depends on MTK_ENTERPRISE_AP_SUPPORT + default n + #CUSTOMISED HOSTAPD config MTK_CUSTOMISED_HOSTAPD_SUPPORT bool "Customised Hostapd Support" @@ -1174,6 +1198,12 @@ config MTK_WIFI_CSI_CN_INFO_SUPPORT depends on MTK_MT_AP_SUPPORT default n +config MTK_6G_AFC_SUPPORT + bool "6G Band AFC Support" + depends on MTK_WIFI_DRIVER + depends on MTK_MT_AP_SUPPORT + default n + config MTK_VENDOR_FEATURE11_SUPPORT bool "Vendor11 Feature Enable" depends on MTK_WIFI_DRIVER @@ -1254,6 +1284,13 @@ config MTK_6G_SUPPORT help Supporting 6GHz Wi-Fi +config MTK_BSSMGR_CROSS_MODULE_SUPPORT + bool "WIFI 6G BSS Manager Cross Module Support" + depends on MTK_6G_SUPPORT + default n + help + Supporting 6GHz Wi-Fi BSS Manager Cross Module + endmenu endif diff --git a/package/mtk/drivers/warp/Makefile b/package/mtk/drivers/warp/Makefile index a0e3de9699..7710fc80d7 100644 --- a/package/mtk/drivers/warp/Makefile +++ b/package/mtk/drivers/warp/Makefile @@ -9,12 +9,12 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=warp ifeq ($(CONFIG_WARP_CHIPSET),"mt7981") -PKG_VERSION:=20220907-791160 -PKG_SOURCE:=mt7981_warp-20220907-791160-obj.tar.xz +PKG_VERSION:=20221209-3e6ae1 +PKG_SOURCE:=mt7981_warp-20221209-3e6ae1-obj.tar.xz else ifeq ($(CONFIG_WARP_CHIPSET),"mt7986") -PKG_VERSION:=20220907-791160 -PKG_SOURCE:=mt7986_warp-20220907-791160-obj.tar.xz +PKG_VERSION:=20221209-3e6ae1 +PKG_SOURCE:=mt7986_warp-20221209-3e6ae1-obj.tar.xz endif endif @@ -51,7 +51,11 @@ define KernelPackage/warp/config endef +ifeq ($(CONFIG_WARP_VERSION), 3) +MTK_WIFI_DIR:=$(TOPDIR)/../ko_module/wlan_driver/logan +else MTK_WIFI_DIR:=$(TOPDIR)/../ko_module/wlan_driver/jedi +endif USE_BIN_DIR:=$(MTK_WIFI_DIR)/warp_driver/bin define Build/Compile diff --git a/package/mtk/drivers/warp/config.in b/package/mtk/drivers/warp/config.in index 772fc18d9f..02879abb9f 100644 --- a/package/mtk/drivers/warp/config.in +++ b/package/mtk/drivers/warp/config.in @@ -2,13 +2,14 @@ if PACKAGE_kmod-warp config WARP_VERSION int "WARP Driver HW Version Support" - range 1 2 + range 1 3 default 1 if TARGET_mediatek_mt7622 - default 2 if TARGET_mediatek_mt7627 + default 2 if TARGET_mediatek_mt7986 + default 3 if TARGET_mediatek_mt7988 config WARP_ATC_SUPPORT bool "WARP Driver Address Translate Support for CR mirror" - default y + default n config WARP_DBG_SUPPORT bool "WARP Driver Debug Info Support" @@ -20,7 +21,7 @@ config WARP_WDMA_RECYCLE_SUPPORT config WED_HW_RRO_SUPPORT bool "WED HW RRO Support" - default n + default y config MTK_MEMORY_SHRINK bool "Memory Shrink" @@ -33,9 +34,9 @@ config WARP_MEMORY_LEAK_DBG config WARP_CHIPSET string "WARP target chipset" - default colgin + default mt7988 help - For colgin: colgin, for panther: mt7986 + For colgin: colgin, for panther: mt7986, for jaguar: mt7988 config WARP_WO_EMBEDDED_LOAD bool "Emebedded MCU firmware support"