[][MAC80211][misc][rework mac80211 patches]
[Description]
Add mac80211_v5.15.81_077622a1 backport package.
Update MT7915 default firmware bin to TSSI_OFF_CLK_OFF
[Release-log]
N/A
Change-Id: I62d5e9f423002f73fba3d80ab5b3dc5eafeb9164
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/6908944
diff --git a/autobuild_mac80211_release/lede-build-sanity.sh b/autobuild_mac80211_release/lede-build-sanity.sh
index 5c404ba..404ad0a 100755
--- a/autobuild_mac80211_release/lede-build-sanity.sh
+++ b/autobuild_mac80211_release/lede-build-sanity.sh
@@ -15,7 +15,7 @@
fi
MTK_FEED_DIR=${BUILD_DIR}/feeds/mtk_openwrt_feed
-MTK_MANIFEST_FEED=${BUILD_DIR}/../mtk_openwrt_feeds
+MTK_MANIFEST_FEED=${BUILD_DIR}/../mtk-openwrt-feeds
if [ -z ${INSTALL_DIR} ]; then
INSTALL_DIR=autobuild_release
@@ -144,14 +144,23 @@
cp -fpR ${BUILD_DIR}/./../mac80211_package/package/network/utils/iwinfo ${BUILD_DIR}/package/network/utils
rm -rf ${BUILD_DIR}/package/kernel/mac80211
+ if [ $1 = "1" ]; then
+ echo "=========================MAC80211 v6.1==================="
+ cp -fpR ${BUILD_DIR}/./../mac80211_package/package/kernel/mac80211 ${BUILD_DIR}/package/kernel
+ rm -rf ${MTK_FEED_DIR}/autobuild_mac80211_release/package/kernel/mac80211
+ mv ${MTK_FEED_DIR}/autobuild_mac80211_release/package/kernel/mac80211_dev ${MTK_FEED_DIR}/autobuild_mac80211_release/package/kernel/mac80211
+ else
+ echo "=========================MAC80211 v5.15=================="
+ tar xvf ${MTK_FEED_DIR}/autobuild_mac80211_release/package/kernel/mac80211/mac80211_v5.15.81_077622a1.tar.gz -C ${BUILD_DIR}/package/kernel/
+ fi
cp -fpR ${BUILD_DIR}/./../mac80211_package/package/kernel/mac80211 ${BUILD_DIR}/package/kernel
rm -rf ${BUILD_DIR}/package/firmware/wireless-regdb
cp -fpR ${BUILD_DIR}/./../mac80211_package/package/firmware/wireless-regdb ${BUILD_DIR}/package/firmware
cp -fpR ${BUILD_DIR}/./../mac80211_package/package/kernel/mt76 ${BUILD_DIR}/package/kernel
+ rm -rf ${BUILD_DIR}/package/kernel/mt76/patches/100-Revert-of-net-pass-the-dst-buffer-to-of_get_mac_addr.patch
rm -rf ${BUILD_DIR}/package/kernel/mt76/patches/101-fix-encap-offload-ethernet-type-check.patch
-
#hack mt7986 hostapd config
echo "CONFIG_MBO=y" >> ./package/network/services/hostapd/files/hostapd-full.config
echo "CONFIG_WPS_UPNP=y" >> ./package/network/services/hostapd/files/hostapd-full.config
@@ -266,6 +275,7 @@
#cp customized autobuild SDK patches
cp -fpR ${BUILD_DIR}/autobuild/$1/target/ ${BUILD_DIR}
cp -fpR ${BUILD_DIR}/autobuild/$1/package/ ${BUILD_DIR}
+ cp -fpR ${BUILD_DIR}/autobuild/$1/tools/ ${BUILD_DIR}
#cp special subtarget patches
diff --git a/autobuild_mac80211_release/mt7986_mac80211/lede-branch-build-sanity.sh b/autobuild_mac80211_release/mt7986_mac80211/lede-branch-build-sanity.sh
index ba5d6c0..b5a507e 100755
--- a/autobuild_mac80211_release/mt7986_mac80211/lede-branch-build-sanity.sh
+++ b/autobuild_mac80211_release/mt7986_mac80211/lede-branch-build-sanity.sh
@@ -6,6 +6,7 @@
branch_name=${temp##*/}
swpath=0
kasan=0
+backport_new=0
args=
for arg in $*; do
@@ -16,6 +17,9 @@
"kasan")
kasan=1
;;
+ "dev")
+ backport_new=1
+ ;;
*)
args="$args $arg"
;;
@@ -53,6 +57,7 @@
echo "CONFIG_SLUB_DEBUG=y" >> ${BUILD_DIR}/target/linux/mediatek/mt7986/config-5.4
echo "CONFIG_FRAME_WARN=4096" >> ${BUILD_DIR}/target/linux/mediatek/mt7986/config-5.4
}
+
}
#step1 clean
@@ -68,7 +73,7 @@
prepare_flowoffload
-prepare_mac80211
+prepare_mac80211 ${backport_new}
prepare_final ${branch_name}
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/mac80211_v5.15.81_077622a1.tar.gz b/autobuild_mac80211_release/package/kernel/mac80211/mac80211_v5.15.81_077622a1.tar.gz
new file mode 100644
index 0000000..e0a87d1
--- /dev/null
+++ b/autobuild_mac80211_release/package/kernel/mac80211/mac80211_v5.15.81_077622a1.tar.gz
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7915_eeprom.bin b/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7915_eeprom.bin
index 007df1b..7584a1d 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7915_eeprom.bin
+++ b/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7915_eeprom.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7915_eeprom_dbdc.bin b/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7915_eeprom_dbdc.bin
index 6c0b64e..d0ce42e 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7915_eeprom_dbdc.bin
+++ b/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7915_eeprom_dbdc.bin
Binary files differ
diff --git a/target/linux/mediatek/base-files/sbin/setup_ax3000.sh b/target/linux/mediatek/base-files/sbin/setup_ax3000.sh
index e2feea1..9bd8c17 100755
--- a/target/linux/mediatek/base-files/sbin/setup_ax3000.sh
+++ b/target/linux/mediatek/base-files/sbin/setup_ax3000.sh
@@ -22,9 +22,9 @@
option channel '${channel_2g}'
option band '2g'
option htmode 'HE40'
- option noscan '1'
- option disabled '0'
- option country '${country}'
+ option noscan '1'
+ option disabled '0'
+ option country '${country}'
config wifi-iface 'default_radio0'
option device 'radio0'
@@ -38,9 +38,9 @@
option path '11280000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0+1'
option channel '${channel_5g}'
option band '5g'
- option htmode 'HE80'
+ option htmode 'HE160'
option disabled '0'
- option country '${country}'
+ option country '${country}'
config wifi-iface 'default_radio1'
option device 'radio1'
@@ -55,4 +55,4 @@
sleep 5
-iwinfo
\ No newline at end of file
+iwinfo
diff --git a/target/linux/mediatek/base-files/sbin/setup_ax6000.sh b/target/linux/mediatek/base-files/sbin/setup_ax6000.sh
new file mode 100755
index 0000000..c4e05c4
--- /dev/null
+++ b/target/linux/mediatek/base-files/sbin/setup_ax6000.sh
@@ -0,0 +1,58 @@
+#================================================================
+# HEADER
+#================================================================
+
+channel_2g=1
+channel_5g=36
+country="US"
+ssid_2g="Openwrt-7986-2g"
+ssid_5g="Openwrt-7986-5g"
+
+#================================================================
+# END_OF_HEADER
+#================================================================
+
+wifi down
+rm -rf /etc/config/wireless
+
+cat > /etc/config/wireless <<EOF
+config wifi-device 'radio0'
+ option type 'mac80211'
+ option path 'platform/18000000.wbsys'
+ option channel '${channel_2g}'
+ option band '2g'
+ option htmode 'HE40'
+ option noscan '1'
+ option disabled '0'
+ option country '${country}'
+
+config wifi-iface 'default_radio0'
+ option device 'radio0'
+ option network 'lan'
+ option mode 'ap'
+ option ssid '${ssid_2g}'
+ option encryption 'none'
+
+config wifi-device 'radio1'
+ option type 'mac80211'
+ option path 'platform/18000000.wbsys+1'
+ option channel '${channel_5g}'
+ option band '5g'
+ option htmode 'HE160'
+ option disabled '0'
+ option country '${country}'
+
+config wifi-iface 'default_radio1'
+ option device 'radio1'
+ option network 'lan'
+ option mode 'ap'
+ option ssid '${ssid_5g}'
+ option encryption 'none'
+EOF
+
+wifi up
+wifi reload
+
+sleep 5
+
+iwinfo
diff --git a/target/linux/mediatek/base-files/sbin/setup_ax7800.sh b/target/linux/mediatek/base-files/sbin/setup_ax7800.sh
new file mode 100755
index 0000000..c708e32
--- /dev/null
+++ b/target/linux/mediatek/base-files/sbin/setup_ax7800.sh
@@ -0,0 +1,91 @@
+#================================================================
+# HEADER
+#================================================================
+
+channel_2g=1
+channel_5g=36
+channel_6g=37
+country="US"
+ssid_2g="Openwrt-7916-2g"
+ssid_5g="Openwrt-7986-5g"
+ssid_6g="Openwrt-7916-6g"
+
+#================================================================
+# END_OF_HEADER
+#================================================================
+
+wifi down
+rm -rf /etc/config/wireless
+
+cat > /etc/config/wireless <<EOF
+config wifi-device 'radio0'
+ option type 'mac80211'
+ option path '11280000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0'
+ option channel '${channel_2g}'
+ option band '2g'
+ option htmode 'HE20'
+ option disabled '0'
+ option country '${country}'
+
+config wifi-iface 'default_radio0'
+ option device 'radio0'
+ option network 'lan'
+ option mode 'ap'
+ option ssid '${ssid_2g}'
+ option encryption 'none'
+
+config wifi-device 'radio1'
+ option type 'mac80211'
+ option path '11280000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0+1'
+ option channel '${channel_6g}'
+ option band '6g'
+ option htmode 'HE160'
+ option disabled '0'
+ option country '${country}'
+
+config wifi-iface 'default_radio1'
+ option device 'radio1'
+ option network 'lan'
+ option mode 'ap'
+ option ssid '${ssid_6g}'
+ option encryption 'sae'
+ option key '12345678'
+
+config wifi-device 'radio2'
+ option type 'mac80211'
+ option path 'platform/18000000.wbsys'
+ option channel '1'
+ option band '2g'
+ option htmode 'HE20'
+ option disabled '1'
+
+config wifi-iface 'default_radio2'
+ option device 'radio2'
+ option network 'lan'
+ option mode 'ap'
+ option ssid 'OpenWrt'
+ option encryption 'none'
+
+config wifi-device 'radio3'
+ option type 'mac80211'
+ option path 'platform/18000000.wbsys+1'
+ option channel '${channel_5g}'
+ option band '5g'
+ option htmode 'HE160'
+ option disabled '0'
+ option country '${country}'
+
+config wifi-iface 'default_radio3'
+ option device 'radio3'
+ option network 'lan'
+ option mode 'ap'
+ option ssid '${ssid_5g}'
+ option encryption 'none'
+EOF
+
+wifi up
+wifi reload
+
+sleep 5
+
+iwinfo
diff --git a/target/linux/mediatek/base-files/sbin/setup_ax8400.sh b/target/linux/mediatek/base-files/sbin/setup_ax8400.sh
index b263142..8b912d5 100755
--- a/target/linux/mediatek/base-files/sbin/setup_ax8400.sh
+++ b/target/linux/mediatek/base-files/sbin/setup_ax8400.sh
@@ -39,8 +39,8 @@
option path 'platform/18000000.wbsys'
option channel '${channel_2g}'
option band '2g'
- option htmode 'HE40'
- option noscan '1'
+ option htmode 'HE40'
+ option noscan '1'
option disabled '0'
option country '${country}'
@@ -56,7 +56,7 @@
option path 'platform/18000000.wbsys+1'
option channel '${channel_6g}'
option band '6g'
- option htmode 'HE80'
+ option htmode 'HE160'
option disabled '0'
option country '${country}'
@@ -74,4 +74,4 @@
sleep 5
-iwinfo
\ No newline at end of file
+iwinfo
diff --git a/target/linux/mediatek/base-files/sbin/smp-mt76.sh b/target/linux/mediatek/base-files/sbin/smp-mt76.sh
index c01743c..66e00d2 100755
--- a/target/linux/mediatek/base-files/sbin/smp-mt76.sh
+++ b/target/linux/mediatek/base-files/sbin/smp-mt76.sh
@@ -23,7 +23,7 @@
do
if [[ "$vif" == "eth0*" ]] || [[ "$vif" == "eth1" ]] || \
[[ "$vif" == "lan*" ]] || [[ "$vif" == "wan*" ]] || \
- [[ "$vif" == "wlan*" ]]; then
+ [[ "$vif" == "wlan*" ]] || [[ "$vif" == "phy*" ]]; then
RPS_IF_LIST="$RPS_IF_LIST $vif"
fi
done;