From a4f3e170291416981093884d6326de63d780d6d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Fri, 1 Nov 2024 21:44:43 +0100 Subject: [PATCH 1/8] bcm27xx-gpu-fw: fix package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Install definition was accidentally removed in 7afdbc0955a5 and IB fails. Fixes: 7afdbc0955a5 ("bcm27xx-gpu-fw: update to latest version") Signed-off-by: Álvaro Fernández Rojas (cherry picked from commit efd1ec51a1) --- package/kernel/bcm27xx-gpu-fw/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/kernel/bcm27xx-gpu-fw/Makefile b/package/kernel/bcm27xx-gpu-fw/Makefile index 6de2fd7501..0b8f5781e5 100644 --- a/package/kernel/bcm27xx-gpu-fw/Makefile +++ b/package/kernel/bcm27xx-gpu-fw/Makefile @@ -4,7 +4,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=bcm27xx-gpu-fw PKG_VERSION:=2024.10.08 PKG_VERSION_REAL:=1.$(subst .,,$(PKG_VERSION)) -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=raspi-firmware_$(PKG_VERSION_REAL).orig.tar.xz PKG_SOURCE_URL:=https://github.com/raspberrypi/firmware/releases/download/$(PKG_VERSION_REAL) @@ -33,6 +33,10 @@ define Build/Compile true endef +define Package/bcm27xx-gpu-fw/install + true +endef + define Build/InstallDev $(CP) $(PKG_BUILD_DIR)/boot/bootcode.bin $(KERNEL_BUILD_DIR) $(CP) $(PKG_BUILD_DIR)/boot/LICENCE.broadcom $(KERNEL_BUILD_DIR) From e3bbeabe9248938ab506bc55c13ff545a72f1d9b Mon Sep 17 00:00:00 2001 From: Paul Donald Date: Tue, 29 Oct 2024 21:49:00 +0100 Subject: [PATCH 2/8] kernel: KERNEL_NET_L3_MASTER_DEV default to y if !SMALL_FLASH Follow-up for 45d541bb409355f090b971d96ebebd8610ef84a7 This change allows features such as kmod-vrf ``` KERNEL_NET_L3_MASTER_DEV=n x86_64 generic bzImage 6,927,360 bytes aarch64 coretex-a53 kernel 4,268,836 bytes KERNEL_NET_L3_MASTER_DEV=y x86_64 generic bzImage 6,931,456 bytes aarch64 coretex-a53 kernel 4,273,042 bytes Delta: x86_64 generic +4096 bytes aarch64 coretex-a53 +4206 bytes x86_64 generic vrf.ko - 258,792 bytes aarch64 coretex-a53 vrf.ko - 263,632 bytes ``` See: https://forum.openwrt.org/t/vrf-support-testing-out-evpn-at-home/181108 https://forum.openwrt.org/t/please-enable-net-l3-master-dev-in-kernel-build-by-default/201825 Signed-off-by: Paul Donald Link: https://github.com/openwrt/openwrt/pull/16819 Signed-off-by: Robert Marko --- config/Config-kernel.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/Config-kernel.in b/config/Config-kernel.in index 43ed9eaf36..0fa039db40 100644 --- a/config/Config-kernel.in +++ b/config/Config-kernel.in @@ -1187,9 +1187,11 @@ endif config KERNEL_NET_L3_MASTER_DEV bool "L3 Master device support" + default y if !SMALL_FLASH help This module provides glue between core networking code and device drivers to support L3 master devices like VRF. + Increases the compressed kernel size by ~4kB (as of Linux 6.6). config KERNEL_XDP_SOCKETS bool "XDP sockets support" From 92fd12e7fd90ab2dc44b70300eb05c9da4f1f698 Mon Sep 17 00:00:00 2001 From: Kuan-Yi Li Date: Sun, 3 Nov 2024 04:11:36 +0800 Subject: [PATCH 3/8] openwrt-keyring: fix missing 24.10 usign key by installing it MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @KA2107 reported that opkg is not able to verify the artifact signatures produced by buildbot using the usign 24.10 release keys. So lets fix it by actually adding the 24.10 usign key with d310c6f2833e97f7 fingerprint into the openwrt-keyring package. Fixes: #16850 Reported-by: @KA2107 Fixes: a535cfc09e1c ("openwrt-keyring: add OpenWrt 24.10 release build usign key") References: 2d03f27f0f07 ("openwrt-keyring: make opkg use 22.03 usign key") Signed-off-by: Kuan-Yi Li Signed-off-by: Petr Štetiar [commit description] --- package/system/openwrt-keyring/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/system/openwrt-keyring/Makefile b/package/system/openwrt-keyring/Makefile index 029463817b..6c2fa3d108 100644 --- a/package/system/openwrt-keyring/Makefile +++ b/package/system/openwrt-keyring/Makefile @@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openwrt-keyring -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/keyring.git @@ -38,8 +38,8 @@ endef else define Package/openwrt-keyring/install $(INSTALL_DIR) $(1)/etc/opkg/keys/ - # Public usign key for unattended snapshot builds - $(INSTALL_DATA) $(PKG_BUILD_DIR)/usign/b5043e70f9a75cde $(1)/etc/opkg/keys/ + # Public usign key for 24.10 release builds + $(INSTALL_DATA) $(PKG_BUILD_DIR)/usign/d310c6f2833e97f7 $(1)/etc/opkg/keys/ endef endif From 6bc930c47dd612a0933f29426e5765362f54e17b Mon Sep 17 00:00:00 2001 From: "Leon M. Busch-George" Date: Sat, 2 Nov 2024 12:28:51 +0100 Subject: [PATCH 4/8] mediatek: YunCore AX835: fix voltage regulator Specifying GPIO_ACTIVE_HIGH on the GPIO for the voltage regulator doesn't suffice. The regulator itself requires enable-active-high to be set. Fixes: #16292 Signed-off-by: Leon M. Busch-George Link: https://github.com/openwrt/openwrt/pull/16839 Signed-off-by: Robert Marko --- target/linux/mediatek/dts/mt7981b-yuncore-ax835.dts | 1 + 1 file changed, 1 insertion(+) diff --git a/target/linux/mediatek/dts/mt7981b-yuncore-ax835.dts b/target/linux/mediatek/dts/mt7981b-yuncore-ax835.dts index 5f98e6178a..b5de1c34b4 100644 --- a/target/linux/mediatek/dts/mt7981b-yuncore-ax835.dts +++ b/target/linux/mediatek/dts/mt7981b-yuncore-ax835.dts @@ -35,6 +35,7 @@ regulator-name = "led_vbus"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; + enable-active-high; regulator-always-on; gpios = <&pio 5 GPIO_ACTIVE_HIGH>; }; From d92306d020f3672d4fa3fc2e09235265a7547926 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Sun, 3 Nov 2024 09:34:31 +0100 Subject: [PATCH 5/8] mtd: Add backported Winbond fix Upstream stable is slow at picking this up and several systems are regressing. Add the patch locally in OpenWrt. Signed-off-by: Linus Walleij --- ...i-nor-winbond-fix-w25q128-regression.patch | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 target/linux/generic/backport-6.6/409-mtd-spi-nor-winbond-fix-w25q128-regression.patch diff --git a/target/linux/generic/backport-6.6/409-mtd-spi-nor-winbond-fix-w25q128-regression.patch b/target/linux/generic/backport-6.6/409-mtd-spi-nor-winbond-fix-w25q128-regression.patch new file mode 100644 index 0000000000..de79328138 --- /dev/null +++ b/target/linux/generic/backport-6.6/409-mtd-spi-nor-winbond-fix-w25q128-regression.patch @@ -0,0 +1,59 @@ +From 342672bbdf713654316a0ff73c7f2ecf7ea6693d Mon Sep 17 00:00:00 2001 +From: Michael Walle +Date: Fri, 21 Jun 2024 14:09:29 +0200 +Subject: [PATCH] mtd: spi-nor: winbond: fix w25q128 regression + +Upstream commit d35df77707bf5ae1221b5ba1c8a88cf4fcdd4901 + +("mtd: spi-nor: winbond: fix w25q128 regression") +however the code has changed a lot after v6.6 so the patch did +not apply to v6.6 or v6.1 which still has the problem. + +This patch fixes the issue in the way of the old API and has +been tested on hardware. Please apply it for v6.1 and v6.6. + +Commit 83e824a4a595 ("mtd: spi-nor: Correct flags for Winbond w25q128") +removed the flags for non-SFDP devices. It was assumed that it wasn't in +use anymore. This wasn't true. Add the no_sfdp_flags as well as the size +again. + +We add the additional flags for dual and quad read because they have +been reported to work properly by Hartmut using both older and newer +versions of this flash, the similar flashes with 64Mbit and 256Mbit +already have these flags and because it will (luckily) trigger our +legacy SFDP parsing, so newer versions with SFDP support will still get +the parameters from the SFDP tables. + +Reported-by: Hartmut Birr +Closes: https://lore.kernel.org/r/CALxbwRo_-9CaJmt7r7ELgu+vOcgk=xZcGHobnKf=oT2=u4d4aA@mail.gmail.com/ +Fixes: 83e824a4a595 ("mtd: spi-nor: Correct flags for Winbond w25q128") +Reviewed-by: Linus Walleij +Signed-off-by: Michael Walle +Acked-by: Tudor Ambarus +Reviewed-by: Esben Haabendal +Reviewed-by: Pratyush Yadav +Signed-off-by: Pratyush Yadav +Link: https://lore.kernel.org/r/20240621120929.2670185-1-mwalle@kernel.org +[Backported to v6.6 - vastly different due to upstream changes] +Reviewed-by: Tudor Ambarus +Signed-off-by: Linus Walleij +--- + drivers/mtd/spi-nor/winbond.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +--- a/drivers/mtd/spi-nor/winbond.c ++++ b/drivers/mtd/spi-nor/winbond.c +@@ -120,9 +120,10 @@ static const struct flash_info winbond_n + NO_SFDP_FLAGS(SECT_4K) }, + { "w25q80bl", INFO(0xef4014, 0, 64 * 1024, 16) + NO_SFDP_FLAGS(SECT_4K) }, +- { "w25q128", INFO(0xef4018, 0, 0, 0) +- PARSE_SFDP +- FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) }, ++ { "w25q128", INFO(0xef4018, 0, 64 * 1024, 256) ++ FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) ++ NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ | ++ SPI_NOR_QUAD_READ) }, + { "w25q256", INFO(0xef4019, 0, 64 * 1024, 512) + NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) + .fixups = &w25q256_fixups }, From 547feaca2ca7a8d1f81757d6905da3da127139d9 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 2 Aug 2024 14:30:32 -0700 Subject: [PATCH 6/8] gpio-button-hotplug: use flexible array member zero length arrays are deprecated. Fixes coccinelle warning: WARNING use flexible-array member instead Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/16848 Signed-off-by: Robert Marko --- package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c index 1dd0ff2a1a..52346c25d9 100644 --- a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c +++ b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c @@ -302,7 +302,7 @@ struct gpio_keys_button_dev { struct device *dev; struct gpio_keys_platform_data *pdata; - struct gpio_keys_button_data data[0]; + struct gpio_keys_button_data data[]; }; static void gpio_keys_polled_queue_work(struct gpio_keys_button_dev *bdev) From de3d57a60caff8654f600dd6e68023eca242f61b Mon Sep 17 00:00:00 2001 From: Enrico Mioso Date: Mon, 21 Oct 2024 23:39:59 +0200 Subject: [PATCH 7/8] uboot-mediatek: fix boot media for mt7981 RFB NOR profile Signed-off-by: Enrico Mioso CC: Daniel Golle --- package/boot/uboot-mediatek/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/boot/uboot-mediatek/Makefile b/package/boot/uboot-mediatek/Makefile index e5a0a393fe..0376eea8f2 100644 --- a/package/boot/uboot-mediatek/Makefile +++ b/package/boot/uboot-mediatek/Makefile @@ -370,7 +370,7 @@ define U-Boot/mt7981_rfb-nor BUILD_DEVICES:=mediatek_mt7981-rfb UBOOT_CONFIG:=mt7981_nor_rfb UBOOT_IMAGE:=u-boot.fip - BL2_BOOTDEV:=spim-nand + BL2_BOOTDEV:=nor BL2_SOC:=mt7981 BL2_DDRTYPE:=ddr3 DEPENDS:=+trusted-firmware-a-mt7981-nor-ddr3 From a923d1f9eca8393656ec18430366877b196a1583 Mon Sep 17 00:00:00 2001 From: Mauri Sandberg Date: Fri, 11 Oct 2024 10:38:07 +0300 Subject: [PATCH 8/8] ramips: Fix EX400 imagebuilder A factory image for DNA EX400 depends on an initramfs image and they were explicitly removed from the imagebuilder recently. Now the factory image creation fails miserably and it also affects custom image creation with the firmware selector. Add the initramfs kernel to the staging so that it's shipped with the imagebuilder. Also remove a image build target added solely for DNA EX400. Tested by creating a factory and syspupgrade images locally with the imagebuilder and verified their functionality. Related work c85348d9abf4 ("imagebuilder: remove initramfs image files") Fixes: fea2264d9fdd ("ramips: mt7621: Add DNA Valokuitu Plus EX400") Signed-off-by: Mauri Sandberg --- v4: use append-image-stage, remove Build/kernel-initramfs-bin v3: adjust commit subject v2: remove fix for inconsistent line ending elsewhere in the file Link: https://github.com/openwrt/openwrt/pull/16659 Signed-off-by: Robert Marko --- target/linux/ramips/image/mt7621.mk | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index 34ed9a4d54..9654e237a8 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -180,10 +180,6 @@ define Build/iodata-mstc-header2 mv $@.new $@ endef -define Build/kernel-initramfs-bin - $(CP) $(KDIR)/vmlinux-initramfs $@ -endef - define Build/znet-header $(eval version=$(word 1,$(1))) $(eval magic=$(if $(word 2,$(1)),$(word 2,$(1)),ZNET)) @@ -1093,8 +1089,8 @@ define Device/dna_valokuitu-plus-ex400 DEVICE_MODEL := Valokuitu Plus EX400 KERNEL := kernel-bin | lzma | uImage lzma KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | uImage lzma - IMAGES := factory.bin sysupgrade.bin - IMAGE/factory.bin := kernel-initramfs-bin | lzma | uImage lzma | \ + IMAGES += factory.bin + IMAGE/factory.bin := append-image-stage initramfs-kernel.bin | \ dna-bootfs with-initrd | dna-header | \ append-md5sum-ascii-salted IMAGE/sysupgrade.bin := dna-bootfs | sysupgrade-tar kernel=$$$$@ | check-size | \