From 6f77ce77248d6458414efafd64c72d653fc70bb8 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Tue, 13 Apr 2021 00:13:33 +0200 Subject: [PATCH 1/4] iwinfo: update to latest Git HEAD 50b64a6 iwinfo: add basic IEEE 802.11ax support 70d2136 iwinfo: nl80211: perform split wiphy dump cd23727 iwinfo: cli: fix hwmode formatting Signed-off-by: David Bauer --- package/network/utils/iwinfo/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/network/utils/iwinfo/Makefile b/package/network/utils/iwinfo/Makefile index 3454d615a9..0f63aca0d9 100644 --- a/package/network/utils/iwinfo/Makefile +++ b/package/network/utils/iwinfo/Makefile @@ -11,9 +11,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/iwinfo.git -PKG_SOURCE_DATE:=2021-01-31 -PKG_SOURCE_VERSION:=4a32b33e9606f1bc1125f4bc24b0581349e55f2e -PKG_MIRROR_HASH:=414e5d150efaadba21103e66f862be66a94dcf83c16a2850f7c05051a9b0739d +PKG_SOURCE_DATE:=2021-04-20 +PKG_SOURCE_VERSION:=cd23727f72b7859ba572c4e273247578c2124926 +PKG_MIRROR_HASH:=a43516e3502274e0ba64348481364158996ddb0019c35c9dcd2d5a257de67e98 PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=GPL-2.0 @@ -25,7 +25,7 @@ PKG_CONFIG_DEPENDS := \ CONFIG_PACKAGE_kmod-brcm-wl-mimo \ CONFIG_PACKAGE_kmod-cfg80211 -IWINFO_ABI_VERSION:=20210106 +IWINFO_ABI_VERSION:=20210420 include $(INCLUDE_DIR)/package.mk From 12cb52bd0665da33cb5dc64697f1751a8b33fb05 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 28 Apr 2021 21:06:36 +0200 Subject: [PATCH 2/4] mac80211: minstrel_ht: fix issue in calculating success probability Missing braces in a macro were leading to badly working rates sometimes getting a success probabilty of 1.0 Signed-off-by: Felix Fietkau --- ...-minstrel_ht-fix-MINSTREL_FRAC-macro.patch | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 package/kernel/mac80211/patches/subsys/353-mac80211-minstrel_ht-fix-MINSTREL_FRAC-macro.patch diff --git a/package/kernel/mac80211/patches/subsys/353-mac80211-minstrel_ht-fix-MINSTREL_FRAC-macro.patch b/package/kernel/mac80211/patches/subsys/353-mac80211-minstrel_ht-fix-MINSTREL_FRAC-macro.patch new file mode 100644 index 0000000000..0d475b7329 --- /dev/null +++ b/package/kernel/mac80211/patches/subsys/353-mac80211-minstrel_ht-fix-MINSTREL_FRAC-macro.patch @@ -0,0 +1,21 @@ +From: Felix Fietkau +Date: Wed, 28 Apr 2021 21:03:13 +0200 +Subject: [PATCH] mac80211: minstrel_ht: fix MINSTREL_FRAC macro + +Add missing braces to avoid issues with e.g. using additions in the +div expression + +Signed-off-by: Felix Fietkau +--- + +--- a/net/mac80211/rc80211_minstrel_ht.h ++++ b/net/mac80211/rc80211_minstrel_ht.h +@@ -14,7 +14,7 @@ + + /* scaled fraction values */ + #define MINSTREL_SCALE 12 +-#define MINSTREL_FRAC(val, div) (((val) << MINSTREL_SCALE) / div) ++#define MINSTREL_FRAC(val, div) (((val) << MINSTREL_SCALE) / (div)) + #define MINSTREL_TRUNC(val) ((val) >> MINSTREL_SCALE) + + #define EWMA_LEVEL 96 /* ewma weighting factor [/EWMA_DIV] */ From ebed523ee8486a68f91ed721c6e48bddf6598700 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Wed, 28 Apr 2021 20:46:46 +0100 Subject: [PATCH 3/4] arm-trusted-firmware-mediatek: fix boot hang on unifi-6-lr The Ubiquiti Networks UniFi 6 LR access point comes with a total of 512 MB RAM provided by 2x 8-bit DDR3 SDRAM. This combination lead to problems with the DDR calibration on boot resulting in occasional hang on boot. Use updated calibration binary provided by MediaTek to make boot on that device more reliable. The binary has also been tested on the BananaPi BPi-R64 board and that also works just fine with the new binary. Signed-off-by: Daniel Golle --- package/boot/arm-trusted-firmware-mediatek/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/boot/arm-trusted-firmware-mediatek/Makefile b/package/boot/arm-trusted-firmware-mediatek/Makefile index b2afdbed06..a1787ead21 100644 --- a/package/boot/arm-trusted-firmware-mediatek/Makefile +++ b/package/boot/arm-trusted-firmware-mediatek/Makefile @@ -13,9 +13,9 @@ PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=https://github.com/mtk-openwrt/arm-trusted-firmware.git -PKG_SOURCE_DATE:=2021-03-10 -PKG_SOURCE_VERSION:=8b635f61091f2e5bce88269468c53fc30bb4cd64 -PKG_MIRROR_HASH:=ffe233a19b51504f605a90a88c7a1bb74303e4a7173a59b24a4dfa572ce99139 +PKG_SOURCE_DATE:=2021-04-28 +PKG_SOURCE_VERSION:=a63914612904642ed974390fff620f7003ebc20a +PKG_MIRROR_HASH:=6396a36406ceecf667470d0d673552751573de65497bf97d1e2af3505fe79366 PKG_MAINTAINER:=Daniel Golle From 43dad22025597cb535626757301e035187d02b25 Mon Sep 17 00:00:00 2001 From: Chen Minqiang Date: Tue, 27 Apr 2021 11:54:34 +0800 Subject: [PATCH 4/4] uboot-mediatek: unifi6lr: mtd erase before write to flash Erase firmware ereas before writing to recovery or production partition when updating them via the bootloader menu. Signed-off-by: Chen Minqiang Signed-off-by: Daniel Golle --- .../boot/uboot-mediatek/patches/412-add-ubnt-unifi-6-lr.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/boot/uboot-mediatek/patches/412-add-ubnt-unifi-6-lr.patch b/package/boot/uboot-mediatek/patches/412-add-ubnt-unifi-6-lr.patch index 17f0b29f84..1af0da13c5 100644 --- a/package/boot/uboot-mediatek/patches/412-add-ubnt-unifi-6-lr.patch +++ b/package/boot/uboot-mediatek/patches/412-add-ubnt-unifi-6-lr.patch @@ -402,8 +402,8 @@ +reset_factory=mtd erase nor0 0xc0000 0x10000 && reset +nor_read_production=mtd read nor0 $loadaddr 0x1000000 0x1000 && imsz $loadaddr image_size && mtd read nor0 $loadaddr 0x1000000 $image_size +nor_read_recovery=mtd read nor0 $loadaddr 0x120000 0x1000 && imsz $loadaddr image_size && mtd read nor0 $loadaddr 0x120000 $image_size -+nor_write_production=mtd write nor0 $loadaddr 0x1000000 $filesize -+nor_write_recovery=mtd write nor0 $loadaddr 0x120000 $filesize ++nor_write_production=mtd erase nor0 0x1000000 $filesize && mtd write nor0 $loadaddr 0x1000000 $filesize ++nor_write_recovery=mtd erase nor0 0x120000 0xee0000 && mtd write nor0 $loadaddr 0x120000 $filesize +_init_env=setenv _init_env ; saveenv +_firstboot=setenv _firstboot ; run _switch_to_menu ; run ethaddr_factory ; run _init_env ; run boot_first +_switch_to_menu=setenv _switch_to_menu ; setenv bootdelay 3 ; setenv bootmenu_delay 3 ; setenv bootmenu_0 $bootmenu_0d ; setenv bootmenu_0d ; run _bootmenu_update_title