aboutsummaryrefslogtreecommitdiffstats
path: root/package
Commit message (Collapse)AuthorAgeFilesLines
* hostapd: add fix for dealing with VHT 160 MHz via ext nss bwFelix Fietkau2023-08-1511-15/+156
| | | | | Signed-off-by: Felix Fietkau <nbd@nbd.name> (cherry picked from commit adfeda849198b33ffa7a7ef233ae8a4df22bbc2d)
* uboot-mediatek: bpi-r3: prepare for larger FIT structuresDaniel Golle2023-08-131-4/+4
| | | | | | | | | | Instead of reading only a single 4kiB page, read the first 128kiB to determine the size of an uImage.FIT using 'imsz' or 'imszb'. This will be needed once we add more Device Tree Overlays, which may happen for the BPi-R3 mini. Signed-off-by: Daniel Golle <daniel@makrotopia.org> (cherry picked from commit 3c2f7bb555c2cd5c4be8aed11b9d31b48cc0bcf8)
* arm-trusted-firmware-tools: fix build on macOS/DarwinFelix Fietkau2023-08-131-0/+21
| | | | | | | Resolve conflicts with the uuid type from darwin system headers Signed-off-by: Felix Fietkau <nbd@nbd.name> (cherry picked from commit 16c37ba9136ff431c7e3c97cc27e4ea166b8020a)
* firmware: intel-microcode: update to 20230808Hauke Mehrtens2023-08-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Debian changelog: intel-microcode (3.20230808.1) unstable; urgency=high * New upstream microcode datafile 20230808 (closes: #1043305) Mitigations for "Downfall" INTEL-SA-00828 (CVE-2022-40982), INTEL-SA-00836 (CVE-2023-23908) and INTEL-SA-00837 (CVE-2022-41804) * Updated microcodes: sig 0x00050653, pf_mask 0x97, 2023-03-23, rev 0x1000181, size 36864 sig 0x00050654, pf_mask 0xb7, 2023-03-06, rev 0x2007006, size 44032 sig 0x00050656, pf_mask 0xbf, 2023-03-17, rev 0x4003604, size 38912 sig 0x00050657, pf_mask 0xbf, 2023-03-17, rev 0x5003604, size 38912 sig 0x0005065b, pf_mask 0xbf, 2023-03-21, rev 0x7002703, size 30720 sig 0x000606a6, pf_mask 0x87, 2023-03-30, rev 0xd0003a5, size 297984 sig 0x000706e5, pf_mask 0x80, 2023-02-26, rev 0x00bc, size 113664 sig 0x000806c1, pf_mask 0x80, 2023-02-27, rev 0x00ac, size 111616 sig 0x000806c2, pf_mask 0xc2, 2023-02-27, rev 0x002c, size 98304 sig 0x000806d1, pf_mask 0xc2, 2023-02-27, rev 0x0046, size 103424 sig 0x000806e9, pf_mask 0xc0, 2023-02-22, rev 0x00f4, size 106496 sig 0x000806e9, pf_mask 0x10, 2023-02-23, rev 0x00f4, size 105472 sig 0x000806ea, pf_mask 0xc0, 2023-02-23, rev 0x00f4, size 105472 sig 0x000806eb, pf_mask 0xd0, 2023-02-23, rev 0x00f4, size 106496 sig 0x000806ec, pf_mask 0x94, 2023-02-26, rev 0x00f8, size 106496 sig 0x000806f8, pf_mask 0x87, 2023-05-09, rev 0x2b0004b1, size 572416 sig 0x000806f7, pf_mask 0x87, 2023-05-09, rev 0x2b0004b1 sig 0x000806f6, pf_mask 0x87, 2023-05-09, rev 0x2b0004b1 sig 0x000806f5, pf_mask 0x87, 2023-05-09, rev 0x2b0004b1 sig 0x000806f4, pf_mask 0x87, 2023-05-09, rev 0x2b0004b1 sig 0x000806f8, pf_mask 0x10, 2023-05-15, rev 0x2c000271, size 605184 sig 0x000806f6, pf_mask 0x10, 2023-05-15, rev 0x2c000271 sig 0x000806f5, pf_mask 0x10, 2023-05-15, rev 0x2c000271 sig 0x000806f4, pf_mask 0x10, 2023-05-15, rev 0x2c000271 sig 0x00090672, pf_mask 0x07, 2023-04-18, rev 0x002e, size 220160 sig 0x00090675, pf_mask 0x07, 2023-04-18, rev 0x002e sig 0x000b06f2, pf_mask 0x07, 2023-04-18, rev 0x002e sig 0x000b06f5, pf_mask 0x07, 2023-04-18, rev 0x002e sig 0x000906a3, pf_mask 0x80, 2023-04-18, rev 0x042c, size 219136 sig 0x000906a4, pf_mask 0x80, 2023-04-18, rev 0x042c sig 0x000906e9, pf_mask 0x2a, 2023-02-23, rev 0x00f4, size 108544 sig 0x000906ea, pf_mask 0x22, 2023-02-23, rev 0x00f4, size 104448 sig 0x000906eb, pf_mask 0x02, 2023-02-23, rev 0x00f4, size 106496 sig 0x000906ec, pf_mask 0x22, 2023-02-23, rev 0x00f4, size 105472 sig 0x000906ed, pf_mask 0x22, 2023-02-27, rev 0x00fa, size 106496 sig 0x000a0652, pf_mask 0x20, 2023-02-23, rev 0x00f8, size 97280 sig 0x000a0653, pf_mask 0x22, 2023-02-23, rev 0x00f8, size 97280 sig 0x000a0655, pf_mask 0x22, 2023-02-23, rev 0x00f8, size 97280 sig 0x000a0660, pf_mask 0x80, 2023-02-23, rev 0x00f8, size 97280 sig 0x000a0661, pf_mask 0x80, 2023-02-23, rev 0x00f8, size 96256 sig 0x000a0671, pf_mask 0x02, 2023-02-26, rev 0x0059, size 104448 sig 0x000b0671, pf_mask 0x32, 2023-06-06, rev 0x0119, size 210944 sig 0x000b06a2, pf_mask 0xe0, 2023-06-06, rev 0x4119, size 216064 sig 0x000b06a3, pf_mask 0xe0, 2023-06-06, rev 0x4119 sig 0x000b06e0, pf_mask 0x11, 2023-04-12, rev 0x0011, size 136192 * source: update symlinks to reflect id of the latest release, 20230808 intel-microcode (3.20230512.1) unstable; urgency=medium Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> (cherry picked from commit ced285487144e1138e3d2b986b3e070a9b4fd412)
* linux-firmware: update to 20230804Hauke Mehrtens2023-08-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7be2766 (tag: 20230804) Merge branch 'rb3-update' of https://github.com/lumag/linux-firmware 66c1db8 Merge https://github.com/pkshih/linux-firmware 5046942 Mellanox: Add new mlxsw_spectrum firmware xx.2012.1012 5c7b67f linux-firmware: Add URL for latest FW binaries for NXP BT chipsets 29f185d rtw89: 8851b: update firmware to v0.29.41.1 742bf57 qcom: sdm845: add RB3 sensors DSP firmware 253cc17 amdgpu: Update DMCUB for DCN314 & Yellow Carp 07f05b0 Merge branch 'dmc-adlp_2.20-mtl_2.13' of git://anongit.freedesktop.org/drm/drm-firmware 5a251ed Merge branch 'for-upstream' of https://github.com/CirrusLogic/linux-firmware 6c8ce49 ice: add LAG-supporting DDP package fd6e13c i915: Update MTL DMC to v2.13 41e615c i915: Update ADLP DMC to v2.20 c8424cf cirrus: Add CS35L41 firmware for Dell Oasis Models b6ea35f copy-firmware: Fix linking directories when using compression 0a51959 copy-firmware: Fix test: unexpected operator b602d43 qcom: sc8280xp: LENOVO: remove directory sym link e0bad5e qcom: sc8280xp: LENOVO: Remove execute bits 59fbffa amdgpu: update VCN 4.0.0 firmware 22fb12f amdgpu: add initial SMU 13.0.10 firmware b3f512f amdgpu: add initial SDMA 6.0.3 firmware b1a7d76 amdgpu: add initial PSP 13.0.10 firmware d6d655a amdgpu: add initial GC 11.0.3 firmware c782458 Merge branch 'v2.0.21961' of https://github.com/yunfei-mtk/linux_fw_10bit ca9086f Merge branch 'dg2_mtl_guc_70.8' of git://anongit.freedesktop.org/drm/drm-firmware 0bc3126 linux-firmware: Update AMD fam17h cpu microcode b250b32 linux-firmware: Update AMD cpu microcode 9dfcace amdgpu: update green sardine VCN firmware b519832 amdgpu: update renoir VCN firmware 5f569aa amdgpu: update raven VCN firmware 868bb36 amdgpu: update raven2 VCN firmware 6fa9a17 amdgpu: update Picasso VCN firmware cd52460 amdgpu: update DMCUB to v0.0.175.0 for various AMDGPU ASICs 4ef7581 Updated NXP SR150 UWB firmware 2514504 Merge branch 'for-upstream' of https://github.com/CirrusLogic/linux-firmware 45f5ebf wfx: update to firmware 3.16.1 f41d890 mediatek: Update mt8195 SCP firmware to support 10bit mode 6f3a37f i915: update DG2 GuC to v70.8.0 0ee23bd i915: update to GuC 70.8.0 and HuC 8.5.1 for MTL 1a76e8b cirrus: Add CS35L41 firmware for ASUS ROG 2023 Models d3f6606 Partially revert "amdgpu: DMCUB updates for DCN 3.1.4 and 3.1.5" 8917650 linux-firmware: update firmware for mediatek bluetooth chip (MT7922) 7d9af09 linux-firmware: update firmware for MT7922 WiFi device 0bab5df Merge tag 'iwlwifi-fw-2023-06-29' of http://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware 3ec3817 linux-firmware: Update firmware file for Intel Bluetooth AX203 7db3ef9 linux-firmware: Update firmware file for Intel Bluetooth AX203 5684048 linux-firmware: Update firmware file for Intel Bluetooth AX211 3f7a24e linux-firmware: Update firmware file for Intel Bluetooth AX211 eb2c745 linux-firmware: Update firmware file for Intel Bluetooth AX210 4a3ff0a linux-firmware: Update firmware file for Intel Bluetooth AX200 1d1bad4 linux-firmware: Update firmware file for Intel Bluetooth AX201 db39dff Fix qcom ASoC tglp WHENCE entry a687f89 Merge branch 'sc8280xp-audio-fw' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/linux-firmware 9e0343c check_whence: Check link targets are valid b255f5b iwlwifi: add new FWs from core80-39 release fa5d30b iwlwifi: update cc/Qu/QuZ firmwares for core80-39 release f9a35b3 qcom: Add Audio firmware for SC8280XP X13s Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> (cherry picked from commit bfbb5ccf7a55ed2cc574405f7f83da5e48811401)
* mbedtls: Update to version 2.28.4Hauke Mehrtens2023-08-112-5/+5
| | | | | | | | This only fixes minor problems. Changelog: https://github.com/Mbed-TLS/mbedtls/releases/tag/v2.28.4 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> (cherry picked from commit d773fe5411cd4fdd8e107cfe338ed731001a1ade)
* uci: update to git HEADHauke Mehrtens2023-08-111-3/+3
| | | | | | | | 3cda251 file: Fix uci -m import command 5781664 remove internal usage of redundant uci_ptr.last Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> (cherry picked from commit d1427863bae1603eb3b8b385024f7ca11297503d)
* kernel: netsupport: Add kmod-sched-skbprioAlexandru Gagniuc2023-08-111-0/+12
| | | | | | | | | Add support for the SKBPRIO queuing discipline. This is subtly different than prio as it also drops packets from the lower priority flows. Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com> (cherry picked from commit 8fba9afda5f514afa48a216514b3f0b0fb22afac)
* kernel: Autoload nvme at preinit timeLuca Barbato2023-08-111-1/+1
| | | | | | | This way is possible to mount nvme extroots. Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit 0fe9a8ca94830270820f7a1eb457f5d5d587125d)
* perf: opt-out of lto usageJavier Marcet2023-08-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes building with USE_LTO enabled: mold: error: undefined symbol: __memset >>> referenced by <artificial> >>> ./tmp/ccsgR7G6.ltrans10.ltrans.o mold: error: undefined symbol: memset_orig >>> referenced by <artificial> >>> ./tmp/ccsgR7G6.ltrans10.ltrans.o mold: error: undefined symbol: perf_regs_load >>> referenced by <artificial> >>> ./tmp/ccsgR7G6.ltrans15.ltrans.o:(test_dwarf_unwind__thread) mold: error: undefined symbol: memset_erms >>> referenced by <artificial> >>> ./tmp/ccsgR7G6.ltrans10.ltrans.o mold: error: undefined symbol: memcpy_orig >>> referenced by <artificial> >>> ./tmp/ccsgR7G6.ltrans10.ltrans.o mold: error: undefined symbol: memcpy_erms >>> referenced by <artificial> >>> ./tmp/ccsgR7G6.ltrans10.ltrans.o mold: error: undefined symbol: __memcpy >>> referenced by <artificial> >>> ./tmp/ccsgR7G6.ltrans10.ltrans.o collect2: error: ld returned 1 exit status make[5]: *** [Makefile.perf:670: ../openwrt/linux/tools/perf-target-x86_64_musl/perf] Error 1 make[4]: *** [Makefile.perf:238: sub-make] Error 2 make[3]: *** [Makefile:70: all] Error 2 make[2]: *** [Makefile:84: ./build_dir/target-x86_64_musl/linux-x86_64/linux-5.15.120/tools/perf-target-x86_64_musl/.built] Error 2 make[2]: Leaving directory './package/devel/perf' time: package/devel/perf/compile#55.88#6.78#12.89 ERROR: package/devel/perf failed to build. Signed-off-by: Javier Marcet <javier@marcet.info> (cherry picked from commit 5ed185bfbd9719ef3b114fa6faeb343ac87b2490)
* util-linux: enable colrm util as packageOskari Rauta2023-08-111-0/+17
| | | | | | | | | | | | | | | colrm is already built, package just isn't generated. colrm can be used to remove columns from file/stdin. Use cases vary, personally I needed it because I build openwrt natively - and wolfssl configure script wants either colrm, or cut but busybox's cut isn't accepted. Built: x86_64, latest git Tested: x86_64, latest git Signed-off-by: Oskari Rauta <oskari.rauta@gmail.com> (cherry picked from commit e21b4c9636d5dc07b303aa568cbf31b76f244397)
* lua: fix integer overflow in LNUM patchAdam Bailey2023-08-112-16/+16
| | | | | | | | | | | Safely detect integer overflow in try_addint() and try_subint(). Old code relied on undefined behavior, and recent versions of GCC on x86 optimized away the if-statements. This caused integer overflow in Lua code instead of falling back to floating-point numbers. Signed-off-by: Adam Bailey <aebailey@gmail.com> (cherry picked from commit 3a2e7c30d3e6a187ba1df740cdb24c8ad84dfe48)
* e2fsprogs: do not symlink tune2fs to findfsMartin Schiller2023-08-111-1/+0
| | | | | | | | | | | | | | | commit c0611b45a998 ("e2fsprogs: symlink e2fsck to fsck.ext{2, 3, 4}, and tune2fs to findfs") introduced a symlink from tune2fs to findfs. This only works when the included private libblkid library is used, but commit 5b1660a5387b ("utils/e2fsprogs: Update to 1.43.6") disabled the usage of this private lib and enabled the shared lib support. Removing this symlink makes it possible to install tune2fs and findfs package. Signed-off-by: Martin Schiller <ms@dev.tdt.de> (cherry picked from commit 0b80c5725fd70bfd23701cd49fa9f252f6835506)
* rpcd: update to latest git HEADHauke Mehrtens2023-08-111-3/+3
| | | | | | | c07ab2f iwinfo: update byte counter to 64bit Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> (cherry picked from commit 2486841c1bc7c3267e409b510e142e04cc5f0a5b)
* rpcd: update to latest git HEADHauke Mehrtens2023-08-111-3/+3
| | | | | | | 31c3907 file: strengthen exec access control Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> (cherry picked from commit 9d8d65322ce7d82ee20cc6dcca07506e7405c5f5)
* iwinfo: update to latest git HEADHauke Mehrtens2023-08-111-4/+4
| | | | | | | | | | | d1f07cf devices: add device id for Atheros AR9287 and AR9380 65ea345 nl80211: constify a few arrays ca79f64 lib: report byte counters as 64 bit values This contains an ABI change, increase the ABI version too. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> (cherry picked from commit a226153067766db6d733aa3e330742c9da40c4f6)
* procd: update to latest git HEADHauke Mehrtens2023-08-111-3/+3
| | | | | | | | 122a5e3 Revert "sysupgrade: print errno on failure" 2db8365 system: add RISC-V CPU info Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> (cherry picked from commit 359638098742d7573ff422f6dc7125c89086072b)
* kernel: bump 5.15 to 5.15.124John Audia2023-08-101-1/+2
| | | | | | | | | | | | | | | | Changelog: https://lore.kernel.org/stable/2023080341-curliness-salary-4158@gregkh/ 1. Needed to make a change to to package/kernel/linux/modules/netsupport.mk due to upstream moving vxlan to its own directory[1]. @john-tho suggested using the the 6.1 xvlan FILES to circumvent. 2. All patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.124&id=77396fa9096abdbfbb87d63e73ad44d5621cf103 Signed-off-by: John Audia <therealgraysky@proton.me> [Refreshed on top of OpenWrt 23.05] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> (cherry picked from commit 81c1172c3626157ff9a146430cd14e32c9c80a5a)
* openssl: update to 3.0.10Ivan Pavlov2023-08-092-4/+4
| | | | | | | | | | Changes between 3.0.9 and 3.0.10 [1 Aug 2023] * Fix excessive time spent checking DH q parameter value ([CVE-2023-3817]) * Fix DH_check() excessive time with over sized modulus ([CVE-2023-3446]) * Do not ignore empty associated data entries with AES-SIV ([CVE-2023-2975]) Signed-off-by: Ivan Pavlov <AuthorReflex@gmail.com> (cherry picked from commit 92602f823a5f29fee41209ccef53ddddb2e89222)
* openssl: opt-out of lto usageChristophe Sokol2023-08-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes building with USE_LTO enabled: aarch64-openwrt-linux-musl-gcc -fPIC -pthread -Wa,--noexecstack -Wall -O3 -Os -pipe -mcpu=cortex-a53 -fno-caller-saves -fno-plt -fhonour-copts -fmacro-prefix-map=/build_dir/target-aarch64_cortex-a53_musl/openssl-3.0.9=openssl-3.0.9 -ffunction-sections -fdata-sections -flto=auto -fno-fat-lto-objects -Wformat -Werror=format-security -DPIC -fPIC -fstack-protector-strong -D_FORTIFY_SOURCE=1 -Wl,-z,now -Wl,-z,relro -DPIC -fPIC -Os -pipe -mcpu=cortex-a53 -fno-caller-saves -fno-plt -fhonour-copts -fmacro-prefix-map=/build_dir/target-aarch64_cortex-a53_musl/openssl-3.0.9=openssl-3.0.9 -ffunction-sections -fdata-sections -flto=auto -fno-fat-lto-objects -Wformat -Werror=format-security -fPIC -fstack-protector-strong -fPIC -fuse-ld=bfd -flto=auto -fuse-linker-plugin -fPIC -specs=/include/hardened-ld-pie.specs -znow -zrelro -L. -Wl,-z,defs -Wl,-znodelete -shared -Wl,-Bsymbolic -Wl,-z,now -Wl,-z,relro -L/staging_dir/toolchain-aarch64_cortex-a53_gcc-13.1.0_musl/usr/lib -L/staging_dir/toolchain-aarch64_cortex-a53_gcc-13.1.0_musl/lib -Wl,--gc-sections \ -o providers/legacy.so -Wl,--version-script=providers/legacy.ld \ providers/legacy-dso-legacyprov.o \ providers/liblegacy.a providers/libcommon.a -lcrypto -ldl -pthread ld.bfd: /tmp/ccdWw6Lo.ltrans0.ltrans.o: in function `legacy_get_params': <artificial>:(.text.legacy_get_params+0xd4): undefined reference to `ossl_prov_is_running' ld.bfd: <artificial>:(.text.legacy_get_params+0xd8): undefined reference to `ossl_prov_is_running' ld.bfd: /tmp/ccdWw6Lo.ltrans0.ltrans.o: in function `legacy_teardown': <artificial>:(.text.legacy_teardown+0x4): undefined reference to `ossl_prov_ctx_get0_libctx' ld.bfd: <artificial>:(.text.legacy_teardown+0x8): undefined reference to `ossl_prov_ctx_get0_libctx' ld.bfd: <artificial>:(.text.legacy_teardown+0x34): undefined reference to `ossl_prov_ctx_free' ld.bfd: <artificial>:(.text.legacy_teardown+0x38): undefined reference to `ossl_prov_ctx_free' ld.bfd: /tmp/ccdWw6Lo.ltrans0.ltrans.o: in function `OSSL_provider_init': <artificial>:(.text.OSSL_provider_init+0x14): undefined reference to `ossl_prov_ctx_new' ld.bfd: <artificial>:(.text.OSSL_provider_init+0x18): undefined reference to `ossl_prov_ctx_new' ld.bfd: <artificial>:(.text.OSSL_provider_init+0x84): undefined reference to `ossl_prov_ctx_set0_libctx' ld.bfd: <artificial>:(.text.OSSL_provider_init+0x88): undefined reference to `ossl_prov_ctx_set0_libctx' ld.bfd: <artificial>:(.text.OSSL_provider_init+0x98): undefined reference to `ossl_prov_ctx_set0_handle' ld.bfd: <artificial>:(.text.OSSL_provider_init+0x9c): undefined reference to `ossl_prov_ctx_set0_handle' ld.bfd: /tmp/ccdWw6Lo.ltrans0.ltrans.o:(.data.rel.ro.legacy_kdfs+0x10): undefined reference to `ossl_kdf_pbkdf1_functions' ld.bfd: /tmp/ccdWw6Lo.ltrans0.ltrans.o:(.data.rel.ro.legacy_ciphers+0x10): undefined reference to `ossl_cast5128ecb_functions' ld.bfd: /tmp/ccdWw6Lo.ltrans0.ltrans.o:(.data.rel.ro.legacy_ciphers+0x30): undefined reference to `ossl_cast5128cbc_functions' [...] ld.bfd: /tmp/ccdWw6Lo.ltrans0.ltrans.o:(.data.rel.ro.legacy_digests+0x10): undefined reference to `ossl_md4_functions' ld.bfd: /tmp/ccdWw6Lo.ltrans0.ltrans.o:(.data.rel.ro.legacy_digests+0x30): undefined reference to `ossl_ripemd160_functions' collect2: error: ld returned 1 exit status Signed-off-by: Christophe Sokol <christophe@wk3.org> (cherry picked from commit 906616d20183bb7be4eb71812ef5e76cb3af56a0)
* kernel: netdevices: add driver for Marvell 10G Ethernet PHYsDaniel Golle2023-08-071-0/+18
| | | | | | | | Package kernel module for Marvell 10G Ethernet PHYs found also in many 10G/1G/100M/10M RJ-45 SFP+ modules. Signed-off-by: Daniel Golle <daniel@makrotopia.org> (cherry picked from commit 2a5c7bf6213cc12d4ae6b7bce5d777b3518a89c1)
* uboot-mediatek: fix build for MT7629Daniel Golle2023-08-071-0/+47
| | | | | | | | Add patch to fix build failure caused by a missing header which had previously been implicitely included. Fixes: 6ddb5f5a65 ("uboot-mediatek: update to version 2023.07.02") Signed-off-by: Daniel Golle <daniel@makrotopia.org>
* uboot-mediatek: add missing 'memory' nodes to downstream boardsDaniel Golle2023-08-076-6/+36
| | | | | | | | | | Among the patches adding support for MT7988 also came the switch to use fdtdec_setup_mem_size_base() and no longer rely on CFG_SYS_SDRAM_BASE. Take care of our downstream boards which did not have a 'memory' node in their device trees. Fixes: 572ea68070 ("uboot-mediatek: add patches for MT7988 and builds for RFB") Signed-off-by: Daniel Golle <daniel@makrotopia.org>
* uboot-mediatek: add patches for MT7988 and builds for RFBDaniel Golle2023-08-0736-13/+9011
| | | | | | | Import pending patches adding support for MT7988 and provide builds for the reference board for all possible boot media. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
* uboot-mediatek: update to version 2023.07.02Daniel Golle2023-08-0728-459/+117
| | | | | | | | | | Release 2023.07 got tagged wrongly and replaced by follow-up release 2023.07.02. Now using upstream DTS for BPi-R3. Removed two patches which made it upstream, refreshed the rest. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
* arm-trusted-firmware-mediatek: fix PKG_MIRROR_HASHDaniel Golle2023-08-071-1/+1
| | | | | | | | | | Instead of using the hash of the Github-generated tarball use the hash of the tarball generated by the OpenWrt build system (in this case they are different, unfortunately). Reported-by: Chen Minqiang <ptpt52@gmail.com> Fixes: 07dbeb430e ("arm-trusted-firmware-mediatek: update to sources of 2023-07-24") Signed-off-by: Daniel Golle <daniel@makrotopia.org>
* arm-trusted-firmware-mediatek: update to sources of 2023-07-24Daniel Golle2023-08-071-5/+142
| | | | | | | | Use updated Trusted Firmware-A sources from MediaTek, now stacked on top of the ARM Trusted Firmware-A v2.9 release. Add builds for the newly added MT7988 SoC. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
* arm-trusted-firmware-tools: update to version 2.9Daniel Golle2023-08-071-2/+2
| | | | | | | | | | | | | | | | | | 147f52f3e feat(fiptool): add cca, core_swd, plat cert in FIP 0aaa382fe fix(sptool): fix concurrency issue for SP packages cb666b39d Merge "fix(sptool): fix concurrency issue for SP packages" into integration 0be2475f6 fix: 'sp_mk_generator.py' reference to undef var 1a28f290b fix(sptool): operators "is/is not" in sp_mk_gen.py cf2dd17dd refactor(security): add OpenSSL 1.x compatibility 4daeaf341 fix(sptool): add dependency to SP image 06e69f7c9 feat(fiptool): handle FIP in a disk partition 5a53c6c66 Merge "feat(fiptool): handle FIP in a disk partition" into integration 034a2e3ef refactor(fiptool): move plat_fiptool.mk to tools 0165ddd7c build(fiptool): add object dependency generation c89fdb4a5 Merge "refactor(fiptool): move plat_fiptool.mk to tools" into integration 1b491eead fix(tree): correct some typos Signed-off-by: Daniel Golle <daniel@makrotopia.org>
* mediatek: filogic: add specific layout for WR30UHank Moretti2023-08-071-0/+1
| | | | | | | | | Because this device enable NMBM by default, most users use custom U-Boot with NMBM-Enabled in Chinese forums. This layout is the same as the ubootmod layout but enabling NMBM. Signed-off-by: Hank Moretti <mchank9999@gmail.com>
* uboot-mediatek: add support for Xiaomi WR30UHank Moretti2023-08-073-0/+471
| | | | | | Add a custom uboot build to support openwrt uboot layout. Signed-off-by: Hank Moretti <mchank9999@gmail.com>
* uboot-mvebu: update to version 2023.07.02Oli Ze2023-07-301-2/+2
| | | | | | | | | | | | | Since 2021.07 multiple bugs were introduced that made it impossible to create a bootable target for mvebu. Those issues should be now fixed since 2023.07-rc1. References: #11661 Signed-off-by: Oli Ze <olze@trustserv.de> Reviewed-by: Robert Marko <robimarko@gmail.com> Tested-by: Andre Heider <a.heider@gmail.com> # espressobin-v3-v5-1gb-2cs Signed-off-by: Petr Štetiar <ynezz@true.cz> [facelift] (cherry picked from commit ba7d6dddc7d20222c1703b173ef50befefb3fb52)
* libnl-tiny: update to latest Git HEADJo-Philipp Wich2023-07-271-6/+6
| | | | | | | | | | | | 8667347 build: allow passing SOVERSION value for dynamic library Also adjust packaging of the library to only ship the SOVERSION suffixed library object, to allow for concurrent installation of ABI-incompible versions in the future. Fixes: #13082 Signed-off-by: Jo-Philipp Wich <jo@mein.io> (cherry picked from commit 4af0a72a65d7c92ed4e7c2455090f695f424903d)
* dropbear: add ed25519 for failsafe keyEtienne Champetier2023-07-261-2/+3
| | | | | | | | | | | | At least Fedora and RHEL 9 set RSAMinSize=2048, so when trying to use failsafe, we get 'Bad server host key: Invalid key length' To workaround the issue, we can use: ssh -o RSAMinSize=1024 ... Generating 2048 bits RSA is extremely slow, so add ed25519. We keep RSA 1024 to be as compatible as possible. Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com> (cherry picked from commit 6ac61dead99ff6b9df00c29b7a858772449718b2)
* ath11k-firmware: update to stable WLAN.HK.2.9.0.1-01837Michał Kwiatek2023-07-261-5/+5
| | | | | | | | | | | | | | Changelog from quic: Bug fixes, stability improvements from previous releases are present. There are no backward comatibility issues with this release. Tested-by: Michał Kwiatek <michal@kwiatek.it> # Xiaomi AX3600 Signed-off-by: Michał Kwiatek <michal@kwiatek.it> [ improve commit description ] Signed-off-by: Christian Marangi <ansuelsmth@gmail.com> (cherry picked from commit 1c56801dd2e696cac7da45912b5e3ea1165549d5)
* layerscape: remove Traverse LS1043 boardsMathew McBride2023-07-261-4/+0
| | | | | | | | | | | | | | | | | The Traverse LS1043 boards were not publicly released, all the production has been going to OEM customers who do not use the image format defined in the OpenWrt tree. Only a few samples were circulated outside Traverse and our OEM customers. The public release (then called Five64) of this series was cancelled in favour of our LS1088A based design (Ten64). It is best to remove these boards to avoid wasting OpenWrt project and contributor resources. Signed-off-by: Mathew McBride <matt@traverse.com.au> (cherry picked from commit 8e7ba6fbae80838c2219ee38307af9c883606c2c)
* layerscape: armv8_64b: add Traverse Ten64 NAND variantMathew McBride2023-07-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Ten64 board[1] is based around NXP's Layerscape LS1088A SoC. It is capable of booting both standard Linux distributions from disk devices, using EFI, and booting OpenWrt from NAND. See the online manual for more information, including the flash layout[2]. This patchset adds support for generating Ten64 images for NAND boot. For disk boot, one can use the EFI support that was recently added to the armvirt target. We previously supported NAND users by building inside our armvirt/EFI target[3], but this approach is not suitable for OpenWrt upstream. Users who used our supplied NAND images will be able to upgrade to this via sysupgrade. Signed-off-by: Mathew McBride <matt@traverse.com.au> [1] - https://www.traverse.com.au/hardware/ten64 [2] - https://ten64doc.traverse.com.au/hardware/flash/ [3] - Example: https://gitlab.com/traversetech/ls1088firmware/openwrt/-/commit/285e4360e1604eb466880d245d48efd9962143a5 (cherry picked from commit af0546da3440dba24217949527e503820350ff05)
* uqmi: do not start 464xlat for dual-stack configurationsLech Perczak2023-07-261-0/+1
| | | | | | | | | If dual-stack configuration is in use, and dhcpv6 option is set, do not start 464xlat sub-interface for dhcpv6 sub-interace , as the configuration already provides IPv4 connectivty, be it through single or dual APN configuration. Signed-off-by: Lech Perczak <lech.perczak@gmail.com> (cherry picked from commit a9237c1af9c2eee0a49d96f2588be85d24489f20)
* uqmi: support split-APN IPv4 and IPv6 dual-stackLech Perczak2023-07-261-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add two new "v6apn" and "v6profile" properties, to support split-APN dual-stack onfiguration. This extends the existing ipv4v6 PDP type, allowing simultaneous connection to two distinct APNs, one for IPv4 and one for IPv6. The parameters override existing 'apn' and 'profile' respectively, if set, but only for IPv6 part of the connection. If unset, they default to their original values, constituting a standard IPv4v6 setup. If a different APN is set for IPv6, a corresponding profile MUST also be configured, with a different ID, than the IPv4 profile, for example, profile 2. Both APNs must match ones configured through QMI or through 'AT+CGDCONT' command. Example configuration in UCI: config interface 'wan' option proto 'qmi' option device '/dev/cdc-wdm0' option autoconnect '1' option pdptype 'ipv4v6' option apn 'internet' option v6apn 'internetipv6' option profile '1' option v6profile '2' Corresponding profile configuration: AT+CGDCONT? +CGDCONT: 1,"IP","internet","0.0.0.0",0,0,0,0 +CGDCONT: 2,"IPV6","internetipv6","0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0",0,0,0,0 Signed-off-by: Lech Perczak <lech.perczak@gmail.com> (cherry picked from commit 48e8bf1b8f3d2750f215765f583c847ff02deca2)
* mac80211: partly revert force-mac80211 loss detectionDavid Bauer2023-07-263-36/+56
| | | | | | | | | | | | This patch will only force mac80211 loss detection upon ath10k by masking the driver-specific loss-detection bit. Ref: commit ed816f6ba8b5 ("mac80211: always use mac80211 loss detection") Signed-off-by: David Bauer <mail@david-bauer.net> (cherry picked from commit d9070f8d23621931c4869980f6e5ae17abbe3e58) [felix.bau@gmx.de: replace path 6.2 with 5.15, refresh patches] Signed-off-by: Felix Baumann <felix.bau@gmx.de>
* mt76: update to the latest versionFelix Fietkau2023-07-261-3/+3
| | | | | | | | | | | 53edfc7aaa34 wifi: mt76: mt7603: fix beacon interval after disabling a single vif 7ef4dd12d982 wifi: mt76: mt7603: fix tx filter/flush function 152608a40aa7 wifi: mt76: mt7615: do not advertise 5 GHz on first phy of MT7615D (DBDC) cacac3902a63 wifi: mt76: split get_of_eeprom in subfunction cd3dfe392769 wifi: mt76: add support for providing eeprom in nvmem cells Signed-off-by: Felix Fietkau <nbd@nbd.name> (cherry picked from commit 4395236a100b558d96d0e836ddc76df19b33ddfb)
* mt76: update to the latest versionFelix Fietkau2023-07-261-3/+3
| | | | | | | bb3937d5c3e0 wifi: mt76: mt7915: remove VHT160 capability on MT7915 Signed-off-by: Felix Fietkau <nbd@nbd.name> (cherry picked from commit 063641f8cf7990731919b950c1bf9eb15d1e74c9)
* mediatek: add support for ZyXEL NWA50AX ProDavid Bauer2023-07-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hardware -------- CPU: Mediatek MT7981 RAM: 512M DDR4 FLASH: 256M NAND ETH: MaxLinear GPY211 (2.5GbE N Base-T) WiFi: Mediatek MT7981 (2.4GHz 2T2R:2 5GHz 3T3R:2 802.11ax) BTN: 1x Reset LED: 1x Multi-Color UART Console ------------ Available below the rubber cover next to the ethernet port. Settings: 115200 8N1 Layout: <12V> <LAN> GND-RX-TX-VCC Logic-Level is 3V3. Don't connect VCC to your UART adapter! Installation Web-UI ------------------- Upload the Factory image using the devices Web-Interface. As the device uses a dual-image partition layout, OpenWrt can only installed on Slot A. This requires the current active image prior flashing the device to be on Slot B. In case this is not the case, OpenWrt will boot only one time, returning to the ZyXEL firmware the second boot. If this happens, first install a ZyXEL firmware upgrade of any version and install OpenWrt after that. Installation TFTP / Recovery ---------------------------- This installation routine is especially useful in case of a bricked device. Attach to the UART console header of the device. Interrupt the boot procedure by pressing Enter. The bootloader has a reduced command-set available from CLI, but more commands can be executed by abusing the atns command. Boot a OpenWrt initramfs image available on a TFTP server at 192.168.1.66. Rename the image to nwa50axpro-openwrt-initramfs.bin. $ atnf nwa50axpro-openwrt-initramfs.bin $ atna 192.168.1.88 $ atns "192.168.1.66; tftpboot; setenv fdt_high 0xffffffffffffffff; bootm" Upon booting, set the booted image to the correct slot: $ zyxel-bootconfig /dev/mtd9 get-status $ zyxel-bootconfig /dev/mtd9 set-image-status 0 valid $ zyxel-bootconfig /dev/mtd9 set-active-image 0 Copy the OpenWrt sysupgrade image to the device using scp. Write the sysupgrade image to NAND using sysupgrade. $ sysupgrade -n image.bin Signed-off-by: David Bauer <mail@david-bauer.net> (cherry picked from commit f0445746f6fd96fc7c5394b238153bd2ff22bc5b)
* libbpf: Update to v1.2.2Tony Ambardar2023-07-201-3/+3
| | | | | | | | Update to the latest upstream release to include recent bugfixes: Link: https://github.com/libbpf/libbpf/compare/v1.2.0...v1.2.2 Signed-off-by: Tony Ambardar <itugrok@yahoo.com> (cherry picked from commit 1d5e7b85ccc58f3d010a54e82ccea81fc102262b)
* nftables: update to 1.0.8Nick Hainke2023-07-201-2/+2
| | | | | | | | ChangeLog: https://www.netfilter.org/projects/nftables/files/changes-nftables-1.0.8.txt Signed-off-by: Nick Hainke <vincent@systemli.org> (cherry picked from commit 58c498247b3d06c0ff1967d2f48ba84084a6cf25)
* libnftnl: update to 1.2.6Nick Hainke2023-07-201-3/+3
| | | | | | | | Release Notes: https://lists.netfilter.org/pipermail/netfilter-announce/2023/000250.html Signed-off-by: Nick Hainke <vincent@systemli.org> (cherry picked from commit e57a752217113d066cdea2073f35e8c7c1fafaa6)
* hostapd: update to 2023-06-22Andre Heider2023-07-2032-202/+162
| | | | | | | | | | | | | | | Removed, merged upstream: - 170-wpa_supplicant-fix-compiling-without-IEEE8021X_EAPOL.patch Manually refreshed: - 040-mesh-allow-processing-authentication-frames-in-block.patch - 600-ubus_support.patch - 761-shared_das_port.patch Fixes: #12661 Fixes: 304423a4 ("hostapd: update to 2023-03-29") Signed-off-by: Andre Heider <a.heider@gmail.com> (cherry picked from commit cd804c1ebb34c9740f8ad9fe393a81f3efb7b009)
* linux-firmware: update to 20230625John Audia2023-07-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change from git log --oneline: ee91452d (tag: 20230625) Makefile, copy-firmware: support xz/zstd compressed firmware ad2ce8be copy-firmware: silence the last shellcheck warnings 67bf50e7 copy-firmware: drop obsolete backticks, quote 77f31a80 copy-firmware: tweak sed invocation 40fa2b20 copy-firmware: quote deskdir and dirname 77f92e0b check_whence: error if symlinks are in-tree f2671b1f check_whence: error if File: is actually a link 4b539e7a check_whence: strip quotation marks 32693d3b linux-firmware: wilc1000: update WILC1000 firmware to v16.0 109b23c5 ice: update ice DDP wireless_edge package to 1.3.10.0 ade163aa amdgpu: DMCUB updates for DCN 3.1.4 and 3.1.5 045b2136 amdgpu: update DMCUB to v0.0.172.0 for various AMDGPU ASICs 5a1842ce Merge branch 'rb3-update' of https://github.com/lumag/linux-firmware 2f81bd9f fix broken cirrus firmware symlinks 01a7a844 qcom: Update the microcode files for Adreno a630 GPUs. 94120467 qcom: sdm845: rename the modem firmware 1c599488 qcom: sdm845: update remoteproc firmware 1cd1c871 rtl_bt: Update RTL8852A BT USB firmware to 0xDAC7_480D 55e74485 rtl_bt: Update RTL8852C BT USB firmware to 0x040D_7225 9dbd8ec2 amdgpu: DMCUB updates for various AMDGPU asics 9a47adc7 Merge branch 'mtl_huc_v8.5.0' of git://anongit.freedesktop.org/drm/drm-firmware eb3ae841 linux-firmware: update firmware for MT7922 WiFi device 5ce06b9e linux-firmware: update firmware for MT7921 WiFi device 2c50361c linux-firmware: update firmware for mediatek bluetooth chip (MT7922) 185f49df linux-firmware: update firmware for mediatek bluetooth chip (MT7921) 05f94af7 Merge branch 'v2.0.21478' of https://github.com/yunfei-mtk/linux_fw_scp 5de33fb4 i915: Add HuC v8.5.0 for MTL 795aea91 mediatek: Update mt8195 SCP firmware to support hevc fc90c59b Merge branch 'db410c' of https://github.com/lumag/linux-firmware 9d4c9a52 qcom: apq8016: add Dragonboard 410c WiFi and modem firmware 1f9667eb Merge branch 'for-upstream' of http://git.chelsio.net/pub/git/linux-firmware b544e2b0 Merge branch 'for-upstream' of https://github.com/CirrusLogic/linux-firmware 244d6b5c cirrus: Add firmware for new Asus ROG Laptops d11ae984 brcm: Add symlinks from Pine64 devices to AW-CM256SM.txt 1c513ec7 amdgpu: Update GC 11.0.1 and 11.0.4 8449fcd0 Merge https://github.com/pkshih/linux-firmware c10facaf rtw89: 8851b: add firmware v0.29.41.0 1ba3519e Merge branch 'dev-queue' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/firmware 2e775450 amdgpu: update yellow carp firmware for amd.5.5 release 5eccb3c1 amdgpu: update navi14 firmware for amd.5.5 release c70d3c3b amdgpu: update navi12 firmware for amd.5.5 release 0e4f17cc amdgpu: update vega20 firmware for amd.5.5 release 413348f3 amdgpu: update vega12 firmware for amd.5.5 release c167587d amdgpu: update navi10 firmware for amd.5.5 release 3c98630a amdgpu: update vega10 firmware for amd.5.5 release d13ef0cb amdgpu: update PSP 13.0.11 firmware for amd.5.5 release 31f8f526 amdgpu: update GC 11.0.4 firmware for amd.5.5 release f0ce7026 amdgpu: update SDMA 6.0.1 firmware for amd.5.5 release 47424464 amdgpu: update PSP 13.0.4 firmware for amd.5.5 release 60dc78a7 amdgpu: update GC 11.0.1 firmware for amd.5.5 release ba70041c amdgpu: update 13.0.8 firmware for amd.5.5 release 9c48881f amdgpu: update GC 10.3.7 firmware for amd.5.5 release bb4d7250 amdgpu: update vangogh firmware for amd.5.5 release 102a4138 amdgpu: update VCN 4.0.4 firmware for amd.5.5 release a7fe4aa1 amdgpu: update SMU 13.0.7 firmware for amd.5.5 release 80b2d561 amdgpu: update PSP 13.0.7 firmware for amd.5.5 release a5d7b4df amdgpu: update GC 11.0.2 firmware for amd.5.5 release c1db00c5 amdgpu: update renoir firmware for amd.5.5 release 683c91f7 amdgpu: update VCN 4.0.0 firmware for amd.5.5 release 39d6fcc7 amdgpu: update SMU 13.0.0 firmware for amd.5.5 release 56832557 amdgpu: update PSP 13.0.0 firmware for amd.5.5 release ffe1a41e amdgpu: update GC 11.0.0 firmware for amd.5.5 release 72d525d7 amdgpu: update green sardine firmware for amd.5.5 release ceba765d amdgpu: update beige goby firmware for amd.5.5 release 95eb53c9 amdgpu: update dimgrey cavefish firmware for amd.5.5 release 909cef98 amdgpu: update arcturus firmware for amd.5.5 release 91251d16 amdgpu: update vcn 3.1.2 firmware for amd.5.5 release 9eaff866 amdgpu: update psp 13.0.5 firmware for amd.5.5 release 44772528 amdgpu: update GC 10.3.6 firmware for amd.5.5 release 3bffc9f8 amdgpu: update navy flounder firmware for amd.5.5 release 3b920773 amdgpu: update sienna cichlid firmware for amd.5.5 release 84d5550e amdgpu: update aldebaran firmware for amd.5.5 release dcd30473 amdgpu: DMCUB updates for various AMDGPU asics c9e4034a ice: update ice DDP comms package to 1.3.40.0 601c1813 Merge https://github.com/pkshih/linux-firmware 08b854f0 rtlwifi: Add firmware v6.0 for RTL8192FU b72c69dd rtlwifi: Update firmware for RTL8188EU to v28.0 51290942 (tag: 20230515) Merge branch 'main' of https://github.com/CirrusLogic/linux-firmware Signed-off-by: John Audia <therealgraysky@proton.me> (cherry picked from commit a5005508f069c9bd0c1d33970e9b3ecbe5040380)
* uboot-mediatek: support classic uImage.FIT with internal images in imszbDaniel Golle2023-07-131-4/+3
| | | | | | | | | The side-effect and main motivation is to also drop the FIT structure size limit because with multiple device tree overlays it may easily grow beyond the previous 4kB limit in the future. Signed-off-by: Daniel Golle <daniel@makrotopia.org> (cherry picked from commit 98e3f82c3fb729c1d9de78fef215322528b50cb4)
* uboot-mediatek: add H3C Magic NX30 Pro supportChukun Pan2023-07-133-0/+454
| | | | | | | | The OEM uboot limit brush into 3rd-party firmware. So add a custom uboot build to support openwrt. Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn> (cherry picked from commit 437e79ad6d01100afac9786d287976de6d5cf363)
* mediatek: add support for Netgear EX6250v2 seriesWenli Looi2023-07-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Netgear EX6250v2, EX6400v3, EX6410v2, EX6470 are wall-plug 802.11ac (Wi-Fi 5) extenders. Like other MT7629 devices, Wi-Fi does not work currently as there is no driver. Related: https://github.com/openwrt/openwrt/pull/5084 For future reference, 2.4GHz MAC = LAN+1, 5GHz MAC = LAN+2. Specifications: * MT7629, 256 MiB RAM, 16 MiB SPI NOR * MT7761N (2.4GHz) / MT7762N (5GHz) - no driver * Ethernet: 1 port 10/100/1000 * UART: 115200 baud (labeled on board) Installation: * Flash the factory image through the stock web interface, or TFTP to the bootloader. NMRP can be used to TFTP without opening the case. * After installation, perform a factory reset. Wait for the device to boot, then hold the reset button for 10 seconds. This is needed because sysupgrade in the stock firmware will attempt to preserve its configuration using sysupgrade.tgz. See https://github.com/openwrt/openwrt/pull/4182 Revert to stock firmware: * Flash the stock firmware to the bootloader using TFTP/NMRP. Signed-off-by: Wenli Looi <wlooi@ucalgary.ca> (cherry picked from commit 73de41898fcd06d837b013449c370c493bcdc595)