From 0cdcba238fe61793e14dd0792e16445f0fa07f05 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 23 Dec 2024 14:20:29 -0800 Subject: [PATCH 01/40] ramips: use regulator for USB The DWC2 driver used here supports a vbus-supply property to control the GPIO. Use it instead of the local gpio,exports solution. Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/17357 Signed-off-by: Robert Marko --- .../linux/ramips/dts/rt3052_accton_wr6202.dts | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/target/linux/ramips/dts/rt3052_accton_wr6202.dts b/target/linux/ramips/dts/rt3052_accton_wr6202.dts index 685f596177..b459894d0d 100644 --- a/target/linux/ramips/dts/rt3052_accton_wr6202.dts +++ b/target/linux/ramips/dts/rt3052_accton_wr6202.dts @@ -94,15 +94,12 @@ }; }; - gpio_export { - compatible = "gpio-export"; - #size-cells = <0>; - - usb { - gpio-export,name = "usb"; - gpio-export,output = <0>; - gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; - }; + reg_usb_power: regulator { + compatible = "regulator-fixed"; + regulator-name = "usb_power"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; }; }; @@ -129,4 +126,6 @@ &otg { status = "okay"; + + vbus-supply = <®_usb_power>; }; From 17cfcaa754cb818a56012ae3cd716d4d8f0e575b Mon Sep 17 00:00:00 2001 From: Rui Salvaterra Date: Sat, 1 Feb 2025 18:38:37 +0000 Subject: [PATCH 02/40] generic: enable CONFIG_USB_NET_DRIVERS This is only relevant for devices with USB support, and in itself changes nothing in the kernel build. However, it is useful to further simplify the dependencies of some USB network devices. Signed-off-by: Rui Salvaterra --- target/linux/generic/config-6.6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/generic/config-6.6 b/target/linux/generic/config-6.6 index ce2dc48dde..78f8b1e5cc 100644 --- a/target/linux/generic/config-6.6 +++ b/target/linux/generic/config-6.6 @@ -6966,7 +6966,7 @@ CONFIG_USB_GADGET_VBUS_DRAW=2 # CONFIG_USB_NET_CH9200 is not set # CONFIG_USB_NET_CX82310_ETH is not set # CONFIG_USB_NET_DM9601 is not set -# CONFIG_USB_NET_DRIVERS is not set +CONFIG_USB_NET_DRIVERS=y # CONFIG_USB_NET_GL620A is not set # CONFIG_USB_NET_HUAWEI_CDC_NCM is not set # CONFIG_USB_NET_INT51X1 is not set From 979938b99f1c43a2125763ec3042d53085bdbaf4 Mon Sep 17 00:00:00 2001 From: Rui Salvaterra Date: Sat, 1 Feb 2025 18:48:29 +0000 Subject: [PATCH 03/40] kernel: usb: simplify usb-net kconfig Now that CONFIG_USB_NET_DRIVERS is unconditionally enabled, remove it from the usb-net kconfig symbol list. Signed-off-by: Rui Salvaterra --- package/kernel/linux/modules/usb.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk index 481d2be59a..84a6354183 100644 --- a/package/kernel/linux/modules/usb.mk +++ b/package/kernel/linux/modules/usb.mk @@ -1178,8 +1178,7 @@ $(eval $(call KernelPackage,usb-atm-cxacru)) define KernelPackage/usb-net TITLE:=Kernel modules for USB-to-Ethernet convertors DEPENDS:=+kmod-mii - KCONFIG:=CONFIG_USB_USBNET \ - CONFIG_USB_NET_DRIVERS + KCONFIG:=CONFIG_USB_USBNET AUTOLOAD:=$(call AutoProbe,usbnet) FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/usbnet.ko $(call AddDepends/usb) From 371cad4f28ffc257a814a53b7bb3be323908f567 Mon Sep 17 00:00:00 2001 From: Rui Salvaterra Date: Sat, 1 Feb 2025 18:51:42 +0000 Subject: [PATCH 04/40] kernel: usb: simplify r8152 dependencies It doesn't depend on either usb-net or usb-net-cdc-ncm. It does, however, depend on mii. Fix thusly, and make it depend explicitly on usb, not usb-net. While at it, add a conditional dependency on libphy, for future kernel versions. Signed-off-by: Rui Salvaterra --- package/kernel/linux/modules/usb.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk index 84a6354183..3f19ea5017 100644 --- a/package/kernel/linux/modules/usb.mk +++ b/package/kernel/linux/modules/usb.mk @@ -1451,11 +1451,11 @@ $(eval $(call KernelPackage,usb-net-rtl8150)) define KernelPackage/usb-net-rtl8152 TITLE:=Kernel module for USB-to-Ethernet Realtek convertors - DEPENDS:=+r8152-firmware +kmod-crypto-sha256 +kmod-usb-net-cdc-ncm + DEPENDS:=+r8152-firmware +kmod-crypto-sha256 +kmod-mii +!LINUX_6_6:kmod-libphy KCONFIG:=CONFIG_USB_RTL8152 FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/r8152.ko AUTOLOAD:=$(call AutoProbe,r8152) - $(call AddDepends/usb-net) + $(call AddDepends/usb) endef define KernelPackage/usb-net-rtl8152/description From aa40ee2e676b350cb816089c1da7fece8638a047 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Mon, 10 Mar 2025 21:38:30 +0800 Subject: [PATCH 05/40] mediatek: assign 5ghz mac with nvmem for cmcc rax3000m Signed-off-by: Tianling Shen --- .../mediatek/dts/mt7981b-cmcc-rax3000m-emmc.dtso | 14 +++++++++++++- .../mediatek/dts/mt7981b-cmcc-rax3000m-nand.dtso | 14 +++++++++++++- .../etc/hotplug.d/ieee80211/11_fix_wifi_mac | 5 ----- 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m-emmc.dtso b/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m-emmc.dtso index dabd4e4327..aeaefd68ab 100644 --- a/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m-emmc.dtso +++ b/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m-emmc.dtso @@ -4,7 +4,7 @@ /plugin/; / { - compatible = "cmcc,rax3000m", "cmcc,rax3000me","mediatek,mt7981"; + compatible = "cmcc,rax3000m", "cmcc,rax3000me", "mediatek,mt7981"; fragment@0 { target = <&chosen>; @@ -63,6 +63,12 @@ reg = <0x0 0x1000>; }; + macaddr_factory_a: macaddr@a { + compatible = "mac-base"; + reg = <0xa 0x6>; + #nvmem-cell-cells = <1>; + }; + macaddr_factory_24: macaddr@24 { compatible = "mac-base"; reg = <0x24 0x6>; @@ -110,6 +116,12 @@ __overlay__ { nvmem-cells = <&eeprom_factory_0>; nvmem-cell-names = "eeprom"; + + band@1 { + reg = <1>; + nvmem-cells = <&macaddr_factory_a 0>; + nvmem-cell-names = "mac-address"; + }; }; }; }; diff --git a/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m-nand.dtso b/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m-nand.dtso index fad02497a1..ff4aef66eb 100644 --- a/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m-nand.dtso +++ b/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m-nand.dtso @@ -4,7 +4,7 @@ /plugin/; / { - compatible = "cmcc,rax3000m", "cmcc,rax3000me","mediatek,mt7981"; + compatible = "cmcc,rax3000m", "cmcc,rax3000me", "mediatek,mt7981"; fragment@0 { target = <&chosen>; @@ -100,6 +100,12 @@ reg = <0x0 0x1000>; }; + macaddr_factory_a: macaddr@a { + compatible = "mac-base"; + reg = <0xa 0x6>; + #nvmem-cell-cells = <1>; + }; + macaddr_factory_24: macaddr@24 { compatible = "mac-base"; reg = <0x24 0x6>; @@ -141,6 +147,12 @@ __overlay__ { nvmem-cells = <&eeprom_factory_0>; nvmem-cell-names = "eeprom"; + + band@1 { + reg = <1>; + nvmem-cells = <&macaddr_factory_a 0>; + nvmem-cell-names = "mac-address"; + }; }; }; }; diff --git a/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac b/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac index d9893439c2..746b6df65c 100644 --- a/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac +++ b/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac @@ -60,11 +60,6 @@ case "$board" in [ "$PHYNBR" = "1" ] && macaddr_add $addr 3 > /sys${DEVPATH}/macaddress [ "$PHYNBR" = "2" ] && macaddr_add $addr 4 > /sys${DEVPATH}/macaddress ;; - cmcc,rax3000m|\ - cmcc,rax3000me) - addr=$(cat /sys/class/net/eth0/address) - [ "$PHYNBR" = "1" ] && macaddr_add $addr -1 > /sys${DEVPATH}/macaddress - ;; comfast,cf-e393ax) addr=$(mtd_get_mac_binary "Factory" 0x8000) [ "$PHYNBR" = "1" ] && macaddr_add $addr 1 > /sys${DEVPATH}/macaddress From fe47089878d5b83e56b73cce4eb053fe412cde9f Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Sat, 8 Mar 2025 20:39:28 +0100 Subject: [PATCH 06/40] libxml2: update to 2.13.6 Release Notes: https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.13.5 https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.13.6 Fixes: CVE-2025-24928 CVE-2024-56171 Link: https://github.com/openwrt/openwrt/pull/18194 Signed-off-by: Nick Hainke --- package/libs/libxml2/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libs/libxml2/Makefile b/package/libs/libxml2/Makefile index c2a804b98f..bcc16783d6 100644 --- a/package/libs/libxml2/Makefile +++ b/package/libs/libxml2/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libxml2 -PKG_VERSION:=2.13.4 +PKG_VERSION:=2.13.6 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNOME/libxml2/$(basename $(PKG_VERSION)) -PKG_HASH:=65d042e1c8010243e617efb02afda20b85c2160acdbfbcb5b26b80cec6515650 +PKG_HASH:=f453480307524968f7a04ec65e64f2a83a825973bcd260a2e7691be82ae70c96 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=COPYING From 79aae6ff429094481fc3835f26267632cb9921bf Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Sat, 8 Mar 2025 20:17:19 +0100 Subject: [PATCH 07/40] libnl: update to 3.11.0 Changes: c7edc38f libnl-3.11.0 release b75e27de lib/route: add support for bridge msti 8a73b245 lib/route: add support for bridge info boolopts 3b284a11 lib/route: extend bridge info support a43a41cd lib/route: add missing bridge info getter functions 756d5161 lib/route: add missing entry in libnl-route-3.sym file 014c33a6 lib/route: add rtnl_neigh ext flags support acf572b5 route: add support for getting permanent mac address of link afafe78a lib/route: extend bridge flags 11597b73 xfrm: remove redundant check in xfrm_sa_update_cache() 2abfb089 xfrm: use the new _nl_auto_nl_object helper 831e9868 cache: use the new _nl_auto_nl_object helper 4b9daa6d add _nl_auto_nl_object helper 379a1405 black: fix "target-version" in "pyproject.toml" 8460c9b7 link/bonding: implement parsing link type d60535c9 link/bonding: implement comparing bond links 22b6cf5c link/bonding: implement io_clone() e1c75bff link/bonding: add getters for attributes ee4612ca link/bonding: rename bn_mask to ce_mask 81c40cbb tests: optimize _nltst_assert_route_list_permutate() to short cut search through permutations 9f5fac78 tests: in _nltst_assert_route_list() accept arbitrary order 01f06b57 base: add _nl_swap() helper macro 5b570259 tests: ensure that there are all expected routes in _nltst_assert_route_list() 1aa16ea9 tests: print route list before failure in _nltst_assert_route_list() 7f099cf0 tests: add _nltst_objects_to_string() helper e76d5697 tests: add _nltst_malloc0() and _nltst_sprintf() helpers d94a3e81 tests: move definition of asserts in "tests/nl-test-util.h" 798278ea tests: use _nl_ptrarray_len() helper in _nltst_assert_route_list() def89a2c base: add _nl_ptrarray_len() helper 64fad14b link: link_msg_parser(): keep link info instead of release and reacquire b8d3cfb2 lib/attr: add nla functions for variable-length integers 2ae88c48 lib/attr: add NLA_{SINT|UINT} attribute types Link: https://github.com/openwrt/openwrt/pull/18193 Signed-off-by: Nick Hainke --- package/libs/libnl/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libs/libnl/Makefile b/package/libs/libnl/Makefile index f8f45e0713..f83a5ac684 100644 --- a/package/libs/libnl/Makefile +++ b/package/libs/libnl/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libnl -PKG_VERSION:=3.10.0 +PKG_VERSION:=3.11.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/thom311/libnl/releases/download/libnl$(subst .,_,$(PKG_VERSION)) -PKG_HASH:=49b3e2235fdb58f5910bbb3ed0de8143b71ffc220571540502eb6c2471f204f5 +PKG_HASH:=2a56e1edefa3e68a7c00879496736fdbf62fc94ed3232c0baba127ecfa76874d PKG_LICENSE:=LGPL-2.1 PKG_LICENSE_FILES:=COPYING From bbe58f9830b38e171541db3eb9bc80ccc9428286 Mon Sep 17 00:00:00 2001 From: Martin Schiller Date: Mon, 10 Mar 2025 08:42:18 +0100 Subject: [PATCH 08/40] generic: net: phy: sfp: backport some FS copper SFP fixes This fixes the handling of some FS copper SFP modules using the RollBall protocol and needing some extra treatment. Signed-off-by: Martin Schiller --- ...rework-the-RollBall-PHY-waiting-code.patch | 134 ++++++++++++++++++ ...HY-discovery-for-FS-SFP-10G-T-module.patch | 85 +++++++++++ ...pdate-comment-for-FS-SFP-10G-T-quirk.patch | 36 +++++ ...or-Fibrestore-2.5G-copper-SFP-module.patch | 77 ++++++++++ ...-for-FS-SFP-10GM-T-copper-SFP-module.patch | 50 +++++++ .../790-SFP-GE-T-ignore-TX_FAULT.patch | 10 +- ...sfp-re-probe-modules-on-DEV_UP-event.patch | 4 +- ...14-net-phy-sfp-add-support-for-SMBus.patch | 6 +- 8 files changed, 392 insertions(+), 10 deletions(-) create mode 100644 target/linux/generic/backport-6.6/785-01-v6.8-net-sfp-rework-the-RollBall-PHY-waiting-code.patch create mode 100644 target/linux/generic/backport-6.6/785-02-v6.8-net-sfp-fix-PHY-discovery-for-FS-SFP-10G-T-module.patch create mode 100644 target/linux/generic/backport-6.6/785-03-v6.10-net-sfp-update-comment-for-FS-SFP-10G-T-quirk.patch create mode 100644 target/linux/generic/backport-6.6/785-04-v6.10-net-sfp-enhance-quirk-for-Fibrestore-2.5G-copper-SFP-module.patch create mode 100644 target/linux/generic/backport-6.6/785-05-v6.15-net-sfp-add-quirk-for-FS-SFP-10GM-T-copper-SFP-module.patch diff --git a/target/linux/generic/backport-6.6/785-01-v6.8-net-sfp-rework-the-RollBall-PHY-waiting-code.patch b/target/linux/generic/backport-6.6/785-01-v6.8-net-sfp-rework-the-RollBall-PHY-waiting-code.patch new file mode 100644 index 0000000000..c1721b3b13 --- /dev/null +++ b/target/linux/generic/backport-6.6/785-01-v6.8-net-sfp-rework-the-RollBall-PHY-waiting-code.patch @@ -0,0 +1,134 @@ +From 2f3ce7a56c6e02bc0b258507f3a82b7511f62f9e Mon Sep 17 00:00:00 2001 +From: Marek Behún +Date: Tue, 21 Nov 2023 18:20:24 +0100 +Subject: net: sfp: rework the RollBall PHY waiting code +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +RollBall SFP modules allow the access to PHY registers only after a +certain time has passed. Until then, the registers read 0xffff. + +Currently we have quirks for modules where we need to wait either 25 +seconds or 4 seconds, but recently I got hands on another module where +the wait is even shorter. + +Instead of hardcoding different wait times, lets rework the code: +- increase the PHY retry count to 25 +- when RollBall module is detected, increase the PHY retry time from + 50ms to 1s + +Signed-off-by: Marek Behún +Reviewed-by: Andrew Lunn +Signed-off-by: David S. Miller +--- + drivers/net/phy/sfp.c | 41 +++++++++++++++++++++-------------------- + 1 file changed, 21 insertions(+), 20 deletions(-) + +--- a/drivers/net/phy/sfp.c ++++ b/drivers/net/phy/sfp.c +@@ -191,7 +191,7 @@ static const enum gpiod_flags gpio_flags + * R_PHY_RETRY is the number of attempts. + */ + #define T_PHY_RETRY msecs_to_jiffies(50) +-#define R_PHY_RETRY 12 ++#define R_PHY_RETRY 25 + + /* SFP module presence detection is poor: the three MOD DEF signals are + * the same length on the PCB, which means it's possible for MOD DEF 0 to +@@ -273,7 +273,7 @@ struct sfp { + struct sfp_eeprom_id id; + unsigned int module_power_mW; + unsigned int module_t_start_up; +- unsigned int module_t_wait; ++ unsigned int phy_t_retry; + + unsigned int rate_kbd; + unsigned int rs_threshold_kbd; +@@ -357,18 +357,22 @@ static void sfp_fixup_10gbaset_30m(struc + sfp->id.base.extended_cc = SFF8024_ECC_10GBASE_T_SR; + } + +-static void sfp_fixup_rollball_proto(struct sfp *sfp, unsigned int secs) ++static void sfp_fixup_rollball(struct sfp *sfp) + { + sfp->mdio_protocol = MDIO_I2C_ROLLBALL; +- sfp->module_t_wait = msecs_to_jiffies(secs * 1000); ++ ++ /* RollBall modules may disallow access to PHY registers for up to 25 ++ * seconds, and the reads return 0xffff before that. Increase the time ++ * between PHY probe retries from 50ms to 1s so that we will wait for ++ * the PHY for a sufficient amount of time. ++ */ ++ sfp->phy_t_retry = msecs_to_jiffies(1000); + } + + static void sfp_fixup_fs_10gt(struct sfp *sfp) + { + sfp_fixup_10gbaset_30m(sfp); +- +- // These SFPs need 4 seconds before the PHY can be accessed +- sfp_fixup_rollball_proto(sfp, 4); ++ sfp_fixup_rollball(sfp); + } + + static void sfp_fixup_halny_gsfp(struct sfp *sfp) +@@ -380,12 +384,6 @@ static void sfp_fixup_halny_gsfp(struct + sfp->state_hw_mask &= ~(SFP_F_TX_FAULT | SFP_F_LOS); + } + +-static void sfp_fixup_rollball(struct sfp *sfp) +-{ +- // Rollball SFPs need 25 seconds before the PHY can be accessed +- sfp_fixup_rollball_proto(sfp, 25); +-} +- + static void sfp_fixup_rollball_cc(struct sfp *sfp) + { + sfp_fixup_rollball(sfp); +@@ -2319,7 +2317,7 @@ static int sfp_sm_mod_probe(struct sfp * + mask |= SFP_F_RS1; + + sfp->module_t_start_up = T_START_UP; +- sfp->module_t_wait = T_WAIT; ++ sfp->phy_t_retry = T_PHY_RETRY; + + sfp->tx_fault_ignore = false; + +@@ -2553,10 +2551,9 @@ static void sfp_sm_main(struct sfp *sfp, + + /* We need to check the TX_FAULT state, which is not defined + * while TX_DISABLE is asserted. The earliest we want to do +- * anything (such as probe for a PHY) is 50ms (or more on +- * specific modules). ++ * anything (such as probe for a PHY) is 50ms. + */ +- sfp_sm_next(sfp, SFP_S_WAIT, sfp->module_t_wait); ++ sfp_sm_next(sfp, SFP_S_WAIT, T_WAIT); + break; + + case SFP_S_WAIT: +@@ -2570,8 +2567,8 @@ static void sfp_sm_main(struct sfp *sfp, + * deasserting. + */ + timeout = sfp->module_t_start_up; +- if (timeout > sfp->module_t_wait) +- timeout -= sfp->module_t_wait; ++ if (timeout > T_WAIT) ++ timeout -= T_WAIT; + else + timeout = 1; + +@@ -2614,7 +2611,11 @@ static void sfp_sm_main(struct sfp *sfp, + ret = sfp_sm_probe_for_phy(sfp); + if (ret == -ENODEV) { + if (--sfp->sm_phy_retries) { +- sfp_sm_next(sfp, SFP_S_INIT_PHY, T_PHY_RETRY); ++ sfp_sm_next(sfp, SFP_S_INIT_PHY, ++ sfp->phy_t_retry); ++ dev_dbg(sfp->dev, ++ "no PHY detected, %u tries left\n", ++ sfp->sm_phy_retries); + break; + } else { + dev_info(sfp->dev, "no PHY detected\n"); diff --git a/target/linux/generic/backport-6.6/785-02-v6.8-net-sfp-fix-PHY-discovery-for-FS-SFP-10G-T-module.patch b/target/linux/generic/backport-6.6/785-02-v6.8-net-sfp-fix-PHY-discovery-for-FS-SFP-10G-T-module.patch new file mode 100644 index 0000000000..234e5a1e44 --- /dev/null +++ b/target/linux/generic/backport-6.6/785-02-v6.8-net-sfp-fix-PHY-discovery-for-FS-SFP-10G-T-module.patch @@ -0,0 +1,85 @@ +From e9301af385e7864dea353f5e58cad7339dd6c718 Mon Sep 17 00:00:00 2001 +From: Marek Behún +Date: Tue, 19 Dec 2023 17:24:15 +0100 +Subject: net: sfp: fix PHY discovery for FS SFP-10G-T module +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Commit 2f3ce7a56c6e ("net: sfp: rework the RollBall PHY waiting code") +changed the long wait before accessing RollBall / FS modules into +probing for PHY every 1 second, and trying 25 times. + +Wei Lei reports that this does not work correctly on FS modules: when +initializing, they may report values different from 0xffff in PHY ID +registers for some MMDs, causing get_phy_c45_ids() to find some bogus +MMD. + +Fix this by adding the module_t_wait member back, and setting it to 4 +seconds for FS modules. + +Fixes: 2f3ce7a56c6e ("net: sfp: rework the RollBall PHY waiting code") +Reported-by: Wei Lei +Signed-off-by: Marek Behún +Tested-by: Lei Wei +Reviewed-by: Andrew Lunn +Signed-off-by: David S. Miller +--- + drivers/net/phy/sfp.c | 17 +++++++++++++---- + 1 file changed, 13 insertions(+), 4 deletions(-) + +--- a/drivers/net/phy/sfp.c ++++ b/drivers/net/phy/sfp.c +@@ -273,6 +273,7 @@ struct sfp { + struct sfp_eeprom_id id; + unsigned int module_power_mW; + unsigned int module_t_start_up; ++ unsigned int module_t_wait; + unsigned int phy_t_retry; + + unsigned int rate_kbd; +@@ -373,6 +374,12 @@ static void sfp_fixup_fs_10gt(struct sfp + { + sfp_fixup_10gbaset_30m(sfp); + sfp_fixup_rollball(sfp); ++ ++ /* The RollBall fixup is not enough for FS modules, the AQR chip inside ++ * them does not return 0xffff for PHY ID registers in all MMDs for the ++ * while initializing. They need a 4 second wait before accessing PHY. ++ */ ++ sfp->module_t_wait = msecs_to_jiffies(4000); + } + + static void sfp_fixup_halny_gsfp(struct sfp *sfp) +@@ -2317,6 +2324,7 @@ static int sfp_sm_mod_probe(struct sfp * + mask |= SFP_F_RS1; + + sfp->module_t_start_up = T_START_UP; ++ sfp->module_t_wait = T_WAIT; + sfp->phy_t_retry = T_PHY_RETRY; + + sfp->tx_fault_ignore = false; +@@ -2551,9 +2559,10 @@ static void sfp_sm_main(struct sfp *sfp, + + /* We need to check the TX_FAULT state, which is not defined + * while TX_DISABLE is asserted. The earliest we want to do +- * anything (such as probe for a PHY) is 50ms. ++ * anything (such as probe for a PHY) is 50ms (or more on ++ * specific modules). + */ +- sfp_sm_next(sfp, SFP_S_WAIT, T_WAIT); ++ sfp_sm_next(sfp, SFP_S_WAIT, sfp->module_t_wait); + break; + + case SFP_S_WAIT: +@@ -2567,8 +2576,8 @@ static void sfp_sm_main(struct sfp *sfp, + * deasserting. + */ + timeout = sfp->module_t_start_up; +- if (timeout > T_WAIT) +- timeout -= T_WAIT; ++ if (timeout > sfp->module_t_wait) ++ timeout -= sfp->module_t_wait; + else + timeout = 1; + diff --git a/target/linux/generic/backport-6.6/785-03-v6.10-net-sfp-update-comment-for-FS-SFP-10G-T-quirk.patch b/target/linux/generic/backport-6.6/785-03-v6.10-net-sfp-update-comment-for-FS-SFP-10G-T-quirk.patch new file mode 100644 index 0000000000..f9e5019e94 --- /dev/null +++ b/target/linux/generic/backport-6.6/785-03-v6.10-net-sfp-update-comment-for-FS-SFP-10G-T-quirk.patch @@ -0,0 +1,36 @@ +From 6999e0fc9a552ce98fcc66bee3dca7e55fba0ed3 Mon Sep 17 00:00:00 2001 +From: Marek Behún +Date: Tue, 23 Apr 2024 10:50:38 +0200 +Subject: net: sfp: update comment for FS SFP-10G-T quirk +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Update the comment for the Fibrestore SFP-10G-T module: since commit +e9301af385e7 ("net: sfp: fix PHY discovery for FS SFP-10G-T module") +we also do a 4 second wait before probing the PHY. + +Fixes: e9301af385e7 ("net: sfp: fix PHY discovery for FS SFP-10G-T module") +Signed-off-by: Marek Behún +Reviewed-by: Andrew Lunn +Reviewed-by: Jiri Pirko +Link: https://lore.kernel.org/r/20240423085039.26957-1-kabel@kernel.org +Signed-off-by: Jakub Kicinski +--- + drivers/net/phy/sfp.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +--- a/drivers/net/phy/sfp.c ++++ b/drivers/net/phy/sfp.c +@@ -454,8 +454,9 @@ static const struct sfp_quirk sfp_quirks + SFP_QUIRK("ALCATELLUCENT", "3FE46541AA", sfp_quirk_2500basex, + sfp_fixup_long_startup), + +- // Fiberstore SFP-10G-T doesn't identify as copper, and uses the +- // Rollball protocol to talk to the PHY. ++ // Fiberstore SFP-10G-T doesn't identify as copper, uses the Rollball ++ // protocol to talk to the PHY and needs 4 sec wait before probing the ++ // PHY. + SFP_QUIRK_F("FS", "SFP-10G-T", sfp_fixup_fs_10gt), + + // Fiberstore GPON-ONU-34-20BI can operate at 2500base-X, but report 1.2GBd diff --git a/target/linux/generic/backport-6.6/785-04-v6.10-net-sfp-enhance-quirk-for-Fibrestore-2.5G-copper-SFP-module.patch b/target/linux/generic/backport-6.6/785-04-v6.10-net-sfp-enhance-quirk-for-Fibrestore-2.5G-copper-SFP-module.patch new file mode 100644 index 0000000000..6b83d3db1d --- /dev/null +++ b/target/linux/generic/backport-6.6/785-04-v6.10-net-sfp-enhance-quirk-for-Fibrestore-2.5G-copper-SFP-module.patch @@ -0,0 +1,77 @@ +From cd4a32e60061789676f7f018a94fcc9ec56732a0 Mon Sep 17 00:00:00 2001 +From: Marek Behún +Date: Tue, 23 Apr 2024 10:50:39 +0200 +Subject: net: sfp: enhance quirk for Fibrestore 2.5G copper SFP module +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Enhance the quirk for Fibrestore 2.5G copper SFP module. The original +commit e27aca3760c0 ("net: sfp: add quirk for FS's 2.5G copper SFP") +introducing the quirk says that the PHY is inaccessible, but that is +not true. + +The module uses Rollball protocol to talk to the PHY, and needs a 4 +second wait before probing it, same as FS 10G module. + +The PHY inside the module is Realtek RTL8221B-VB-CG PHY. The realtek +driver recently gained support to set it up via clause 45 accesses. + +Signed-off-by: Marek Behún +Reviewed-by: Jiri Pirko +Link: https://lore.kernel.org/r/20240423085039.26957-2-kabel@kernel.org +Signed-off-by: Jakub Kicinski +--- + drivers/net/phy/sfp.c | 18 ++++++++++++------ + 1 file changed, 12 insertions(+), 6 deletions(-) + +--- a/drivers/net/phy/sfp.c ++++ b/drivers/net/phy/sfp.c +@@ -370,18 +370,23 @@ static void sfp_fixup_rollball(struct sf + sfp->phy_t_retry = msecs_to_jiffies(1000); + } + +-static void sfp_fixup_fs_10gt(struct sfp *sfp) ++static void sfp_fixup_fs_2_5gt(struct sfp *sfp) + { +- sfp_fixup_10gbaset_30m(sfp); + sfp_fixup_rollball(sfp); + +- /* The RollBall fixup is not enough for FS modules, the AQR chip inside ++ /* The RollBall fixup is not enough for FS modules, the PHY chip inside + * them does not return 0xffff for PHY ID registers in all MMDs for the + * while initializing. They need a 4 second wait before accessing PHY. + */ + sfp->module_t_wait = msecs_to_jiffies(4000); + } + ++static void sfp_fixup_fs_10gt(struct sfp *sfp) ++{ ++ sfp_fixup_10gbaset_30m(sfp); ++ sfp_fixup_fs_2_5gt(sfp); ++} ++ + static void sfp_fixup_halny_gsfp(struct sfp *sfp) + { + /* Ignore the TX_FAULT and LOS signals on this module. +@@ -459,6 +464,10 @@ static const struct sfp_quirk sfp_quirks + // PHY. + SFP_QUIRK_F("FS", "SFP-10G-T", sfp_fixup_fs_10gt), + ++ // Fiberstore SFP-2.5G-T uses Rollball protocol to talk to the PHY and ++ // needs 4 sec wait before probing the PHY. ++ SFP_QUIRK_F("FS", "SFP-2.5G-T", sfp_fixup_fs_2_5gt), ++ + // Fiberstore GPON-ONU-34-20BI can operate at 2500base-X, but report 1.2GBd + // NRZ in their EEPROM + SFP_QUIRK("FS", "GPON-ONU-34-20BI", sfp_quirk_2500basex, +@@ -475,9 +484,6 @@ static const struct sfp_quirk sfp_quirks + SFP_QUIRK("HUAWEI", "MA5671A", sfp_quirk_2500basex, + sfp_fixup_ignore_tx_fault), + +- // FS 2.5G Base-T +- SFP_QUIRK_M("FS", "SFP-2.5G-T", sfp_quirk_oem_2_5g), +- + // Lantech 8330-262D-E can operate at 2500base-X, but incorrectly report + // 2500MBd NRZ in their EEPROM + SFP_QUIRK_M("Lantech", "8330-262D-E", sfp_quirk_2500basex), diff --git a/target/linux/generic/backport-6.6/785-05-v6.15-net-sfp-add-quirk-for-FS-SFP-10GM-T-copper-SFP-module.patch b/target/linux/generic/backport-6.6/785-05-v6.15-net-sfp-add-quirk-for-FS-SFP-10GM-T-copper-SFP-module.patch new file mode 100644 index 0000000000..37657612d7 --- /dev/null +++ b/target/linux/generic/backport-6.6/785-05-v6.15-net-sfp-add-quirk-for-FS-SFP-10GM-T-copper-SFP-module.patch @@ -0,0 +1,50 @@ +From 05ec5c085eb7ae044d49e04a3cff194a0b2a3251 Mon Sep 17 00:00:00 2001 +From: Martin Schiller +Date: Thu, 27 Feb 2025 08:10:58 +0100 +Subject: net: sfp: add quirk for FS SFP-10GM-T copper SFP+ module + +Add quirk for a copper SFP that identifies itself as "FS" "SFP-10GM-T". +It uses RollBall protocol to talk to the PHY and needs 4 sec wait before +probing the PHY. + +Signed-off-by: Martin Schiller +Link: https://patch.msgid.link/20250227071058.1520027-1-ms@dev.tdt.de +Signed-off-by: Jakub Kicinski +--- + drivers/net/phy/sfp.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +--- a/drivers/net/phy/sfp.c ++++ b/drivers/net/phy/sfp.c +@@ -370,7 +370,7 @@ static void sfp_fixup_rollball(struct sf + sfp->phy_t_retry = msecs_to_jiffies(1000); + } + +-static void sfp_fixup_fs_2_5gt(struct sfp *sfp) ++static void sfp_fixup_rollball_wait4s(struct sfp *sfp) + { + sfp_fixup_rollball(sfp); + +@@ -384,7 +384,7 @@ static void sfp_fixup_fs_2_5gt(struct sf + static void sfp_fixup_fs_10gt(struct sfp *sfp) + { + sfp_fixup_10gbaset_30m(sfp); +- sfp_fixup_fs_2_5gt(sfp); ++ sfp_fixup_rollball_wait4s(sfp); + } + + static void sfp_fixup_halny_gsfp(struct sfp *sfp) +@@ -464,9 +464,10 @@ static const struct sfp_quirk sfp_quirks + // PHY. + SFP_QUIRK_F("FS", "SFP-10G-T", sfp_fixup_fs_10gt), + +- // Fiberstore SFP-2.5G-T uses Rollball protocol to talk to the PHY and +- // needs 4 sec wait before probing the PHY. +- SFP_QUIRK_F("FS", "SFP-2.5G-T", sfp_fixup_fs_2_5gt), ++ // Fiberstore SFP-2.5G-T and SFP-10GM-T uses Rollball protocol to talk ++ // to the PHY and needs 4 sec wait before probing the PHY. ++ SFP_QUIRK_F("FS", "SFP-2.5G-T", sfp_fixup_rollball_wait4s), ++ SFP_QUIRK_F("FS", "SFP-10GM-T", sfp_fixup_rollball_wait4s), + + // Fiberstore GPON-ONU-34-20BI can operate at 2500base-X, but report 1.2GBd + // NRZ in their EEPROM diff --git a/target/linux/generic/hack-6.6/790-SFP-GE-T-ignore-TX_FAULT.patch b/target/linux/generic/hack-6.6/790-SFP-GE-T-ignore-TX_FAULT.patch index 1d6bc6ee07..b125e93aaf 100644 --- a/target/linux/generic/hack-6.6/790-SFP-GE-T-ignore-TX_FAULT.patch +++ b/target/linux/generic/hack-6.6/790-SFP-GE-T-ignore-TX_FAULT.patch @@ -26,9 +26,9 @@ Signed-off-by: Daniel Golle --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c -@@ -472,6 +472,9 @@ static const struct sfp_quirk sfp_quirks - // FS 2.5G Base-T - SFP_QUIRK_M("FS", "SFP-2.5G-T", sfp_quirk_oem_2_5g), +@@ -485,6 +485,9 @@ static const struct sfp_quirk sfp_quirks + SFP_QUIRK("HUAWEI", "MA5671A", sfp_quirk_2500basex, + sfp_fixup_ignore_tx_fault), + // OEM SFP-GE-T is 1000Base-T module + SFP_QUIRK_F("OEM", "SFP-GE-T", sfp_fixup_ignore_tx_fault), @@ -36,7 +36,7 @@ Signed-off-by: Daniel Golle // Lantech 8330-262D-E can operate at 2500base-X, but incorrectly report // 2500MBd NRZ in their EEPROM SFP_QUIRK_M("Lantech", "8330-262D-E", sfp_quirk_2500basex), -@@ -2590,7 +2593,8 @@ static void sfp_sm_main(struct sfp *sfp, +@@ -2604,7 +2607,8 @@ static void sfp_sm_main(struct sfp *sfp, * or t_start_up, so assume there is a fault. */ sfp_sm_fault(sfp, SFP_S_INIT_TX_FAULT, @@ -46,7 +46,7 @@ Signed-off-by: Daniel Golle } else if (event == SFP_E_TIMEOUT || event == SFP_E_TX_CLEAR) { init_done: /* Create mdiobus and start trying for PHY */ -@@ -2844,10 +2848,12 @@ static void sfp_check_state(struct sfp * +@@ -2862,10 +2866,12 @@ static void sfp_check_state(struct sfp * mutex_lock(&sfp->st_mutex); state = sfp_get_state(sfp); changed = state ^ sfp->state; diff --git a/target/linux/realtek/patches-6.6/710-net-phy-sfp-re-probe-modules-on-DEV_UP-event.patch b/target/linux/realtek/patches-6.6/710-net-phy-sfp-re-probe-modules-on-DEV_UP-event.patch index 26216691e4..3ec0dcd07b 100644 --- a/target/linux/realtek/patches-6.6/710-net-phy-sfp-re-probe-modules-on-DEV_UP-event.patch +++ b/target/linux/realtek/patches-6.6/710-net-phy-sfp-re-probe-modules-on-DEV_UP-event.patch @@ -10,7 +10,7 @@ Signed-off-by: Antoine Tenart --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c -@@ -1557,6 +1557,10 @@ static void sfp_hwmon_probe(struct work_ +@@ -1570,6 +1570,10 @@ static void sfp_hwmon_probe(struct work_ struct sfp *sfp = container_of(work, struct sfp, hwmon_probe.work); int err; @@ -21,7 +21,7 @@ Signed-off-by: Antoine Tenart /* hwmon interface needs to access 16bit registers in atomic way to * guarantee coherency of the diagnostic monitoring data. If it is not * possible to guarantee coherency because EEPROM is broken in such way -@@ -2416,6 +2420,13 @@ static void sfp_sm_module(struct sfp *sf +@@ -2430,6 +2434,13 @@ static void sfp_sm_module(struct sfp *sf return; } diff --git a/target/linux/realtek/patches-6.6/714-net-phy-sfp-add-support-for-SMBus.patch b/target/linux/realtek/patches-6.6/714-net-phy-sfp-add-support-for-SMBus.patch index 96c1088442..91b2920175 100644 --- a/target/linux/realtek/patches-6.6/714-net-phy-sfp-add-support-for-SMBus.patch +++ b/target/linux/realtek/patches-6.6/714-net-phy-sfp-add-support-for-SMBus.patch @@ -10,7 +10,7 @@ Signed-off-by: Antoine Tenart --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c -@@ -663,10 +663,64 @@ static int sfp_i2c_write(struct sfp *sfp +@@ -676,10 +676,64 @@ static int sfp_i2c_write(struct sfp *sfp return ret == ARRAY_SIZE(msgs) ? len : 0; } @@ -77,7 +77,7 @@ Signed-off-by: Antoine Tenart sfp->i2c = i2c; sfp->read = sfp_i2c_read; -@@ -698,6 +752,29 @@ static int sfp_i2c_mdiobus_create(struct +@@ -711,6 +765,29 @@ static int sfp_i2c_mdiobus_create(struct return 0; } @@ -107,7 +107,7 @@ Signed-off-by: Antoine Tenart static void sfp_i2c_mdiobus_destroy(struct sfp *sfp) { mdiobus_unregister(sfp->i2c_mii); -@@ -1875,9 +1952,15 @@ static void sfp_sm_fault(struct sfp *sfp +@@ -1888,9 +1965,15 @@ static void sfp_sm_fault(struct sfp *sfp static int sfp_sm_add_mdio_bus(struct sfp *sfp) { From 843e50f4fac243e21ffb3d1bd7a17a400b114057 Mon Sep 17 00:00:00 2001 From: Martin Schiller Date: Wed, 23 Oct 2024 13:07:27 +0200 Subject: [PATCH 09/40] mediatek: bpi-r4: create additional emmc gpt artifact This makes it possible to initialize the eMMC from scratch like it is done for the BPI-R3 mini (without an SD card). Signed-off-by: Martin Schiller --- target/linux/mediatek/image/filogic.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/linux/mediatek/image/filogic.mk b/target/linux/mediatek/image/filogic.mk index 37f6c07774..531cf83863 100644 --- a/target/linux/mediatek/image/filogic.mk +++ b/target/linux/mediatek/image/filogic.mk @@ -439,9 +439,10 @@ define Device/bananapi_bpi-r4-common KERNEL_LOADADDR := 0x46000000 KERNEL_INITRAMFS_SUFFIX := -recovery.itb ARTIFACTS := \ - emmc-preloader.bin emmc-bl31-uboot.fip \ + emmc-gpt.bin emmc-preloader.bin emmc-bl31-uboot.fip \ sdcard.img.gz \ snand-preloader.bin snand-bl31-uboot.fip + ARTIFACT/emmc-gpt.bin := mt798x-gpt emmc ARTIFACT/emmc-preloader.bin := mt7988-bl2 emmc-comb ARTIFACT/emmc-bl31-uboot.fip := mt7988-bl31-uboot $$(DEVICE_NAME)-emmc ARTIFACT/snand-preloader.bin := mt7988-bl2 spim-nand-ubi-comb From dbdd84725d5dd63480be7904d917a433b3c34b0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1vid=20Benko?= Date: Mon, 24 Feb 2025 10:43:10 +0100 Subject: [PATCH 10/40] hostapd/RADIUS_server: add config option for IPv6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Even though IPv6 support for hostapd RADIUS server is implemented (flag `-6`), it's not possible to enable it from configuration. This commit adds this option and adapts init script. Signed-off-by: Dávid Benko Link: https://github.com/openwrt/openwrt/pull/18089 Signed-off-by: Robert Marko --- package/network/services/hostapd/files/radius.config | 1 + package/network/services/hostapd/files/radius.init | 2 ++ 2 files changed, 3 insertions(+) diff --git a/package/network/services/hostapd/files/radius.config b/package/network/services/hostapd/files/radius.config index ad8730748b..a66fc2a9ac 100644 --- a/package/network/services/hostapd/files/radius.config +++ b/package/network/services/hostapd/files/radius.config @@ -1,5 +1,6 @@ config radius option disabled '1' + option ipv6 '1' option ca_cert '/etc/radius/ca.pem' option cert '/etc/radius/cert.pem' option key '/etc/radius/key.pem' diff --git a/package/network/services/hostapd/files/radius.init b/package/network/services/hostapd/files/radius.init index 4c562c2473..b594993a56 100644 --- a/package/network/services/hostapd/files/radius.init +++ b/package/network/services/hostapd/files/radius.init @@ -12,6 +12,7 @@ radius_start() { [ "$disabled" -gt 0 ] && return + config_get_bool ipv6 "$cfg" ipv6 1 config_get ca "$cfg" ca_cert config_get key "$cfg" key config_get cert "$cfg" cert @@ -28,6 +29,7 @@ radius_start() { -s "$clients" -u "$users" \ -p "$auth_port" -P "$acct_port" \ -i "$identity" + [ "$ipv6" -gt 0 ] && procd_append_param command -6 procd_close_instance } From 939628f6b8373fb3dfd26d55229c81e584269a22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1vid=20Benko?= Date: Mon, 24 Feb 2025 11:01:19 +0100 Subject: [PATCH 11/40] hostapd/RADIUS_server: enhance logging MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently, logging level of the RADIUS server is a constant corresponding to the highest verbosity (EXCESSIVE, ALL), but when running as a system service, the output is discarded. This commit makes logging verbosity configurable by `log_level` option and redirects all logs to `logd`. Possible levels are defined in hostap sources: https://w1.fi/cgit/hostap/tree/src/utils/wpa_debug.h?id=012a893c469157d5734f6f33953497ea6e3b0169#n23 Their reference is inlined in `radius.config` file. Default value for logging verbosity is INFO (even if the `-l` flag isn't specified). Signed-off-by: Dávid Benko Link: https://github.com/openwrt/openwrt/pull/18089 Signed-off-by: Robert Marko --- package/network/services/hostapd/files/radius.config | 11 +++++++++++ package/network/services/hostapd/files/radius.init | 5 ++++- package/network/services/hostapd/src/hostapd/radius.c | 6 ++++-- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/package/network/services/hostapd/files/radius.config b/package/network/services/hostapd/files/radius.config index a66fc2a9ac..9c26b751f2 100644 --- a/package/network/services/hostapd/files/radius.config +++ b/package/network/services/hostapd/files/radius.config @@ -1,6 +1,17 @@ config radius option disabled '1' option ipv6 '1' + + # Logging levels: + # 0: ALL + # 1: MSGDUMP + # 2: DEBUG + # 3: INFO + # 4: WARNING + # 5: ERROR + # Default: INFO + option log_level '3' + option ca_cert '/etc/radius/ca.pem' option cert '/etc/radius/cert.pem' option key '/etc/radius/key.pem' diff --git a/package/network/services/hostapd/files/radius.init b/package/network/services/hostapd/files/radius.init index b594993a56..29f687c93f 100644 --- a/package/network/services/hostapd/files/radius.init +++ b/package/network/services/hostapd/files/radius.init @@ -13,6 +13,7 @@ radius_start() { [ "$disabled" -gt 0 ] && return config_get_bool ipv6 "$cfg" ipv6 1 + config_get log_level "$cfg" log_level 3 config_get ca "$cfg" ca_cert config_get key "$cfg" key config_get cert "$cfg" cert @@ -24,12 +25,14 @@ radius_start() { procd_open_instance $cfg procd_set_param command /usr/sbin/hostapd-radius \ - -C "$ca" \ + -l "$log_level" -C "$ca" \ -c "$cert" -k "$key" \ -s "$clients" -u "$users" \ -p "$auth_port" -P "$acct_port" \ -i "$identity" [ "$ipv6" -gt 0 ] && procd_append_param command -6 + procd_set_param stdout 1 + procd_set_param stderr 1 procd_close_instance } diff --git a/package/network/services/hostapd/src/hostapd/radius.c b/package/network/services/hostapd/src/hostapd/radius.c index 362a22c276..7685d4d674 100644 --- a/package/network/services/hostapd/src/hostapd/radius.c +++ b/package/network/services/hostapd/src/hostapd/radius.c @@ -624,7 +624,6 @@ int radius_main(int argc, char **argv) int ch; wpa_debug_setup_stdout(); - wpa_debug_level = 0; if (eloop_init()) { wpa_printf(MSG_ERROR, "Failed to initialize event loop"); @@ -634,11 +633,14 @@ int radius_main(int argc, char **argv) eap_server_register_methods(); radius_init(&state); - while ((ch = getopt(argc, argv, "6C:c:d:i:k:K:p:P:s:u:")) != -1) { + while ((ch = getopt(argc, argv, "6l:C:c:d:i:k:K:p:P:s:u:")) != -1) { switch (ch) { case '6': config.radius.ipv6 = 1; break; + case 'l': + wpa_debug_level = atoi(optarg); + break; case 'C': config.tls.ca_cert = optarg; break; From 8d69613125e037d00a4d202e1fb26bfe6548b6b9 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Wed, 12 Mar 2025 23:54:38 +0100 Subject: [PATCH 12/40] armsr: Fix kmod-fsl-dpaa2-net build The build failed because the CONFIG_FSL_DPAA2_ETH_DCB option was not set. Activate this option to build the driver with DCB support when it is available. Fixes: 40f1db9cb11d ("kernel: Add KERNEL_DCB (Data Center Bridging)") Signed-off-by: Hauke Mehrtens --- target/linux/armsr/modules.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/linux/armsr/modules.mk b/target/linux/armsr/modules.mk index 692fb9fa68..d570d7f74e 100644 --- a/target/linux/armsr/modules.mk +++ b/target/linux/armsr/modules.mk @@ -128,7 +128,8 @@ define KernelPackage/fsl-dpaa2-net +kmod-fsl-pcs-lynx +kmod-fsl-mc-dpio KCONFIG:= \ CONFIG_FSL_MC_UAPI_SUPPORT=y \ - CONFIG_FSL_DPAA2_ETH + CONFIG_FSL_DPAA2_ETH \ + CONFIG_FSL_DPAA2_ETH_DCB=y FILES:= \ $(LINUX_DIR)/drivers/net/ethernet/freescale/dpaa2/fsl-dpaa2-eth.ko AUTOLOAD=$(call AutoLoad,35,fsl-dpaa2-eth) From aabc61d93f89bf3253bad98fd2fe8d5450c352bf Mon Sep 17 00:00:00 2001 From: John Audia Date: Fri, 7 Mar 2025 15:17:22 -0500 Subject: [PATCH 13/40] kernel: bump 6.6 to 6.6.81 Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.81 All patches automatically rebased. For x86, CONFIG_MICROCODE_LATE_FORCE_MINREV was introduced in this bump with hrecommendation to enable it[1]. 1. https://web.git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/diff/arch/x86/Kconfig?id=v6.6.81&id2=v6.6.80 Build system: x86/64 Build-tested: bcm27xx/bcm2712, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Run-tested: bcm27xx/bcm2712, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Signed-off-by: John Audia Link: https://github.com/openwrt/openwrt/pull/18188 Signed-off-by: Hauke Mehrtens --- include/kernel-6.6 | 4 ++-- ...all-the-downstream-rpi-sound-card-dr.patch | 2 +- ...-net-macb-Also-set-DMA-coherent-mask.patch | 24 +++++++++---------- ...port-for-Raspberry-Pi-RP1-ethernet-c.patch | 4 ++-- ...-rockchip-Fix-typo-in-function-names.patch | 2 +- target/linux/x86/config-6.6 | 1 + 6 files changed, 19 insertions(+), 18 deletions(-) diff --git a/include/kernel-6.6 b/include/kernel-6.6 index 1c34069947..c5c29a5aad 100644 --- a/include/kernel-6.6 +++ b/include/kernel-6.6 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.6 = .80 -LINUX_KERNEL_HASH-6.6.80 = 6cf911d01324f45c9dd2f44cf06f55bda0ecf383bc498f132a0c549768531327 +LINUX_VERSION-6.6 = .81 +LINUX_KERNEL_HASH-6.6.81 = af483828e67f1b9918bc438d789cdbb06c13a4d43a41d5f35d44c9a6d620318f diff --git a/target/linux/bcm27xx/patches-6.6/950-0106-Add-support-for-all-the-downstream-rpi-sound-card-dr.patch b/target/linux/bcm27xx/patches-6.6/950-0106-Add-support-for-all-the-downstream-rpi-sound-card-dr.patch index 1d2f006258..56712a2b48 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0106-Add-support-for-all-the-downstream-rpi-sound-card-dr.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0106-Add-support-for-all-the-downstream-rpi-sound-card-dr.patch @@ -17583,7 +17583,7 @@ Signed-off-by: Phil Elwell * For devices with more than one control interface, we assume the --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c -@@ -2253,6 +2253,8 @@ static const struct usb_audio_quirk_flag +@@ -2254,6 +2254,8 @@ static const struct usb_audio_quirk_flag QUIRK_FLAG_ALIGN_TRANSFER), DEVICE_FLG(0x534d, 0x2109, /* MacroSilicon MS2109 */ QUIRK_FLAG_ALIGN_TRANSFER), diff --git a/target/linux/bcm27xx/patches-6.6/950-0518-net-macb-Also-set-DMA-coherent-mask.patch b/target/linux/bcm27xx/patches-6.6/950-0518-net-macb-Also-set-DMA-coherent-mask.patch index cbfab3e4e6..9882230654 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0518-net-macb-Also-set-DMA-coherent-mask.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0518-net-macb-Also-set-DMA-coherent-mask.patch @@ -134,7 +134,7 @@ Signed-off-by: Jonathan Bell struct napi_struct napi_tx; dma_addr_t rx_ring_dma; -@@ -1285,9 +1304,15 @@ struct macb { +@@ -1287,9 +1306,15 @@ struct macb { u32 caps; unsigned int dma_burst_length; @@ -222,7 +222,7 @@ Signed-off-by: Jonathan Bell wmb(); // ensure softirq can see update } -@@ -2402,6 +2425,11 @@ static netdev_tx_t macb_start_xmit(struc +@@ -2404,6 +2427,11 @@ static netdev_tx_t macb_start_xmit(struc skb_tx_timestamp(skb); spin_lock_irq(&bp->lock); @@ -234,7 +234,7 @@ Signed-off-by: Jonathan Bell macb_writel(bp, NCR, macb_readl(bp, NCR) | MACB_BIT(TSTART)); spin_unlock_irq(&bp->lock); -@@ -2776,6 +2804,37 @@ static void macb_configure_dma(struct ma +@@ -2778,6 +2806,37 @@ static void macb_configure_dma(struct ma } } @@ -272,7 +272,7 @@ Signed-off-by: Jonathan Bell static void macb_init_hw(struct macb *bp) { u32 config; -@@ -2804,6 +2863,11 @@ static void macb_init_hw(struct macb *bp +@@ -2806,6 +2865,11 @@ static void macb_init_hw(struct macb *bp if (bp->caps & MACB_CAPS_JUMBO) bp->rx_frm_len_mask = MACB_RX_JFRMLEN_MASK; @@ -284,7 +284,7 @@ Signed-off-by: Jonathan Bell macb_configure_dma(bp); /* Enable RX partial store and forward and set watermark */ -@@ -3165,6 +3229,52 @@ static void gem_get_ethtool_strings(stru +@@ -3170,6 +3234,52 @@ static void gem_get_ethtool_strings(stru } } @@ -337,7 +337,7 @@ Signed-off-by: Jonathan Bell static struct net_device_stats *macb_get_stats(struct net_device *dev) { struct macb *bp = netdev_priv(dev); -@@ -3757,6 +3867,8 @@ static const struct ethtool_ops macb_eth +@@ -3764,6 +3874,8 @@ static const struct ethtool_ops macb_eth }; static const struct ethtool_ops gem_ethtool_ops = { @@ -346,7 +346,7 @@ Signed-off-by: Jonathan Bell .get_regs_len = macb_get_regs_len, .get_regs = macb_get_regs, .get_wol = macb_get_wol, -@@ -3766,6 +3878,8 @@ static const struct ethtool_ops gem_etht +@@ -3773,6 +3885,8 @@ static const struct ethtool_ops gem_etht .get_ethtool_stats = gem_get_ethtool_stats, .get_strings = gem_get_ethtool_strings, .get_sset_count = gem_get_sset_count, @@ -355,7 +355,7 @@ Signed-off-by: Jonathan Bell .get_link_ksettings = macb_get_link_ksettings, .set_link_ksettings = macb_set_link_ksettings, .get_ringparam = macb_get_ringparam, -@@ -5062,6 +5176,11 @@ static int macb_probe(struct platform_de +@@ -5069,6 +5183,11 @@ static int macb_probe(struct platform_de } } } @@ -365,9 +365,9 @@ Signed-off-by: Jonathan Bell + bp->use_aw2b_fill = device_property_read_bool(&pdev->dev, "cdns,use-aw2b-fill"); + spin_lock_init(&bp->lock); + spin_lock_init(&bp->stats_lock); - /* setup capabilities */ -@@ -5117,6 +5236,21 @@ static int macb_probe(struct platform_de +@@ -5125,6 +5244,21 @@ static int macb_probe(struct platform_de else bp->phy_interface = interface; @@ -389,7 +389,7 @@ Signed-off-by: Jonathan Bell /* IP specific init */ err = init(pdev); if (err) -@@ -5193,6 +5327,19 @@ static int macb_remove(struct platform_d +@@ -5201,6 +5335,19 @@ static int macb_remove(struct platform_d return 0; } @@ -409,7 +409,7 @@ Signed-off-by: Jonathan Bell static int __maybe_unused macb_suspend(struct device *dev) { struct net_device *netdev = dev_get_drvdata(dev); -@@ -5407,6 +5554,7 @@ static const struct dev_pm_ops macb_pm_o +@@ -5415,6 +5562,7 @@ static const struct dev_pm_ops macb_pm_o static struct platform_driver macb_driver = { .probe = macb_probe, .remove = macb_remove, diff --git a/target/linux/bcm27xx/patches-6.6/950-1423-net-macb-Add-support-for-Raspberry-Pi-RP1-ethernet-c.patch b/target/linux/bcm27xx/patches-6.6/950-1423-net-macb-Add-support-for-Raspberry-Pi-RP1-ethernet-c.patch index 6a9b7b36bd..c34d1c8720 100644 --- a/target/linux/bcm27xx/patches-6.6/950-1423-net-macb-Add-support-for-Raspberry-Pi-RP1-ethernet-c.patch +++ b/target/linux/bcm27xx/patches-6.6/950-1423-net-macb-Add-support-for-Raspberry-Pi-RP1-ethernet-c.patch @@ -15,7 +15,7 @@ Signed-off-by: Dave Stevenson --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c -@@ -5023,6 +5023,17 @@ static const struct macb_config versal_c +@@ -5030,6 +5030,17 @@ static const struct macb_config versal_c .usrio = &macb_default_usrio, }; @@ -33,7 +33,7 @@ Signed-off-by: Dave Stevenson static const struct of_device_id macb_dt_ids[] = { { .compatible = "cdns,at91sam9260-macb", .data = &at91sam9260_config }, { .compatible = "cdns,macb" }, -@@ -5043,6 +5054,7 @@ static const struct of_device_id macb_dt +@@ -5050,6 +5061,7 @@ static const struct of_device_id macb_dt { .compatible = "microchip,mpfs-macb", .data = &mpfs_config }, { .compatible = "microchip,sama7g5-gem", .data = &sama7g5_gem_config }, { .compatible = "microchip,sama7g5-emac", .data = &sama7g5_emac_config }, diff --git a/target/linux/rockchip/patches-6.6/032-04-v6.10-phy-rockchip-Fix-typo-in-function-names.patch b/target/linux/rockchip/patches-6.6/032-04-v6.10-phy-rockchip-Fix-typo-in-function-names.patch index 9495dd2b10..08620d66ec 100644 --- a/target/linux/rockchip/patches-6.6/032-04-v6.10-phy-rockchip-Fix-typo-in-function-names.patch +++ b/target/linux/rockchip/patches-6.6/032-04-v6.10-phy-rockchip-Fix-typo-in-function-names.patch @@ -26,7 +26,7 @@ Signed-off-by: Vinod Koul .init = rockchip_combphy_init, .exit = rockchip_combphy_exit, .owner = THIS_MODULE, -@@ -364,7 +364,7 @@ static int rockchip_combphy_probe(struct +@@ -367,7 +367,7 @@ static int rockchip_combphy_probe(struct return ret; } diff --git a/target/linux/x86/config-6.6 b/target/linux/x86/config-6.6 index c416bb6a08..ad73334253 100644 --- a/target/linux/x86/config-6.6 +++ b/target/linux/x86/config-6.6 @@ -239,6 +239,7 @@ CONFIG_M686=y # CONFIG_MGEODEGX1 is not set # CONFIG_MGEODE_LX is not set CONFIG_MICROCODE=y +CONFIG_MICROCODE_LATE_FORCE_MINREV=y CONFIG_MICROCODE_LATE_LOADING=y CONFIG_MIGRATION=y CONFIG_MITIGATION_RFDS=y From 7cf8f61eb24c32bb47925cbd11f1cde68c9ba0b9 Mon Sep 17 00:00:00 2001 From: John Audia Date: Sun, 9 Mar 2025 06:18:32 -0400 Subject: [PATCH 14/40] kernel: bump 6.6 to 6.6.82 Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.82 All patches automatically rebased. Added CONFIG_MICROCODE_INITRD32=y to x86: config-6.6[1] 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/diff/arch/x86/Kconfig?id=v6.6.82&id2=v6.6.81 Build system: x86/64 Build-tested: bcm27xx/bcm2712 Run-tested: bcm27xx/bcm2712 Signed-off-by: John Audia Link: https://github.com/openwrt/openwrt/pull/18188 Signed-off-by: Hauke Mehrtens --- include/kernel-6.6 | 4 ++-- target/linux/x86/config-6.6 | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/kernel-6.6 b/include/kernel-6.6 index c5c29a5aad..7502edfd62 100644 --- a/include/kernel-6.6 +++ b/include/kernel-6.6 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.6 = .81 -LINUX_KERNEL_HASH-6.6.81 = af483828e67f1b9918bc438d789cdbb06c13a4d43a41d5f35d44c9a6d620318f +LINUX_VERSION-6.6 = .82 +LINUX_KERNEL_HASH-6.6.82 = f3c2389b8c23cabe747f104a3e434201ca6e7725bbbfb3a8c59a063ac4820e41 diff --git a/target/linux/x86/config-6.6 b/target/linux/x86/config-6.6 index ad73334253..2b6ab88dc3 100644 --- a/target/linux/x86/config-6.6 +++ b/target/linux/x86/config-6.6 @@ -239,6 +239,7 @@ CONFIG_M686=y # CONFIG_MGEODEGX1 is not set # CONFIG_MGEODE_LX is not set CONFIG_MICROCODE=y +CONFIG_MICROCODE_INITRD32=y CONFIG_MICROCODE_LATE_FORCE_MINREV=y CONFIG_MICROCODE_LATE_LOADING=y CONFIG_MIGRATION=y From 228eb7f62ad3a3b4e9101a7a840b26aef469009e Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 11 Mar 2025 12:46:25 +0100 Subject: [PATCH 15/40] unetd: cli: fix editing service config attributes They must be set on the config object instead of the main service object Signed-off-by: Felix Fietkau --- package/network/services/unetd/files/unet.uc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/network/services/unetd/files/unet.uc b/package/network/services/unetd/files/unet.uc index 023ea3e6b8..06437c282c 100644 --- a/package/network/services/unetd/files/unet.uc +++ b/package/network/services/unetd/files/unet.uc @@ -937,6 +937,12 @@ function is_vxlan_service(ctx, argv, named, spec) return type == "vxlan"; } +function get_config_object(ctx, spec, obj, argv) +{ + obj.config ??= {}; + return obj.config; +} + const service_editor = { change_cb: function(ctx, argv) { ctx.data.netdata.changed = true; @@ -964,6 +970,7 @@ const service_editor = { help: "VXLAN ID", attribute: "id", available: is_vxlan_service, + get_object: get_config_object, args: { type: "int", min: 0, @@ -974,6 +981,7 @@ const service_editor = { help: "VXLAN port", attribute: "port", available: is_vxlan_service, + get_object: get_config_object, args: { type: "int", min: 1, @@ -984,6 +992,7 @@ const service_editor = { help: "VXLAN tunnel MTU", attribute: "mtu", available: is_vxlan_service, + get_object: get_config_object, args: { type: "int", min: 1280, @@ -994,6 +1003,7 @@ const service_editor = { help: "Member allowed to receive broad-/multicast and unknown unicast", attribute: "forward_ports", available: is_vxlan_service, + get_object: get_config_object, multiple: true, args: { type: "enum", From ae31c0ddd78f8f02b303cff8b455b0a5d05239bf Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 11 Mar 2025 13:33:45 +0100 Subject: [PATCH 16/40] cli: fix removing values when attribute has .get_object set Signed-off-by: Felix Fietkau --- package/utils/cli/files/usr/share/ucode/cli/object-editor.uc | 1 + 1 file changed, 1 insertion(+) diff --git a/package/utils/cli/files/usr/share/ucode/cli/object-editor.uc b/package/utils/cli/files/usr/share/ucode/cli/object-editor.uc index 2a21e8d622..0a44754064 100644 --- a/package/utils/cli/files/usr/share/ucode/cli/object-editor.uc +++ b/package/utils/cli/files/usr/share/ucode/cli/object-editor.uc @@ -241,6 +241,7 @@ function remove_params(orig_params) delete val.allow_empty; val.args = { type: "enum", + get_object: val.get_object, attribute: val.attribute ?? name, value: param_values, force_helptext: true, From a46a55b407e71b8f92a2754565f7883de49e368e Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 11 Mar 2025 13:37:33 +0100 Subject: [PATCH 17/40] cli: fix showing empty lists Display as value instead of hiding the attribute name Signed-off-by: Felix Fietkau --- package/utils/cli/files/usr/sbin/cli | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/utils/cli/files/usr/sbin/cli b/package/utils/cli/files/usr/sbin/cli index 608ae2f97c..531a64503e 100755 --- a/package/utils/cli/files/usr/sbin/cli +++ b/package/utils/cli/files/usr/sbin/cli @@ -345,6 +345,8 @@ function format_multiline(prefix, val) if (type(val) != "array") val = [ val ]; + if (length(val) == 0) + val = [ "" ]; for (let cur in val) { cur = format_entry(cur); From 3b65496654335dba662367f35f79248d389eb6b0 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 13 Mar 2025 11:22:50 +0100 Subject: [PATCH 18/40] procd: update to Git HEAD (2025-03-13) 80187cf5badb service: re-run init script "running" command after instance restart 891094aefcb2 rcS: avoid duplicate pending "running" calls Signed-off-by: Felix Fietkau --- package/system/procd/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile index c7846f21bd..0e9097f6ad 100644 --- a/package/system/procd/Makefile +++ b/package/system/procd/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git -PKG_MIRROR_HASH:=cad8681f04922a3ba05363330a2896a598572a2beee980692f1cd7c8d7136b5e -PKG_SOURCE_DATE:=2025-01-30 -PKG_SOURCE_VERSION:=7fcb5a275fcff5ab697357c86ce568c71128b982 +PKG_MIRROR_HASH:=6c3cbc18ac23f925199308e40e78b423858d3abe3a396078fbd142996d266642 +PKG_SOURCE_DATE:=2025-03-13 +PKG_SOURCE_VERSION:=891094aefcb28a376a43b7c539f599a8e0987e4d CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 From 9a79cdc7ee2d5c12f3a19ab89c8821d8672c1080 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 13 Mar 2025 10:11:56 +0100 Subject: [PATCH 19/40] package: use service_running instead of service_started for ubus config Fixes issue with loading config after a service crash. Should also improve startup time. Signed-off-by: Felix Fietkau --- package/libs/udebug/files/udebug.init | 2 +- package/network/config/qosify/files/qosify.init | 2 +- package/network/services/bridger/files/bridger.init | 2 +- package/network/services/omcproxy/files/omcproxy.init | 2 +- package/network/services/umdns/files/umdns.init | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/libs/udebug/files/udebug.init b/package/libs/udebug/files/udebug.init index b57e962f6f..a9c92eee8f 100755 --- a/package/libs/udebug/files/udebug.init +++ b/package/libs/udebug/files/udebug.init @@ -49,7 +49,7 @@ service_triggers() { procd_add_reload_trigger udebug } -service_started() { +service_running() { ubus -t 10 wait_for udebug [ $? = 0 ] && reload_service } diff --git a/package/network/config/qosify/files/qosify.init b/package/network/config/qosify/files/qosify.init index f676d92a52..8c1ca7d29e 100644 --- a/package/network/config/qosify/files/qosify.init +++ b/package/network/config/qosify/files/qosify.init @@ -165,7 +165,7 @@ start_service() { procd_close_instance } -service_started() { +service_running() { ubus -t 10 wait_for qosify [ $? = 0 ] && reload_service } diff --git a/package/network/services/bridger/files/bridger.init b/package/network/services/bridger/files/bridger.init index 057b18a94f..feb3e5c379 100644 --- a/package/network/services/bridger/files/bridger.init +++ b/package/network/services/bridger/files/bridger.init @@ -43,7 +43,7 @@ start_service() { procd_close_instance } -service_started() { +service_running() { ubus -t 10 wait_for bridger [ $? = 0 ] && reload_service } diff --git a/package/network/services/omcproxy/files/omcproxy.init b/package/network/services/omcproxy/files/omcproxy.init index 757b7794ef..e2792a8956 100644 --- a/package/network/services/omcproxy/files/omcproxy.init +++ b/package/network/services/omcproxy/files/omcproxy.init @@ -157,7 +157,7 @@ start_service() { echo 128 > /proc/sys/net/ipv4/igmp_max_memberships } -service_started() { +service_running() { procd_set_config_changed firewall } diff --git a/package/network/services/umdns/files/umdns.init b/package/network/services/umdns/files/umdns.init index 61b2a338d6..87a6f8e16d 100644 --- a/package/network/services/umdns/files/umdns.init +++ b/package/network/services/umdns/files/umdns.init @@ -66,7 +66,7 @@ start_service() { procd_close_instance } -service_started() { +service_running() { ubus -t 10 wait_for umdns [ $? = 0 ] && reload_service } From a21ae5cc61f021ae9a18dad6ca330295e0a49a04 Mon Sep 17 00:00:00 2001 From: John Audia Date: Wed, 12 Mar 2025 17:14:01 -0400 Subject: [PATCH 20/40] linux-firmware: update to 20250311 git log --no-merges --pretty=oneline --abbrev-commit 20250211...20250311 bdd88e967517 amdgpu: update psp 14.0.0 firmware c8234f76bdd5 amdgpu: update gc 11.5.0 firmware cc3227cd4fdb amdgpu: update vcn 4.0.2 firmware 1498f32eb8b7 amdgpu: update psp 13.0.4 firmware a8bbcfaa3e15 amdgpu: update gc 11.0.1 firmware 645cc116bf8c amdgpu: update navy flounder firmware 5eac1029bb58 amdgpu: update gc 11.5.2 firmware c5dc6df52b6d amdgpu: update vcn 5.0.0 firmware 8d5a8ed7f731 amdgpu: update smu 14.0.3 firmware e6827bc2196f amdgpu: update sdma 7.0.1 firmware 44458e4f60b2 amdgpu: update gc 14.0.3 firmware 118bd6c7609c amdgpu: update gc 12.0.1 firmware 16987c25cf66 amdgpu: update sienna cichlid firmware 7ade6230b03a amdgpu: update yellow carp firmware 03d2ad8f27f3 amdgpu: update smu 14.0.2 firmware eaf44ec2dff9 amdgpu: update psp 14.0.2 firmware a9e53dc0e853 amdgpu: update gc 12.0.0 firmware f7654d0634d3 amdgpu: update vega20 firmware ff0fce9d60e1 amdgpu: update navi14 firmware 052c28862ae1 amdgpu: update vega12 firmware 3ca9ff138536 amdgpu: update vcn 4.0.4 firmware 3402e84bb438 amdgpu: update psp 13.0.7 firmware 1d028a0a7820 amdgpu: update gc 11.0.2 firmware e58f61a19248 amdgpu: update vega10 firmware 0560dbe09009 amdgpu: update vcn 3.1.2 firmware b3bcd93cdaa4 amdgpu: update gc 10.3.6 firmware 777f9945d49e amdgpu: update navi10 firmware 204aacb2901c amdgpu: update navi12 firmware f3f87199f598 amdgpu: update psp 13.0.10 firmware 0833f16ca55a amdgpu: update gc 11.0.3 firmware 598c0af458cb amdgpu: update vangogh firmware c32b218f2621 amdgpu: update picasso firmware fcc391f90bec amdgpu: update vcn 4.0.0 firmware bdd88e967517 amdgpu: update psp 14.0.0 firmware c8234f76bdd5 amdgpu: update gc 11.5.0 firmware cc3227cd4fdb amdgpu: update vcn 4.0.2 firmware 1498f32eb8b7 amdgpu: update psp 13.0.4 firmware a8bbcfaa3e15 amdgpu: update gc 11.0.1 firmware 645cc116bf8c amdgpu: update navy flounder firmware 5eac1029bb58 amdgpu: update gc 11.5.2 firmware c5dc6df52b6d amdgpu: update vcn 5.0.0 firmware 8d5a8ed7f731 amdgpu: update smu 14.0.3 firmware e6827bc2196f amdgpu: update sdma 7.0.1 firmware 44458e4f60b2 amdgpu: update gc 14.0.3 firmware 118bd6c7609c amdgpu: update gc 12.0.1 firmware 16987c25cf66 amdgpu: update sienna cichlid firmware 7ade6230b03a amdgpu: update yellow carp firmware 03d2ad8f27f3 amdgpu: update smu 14.0.2 firmware eaf44ec2dff9 amdgpu: update psp 14.0.2 firmware a9e53dc0e853 amdgpu: update gc 12.0.0 firmware f7654d0634d3 amdgpu: update vega20 firmware ff0fce9d60e1 amdgpu: update navi14 firmware 052c28862ae1 amdgpu: update vega12 firmware 3ca9ff138536 amdgpu: update vcn 4.0.4 firmware 3402e84bb438 amdgpu: update psp 13.0.7 firmware 1d028a0a7820 amdgpu: update gc 11.0.2 firmware e58f61a19248 amdgpu: update vega10 firmware 0560dbe09009 amdgpu: update vcn 3.1.2 firmware b3bcd93cdaa4 amdgpu: update gc 10.3.6 firmware 777f9945d49e amdgpu: update navi10 firmware 204aacb2901c amdgpu: update navi12 firmware f3f87199f598 amdgpu: update psp 13.0.10 firmware 0833f16ca55a amdgpu: update gc 11.0.3 firmware 598c0af458cb amdgpu: update vangogh firmware c32b218f2621 amdgpu: update picasso firmware fcc391f90bec amdgpu: update vcn 4.0.0 firmware bdd88e967517 amdgpu: update psp 14.0.0 firmware c8234f76bdd5 amdgpu: update gc 11.5.0 firmware cc3227cd4fdb amdgpu: update vcn 4.0.2 firmware 1498f32eb8b7 amdgpu: update psp 13.0.4 firmware a8bbcfaa3e15 amdgpu: update gc 11.0.1 firmware 645cc116bf8c amdgpu: update navy flounder firmware 5eac1029bb58 amdgpu: update gc 11.5.2 firmware c5dc6df52b6d amdgpu: update vcn 5.0.0 firmware 8d5a8ed7f731 amdgpu: update smu 14.0.3 firmware e6827bc2196f amdgpu: update sdma 7.0.1 firmware 44458e4f60b2 amdgpu: update gc 14.0.3 firmware 118bd6c7609c amdgpu: update gc 12.0.1 firmware 16987c25cf66 amdgpu: update sienna cichlid firmware 7ade6230b03a amdgpu: update yellow carp firmware 03d2ad8f27f3 amdgpu: update smu 14.0.2 firmware eaf44ec2dff9 amdgpu: update psp 14.0.2 firmware a9e53dc0e853 amdgpu: update gc 12.0.0 firmware f7654d0634d3 amdgpu: update vega20 firmware ff0fce9d60e1 amdgpu: update navi14 firmware 052c28862ae1 amdgpu: update vega12 firmware 3ca9ff138536 amdgpu: update vcn 4.0.4 firmware 3402e84bb438 amdgpu: update psp 13.0.7 firmware 1d028a0a7820 amdgpu: update gc 11.0.2 firmware e58f61a19248 amdgpu: update vega10 firmware 0560dbe09009 amdgpu: update vcn 3.1.2 firmware b3bcd93cdaa4 amdgpu: update gc 10.3.6 firmware 777f9945d49e amdgpu: update navi10 firmware 204aacb2901c amdgpu: update navi12 firmware f3f87199f598 amdgpu: update psp 13.0.10 firmware 0833f16ca55a amdgpu: update gc 11.0.3 firmware 598c0af458cb amdgpu: update vangogh firmware c32b218f2621 amdgpu: update picasso firmware fcc391f90bec amdgpu: update vcn 4.0.0 firmware 16dba25cc2a6 amdgpu: update psp 13.0.0 firmware 1921d2321616 amdgpu: update gc 11.0.0 firmware 401fdb179a92 amdgpu: update psp 13.0.14 firmware 9b0c9f217009 amdgpu: update gc 9.4.4 firmware 12f2ea7e1edd amdgpu: update psp 13.0.6 firmware 37dd196c523d amdgpu: update gc 9.4.3 firmware f04ce74d4960 amdgpu: update beige goby firmware 5f011e04bba5 amdgpu: update gc 10.3.7 firmware 6f8864aecde2 amdgpu: update psp 14.0.1 firmware ccd76e2f57a1 amdgpu: update gc 11.5.1 firmware c5710c8a642a amdgpu: update gc 11.0.4 firmware ff2c4d0706a8 amdgpu: update dimgrey cavefish firmware 6966680eeb7d amdgpu: update aldebaran firmware ffdb342f8db5 qcom: Update gpu firmwares for qcs8300 chipset ad16cf3b829f linux-firmware: add firmware for qat_420xx devices c2c0e64a1b02 amdgpu: DMCUB updates for various ASICs d2e1085e36fb i915: Update Xe3LPD DMC to v2.20 8b3109069b3b linux-firmware: update firmware for MT7925 WiFi device ae25a3cb0fd8 mediatek MT7925: update bluetooth firmware to 20250305133215 7a074fed8691 mediatek MT7920: update bluetooth firmware to 20250210151502 d61ca3c53acd linux-firmware: Update firmware file for Intel BlazarU core 9971a5b69745 linux-firmware: Update firmware file for Intel BlazarI core 9b870dde196d intel_vpu: Add firmware for 37xx and 40xx NPUs f573fa75ee6c QCA: Add Bluetooth firmwares for QCA2066 with USB transport 250b01fdbbda QCA: Add two bluetooth firmware nvm files for QCA2066 ca3ecd432113 QCA: Update Bluetooth QCA2066 firmware to 2.1.0-00653 f5afc67b2d57 QCA: Update Bluetooth WCN685x 2.1 firmware to 2.1.0-00653 675b89218fe1 cirrus: cs35l41: Add firmware and tuning for ASUS Consumer laptops 68fe46cc732f cirrus: cs35l41: Add Firmware for various ASUS Commercial laptops 312effe7857e ASoC: tas2781: Update dsp firmware for Gemtree project 35900e1f24cd xe: Update GUC to v70.40.2 for BMG, LNL 5602c7293e66 amdgpu: DMCUB updates for various ASICs de78f0aaafb9 amdgpu: DCUB update for DCN401 and DCN315 90e90cd14622 cirrus: cs35l41: Add firmware and tunings for CS35L41 driver for Steam Deck 811bb52b1d29 ath11k: QCN9074 hw1.0: update to WLAN.HK.2.9.0.1-02175-QCAHKSWPL_SILICONZ-2 a4ede19b319e ath11k: QCA6698AQ hw2.1: update to WLAN.HSP.1.1-04604-QCAHSPSWPL_V1_V2_SILICONZ_IOE-1 537891bbcbb2 ath11k: QCA6698AQ hw2.1: update board-2.bin 0a69dcd33a4b rtw89: 8852bt: update fw to v0.29.122.0 and BB parameter to 07 3660cb7665df linux-firmware: Update AMD SEV firmware 15442c631c6b linux-firmware: update firmware for MT7920 WiFi device 2ee90738b79a qca: update WCN3988 firmware 1cc8c1bfa112 amdgpu: Update ISP FW for isp v4.1.1 773611b481e1 qcom: add firmware for Adreno A225 307af4cea232 cirrus: cs35l56: Add and update firmware for Cirrus CS35L56 for two HP laptops 0aad62c61cab cirrus: cs35l56: Add firmware for Cirrus Amps for some ASUS laptops f2ac3cafdec1 cirrus: cs35l56: Add and update firmware for Cirrus CS35L56 for various Lenovo laptops 50710a3006fa cirrus: cs35l56: Update firmware for Cirrus Amps for some Dell laptops d88562a09aac linux-firmware: update firmware for en8811h 2.5G ethernet phy f71241766176 i915: Update Xe3LPD DMC to v2.17 9ea3e5dd4265 ASoC: tas2781: Change regbin firmwares for single device Build system: x86/64 Build-tested: x86/64 Run-tested: x86/64 Signed-off-by: John Audia Link: https://github.com/openwrt/openwrt/pull/18234 Signed-off-by: Nick Hainke --- package/firmware/linux-firmware/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/firmware/linux-firmware/Makefile b/package/firmware/linux-firmware/Makefile index bb5d14e04f..6402c5e3e1 100644 --- a/package/firmware/linux-firmware/Makefile +++ b/package/firmware/linux-firmware/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=linux-firmware -PKG_VERSION:=20250211 +PKG_VERSION:=20250311 PKG_RELEASE:=1 PKG_SOURCE_URL:=@KERNEL/linux/kernel/firmware PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_HASH:=2de1345897bf839d532c5de0fdb348770ca2a5f4edfb21971582597abb45297d +PKG_HASH:=b1083a36f19aea46f661dcfd4cd462d13933dcb4e7f0dc809525552dd5c3541d PKG_MAINTAINER:=Felix Fietkau From e8603f3b5a15856fccee2e02a5406ca9c8b2ba1d Mon Sep 17 00:00:00 2001 From: Andreas Gnau Date: Tue, 7 Jan 2025 23:04:30 +0100 Subject: [PATCH 21/40] ramips: mt7621: Move common DNA EX400 defs to dtsi Move common definitions for DNA Valokuitu Plus EX400 to a dtsi include. This is in preparation of adding the non-branded variant of the device produced by Genexis / Inteno in the next commit. The device with DNA branding differs in the LED labling on the device. Signed-off-by: Andreas Gnau Link: https://github.com/openwrt/openwrt/pull/17551 Signed-off-by: Hauke Mehrtens --- .../dts/mt7621_dna_valokuitu-plus-ex400.dts | 125 +---------------- .../mt7621_genexis_pulse-ex400-common.dtsi | 128 ++++++++++++++++++ 2 files changed, 129 insertions(+), 124 deletions(-) create mode 100644 target/linux/ramips/dts/mt7621_genexis_pulse-ex400-common.dtsi diff --git a/target/linux/ramips/dts/mt7621_dna_valokuitu-plus-ex400.dts b/target/linux/ramips/dts/mt7621_dna_valokuitu-plus-ex400.dts index cc5b4b71d0..9bbe91beef 100644 --- a/target/linux/ramips/dts/mt7621_dna_valokuitu-plus-ex400.dts +++ b/target/linux/ramips/dts/mt7621_dna_valokuitu-plus-ex400.dts @@ -1,131 +1,8 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT -#include "mt7621.dtsi" - -#include -#include -#include +#include "mt7621_genexis_pulse-ex400-common.dtsi" / { compatible = "dna,valokuitu-plus-ex400", "mediatek,mt7621-soc"; model = "DNA Valokuitu Plus EX400"; - - aliases { - ethernet0 = &gmac0; - label-mac-device = &gmac0; - led-boot = &led_status_red; - led-failsafe = &led_status_red; - led-running = &led_status_green; - led-upgrade = &led_update_green; - }; - - chosen { - bootargs-override = "console=ttyS0,115200 rootfstype=squashfs,jffs2"; - }; - - keys { - compatible = "gpio-keys"; - - reset { - label = "reset"; - gpios = <&gpio 18 GPIO_ACTIVE_LOW>; - linux,code = ; - }; - }; - - leds { - compatible = "gpio-leds"; - - led_status_green: led-0 { - color = ; - function = LED_FUNCTION_STATUS; - gpios = <&gpio 8 GPIO_ACTIVE_LOW>; - }; - - led_status_red: led-1 { - color = ; - function = LED_FUNCTION_STATUS; - gpios = <&gpio 11 GPIO_ACTIVE_HIGH>; - }; - - led_update_green: led-2 { - color = ; - function = LED_FUNCTION_PROGRAMMING; - gpios = <&gpio 12 GPIO_ACTIVE_LOW>; - }; - }; -}; - -&pcie { - status = "okay"; -}; - -&nand { - status = "okay"; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - reg = <0x00 0x100000>; - label = "uboot"; - read-only; - }; - - partition@100000 { - reg = <0x100000 0xff00000>; - label = "ubi"; - compatible = "linux,ubi"; - - volumes { - ubi-volume-env1 { - volname = "env1"; - - nvmem-layout { - compatible = "u-boot,env-redundant-count"; - - ethaddr: ethaddr { - #nvmem-cell-cells = <1>; - }; - }; - }; - }; - }; - }; -}; - -&gmac1 { - label = "wan"; - phy-handle = <ðphy0>; - nvmem-cells = <ðaddr 1>; - nvmem-cell-names = "mac-address"; - status = "okay"; -}; - -&i2c { - status = "okay"; -}; - -ðphy0 { - /delete-property/ interrupts; -}; - -&state_default { - gpio { - groups = "uart2", "uart3"; - function = "gpio"; - }; -}; - -&switch0 { - ports { - port@1 { - label = "lan"; - nvmem-cells = <ðaddr 0>; - nvmem-cell-names = "mac-address"; - status = "okay"; - }; - }; }; diff --git a/target/linux/ramips/dts/mt7621_genexis_pulse-ex400-common.dtsi b/target/linux/ramips/dts/mt7621_genexis_pulse-ex400-common.dtsi new file mode 100644 index 0000000000..dddc381fe8 --- /dev/null +++ b/target/linux/ramips/dts/mt7621_genexis_pulse-ex400-common.dtsi @@ -0,0 +1,128 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +#include "mt7621.dtsi" + +#include +#include +#include + +/ { + aliases { + ethernet0 = &gmac0; + label-mac-device = &gmac0; + led-boot = &led_status_red; + led-failsafe = &led_status_red; + led-running = &led_status_green; + led-upgrade = &led_update_green; + }; + + chosen { + bootargs-override = "console=ttyS0,115200 rootfstype=squashfs,jffs2"; + }; + + keys { + compatible = "gpio-keys"; + + reset { + label = "reset"; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; + + leds { + compatible = "gpio-leds"; + + led_status_green: led-0 { + color = ; + function = LED_FUNCTION_STATUS; + gpios = <&gpio 8 GPIO_ACTIVE_LOW>; + }; + + led_status_red: led-1 { + color = ; + function = LED_FUNCTION_STATUS; + gpios = <&gpio 11 GPIO_ACTIVE_HIGH>; + }; + + led_update_green: led-2 { + color = ; + function = LED_FUNCTION_PROGRAMMING; + gpios = <&gpio 12 GPIO_ACTIVE_LOW>; + }; + }; +}; + +&pcie { + status = "okay"; +}; + +&nand { + status = "okay"; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + reg = <0x00 0x100000>; + label = "uboot"; + read-only; + }; + + partition@100000 { + reg = <0x100000 0xff00000>; + label = "ubi"; + compatible = "linux,ubi"; + + volumes { + ubi-volume-env1 { + volname = "env1"; + + nvmem-layout { + compatible = "u-boot,env-redundant-count"; + + ethaddr: ethaddr { + #nvmem-cell-cells = <1>; + }; + }; + }; + }; + }; + }; +}; + +&gmac1 { + label = "wan"; + phy-handle = <ðphy0>; + nvmem-cells = <ðaddr 1>; + nvmem-cell-names = "mac-address"; + status = "okay"; +}; + +&i2c { + status = "okay"; +}; + +ðphy0 { + /delete-property/ interrupts; +}; + +&state_default { + gpio { + groups = "uart2", "uart3"; + function = "gpio"; + }; +}; + +&switch0 { + ports { + port@1 { + label = "lan"; + nvmem-cells = <ðaddr 0>; + nvmem-cell-names = "mac-address"; + status = "okay"; + }; + }; +}; From 3e7337feead8e0a0f5a05f5b91d7d0fd7f14ec56 Mon Sep 17 00:00:00 2001 From: Andreas Gnau Date: Tue, 7 Jan 2025 23:55:12 +0100 Subject: [PATCH 22/40] ramips: Add support for Genexis / Inteno Pulse EX400 Add support for Genexis Pulse EX400 / Inteno Pulse EX400. A branded variant for the Finnish ISP DNA has already been added in fea2264d9fdd (ramips: mt7621: Add DNA Valokuitu Plus EX400, 2023-07-31). This commit adds support for the generic variants with Inteno and Genexis branding. Inteno changed its name to Genexis and both brandings exist. In terms of electronics, there is no difference between the DNA-branded version and other brandings. LED markings on the case are different, though. While the DNA-version has a "software-update" LED, the other versions have a WPS LED. To reduce user confusion, create a separate image. Add the different device-tree with the different LED and rename things to work the same way for both variants. Specifications: - Device: Genexis Pulse EX400 / Inteno Pulse EX400 - SoC: MT7621A - Flash: 256 MB NAND - RAM: 256 MB - Ethernet: Built-in, 2 x 1 GbE - Wifi: MT7603 2.4 GHz 2x2 MIMO, MT7615 5 GHz 4x4 MU-MIMO - USB: 1x 2.0 - LEDs (GPIO): green/red status, green WPS - LEDs (SX9512, unsupported): Broadband, Wi-Fi 2.4G, Wi-Fi 5G - Buttons (GPIO): Reset - Buttons (SX9512, unsupported): Wi-Fi 2.4G, Wi-Fi 5G, WPS MAC addresses: - LAN: U-Boot 'ethaddr' (label) - WAN: label + 1 - 2.4 GHz: label + 6 - 5 GHz: label + 7 Serial: There is a black block connector next to the red ethernet connector. It is accessible also through holes in the casing. Pinout (TTL 3.3V) +---+---+ |Tx |Rx | +---+---+ |Vcc|Gnd| +---+---+ Firmware: The vendor firmware is a fork of OpenWrt (Reboot) with a kernel version 4.4.93. The flash is arranged as below and there is a dual boot mechanism alternating between rootfs_0 and rootfs_1. +-------+------+------+-----------+-----------+ | | env1 | env2 | rootfs_0 | rootfs_1 | | +------+------+-----------+-----------+ | | UBI volumes | +-------+-------------------------------------+ |U-Boot | UBI | +-------+-------------------------------------+ |mtd0 | mtd1 | +-------+-------------------------------------+ | NAND | +---------------------------------------------+ In OpenWrt rootfs_0 will be used as a boot partition that will contain the kernel and the dtb. The squashfs rootfs and overlay are standard OpenWrt behaviour. +-------+------+------+-----------+--------+------------+ | | env1 | env2 | rootfs_0 | rootfs | rootfs_data| | +------+------+-----------+--------+------------+ | | UBI volumes | +-------+-----------------------------------------------+ |U-Boot | UBI | +-------+-----------------------------------------------+ |mtd0 | mtd1 | +-------+-----------------------------------------------+ | NAND | +-------------------------------------------------------+ U-boot: With proper serial access, booting can be halted to U-boot by pressing any key. TFTP and flash writes are available, but only the first one has been tested. NOTE: Recovery mode can be accessed by holding down the reset button while powering on the device. The led 'Update' will show a solid green light once ready. A web server will be running at 192.168.1.1:80 and it will allow flashing a firmware package. You can cycle between rootfs_0 and rootfs_1 by pressing the reset button once. Root password: With the vendor web UI create a backup of your settings and download the archive to your computer. Within the archive in the file /etc/shadow replace the password hash for root with that of a password you know. Restore the configuration with the vendor web UI and you will have changed the root password. SSH access: You might need to enable the SSH service for LAN interface as by default it's enabled for WAN only. Installing OpenWrt: With the vendor web UI, or from the U-Boot recovery UI, install the OpenWrt factory image. Alternatively, ssh to the device and use sysupgrade -n from cli. Finalize by installing the OpenWrt sysupgrade image to get a fully functioning system. Reverting to the vendor firmware: Boot with OpenWrt initramfs image - Remove volumes rootfs_0, rootfs and rootfs_data and create vendor volumes. ubirmvol /dev/ubi0 -n 2 ubirmvol /dev/ubi0 -n 3 ubirmvol /dev/ubi0 -n 4 ubimkvol /dev/ubi0 -N rootfs_0 -S 990 ubimkvol /dev/ubi0 -N rootfs_1 -S 990 Power off and enter to the U-boot recovery to install the vendor firmware. Signed-off-by: Andreas Gnau Link: https://github.com/openwrt/openwrt/pull/17551 Signed-off-by: Hauke Mehrtens --- package/boot/uboot-envtools/files/ramips | 3 +- .../dts/mt7621_dna_valokuitu-plus-ex400.dts | 15 ++++++ .../mt7621_genexis_pulse-ex400-common.dtsi | 12 +---- .../ramips/dts/mt7621_genexis_pulse-ex400.dts | 23 +++++++++ target/linux/ramips/image/mt7621.mk | 47 ++++++++++++------- .../mt7621/base-files/etc/board.d/02_network | 1 + .../mt7621/base-files/etc/init.d/bootcount | 3 +- .../lib/upgrade/{dna.sh => inteno.sh} | 13 +++-- .../mt7621/base-files/lib/upgrade/platform.sh | 5 +- 9 files changed, 87 insertions(+), 35 deletions(-) create mode 100644 target/linux/ramips/dts/mt7621_genexis_pulse-ex400.dts rename target/linux/ramips/mt7621/base-files/lib/upgrade/{dna.sh => inteno.sh} (79%) diff --git a/package/boot/uboot-envtools/files/ramips b/package/boot/uboot-envtools/files/ramips index c1633e2cac..326524fba7 100644 --- a/package/boot/uboot-envtools/files/ramips +++ b/package/boot/uboot-envtools/files/ramips @@ -149,7 +149,8 @@ xiaomi,mi-router-cr6608|\ xiaomi,mi-router-cr6609) ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x10000" "0x20000" ;; -dna,valokuitu-plus-ex400) +dna,valokuitu-plus-ex400|\ +genexis,pulse-ex400) ubootenv_add_uci_config "/dev/ubi0_0" "0x0" "0x1f000" "0x1f000" "1" ubootenv_add_uci_config "/dev/ubi0_1" "0x0" "0x1f000" "0x1f000" "1" ;; diff --git a/target/linux/ramips/dts/mt7621_dna_valokuitu-plus-ex400.dts b/target/linux/ramips/dts/mt7621_dna_valokuitu-plus-ex400.dts index 9bbe91beef..e06da71d76 100644 --- a/target/linux/ramips/dts/mt7621_dna_valokuitu-plus-ex400.dts +++ b/target/linux/ramips/dts/mt7621_dna_valokuitu-plus-ex400.dts @@ -5,4 +5,19 @@ / { compatible = "dna,valokuitu-plus-ex400", "mediatek,mt7621-soc"; model = "DNA Valokuitu Plus EX400"; + + aliases { + led-boot = &led_status_red; + led-failsafe = &led_status_red; + led-running = &led_status_green; + led-upgrade = &led_update_green; + }; +}; + +&leds { + led_update_green: led-2 { + color = ; + function = LED_FUNCTION_PROGRAMMING; + gpios = <&gpio 12 GPIO_ACTIVE_LOW>; + }; }; diff --git a/target/linux/ramips/dts/mt7621_genexis_pulse-ex400-common.dtsi b/target/linux/ramips/dts/mt7621_genexis_pulse-ex400-common.dtsi index dddc381fe8..a3bc70e8ce 100644 --- a/target/linux/ramips/dts/mt7621_genexis_pulse-ex400-common.dtsi +++ b/target/linux/ramips/dts/mt7621_genexis_pulse-ex400-common.dtsi @@ -10,10 +10,6 @@ aliases { ethernet0 = &gmac0; label-mac-device = &gmac0; - led-boot = &led_status_red; - led-failsafe = &led_status_red; - led-running = &led_status_green; - led-upgrade = &led_update_green; }; chosen { @@ -30,7 +26,7 @@ }; }; - leds { + leds: leds { compatible = "gpio-leds"; led_status_green: led-0 { @@ -44,12 +40,6 @@ function = LED_FUNCTION_STATUS; gpios = <&gpio 11 GPIO_ACTIVE_HIGH>; }; - - led_update_green: led-2 { - color = ; - function = LED_FUNCTION_PROGRAMMING; - gpios = <&gpio 12 GPIO_ACTIVE_LOW>; - }; }; }; diff --git a/target/linux/ramips/dts/mt7621_genexis_pulse-ex400.dts b/target/linux/ramips/dts/mt7621_genexis_pulse-ex400.dts new file mode 100644 index 0000000000..2ec6498322 --- /dev/null +++ b/target/linux/ramips/dts/mt7621_genexis_pulse-ex400.dts @@ -0,0 +1,23 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +#include "mt7621_genexis_pulse-ex400-common.dtsi" + +/ { + compatible = "genexis,pulse-ex400", "mediatek,mt7621-soc"; + model = "Genexis/Inteno Pulse EX400"; + + aliases { + led-boot = &led_status_red; + led-failsafe = &led_status_red; + led-running = &led_status_green; + led-upgrade = &led_status_red; + }; +}; + +&leds { + led_wps_green: led-2 { + color = ; + function = LED_FUNCTION_WPS; + gpios = <&gpio 12 GPIO_ACTIVE_LOW>; + }; +}; diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index 1f04dbdef6..370b20a783 100755 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -51,7 +51,7 @@ define Build/arcadyan-trx rm $@.hsqs $@.tail endef -define Build/dna-header +define Build/inteno-y3-header BC='$(STAGING_DIR_HOST)/bin/bc' ;\ ubifsofs="1024" ;\ ubifs="$$(stat -c%s $@)" ;\ @@ -91,7 +91,7 @@ define Build/dna-header mv $@.tmp $@ endef -define Build/dna-bootfs +define Build/inteno-bootfs mkdir -p $@.ubifs-dir/boot # populate the boot fs with the dtb and the kernel image @@ -1085,23 +1085,11 @@ define Device/d-team_pbr-m1 endef TARGET_DEVICES += d-team_pbr-m1 +# Branded version of Genexis / Inteno EX400 (difference is one LED) define Device/dna_valokuitu-plus-ex400 - $(Device/dsa-migration) - IMAGE_SIZE := 117m - PAGESIZE := 2048 - MKUBIFS_OPTS := --min-io-size=$$(PAGESIZE) --leb-size=124KiB --max-leb-cnt=96 \ - --log-lebs=2 --space-fixup --squash-uids + $(Device/genexis_pulse-ex400/common) DEVICE_VENDOR := DNA DEVICE_MODEL := Valokuitu Plus EX400 - KERNEL := kernel-bin | lzma | uImage lzma - KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | uImage lzma - IMAGES += factory.bin - IMAGE/factory.bin := append-image-stage initramfs-kernel.bin | \ - dna-bootfs | dna-header | append-md5sum-ascii-salted - IMAGE/sysupgrade.bin := append-kernel | dna-bootfs | \ - sysupgrade-tar kernel=$$$$@ | check-size | append-metadata - DEVICE_IMG_NAME = $$(DEVICE_IMG_PREFIX)-$$(2) - DEVICE_PACKAGES := kmod-mt7603 kmod-mt7615-firmware kmod-usb3 endef TARGET_DEVICES += dna_valokuitu-plus-ex400 @@ -1406,6 +1394,33 @@ define Device/gemtek_wvrtm-130acn endef TARGET_DEVICES += gemtek_wvrtm-130acn +# Common definitions shared between genexis_pulse-ex400 and dna_valokuitu-plus-ex400 +define Device/genexis_pulse-ex400/common + $(Device/dsa-migration) + IMAGE_SIZE := 117m + PAGESIZE := 2048 + MKUBIFS_OPTS := --min-io-size=$$(PAGESIZE) --leb-size=124KiB --max-leb-cnt=96 \ + --log-lebs=2 --space-fixup --squash-uids + KERNEL := kernel-bin | lzma | uImage lzma + KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | uImage lzma + IMAGES += factory.bin + IMAGE/factory.bin := append-image-stage initramfs-kernel.bin | \ + inteno-bootfs | inteno-y3-header | append-md5sum-ascii-salted + IMAGE/sysupgrade.bin := append-kernel | inteno-bootfs | \ + sysupgrade-tar kernel=$$$$@ | check-size | append-metadata + DEVICE_IMG_NAME = $$(DEVICE_IMG_PREFIX)-$$(2) + DEVICE_PACKAGES := kmod-mt7603 kmod-mt7615-firmware kmod-usb3 +endef + +define Device/genexis_pulse-ex400 + $(Device/genexis_pulse-ex400/common) + DEVICE_VENDOR := Genexis + DEVICE_MODEL := Pulse EX400 + DEVICE_ALT0_VENDOR := Inteno + DEVICE_ALT0_MODEL := Pulse EX400 +endef +TARGET_DEVICES += genexis_pulse-ex400 + define Device/glinet_gl-mt1300 $(Device/dsa-migration) IMAGE_SIZE := 32448k diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network index dfb139db4e..2374d5f60a 100644 --- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network +++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network @@ -73,6 +73,7 @@ ramips_setup_interfaces() cudy,m1300-v2|\ cudy,m1800|\ dna,valokuitu-plus-ex400|\ + genexis,pulse-ex400|\ humax,e10|\ keenetic,kn-3510|\ meig,slt866|\ diff --git a/target/linux/ramips/mt7621/base-files/etc/init.d/bootcount b/target/linux/ramips/mt7621/base-files/etc/init.d/bootcount index b83223e7dd..2c88d68051 100755 --- a/target/linux/ramips/mt7621/base-files/etc/init.d/bootcount +++ b/target/linux/ramips/mt7621/base-files/etc/init.d/bootcount @@ -32,7 +32,8 @@ boot() { samknows,whitebox-v8) fw_setenv bootcount 0 ;; - dna,valokuitu-plus-ex400) + dna,valokuitu-plus-ex400|\ + genexis,pulse-ex400) fw_setenv boot_cnt_primary 0 fw_setenv boot_cnt_alt 0 ;; diff --git a/target/linux/ramips/mt7621/base-files/lib/upgrade/dna.sh b/target/linux/ramips/mt7621/base-files/lib/upgrade/inteno.sh similarity index 79% rename from target/linux/ramips/mt7621/base-files/lib/upgrade/dna.sh rename to target/linux/ramips/mt7621/base-files/lib/upgrade/inteno.sh index d699516ff6..677000f6b1 100644 --- a/target/linux/ramips/mt7621/base-files/lib/upgrade/dna.sh +++ b/target/linux/ramips/mt7621/base-files/lib/upgrade/inteno.sh @@ -16,11 +16,16 @@ . /lib/functions.sh . /lib/upgrade/nand.sh -dna_do_upgrade () { - tar -xaf $1 +inteno_do_upgrade () { + local tar_file=$1 + local cmd=cat + # WARNING: This fails if tar contains more than one 'sysupgrade-*' directory. + local board_dir="$(tar tf "$tar_file" | grep -m 1 '^sysupgrade-.*/$')" + board_dir="${board_dir%/}" + tar -xaf "$tar_file" # get the size of the new bootfs - local _bootfs_size=$(wc -c < ./sysupgrade-dna_valokuitu-plus-ex400/kernel) + local _bootfs_size=$(wc -c < "$board_dir/kernel") [ -n "$_bootfs_size" -a "$_bootfs_size" -gt "0" ] || nand_do_upgrade_failed # remove existing rootfses and recreate rootfs_0 @@ -32,7 +37,7 @@ dna_do_upgrade () { # update the rootfs_0 contents local _kern_ubivol=$( nand_find_volume "ubi0" "rootfs_0" ) - ubiupdatevol /dev/${_kern_ubivol} sysupgrade-dna_valokuitu-plus-ex400/kernel + ubiupdatevol "/dev/$_kern_ubivol" "$board_dir/kernel" fw_setenv root_vol rootfs_0 fw_setenv boot_cnt_primary 0 diff --git a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh index f2325c8325..fabaa6ccfb 100755 --- a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh @@ -157,8 +157,9 @@ platform_do_upgrade() { buffalo,wsr-2533dhpls) buffalo_do_upgrade "$1" ;; - dna,valokuitu-plus-ex400) - dna_do_upgrade "$1" + dna,valokuitu-plus-ex400|\ + genexis,pulse-ex400) + inteno_do_upgrade "$1" ;; elecom,wrc-x1800gs) [ "$(fw_printenv -n bootmenu_delay)" != "0" ] || \ From 4e3342f5f17d5d227f036b4b16e2a3721a2e8493 Mon Sep 17 00:00:00 2001 From: Andreas Gnau Date: Fri, 10 Jan 2025 22:42:03 +0100 Subject: [PATCH 23/40] ramips: mt7621: Reduce hardcoded metadata for Inteno Y3 imgs Instead of hardcoded metadata, put some sensible data instead. Signed-off-by: Andreas Gnau Link: https://github.com/openwrt/openwrt/pull/17551 Signed-off-by: Hauke Mehrtens --- target/linux/ramips/image/mt7621.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index 370b20a783..80254ed0e7 100755 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -67,12 +67,12 @@ define Build/inteno-y3-header echo "IntenoIopY" > $@.tmp ;\ echo "version 5" >> $@.tmp ;\ echo "integrity MD5SUM" >> $@.tmp ;\ - echo "board EX400" >> $@.tmp ;\ - echo "chip 7621" >> $@.tmp ;\ - echo "arch all mipsel_1004kc" >> $@.tmp ;\ - echo "model EX400" >> $@.tmp ;\ - echo "release EX400-X-DNA-4.3.6.100-R-210518_0935" >> $@.tmp ;\ - echo "customer DNA" >> $@.tmp ;\ + echo "board $(word 1,$(1))" >> $@.tmp ;\ + echo "chip $(patsubst mt%,%,$(SOC:bcm%=%))" >> $@.tmp ;\ + echo "arch all $(CONFIG_TARGET_ARCH_PACKAGES)" >> $@.tmp ;\ + echo "model $(word 1,$(1))" >> $@.tmp ;\ + echo "release $(DEVICE_IMG_PREFIX)" >> $@.tmp ;\ + echo "customer $(if $(CONFIG_VERSION_DIST),$(CONFIG_VERSION_DIST),OpenWrt)" >> $@.tmp ;\ echo "ubifsofs $${ubifsofs}" >> $@.tmp ;\ echo "ubifs $${ubifs}" >> $@.tmp ;\ echo "pkginfoofs $${pkginfoofs}" >> $@.tmp ;\ @@ -1405,7 +1405,7 @@ define Device/genexis_pulse-ex400/common KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | uImage lzma IMAGES += factory.bin IMAGE/factory.bin := append-image-stage initramfs-kernel.bin | \ - inteno-bootfs | inteno-y3-header | append-md5sum-ascii-salted + inteno-bootfs | inteno-y3-header EX400 | append-md5sum-ascii-salted IMAGE/sysupgrade.bin := append-kernel | inteno-bootfs | \ sysupgrade-tar kernel=$$$$@ | check-size | append-metadata DEVICE_IMG_NAME = $$(DEVICE_IMG_PREFIX)-$$(2) From 160e0b7ad866c9f52b81d95588c7b0a40cffd109 Mon Sep 17 00:00:00 2001 From: John Audia Date: Sat, 8 Mar 2025 10:29:51 -0500 Subject: [PATCH 24/40] tools/coreutils: update to 9.6 Update to latest stable release https://lists.gnu.org/archive/html/coreutils/2025-01/msg00049.html Signed-off-by: John Audia Link: https://github.com/openwrt/openwrt/pull/18191 Signed-off-by: Nick Hainke --- tools/coreutils/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/coreutils/Makefile b/tools/coreutils/Makefile index 73b95912ee..862f4d8bcb 100644 --- a/tools/coreutils/Makefile +++ b/tools/coreutils/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=coreutils PKG_CPE_ID:=cpe:/a:gnu:coreutils -PKG_VERSION:=9.5 +PKG_VERSION:=9.6 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/coreutils -PKG_HASH:=767ae6a22950ec42f3ba5f7c1de79dd27800ee8e9b8642da5dedb5974a1741e5 +PKG_HASH:=7a0124327b398fd9eb1a6abde583389821422c744ffa10734b24f557610d3283 HOST_BUILD_PARALLEL := 1 From 6ef0f08664ff28aa932e3ea194b0c6f6d907b136 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 14 Mar 2025 10:01:33 +0100 Subject: [PATCH 25/40] umdns: set triggers and firewall rules on reload Both depend on the config, so they need to be sent to procd on reload. Signed-off-by: Felix Fietkau --- package/network/services/umdns/files/umdns.init | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/package/network/services/umdns/files/umdns.init b/package/network/services/umdns/files/umdns.init index 87a6f8e16d..0516192fa2 100644 --- a/package/network/services/umdns/files/umdns.init +++ b/package/network/services/umdns/files/umdns.init @@ -17,7 +17,7 @@ load_ifaces() { done } -reload_service() { +do_reload_service() { json_init json_add_array interfaces for i in $(load_ifaces); do @@ -66,7 +66,12 @@ start_service() { procd_close_instance } +reload_service() { + rc_procd start_service + do_reload_service +} + service_running() { ubus -t 10 wait_for umdns - [ $? = 0 ] && reload_service + [ $? = 0 ] && do_reload_service } From 6c8cc862954b61d91a0c2670be4be0795c184ae5 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Fri, 14 Mar 2025 11:21:55 +0000 Subject: [PATCH 26/40] mediatek: filogic: openwrt-one: drop kmod-nvme The OpenWrt One is the only board listing kmod-nvme as part of it's default package set. Remove kmod-nvme from the default package set as the board is sold without an NVMe SSD and the M.2 slot can also be used for other purposes. Signed-off-by: Daniel Golle --- target/linux/mediatek/image/filogic.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/mediatek/image/filogic.mk b/target/linux/mediatek/image/filogic.mk index 531cf83863..d47df9b201 100644 --- a/target/linux/mediatek/image/filogic.mk +++ b/target/linux/mediatek/image/filogic.mk @@ -1341,7 +1341,7 @@ define Device/openwrt_one DEVICE_DTS_DIR := ../dts DEVICE_DTC_FLAGS := --pad 4096 DEVICE_DTS_LOADADDR := 0x43f00000 - DEVICE_PACKAGES := kmod-mt7915e kmod-mt7981-firmware mt7981-wo-firmware kmod-rtc-pcf8563 kmod-usb3 kmod-nvme kmod-phy-airoha-en8811h + DEVICE_PACKAGES := kmod-mt7915e kmod-mt7981-firmware mt7981-wo-firmware kmod-rtc-pcf8563 kmod-usb3 kmod-phy-airoha-en8811h KERNEL_LOADADDR := 0x44000000 KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ From f4801cffc3697d57a6d47e325d2f43c785ce3416 Mon Sep 17 00:00:00 2001 From: John Audia Date: Sat, 8 Mar 2025 16:33:32 -0500 Subject: [PATCH 27/40] firmware: intel-microcode: update to 20250211 Debian Changelogs from 20240531: local access. - Mitigations for INTEL-SA-01079 (CVE-2024-23918) Potential security vulnerabilities in some Intel Xeon processors using Intel SGX may allow escalation of privilege. Intel disclosed that some processor models were already fixed by a previous microcode update. - Updated mitigations for INTEL-SA-01097 (CVE-2024-24968) Improper finite state machines (FSMs) in hardware logic in some Intel Processors may allow an privileged user to potentially enable a denial of service via local access. - Mitigations for INTEL-SA-01103 (CVE-2024-23984) A potential security vulnerability in the Running Average Power Limit (RAPL) interface for some Intel Processors may allow information disclosure. Added mitigations for more processor models. * Updated Microcodes: sig 0x000806f8, pf_mask 0x87, 2024-06-20, rev 0x2b000603, size 588800 sig 0x000806f7, pf_mask 0x87, 2024-06-20, rev 0x2b000603 sig 0x000806f6, pf_mask 0x87, 2024-06-20, rev 0x2b000603 sig 0x000806f5, pf_mask 0x87, 2024-06-20, rev 0x2b000603 sig 0x000806f4, pf_mask 0x87, 2024-06-20, rev 0x2b000603 sig 0x00090672, pf_mask 0x07, 2024-05-29, rev 0x0037, size 224256 sig 0x00090675, pf_mask 0x07, 2024-05-29, rev 0x0037 sig 0x000b06f2, pf_mask 0x07, 2024-05-29, rev 0x0037 sig 0x000b06f5, pf_mask 0x07, 2024-05-29, rev 0x0037 sig 0x000906a3, pf_mask 0x80, 2024-06-03, rev 0x0435, size 223232 sig 0x000906a4, pf_mask 0x80, 2024-06-03, rev 0x0435 sig 0x000a06a4, pf_mask 0xe6, 2024-08-02, rev 0x0020, size 138240 sig 0x000b06a2, pf_mask 0xe0, 2024-05-29, rev 0x4123, size 220160 sig 0x000b06a3, pf_mask 0xe0, 2024-05-29, rev 0x4123 sig 0x000b06a8, pf_mask 0xe0, 2024-05-29, rev 0x4123 sig 0x000c06f2, pf_mask 0x87, 2024-06-20, rev 0x21000283, size 560128 sig 0x000c06f1, pf_mask 0x87, 2024-06-20, rev 0x21000283 * source: update symlinks to reflect id of the latest release, 20241112 * Update changelog for 3.20240910.1 and 3.20240813.1 with new information: INTEL-SA-1103 was addressed by 3.20240813.1 for some processor models, and not by 3.20240910. INTEL-SA-1079 was addressed by 3.20240910.1 for some processor models. -- Henrique de Moraes Holschuh Thu, 14 Nov 2024 15:37:40 -0300 intel-microcode (3.20241029.1) UNRELEASED; urgency=medium * New upstream microcode datafile 20241029 - Not relevant for operating system microcode updates - Only when loaded from firmware, this update fixes the critical, potentially hardware-damaging errata RPL061: Incorrect Internal Voltage Request on Raptor Lake (Core 13th/14th gen) Intel processors. * Updated Microcodes: sig 0x000b0671, pf_mask 0x32, 2024-08-29, rev 0x012b, size 211968 -- Henrique de Moraes Holschuh Thu, 14 Nov 2024 14:49:03 -0300 intel-microcode (3.20240910.1) unstable; urgency=medium * New upstream microcode datafile 20240910 (closes: #1081363) - Mitigations for INTEL-SA-01097 (CVE-2024-24968) Improper finite state machines (FSMs) in hardware logic in some Intel Processors may allow an privileged user to potentially enable a denial of service via local access. - Fixes for unspecified functional issues on several processor models - The processor voltage limit issue on Core 13rd/14th gen REQUIRES A FIRMWARE UPDATE. It is present in this release for sig 0xb0671, but THE VOLTAGE ISSUE FIX ONLY WORKS WHEN THE MICROCODE UPDATE IS LOADED THROUGH THE FIT TABLE IN FIRMWARE. Contact your system vendor for a firmware update that includes the appropriate microcode update for your processor. * Updated Microcodes: sig 0x00090672, pf_mask 0x07, 2024-02-22, rev 0x0036, size 224256 sig 0x00090675, pf_mask 0x07, 2024-02-22, rev 0x0036 sig 0x000b06f2, pf_mask 0x07, 2024-02-22, rev 0x0036 sig 0x000b06f5, pf_mask 0x07, 2024-02-22, rev 0x0036 sig 0x000906a3, pf_mask 0x80, 2024-02-22, rev 0x0434, size 222208 sig 0x000906a4, pf_mask 0x80, 2024-02-22, rev 0x0434 sig 0x000a06a4, pf_mask 0xe6, 2024-06-17, rev 0x001f, size 137216 sig 0x000b0671, pf_mask 0x32, 2024-07-18, rev 0x0129, size 215040 sig 0x000b06a2, pf_mask 0xe0, 2024-02-22, rev 0x4122, size 220160 sig 0x000b06a3, pf_mask 0xe0, 2024-02-22, rev 0x4122 sig 0x000b06a8, pf_mask 0xe0, 2024-02-22, rev 0x4122 sig 0x000b06e0, pf_mask 0x19, 2024-03-25, rev 0x001a, size 138240 * Update changelog for 3.20240813.1 with new information * Update changelog for 3.20240514.1 with new information * source: update symlinks to reflect id of the latest release, 20240910 -- Henrique de Moraes Holschuh Sat, 21 Sep 2024 16:40:07 -0300 intel-microcode (3.20240813.2) unstable; urgency=high * Merge changes from intel-microcode/3.20240531.1+nmu1, which were left out from 3.20240813.1 by an oversight, regressing merged-usr. Closes: #1060200 -- Henrique de Moraes Holschuh Sat, 17 Aug 2024 11:31:32 -0300 intel-microcode (3.20240813.1) unstable; urgency=medium * New upstream microcode datafile 20240813 (closes: #1078742) - Mitigations for INTEL-SA-01083 (CVE-2024-24853) Incorrect behavior order in transition between executive monitor and SMI transfer monitor (STM) in some Intel Processors may allow a privileged user to potentially enable escalation of privilege via local access. - Mitigations for INTEL-SA-01118 (CVE-2024-25939) Mirrored regions with different values in 3rd Generation Intel Xeon Scalable Processors may allow a privileged user to potentially enable denial of service via local access. - Mitigations for INTEL-SA-01100 (CVE-2024-24980) Protection mechanism failure in some 3rd, 4th, and 5th Generation Intel Xeon Processors may allow a privileged user to potentially enable escalation of privilege via local access. - Mitigations for INTEL-SA-01038 (CVE-2023-42667) Improper isolation in the Intel Core Ultra Processor stream cache mechanism may allow an authenticated user to potentially enable escalation of privilege via local access. Intel disclosed that some processor models were already fixed by the previous microcode update. - Mitigations for INTEL-SA-01046 (CVE-2023-49141) Improper isolation in some Intel Processors stream cache mechanism may allow an authenticated user to potentially enable escalation of privilege via local access. Intel disclosed that some processor models were already fixed by the previous microcode update. - Mitigations for INTEL-SA-01079 (CVE-2024-23918) Potential security vulnerabilities in some Intel Xeon processors using Intel SGX may allow escalation of privilege. Intel released this information during the full disclosure for the 20241112 update. Processor signatures 0x606a6 and 0x606c1. - Mitigations for INTEL-SA-01103 (CVE-2024-23984) A potential security vulnerability in the Running Average Power Limit (RAPL) interface for some Intel Processors may allow information disclosure. Intel released this information during the full disclosure for the 20240910 update. Processor signatures 0x5065b, 0x606a6, 0x606c1. - Fix for unspecified functional issues on several processor models - Fix for errata TGL068/ADL075/ICL088/... "Processor may hang during a microcode update". It is not clear which processors were fixed by this release, or by one of the microcode updates from 2024-05. - Mitigations for INTEL-SA-01213 (CVE-2024-36293) Improper access control in the EDECCSSA user leaf function for some Intel Processors with Intel SGX may allow an authenticated user to potentially enable denial of service via local access. Intel released this information during the full disclosure for the 20250211 update. Processor signature 0x906ec (9th Generation Intel Core processor). * Updated microcodes: sig 0x00050657, pf_mask 0xbf, 2024-03-01, rev 0x5003707, size 39936 sig 0x0005065b, pf_mask 0xbf, 2024-04-01, rev 0x7002904, size 30720 sig 0x000606a6, pf_mask 0x87, 2024-04-01, rev 0xd0003e7, size 308224 sig 0x000606c1, pf_mask 0x10, 2024-04-03, rev 0x10002b0, size 300032 sig 0x000706e5, pf_mask 0x80, 2024-02-15, rev 0x00c6, size 114688 sig 0x000806c1, pf_mask 0x80, 2024-02-15, rev 0x00b8, size 112640 sig 0x000806c2, pf_mask 0xc2, 2024-02-15, rev 0x0038, size 99328 sig 0x000806d1, pf_mask 0xc2, 2024-02-15, rev 0x0052, size 104448 sig 0x000806e9, pf_mask 0xc0, 2024-02-01, rev 0x00f6, size 106496 sig 0x000806e9, pf_mask 0x10, 2024-02-01, rev 0x00f6, size 106496 sig 0x000806ea, pf_mask 0xc0, 2024-02-01, rev 0x00f6, size 105472 sig 0x000806eb, pf_mask 0xd0, 2024-02-01, rev 0x00f6, size 106496 sig 0x000806ec, pf_mask 0x94, 2024-02-05, rev 0x00fc, size 106496 sig 0x00090661, pf_mask 0x01, 2024-04-05, rev 0x001a, size 20480 sig 0x000906ea, pf_mask 0x22, 2024-02-01, rev 0x00f8, size 105472 sig 0x000906eb, pf_mask 0x02, 2024-02-01, rev 0x00f6, size 106496 sig 0x000906ec, pf_mask 0x22, 2024-02-01, rev 0x00f8, size 106496 sig 0x000906ed, pf_mask 0x22, 2024-02-05, rev 0x0100, size 106496 sig 0x000a0652, pf_mask 0x20, 2024-02-01, rev 0x00fc, size 97280 sig 0x000a0653, pf_mask 0x22, 2024-02-01, rev 0x00fc, size 98304 sig 0x000a0655, pf_mask 0x22, 2024-02-01, rev 0x00fc, size 97280 sig 0x000a0660, pf_mask 0x80, 2024-02-01, rev 0x00fe, size 97280 sig 0x000a0661, pf_mask 0x80, 2024-02-01, rev 0x00fc, size 97280 sig 0x000a0671, pf_mask 0x02, 2024-03-07, rev 0x0062, size 108544 sig 0x000a06a4, pf_mask 0xe6, 2024-04-15, rev 0x001e, size 137216 * source: update symlinks to reflect id of the latest release, 20240813 * postinst, postrm: switch to dpkg-trigger to run update-initramfs -- Henrique de Moraes Holschuh Thu, 15 Aug 2024 14:41:50 -0300 Signed-off-by: John Audia Link: https://github.com/openwrt/openwrt/pull/18197 Signed-off-by: Hauke Mehrtens --- package/firmware/intel-microcode/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/firmware/intel-microcode/Makefile b/package/firmware/intel-microcode/Makefile index bdd8ae73d8..2ec1f22c35 100644 --- a/package/firmware/intel-microcode/Makefile +++ b/package/firmware/intel-microcode/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=intel-microcode -PKG_VERSION:=20240531 +PKG_VERSION:=20250211 PKG_RELEASE:=1 PKG_SOURCE:=intel-microcode_3.$(PKG_VERSION).1.tar.xz PKG_SOURCE_URL:=@DEBIAN/pool/non-free-firmware/i/intel-microcode/ -PKG_HASH:=808cbb57a790dab7060b59b31e70e54ac47d3798d75e9784ed57a65b9f951fc4 +PKG_HASH:=06b7aca49790d673623cb42f7a62a517d82555ce96371d2967b568d6e30fd787 PKG_BUILD_DIR:=$(BUILD_DIR)/intel-microcode-3.$(PKG_VERSION).1 PKG_CPE_ID:=cpe:/a:intel:microcode From a53417cc301f6b2cdcc7270d1b275acf49e6e64b Mon Sep 17 00:00:00 2001 From: Mauri Sandberg Date: Thu, 30 Jan 2025 18:08:25 +0200 Subject: [PATCH 28/40] ramips: Cleanup Genexis EX400 upgrade script The code can be made more efficient by not extracting the sysupgrade.tar but rather just querying for the filesize within the archive. Resorting to manual update of UBI volume is extra work too, setting CI_KERNPART=rootfs_0 is enough. Suggested-by: Andreas Gnau Signed-off-by: Mauri Sandberg Link: https://github.com/openwrt/openwrt/pull/17806 Signed-off-by: Hauke Mehrtens --- .../mt7621/base-files/lib/upgrade/inteno.sh | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/target/linux/ramips/mt7621/base-files/lib/upgrade/inteno.sh b/target/linux/ramips/mt7621/base-files/lib/upgrade/inteno.sh index 677000f6b1..ecaa1a808c 100644 --- a/target/linux/ramips/mt7621/base-files/lib/upgrade/inteno.sh +++ b/target/linux/ramips/mt7621/base-files/lib/upgrade/inteno.sh @@ -17,15 +17,8 @@ . /lib/upgrade/nand.sh inteno_do_upgrade () { - local tar_file=$1 - local cmd=cat - # WARNING: This fails if tar contains more than one 'sysupgrade-*' directory. - local board_dir="$(tar tf "$tar_file" | grep -m 1 '^sysupgrade-.*/$')" - board_dir="${board_dir%/}" - tar -xaf "$tar_file" - # get the size of the new bootfs - local _bootfs_size=$(wc -c < "$board_dir/kernel") + local _bootfs_size=$(tar -tvf $1 | grep kernel | awk '{print $3}') [ -n "$_bootfs_size" -a "$_bootfs_size" -gt "0" ] || nand_do_upgrade_failed # remove existing rootfses and recreate rootfs_0 @@ -35,15 +28,11 @@ inteno_do_upgrade () { ubirmvol /dev/ubi0 --name=rootfs_data > /dev/null 2>&1 ubimkvol /dev/ubi0 --type=static --size=${_bootfs_size} --name=rootfs_0 - # update the rootfs_0 contents - local _kern_ubivol=$( nand_find_volume "ubi0" "rootfs_0" ) - ubiupdatevol "/dev/$_kern_ubivol" "$board_dir/kernel" - fw_setenv root_vol rootfs_0 fw_setenv boot_cnt_primary 0 fw_setenv boot_cnt_alt 0 # proceed to upgrade the default way - CI_KERNPART=none + CI_KERNPART=rootfs_0 nand_do_upgrade "$1" } From c2a58fe875ff04ce956c7da8f42412053bfc7597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Sat, 15 Mar 2025 09:15:22 +0000 Subject: [PATCH 29/40] tools/coreutils: fix wrong PKG_HASH after update to version 9.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently macOS builds are failing due to hash mismatch. Lets fix it by using proper hash: Here are the SHA1 and SHA256 checksums: File: coreutils-9.6.tar.gz SHA1 sum: 1da82e96486e0eedbd5257c8190f2cf9fcb71c2e SHA256 sum: 2bec616375002c92c1ed5ead32a092b174fe44c14bc736d32e5961053b821d84 References: https://lists.gnu.org/archive/html/coreutils/2025-01/msg00049.html Fixes: 160e0b7ad866 ("tools/coreutils: update to 9.6") Reported-by: Mieczyslaw Nalewaj Signed-off-by: Petr Štetiar --- tools/coreutils/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/coreutils/Makefile b/tools/coreutils/Makefile index 862f4d8bcb..2ffa052330 100644 --- a/tools/coreutils/Makefile +++ b/tools/coreutils/Makefile @@ -12,7 +12,7 @@ PKG_VERSION:=9.6 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/coreutils -PKG_HASH:=7a0124327b398fd9eb1a6abde583389821422c744ffa10734b24f557610d3283 +PKG_HASH:=2bec616375002c92c1ed5ead32a092b174fe44c14bc736d32e5961053b821d84 HOST_BUILD_PARALLEL := 1 From bdd5587b6b0f5281806607a7eb8ffd298fdbe4c7 Mon Sep 17 00:00:00 2001 From: Mieczyslaw Nalewaj Date: Thu, 13 Mar 2025 19:26:01 +0100 Subject: [PATCH 30/40] generic: rename backport patch 852 Rename 852-stable-bus-mhi-host-pci_generic-constify-modem_telit_fn980_.patch to 852-v6.9-stable-bus-mhi-host-pci_generic-constify-modem_telit_fn980.patch because it is used since kernel 6.9-rc1 (https://lore.kernel.org/lkml/Zfwv2y7P7BneKqMZ@kroah.com/). Link: https://web.git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-6.9.y&id=2ec11b5d6d900b17c7d001fbee4751fd2aa58917 Signed-off-by: Mieczyslaw Nalewaj Link: https://github.com/openwrt/openwrt/pull/18237 Signed-off-by: Hauke Mehrtens --- ...ble-bus-mhi-host-pci_generic-constify-modem_telit_fn980.patch} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename target/linux/generic/backport-6.6/{852-stable-bus-mhi-host-pci_generic-constify-modem_telit_fn980_.patch => 852-v6.9-stable-bus-mhi-host-pci_generic-constify-modem_telit_fn980.patch} (100%) diff --git a/target/linux/generic/backport-6.6/852-stable-bus-mhi-host-pci_generic-constify-modem_telit_fn980_.patch b/target/linux/generic/backport-6.6/852-v6.9-stable-bus-mhi-host-pci_generic-constify-modem_telit_fn980.patch similarity index 100% rename from target/linux/generic/backport-6.6/852-stable-bus-mhi-host-pci_generic-constify-modem_telit_fn980_.patch rename to target/linux/generic/backport-6.6/852-v6.9-stable-bus-mhi-host-pci_generic-constify-modem_telit_fn980.patch From 748682e8556d27d904d3fe363228e16eff47afd9 Mon Sep 17 00:00:00 2001 From: John Audia Date: Thu, 13 Mar 2025 16:47:09 -0400 Subject: [PATCH 31/40] kernel: bump 6.6 to 6.6.83 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.83 Removed upstreamed: bcm27xx/patches-6.6/950-0483-usb-xhci-borrow-upstream-TRB_FETCH-quirk-on-VL805-ho.patch[1] Manually rebased: bcm27xx/patches-6.6/950-0061-Revert-Revert-xhci-add-quirk-for-host-controllers-th.patch bcm27xx/patches-6.6/950-0485-usb-xhci-add-XHCI_VLI_HUB_TT_QUIRK.patch bcm27xx/patches-6.6/950-0519-usb-dwc3-Set-DMA-and-coherent-masks-early.patch All other patches automatically rebased. 1. https://web.git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/drivers/usb/host/xhci-pci.c?h=linux-6.6.y&id=c401b1b4b835d66792e884b76264d742a20d931d Build system: x86/64 Build-tested: x86/64 Run-tested: x86/64 Signed-off-by: John Audia [fixed issues with bcm27xx patches] Signed-off-by: Álvaro Fernández Rojas --- include/kernel-6.6 | 4 +-- ...12-net-dsa-mt7530-Add-EN7581-support.patch | 4 +-- .../900-unaligned_access_hacks.patch | 6 ++-- ...ci-add-quirk-for-host-controllers-th.patch | 12 +++---- ...-quirks-add-link-TRB-quirk-for-VL805.patch | 4 +-- ...upstream-TRB_FETCH-quirk-on-VL805-ho.patch | 32 ------------------- ...b-xhci-add-VLI_SS_BULK_OUT_BUG-quirk.patch | 4 +-- ...5-usb-xhci-add-XHCI_VLI_HUB_TT_QUIRK.patch | 10 +++--- ...wc3-Set-DMA-and-coherent-masks-early.patch | 20 ++++++------ ...-add-FS-LS-bus-instance-parkmode-dis.patch | 4 +-- ...d-support-for-setting-NAK-enhancemen.patch | 4 +-- ...ansmit-from-devices-with-no-checksum.patch | 2 +- ...3x-remove-mt753x_phylink_pcs_link_up.patch | 4 +-- ...lways-trap-frames-to-active-CPU-port.patch | 4 +-- ...tore-port-5-SGMII-capability-of-MT75.patch | 14 ++++---- ...mprove-comments-regarding-switch-por.patch | 12 +++---- ...all-port-6-setup-from-mt7530_mac_con.patch | 2 +- ...30-remove-pad_setup-function-pointer.patch | 16 +++++----- ...-correct-port-capabilities-of-MT7988.patch | 2 +- ...o-not-clear-config-supported_interfa.patch | 2 +- ...emove-.mac_port_config-for-MT7988-an.patch | 8 ++--- ...o-not-use-SW_PHY_RST-to-reset-MT7531.patch | 2 +- ...et-rid-of-useless-error-returns-on-p.patch | 16 +++++----- ...get-rid-of-priv-info-cpu_port_config.patch | 14 ++++---- ...-mt7530-get-rid-of-mt753x_mac_config.patch | 4 +-- ...ut-initialising-PCS-devices-code-bac.patch | 4 +-- ...-dsa-mt7530-simplify-link-operations.patch | 2 +- ...0-provide-own-phylink-MAC-operations.patch | 10 +++--- ...dio-read-PHY-address-of-switch-from-.patch | 2 +- ...et-dsa-mt7530-refactor-MT7530_PMCR_P.patch | 12 +++---- ...ename-p5_intf_sel-and-use-only-for-M.patch | 2 +- ...efactor-MT7530_MFC-and-MT7531_CFC-ad.patch | 2 +- ...efactor-MT7530_HWTRAP-and-MT7530_MHW.patch | 2 +- ...eturn-mt7530_setup_mdio-mt7531_setup.patch | 8 ++--- ...efine-MAC-speed-capabilities-per-swi.patch | 8 ++--- ...530-get-rid-of-function-sanity-check.patch | 2 +- ...dsa-mt7530-refactor-MT7530_PMEEECR_P.patch | 4 +-- ...se-priv-ds-num_ports-instead-of-MT75.patch | 2 +- ...o-not-pass-port-variable-to-mt7531_r.patch | 4 +-- ...xplain-exposing-MDIO-bus-of-MT7531AE.patch | 2 +- ...680-net-add-TCP-fraglist-GRO-support.patch | 16 +++++----- ...fraglist-segmentation-after-pull-fro.patch | 2 +- .../999-atm-mpoa-intel-dsl-phy-support.patch | 4 +-- ...c3-add-optional-PHY-interface-clocks.patch | 6 ++-- ...ove-performance-usb-using-lowmem-for.patch | 2 +- ...ma_alloc_noncoherent-to-alloc-low-me.patch | 2 +- 46 files changed, 134 insertions(+), 170 deletions(-) delete mode 100644 target/linux/bcm27xx/patches-6.6/950-0483-usb-xhci-borrow-upstream-TRB_FETCH-quirk-on-VL805-ho.patch diff --git a/include/kernel-6.6 b/include/kernel-6.6 index 7502edfd62..e6f3c97c6e 100644 --- a/include/kernel-6.6 +++ b/include/kernel-6.6 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.6 = .82 -LINUX_KERNEL_HASH-6.6.82 = f3c2389b8c23cabe747f104a3e434201ca6e7725bbbfb3a8c59a063ac4820e41 +LINUX_VERSION-6.6 = .83 +LINUX_KERNEL_HASH-6.6.83 = 894bbbe63b7484a0bc576a1e11a8dbc090fbd476d6424431bdc8435e03c2c208 diff --git a/target/linux/airoha/patches-6.6/029-v6.12-net-dsa-mt7530-Add-EN7581-support.patch b/target/linux/airoha/patches-6.6/029-v6.12-net-dsa-mt7530-Add-EN7581-support.patch index 55e4ae9d40..2f37b86cca 100644 --- a/target/linux/airoha/patches-6.6/029-v6.12-net-dsa-mt7530-Add-EN7581-support.patch +++ b/target/linux/airoha/patches-6.6/029-v6.12-net-dsa-mt7530-Add-EN7581-support.patch @@ -79,7 +79,7 @@ Signed-off-by: David S. Miller /* Disable forwarding by default on all ports */ mt7530_rmw(priv, MT7530_PCR_P(i), PCR_MATRIX_MASK, -@@ -2783,6 +2788,28 @@ static void mt7988_mac_port_get_caps(str +@@ -2779,6 +2784,28 @@ static void mt7988_mac_port_get_caps(str } } @@ -108,7 +108,7 @@ Signed-off-by: David S. Miller static void mt7530_mac_config(struct dsa_switch *ds, int port, unsigned int mode, phy_interface_t interface) -@@ -3220,6 +3247,16 @@ const struct mt753x_info mt753x_table[] +@@ -3216,6 +3243,16 @@ const struct mt753x_info mt753x_table[] .phy_write_c45 = mt7531_ind_c45_phy_write, .mac_port_get_caps = mt7988_mac_port_get_caps, }, diff --git a/target/linux/ath79/patches-6.6/900-unaligned_access_hacks.patch b/target/linux/ath79/patches-6.6/900-unaligned_access_hacks.patch index 91e39d7d24..870567c058 100644 --- a/target/linux/ath79/patches-6.6/900-unaligned_access_hacks.patch +++ b/target/linux/ath79/patches-6.6/900-unaligned_access_hacks.patch @@ -858,7 +858,7 @@ SVN-Revision: 35130 --- a/net/ipv4/tcp_offload.c +++ b/net/ipv4/tcp_offload.c -@@ -63,7 +63,7 @@ static struct sk_buff *__tcpv4_gso_segme +@@ -66,7 +66,7 @@ static struct sk_buff *__tcpv4_gso_segme th2 = tcp_hdr(seg->next); iph2 = ip_hdr(seg->next); @@ -867,7 +867,7 @@ SVN-Revision: 35130 iph->daddr == iph2->daddr && iph->saddr == iph2->saddr) return segs; -@@ -264,7 +264,7 @@ struct sk_buff *tcp_gro_lookup(struct li +@@ -267,7 +267,7 @@ struct sk_buff *tcp_gro_lookup(struct li continue; th2 = tcp_hdr(p); @@ -876,7 +876,7 @@ SVN-Revision: 35130 NAPI_GRO_CB(p)->same_flow = 0; continue; } -@@ -330,8 +330,8 @@ struct sk_buff *tcp_gro_receive(struct l +@@ -333,8 +333,8 @@ struct sk_buff *tcp_gro_receive(struct l ~(TCP_FLAG_CWR | TCP_FLAG_FIN | TCP_FLAG_PSH)); flush |= (__force int)(th->ack_seq ^ th2->ack_seq); for (i = sizeof(*th); i < thlen; i += 4) diff --git a/target/linux/bcm27xx/patches-6.6/950-0061-Revert-Revert-xhci-add-quirk-for-host-controllers-th.patch b/target/linux/bcm27xx/patches-6.6/950-0061-Revert-Revert-xhci-add-quirk-for-host-controllers-th.patch index 3898e05aae..e2c2b02f70 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0061-Revert-Revert-xhci-add-quirk-for-host-controllers-th.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0061-Revert-Revert-xhci-add-quirk-for-host-controllers-th.patch @@ -14,18 +14,14 @@ We don't agree with upstream revert so undo it. --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c -@@ -480,8 +480,10 @@ static void xhci_pci_quirks(struct devic - pdev->device == 0x3432) - xhci->quirks |= XHCI_BROKEN_STREAMS; - -- if (pdev->vendor == PCI_VENDOR_ID_VIA && pdev->device == 0x3483) -+ if (pdev->vendor == PCI_VENDOR_ID_VIA && pdev->device == 0x3483) { +@@ -485,6 +485,7 @@ static void xhci_pci_quirks(struct devic + if (pdev->vendor == PCI_VENDOR_ID_VIA && pdev->device == PCI_DEVICE_ID_VIA_VL805) { xhci->quirks |= XHCI_LPM_SUPPORT; + xhci->quirks |= XHCI_TRB_OVERFETCH; + xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS; -+ } + } if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && - pdev->device == PCI_DEVICE_ID_ASMEDIA_1042_XHCI) { --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -635,8 +635,11 @@ static int xhci_move_dequeue_past_td(str diff --git a/target/linux/bcm27xx/patches-6.6/950-0482-xhci-quirks-add-link-TRB-quirk-for-VL805.patch b/target/linux/bcm27xx/patches-6.6/950-0482-xhci-quirks-add-link-TRB-quirk-for-VL805.patch index 2b267c7792..e295c225f7 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0482-xhci-quirks-add-link-TRB-quirk-for-VL805.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0482-xhci-quirks-add-link-TRB-quirk-for-VL805.patch @@ -24,9 +24,9 @@ Signed-off-by: Jonathan Bell --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c -@@ -483,6 +483,7 @@ static void xhci_pci_quirks(struct devic - if (pdev->vendor == PCI_VENDOR_ID_VIA && pdev->device == 0x3483) { +@@ -486,6 +486,7 @@ static void xhci_pci_quirks(struct devic xhci->quirks |= XHCI_LPM_SUPPORT; + xhci->quirks |= XHCI_TRB_OVERFETCH; xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS; + xhci->quirks |= XHCI_AVOID_DQ_ON_LINK; } diff --git a/target/linux/bcm27xx/patches-6.6/950-0483-usb-xhci-borrow-upstream-TRB_FETCH-quirk-on-VL805-ho.patch b/target/linux/bcm27xx/patches-6.6/950-0483-usb-xhci-borrow-upstream-TRB_FETCH-quirk-on-VL805-ho.patch deleted file mode 100644 index 852e6a3673..0000000000 --- a/target/linux/bcm27xx/patches-6.6/950-0483-usb-xhci-borrow-upstream-TRB_FETCH-quirk-on-VL805-ho.patch +++ /dev/null @@ -1,32 +0,0 @@ -From bab2f1e4e90675af7ea6b48b5c28eb94e22cecd7 Mon Sep 17 00:00:00 2001 -From: Jonathan Bell -Date: Thu, 13 Jul 2023 15:06:54 +0100 -Subject: [PATCH 0483/1085] usb: xhci: borrow upstream TRB_FETCH quirk on VL805 - hosts - -This reimplements 5a57342 usb: xhci: add VLI_TRB_CACHE_BUG quirk - -The downstream implementation required a fair bit of driver surgery to -allow for truncated ring segments, which needed to shrink by a small -amount to avoid the cache prefetcher from reading off the end of one -segment and into another. - -An upstream implementation for a similar bug on a different controller -just doubles the size of the memory allocated for ring segments, which -is a bit more wasteful (+4K per allocation) but means less code churn. - -Signed-off-by: Jonathan Bell ---- - drivers/usb/host/xhci-pci.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/usb/host/xhci-pci.c -+++ b/drivers/usb/host/xhci-pci.c -@@ -484,6 +484,7 @@ static void xhci_pci_quirks(struct devic - xhci->quirks |= XHCI_LPM_SUPPORT; - xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS; - xhci->quirks |= XHCI_AVOID_DQ_ON_LINK; -+ xhci->quirks |= XHCI_ZHAOXIN_TRB_FETCH; - } - - if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && diff --git a/target/linux/bcm27xx/patches-6.6/950-0484-usb-xhci-add-VLI_SS_BULK_OUT_BUG-quirk.patch b/target/linux/bcm27xx/patches-6.6/950-0484-usb-xhci-add-VLI_SS_BULK_OUT_BUG-quirk.patch index a1e8f9ed22..b6cfc1b7a8 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0484-usb-xhci-add-VLI_SS_BULK_OUT_BUG-quirk.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0484-usb-xhci-add-VLI_SS_BULK_OUT_BUG-quirk.patch @@ -90,10 +90,10 @@ Signed-off-by: Jonathan Bell /* Allow 3 retries for everything but isoc, set CErr = 3 */ --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c -@@ -485,6 +485,7 @@ static void xhci_pci_quirks(struct devic +@@ -487,6 +487,7 @@ static void xhci_pci_quirks(struct devic + xhci->quirks |= XHCI_TRB_OVERFETCH; xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS; xhci->quirks |= XHCI_AVOID_DQ_ON_LINK; - xhci->quirks |= XHCI_ZHAOXIN_TRB_FETCH; + xhci->quirks |= XHCI_VLI_SS_BULK_OUT_BUG; } diff --git a/target/linux/bcm27xx/patches-6.6/950-0485-usb-xhci-add-XHCI_VLI_HUB_TT_QUIRK.patch b/target/linux/bcm27xx/patches-6.6/950-0485-usb-xhci-add-XHCI_VLI_HUB_TT_QUIRK.patch index adf25d9495..a17245d94f 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0485-usb-xhci-add-XHCI_VLI_HUB_TT_QUIRK.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0485-usb-xhci-add-XHCI_VLI_HUB_TT_QUIRK.patch @@ -45,9 +45,9 @@ Signed-off-by: Jonathan Bell +#define VL805_FW_VER_0138C0 0x0138C0 + /* Device for a quirk */ - #define PCI_VENDOR_ID_FRESCO_LOGIC 0x1b73 - #define PCI_DEVICE_ID_FRESCO_LOGIC_PDK 0x1000 -@@ -295,6 +297,16 @@ static int xhci_pci_reinit(struct xhci_h + #define PCI_VENDOR_ID_FRESCO_LOGIC 0x1b73 + #define PCI_DEVICE_ID_FRESCO_LOGIC_PDK 0x1000 +@@ -297,6 +299,16 @@ static int xhci_pci_reinit(struct xhci_h return 0; } @@ -64,9 +64,9 @@ Signed-off-by: Jonathan Bell static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) { struct pci_dev *pdev = to_pci_dev(dev); -@@ -486,6 +498,8 @@ static void xhci_pci_quirks(struct devic +@@ -488,6 +500,8 @@ static void xhci_pci_quirks(struct devic + xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS; xhci->quirks |= XHCI_AVOID_DQ_ON_LINK; - xhci->quirks |= XHCI_ZHAOXIN_TRB_FETCH; xhci->quirks |= XHCI_VLI_SS_BULK_OUT_BUG; + if (xhci_vl805_get_fw_version(pdev) < VL805_FW_VER_0138C0) + xhci->quirks |= XHCI_VLI_HUB_TT_QUIRK; diff --git a/target/linux/bcm27xx/patches-6.6/950-0519-usb-dwc3-Set-DMA-and-coherent-masks-early.patch b/target/linux/bcm27xx/patches-6.6/950-0519-usb-dwc3-Set-DMA-and-coherent-masks-early.patch index 8a469986f0..a087faa35b 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0519-usb-dwc3-Set-DMA-and-coherent-masks-early.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0519-usb-dwc3-Set-DMA-and-coherent-masks-early.patch @@ -212,7 +212,7 @@ Signed-off-by: Jonathan Bell }, --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c -@@ -1208,6 +1208,24 @@ static void dwc3_config_threshold(struct +@@ -1223,6 +1223,24 @@ static void dwc3_config_threshold(struct } } @@ -237,7 +237,7 @@ Signed-off-by: Jonathan Bell /** * dwc3_core_init - Low-level initialization of DWC3 Core * @dwc: Pointer to our controller context structure -@@ -1273,6 +1291,8 @@ static int dwc3_core_init(struct dwc3 *d +@@ -1288,6 +1306,8 @@ static int dwc3_core_init(struct dwc3 *d dwc3_set_incr_burst_type(dwc); @@ -246,7 +246,7 @@ Signed-off-by: Jonathan Bell ret = dwc3_phy_power_on(dwc); if (ret) goto err_exit_phy; -@@ -1362,6 +1382,24 @@ static int dwc3_core_init(struct dwc3 *d +@@ -1377,6 +1397,24 @@ static int dwc3_core_init(struct dwc3 *d dwc3_config_threshold(dwc); @@ -271,7 +271,7 @@ Signed-off-by: Jonathan Bell return 0; err_power_off_phy: -@@ -1505,6 +1543,7 @@ static void dwc3_get_properties(struct d +@@ -1520,6 +1558,7 @@ static void dwc3_get_properties(struct d u8 tx_thr_num_pkt_prd = 0; u8 tx_max_burst_prd = 0; u8 tx_fifo_resize_max_num; @@ -279,7 +279,7 @@ Signed-off-by: Jonathan Bell /* default to highest possible threshold */ lpm_nyet_threshold = 0xf; -@@ -1525,6 +1564,9 @@ static void dwc3_get_properties(struct d +@@ -1540,6 +1579,9 @@ static void dwc3_get_properties(struct d */ tx_fifo_resize_max_num = 6; @@ -289,7 +289,7 @@ Signed-off-by: Jonathan Bell dwc->maximum_speed = usb_get_maximum_speed(dev); dwc->max_ssp_rate = usb_get_maximum_ssp_rate(dev); dwc->dr_mode = usb_get_dr_mode(dev); -@@ -1639,6 +1681,9 @@ static void dwc3_get_properties(struct d +@@ -1654,6 +1696,9 @@ static void dwc3_get_properties(struct d dwc->dis_split_quirk = device_property_read_bool(dev, "snps,dis-split-quirk"); @@ -299,16 +299,16 @@ Signed-off-by: Jonathan Bell dwc->lpm_nyet_threshold = lpm_nyet_threshold; dwc->tx_de_emphasis = tx_de_emphasis; -@@ -1656,6 +1701,8 @@ static void dwc3_get_properties(struct d +@@ -1671,6 +1716,8 @@ static void dwc3_get_properties(struct d dwc->tx_thr_num_pkt_prd = tx_thr_num_pkt_prd; dwc->tx_max_burst_prd = tx_max_burst_prd; + dwc->axi_pipe_limit = axi_pipe_limit; + - dwc->imod_interval = 0; - dwc->tx_fifo_resize_max_num = tx_fifo_resize_max_num; -@@ -1952,6 +1999,12 @@ static int dwc3_probe(struct platform_de + } + +@@ -1963,6 +2010,12 @@ static int dwc3_probe(struct platform_de if (IS_ERR(dwc->usb_psy)) return dev_err_probe(dev, PTR_ERR(dwc->usb_psy), "couldn't get usb power supply\n"); diff --git a/target/linux/bcm27xx/patches-6.6/950-0853-drivers-usb-dwc3-add-FS-LS-bus-instance-parkmode-dis.patch b/target/linux/bcm27xx/patches-6.6/950-0853-drivers-usb-dwc3-add-FS-LS-bus-instance-parkmode-dis.patch index abd631b6f7..47fa0b7541 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0853-drivers-usb-dwc3-add-FS-LS-bus-instance-parkmode-dis.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0853-drivers-usb-dwc3-add-FS-LS-bus-instance-parkmode-dis.patch @@ -16,7 +16,7 @@ Signed-off-by: Jonathan Bell --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c -@@ -1372,6 +1372,9 @@ static int dwc3_core_init(struct dwc3 *d +@@ -1387,6 +1387,9 @@ static int dwc3_core_init(struct dwc3 *d if (dwc->parkmode_disable_hs_quirk) reg |= DWC3_GUCTL1_PARKMODE_DISABLE_HS; @@ -26,7 +26,7 @@ Signed-off-by: Jonathan Bell if (DWC3_VER_IS_WITHIN(DWC3, 290A, ANY) && (dwc->maximum_speed == USB_SPEED_HIGH || dwc->maximum_speed == USB_SPEED_FULL)) -@@ -1661,6 +1664,8 @@ static void dwc3_get_properties(struct d +@@ -1676,6 +1679,8 @@ static void dwc3_get_properties(struct d "snps,parkmode-disable-ss-quirk"); dwc->parkmode_disable_hs_quirk = device_property_read_bool(dev, "snps,parkmode-disable-hs-quirk"); diff --git a/target/linux/bcm27xx/patches-6.6/950-1359-usb-dwc3-core-add-support-for-setting-NAK-enhancemen.patch b/target/linux/bcm27xx/patches-6.6/950-1359-usb-dwc3-core-add-support-for-setting-NAK-enhancemen.patch index 0ed02a82cf..5b700990b2 100644 --- a/target/linux/bcm27xx/patches-6.6/950-1359-usb-dwc3-core-add-support-for-setting-NAK-enhancemen.patch +++ b/target/linux/bcm27xx/patches-6.6/950-1359-usb-dwc3-core-add-support-for-setting-NAK-enhancemen.patch @@ -22,7 +22,7 @@ Signed-off-by: Jonathan Bell --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c -@@ -1366,6 +1366,12 @@ static int dwc3_core_init(struct dwc3 *d +@@ -1381,6 +1381,12 @@ static int dwc3_core_init(struct dwc3 *d if (dwc->dis_tx_ipgap_linecheck_quirk) reg |= DWC3_GUCTL1_TX_IPGAP_LINECHECK_DIS; @@ -35,7 +35,7 @@ Signed-off-by: Jonathan Bell if (dwc->parkmode_disable_ss_quirk) reg |= DWC3_GUCTL1_PARKMODE_DISABLE_SS; -@@ -1660,6 +1666,10 @@ static void dwc3_get_properties(struct d +@@ -1675,6 +1681,10 @@ static void dwc3_get_properties(struct d "snps,resume-hs-terminations"); dwc->ulpi_ext_vbus_drv = device_property_read_bool(dev, "snps,ulpi-ext-vbus-drv"); diff --git a/target/linux/generic/backport-6.6/611-01-v6.11-udp-Allow-GSO-transmit-from-devices-with-no-checksum.patch b/target/linux/generic/backport-6.6/611-01-v6.11-udp-Allow-GSO-transmit-from-devices-with-no-checksum.patch index b9633a8772..d1673ec7d4 100644 --- a/target/linux/generic/backport-6.6/611-01-v6.11-udp-Allow-GSO-transmit-from-devices-with-no-checksum.patch +++ b/target/linux/generic/backport-6.6/611-01-v6.11-udp-Allow-GSO-transmit-from-devices-with-no-checksum.patch @@ -65,7 +65,7 @@ Signed-off-by: Jakub Kicinski } --- a/net/ipv4/udp_offload.c +++ b/net/ipv4/udp_offload.c -@@ -380,6 +380,14 @@ struct sk_buff *__udp_gso_segment(struct +@@ -384,6 +384,14 @@ struct sk_buff *__udp_gso_segment(struct else uh->check = gso_make_checksum(seg, ~check) ? : CSUM_MANGLED_0; diff --git a/target/linux/generic/backport-6.6/790-02-v6.7-net-dsa-mt753x-remove-mt753x_phylink_pcs_link_up.patch b/target/linux/generic/backport-6.6/790-02-v6.7-net-dsa-mt753x-remove-mt753x_phylink_pcs_link_up.patch index 506024379e..d99822a2e0 100644 --- a/target/linux/generic/backport-6.6/790-02-v6.7-net-dsa-mt753x-remove-mt753x_phylink_pcs_link_up.patch +++ b/target/linux/generic/backport-6.6/790-02-v6.7-net-dsa-mt753x-remove-mt753x_phylink_pcs_link_up.patch @@ -24,7 +24,7 @@ Signed-off-by: Jakub Kicinski --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -3037,15 +3037,6 @@ static void mt753x_phylink_mac_link_down +@@ -3033,15 +3033,6 @@ static void mt753x_phylink_mac_link_down mt7530_clear(priv, MT7530_PMCR_P(port), PMCR_LINK_SETTINGS_MASK); } @@ -40,7 +40,7 @@ Signed-off-by: Jakub Kicinski static void mt753x_phylink_mac_link_up(struct dsa_switch *ds, int port, unsigned int mode, phy_interface_t interface, -@@ -3133,8 +3124,6 @@ mt7531_cpu_port_config(struct dsa_switch +@@ -3129,8 +3120,6 @@ mt7531_cpu_port_config(struct dsa_switch return ret; mt7530_write(priv, MT7530_PMCR_P(port), PMCR_CPU_PORT_SETTING(priv->id)); diff --git a/target/linux/generic/backport-6.6/790-05-v6.9-net-dsa-mt7530-always-trap-frames-to-active-CPU-port.patch b/target/linux/generic/backport-6.6/790-05-v6.9-net-dsa-mt7530-always-trap-frames-to-active-CPU-port.patch index 8c73ea94a1..8fab36a4aa 100644 --- a/target/linux/generic/backport-6.6/790-05-v6.9-net-dsa-mt7530-always-trap-frames-to-active-CPU-port.patch +++ b/target/linux/generic/backport-6.6/790-05-v6.9-net-dsa-mt7530-always-trap-frames-to-active-CPU-port.patch @@ -49,7 +49,7 @@ Signed-off-by: Jakub Kicinski /* Add the CPU port to the CPU port bitmap for MT7531 and the switch on * the MT7988 SoC. Trapped frames will be forwarded to the CPU port that * is affine to the inbound user port. -@@ -3305,6 +3301,36 @@ static int mt753x_set_mac_eee(struct dsa +@@ -3301,6 +3297,36 @@ static int mt753x_set_mac_eee(struct dsa return 0; } @@ -86,7 +86,7 @@ Signed-off-by: Jakub Kicinski static int mt7988_pad_setup(struct dsa_switch *ds, phy_interface_t interface) { return 0; -@@ -3360,6 +3386,7 @@ const struct dsa_switch_ops mt7530_switc +@@ -3356,6 +3382,7 @@ const struct dsa_switch_ops mt7530_switc .phylink_mac_link_up = mt753x_phylink_mac_link_up, .get_mac_eee = mt753x_get_mac_eee, .set_mac_eee = mt753x_set_mac_eee, diff --git a/target/linux/generic/backport-6.6/790-07-v6.9-net-dsa-mt7530-store-port-5-SGMII-capability-of-MT75.patch b/target/linux/generic/backport-6.6/790-07-v6.9-net-dsa-mt7530-store-port-5-SGMII-capability-of-MT75.patch index 426a7bcc2f..5e6dfe6c6d 100644 --- a/target/linux/generic/backport-6.6/790-07-v6.9-net-dsa-mt7530-store-port-5-SGMII-capability-of-MT75.patch +++ b/target/linux/generic/backport-6.6/790-07-v6.9-net-dsa-mt7530-store-port-5-SGMII-capability-of-MT75.patch @@ -100,7 +100,7 @@ Signed-off-by: Jakub Kicinski default: return "unknown"; } -@@ -2694,6 +2680,12 @@ mt7531_setup(struct dsa_switch *ds) +@@ -2695,6 +2681,12 @@ mt7531_setup(struct dsa_switch *ds) return -ENODEV; } @@ -113,7 +113,7 @@ Signed-off-by: Jakub Kicinski /* all MACs must be forced link-down before sw reset */ for (i = 0; i < MT7530_NUM_PORTS; i++) mt7530_write(priv, MT7530_PMCR_P(i), MT7531_FORCE_LNK); -@@ -2703,21 +2695,18 @@ mt7531_setup(struct dsa_switch *ds) +@@ -2704,21 +2696,18 @@ mt7531_setup(struct dsa_switch *ds) SYS_CTRL_PHY_RST | SYS_CTRL_SW_RST | SYS_CTRL_REG_RST); @@ -141,7 +141,7 @@ Signed-off-by: Jakub Kicinski mt7530_rmw(priv, MT7531_GPIO_MODE0, MT7531_GPIO0_MASK, MT7531_GPIO0_INTERRUPT); -@@ -2784,11 +2773,6 @@ static void mt7530_mac_port_get_caps(str +@@ -2780,11 +2769,6 @@ static void mt7530_mac_port_get_caps(str } } @@ -153,7 +153,7 @@ Signed-off-by: Jakub Kicinski static void mt7531_mac_port_get_caps(struct dsa_switch *ds, int port, struct phylink_config *config) { -@@ -2801,7 +2785,7 @@ static void mt7531_mac_port_get_caps(str +@@ -2797,7 +2781,7 @@ static void mt7531_mac_port_get_caps(str break; case 5: /* 2nd cpu port supports either rgmii or sgmii/8023z */ @@ -162,7 +162,7 @@ Signed-off-by: Jakub Kicinski phy_interface_set_rgmii(config->supported_interfaces); break; } -@@ -2868,7 +2852,7 @@ static int mt7531_rgmii_setup(struct mt7 +@@ -2864,7 +2848,7 @@ static int mt7531_rgmii_setup(struct mt7 { u32 val; @@ -171,7 +171,7 @@ Signed-off-by: Jakub Kicinski dev_err(priv->dev, "RGMII mode is not available for port %d\n", port); return -EINVAL; -@@ -3111,7 +3095,7 @@ mt7531_cpu_port_config(struct dsa_switch +@@ -3107,7 +3091,7 @@ mt7531_cpu_port_config(struct dsa_switch switch (port) { case 5: @@ -180,7 +180,7 @@ Signed-off-by: Jakub Kicinski interface = PHY_INTERFACE_MODE_RGMII; else interface = PHY_INTERFACE_MODE_2500BASEX; -@@ -3263,7 +3247,7 @@ mt753x_setup(struct dsa_switch *ds) +@@ -3259,7 +3243,7 @@ mt753x_setup(struct dsa_switch *ds) mt7530_free_irq_common(priv); if (priv->create_sgmii) { diff --git a/target/linux/generic/backport-6.6/790-08-v6.9-net-dsa-mt7530-improve-comments-regarding-switch-por.patch b/target/linux/generic/backport-6.6/790-08-v6.9-net-dsa-mt7530-improve-comments-regarding-switch-por.patch index 3309e248c9..3dddbbeee8 100644 --- a/target/linux/generic/backport-6.6/790-08-v6.9-net-dsa-mt7530-improve-comments-regarding-switch-por.patch +++ b/target/linux/generic/backport-6.6/790-08-v6.9-net-dsa-mt7530-improve-comments-regarding-switch-por.patch @@ -37,7 +37,7 @@ Signed-off-by: Jakub Kicinski --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -2751,12 +2751,14 @@ static void mt7530_mac_port_get_caps(str +@@ -2747,12 +2747,14 @@ static void mt7530_mac_port_get_caps(str struct phylink_config *config) { switch (port) { @@ -54,7 +54,7 @@ Signed-off-by: Jakub Kicinski phy_interface_set_rgmii(config->supported_interfaces); __set_bit(PHY_INTERFACE_MODE_MII, config->supported_interfaces); -@@ -2764,7 +2766,8 @@ static void mt7530_mac_port_get_caps(str +@@ -2760,7 +2762,8 @@ static void mt7530_mac_port_get_caps(str config->supported_interfaces); break; @@ -64,7 +64,7 @@ Signed-off-by: Jakub Kicinski __set_bit(PHY_INTERFACE_MODE_RGMII, config->supported_interfaces); __set_bit(PHY_INTERFACE_MODE_TRGMII, -@@ -2779,19 +2782,24 @@ static void mt7531_mac_port_get_caps(str +@@ -2775,19 +2778,24 @@ static void mt7531_mac_port_get_caps(str struct mt7530_priv *priv = ds->priv; switch (port) { @@ -92,7 +92,7 @@ Signed-off-by: Jakub Kicinski __set_bit(PHY_INTERFACE_MODE_SGMII, config->supported_interfaces); __set_bit(PHY_INTERFACE_MODE_1000BASEX, -@@ -2810,11 +2818,13 @@ static void mt7988_mac_port_get_caps(str +@@ -2806,11 +2814,13 @@ static void mt7988_mac_port_get_caps(str phy_interface_zero(config->supported_interfaces); switch (port) { @@ -107,7 +107,7 @@ Signed-off-by: Jakub Kicinski case 6: __set_bit(PHY_INTERFACE_MODE_INTERNAL, config->supported_interfaces); -@@ -2978,12 +2988,12 @@ mt753x_phylink_mac_config(struct dsa_swi +@@ -2974,12 +2984,12 @@ mt753x_phylink_mac_config(struct dsa_swi u32 mcr_cur, mcr_new; switch (port) { @@ -122,7 +122,7 @@ Signed-off-by: Jakub Kicinski if (priv->p5_interface == state->interface) break; -@@ -2993,7 +3003,7 @@ mt753x_phylink_mac_config(struct dsa_swi +@@ -2989,7 +2999,7 @@ mt753x_phylink_mac_config(struct dsa_swi if (priv->p5_intf_sel != P5_DISABLED) priv->p5_interface = state->interface; break; diff --git a/target/linux/generic/backport-6.6/790-15-v6.9-net-dsa-mt7530-call-port-6-setup-from-mt7530_mac_con.patch b/target/linux/generic/backport-6.6/790-15-v6.9-net-dsa-mt7530-call-port-6-setup-from-mt7530_mac_con.patch index 330a92e7d4..2180436aba 100644 --- a/target/linux/generic/backport-6.6/790-15-v6.9-net-dsa-mt7530-call-port-6-setup-from-mt7530_mac_con.patch +++ b/target/linux/generic/backport-6.6/790-15-v6.9-net-dsa-mt7530-call-port-6-setup-from-mt7530_mac_con.patch @@ -79,7 +79,7 @@ Signed-off-by: Jakub Kicinski return 0; } -@@ -2826,11 +2830,10 @@ mt7530_mac_config(struct dsa_switch *ds, +@@ -2822,11 +2826,10 @@ mt7530_mac_config(struct dsa_switch *ds, { struct mt7530_priv *priv = ds->priv; diff --git a/target/linux/generic/backport-6.6/790-16-v6.9-net-dsa-mt7530-remove-pad_setup-function-pointer.patch b/target/linux/generic/backport-6.6/790-16-v6.9-net-dsa-mt7530-remove-pad_setup-function-pointer.patch index dcf1afa16e..c7e2af8ca8 100644 --- a/target/linux/generic/backport-6.6/790-16-v6.9-net-dsa-mt7530-remove-pad_setup-function-pointer.patch +++ b/target/linux/generic/backport-6.6/790-16-v6.9-net-dsa-mt7530-remove-pad_setup-function-pointer.patch @@ -47,7 +47,7 @@ Signed-off-by: Jakub Kicinski static void mt7531_pll_setup(struct mt7530_priv *priv) { -@@ -2817,14 +2805,6 @@ static void mt7988_mac_port_get_caps(str +@@ -2813,14 +2801,6 @@ static void mt7988_mac_port_get_caps(str } static int @@ -62,7 +62,7 @@ Signed-off-by: Jakub Kicinski mt7530_mac_config(struct dsa_switch *ds, int port, unsigned int mode, phy_interface_t interface) { -@@ -2989,8 +2969,6 @@ mt753x_phylink_mac_config(struct dsa_swi +@@ -2985,8 +2965,6 @@ mt753x_phylink_mac_config(struct dsa_swi if (priv->p6_interface == state->interface) break; @@ -71,7 +71,7 @@ Signed-off-by: Jakub Kicinski if (mt753x_mac_config(ds, port, mode, state) < 0) goto unsupported; -@@ -3307,11 +3285,6 @@ mt753x_conduit_state_change(struct dsa_s +@@ -3303,11 +3281,6 @@ mt753x_conduit_state_change(struct dsa_s mt7530_rmw(priv, MT7530_MFC, CPU_EN | CPU_PORT_MASK, val); } @@ -83,7 +83,7 @@ Signed-off-by: Jakub Kicinski static int mt7988_setup(struct dsa_switch *ds) { struct mt7530_priv *priv = ds->priv; -@@ -3375,7 +3348,6 @@ const struct mt753x_info mt753x_table[] +@@ -3371,7 +3344,6 @@ const struct mt753x_info mt753x_table[] .phy_write_c22 = mt7530_phy_write_c22, .phy_read_c45 = mt7530_phy_read_c45, .phy_write_c45 = mt7530_phy_write_c45, @@ -91,7 +91,7 @@ Signed-off-by: Jakub Kicinski .mac_port_get_caps = mt7530_mac_port_get_caps, .mac_port_config = mt7530_mac_config, }, -@@ -3387,7 +3359,6 @@ const struct mt753x_info mt753x_table[] +@@ -3383,7 +3355,6 @@ const struct mt753x_info mt753x_table[] .phy_write_c22 = mt7530_phy_write_c22, .phy_read_c45 = mt7530_phy_read_c45, .phy_write_c45 = mt7530_phy_write_c45, @@ -99,7 +99,7 @@ Signed-off-by: Jakub Kicinski .mac_port_get_caps = mt7530_mac_port_get_caps, .mac_port_config = mt7530_mac_config, }, -@@ -3399,7 +3370,6 @@ const struct mt753x_info mt753x_table[] +@@ -3395,7 +3366,6 @@ const struct mt753x_info mt753x_table[] .phy_write_c22 = mt7531_ind_c22_phy_write, .phy_read_c45 = mt7531_ind_c45_phy_read, .phy_write_c45 = mt7531_ind_c45_phy_write, @@ -107,7 +107,7 @@ Signed-off-by: Jakub Kicinski .cpu_port_config = mt7531_cpu_port_config, .mac_port_get_caps = mt7531_mac_port_get_caps, .mac_port_config = mt7531_mac_config, -@@ -3412,7 +3382,6 @@ const struct mt753x_info mt753x_table[] +@@ -3408,7 +3378,6 @@ const struct mt753x_info mt753x_table[] .phy_write_c22 = mt7531_ind_c22_phy_write, .phy_read_c45 = mt7531_ind_c45_phy_read, .phy_write_c45 = mt7531_ind_c45_phy_write, @@ -115,7 +115,7 @@ Signed-off-by: Jakub Kicinski .cpu_port_config = mt7988_cpu_port_config, .mac_port_get_caps = mt7988_mac_port_get_caps, .mac_port_config = mt7988_mac_config, -@@ -3442,9 +3411,8 @@ mt7530_probe_common(struct mt7530_priv * +@@ -3438,9 +3407,8 @@ mt7530_probe_common(struct mt7530_priv * /* Sanity check if these required device operations are filled * properly. */ diff --git a/target/linux/generic/backport-6.6/790-17-v6.9-net-dsa-mt7530-correct-port-capabilities-of-MT7988.patch b/target/linux/generic/backport-6.6/790-17-v6.9-net-dsa-mt7530-correct-port-capabilities-of-MT7988.patch index f6c2919eaf..b833522deb 100644 --- a/target/linux/generic/backport-6.6/790-17-v6.9-net-dsa-mt7530-correct-port-capabilities-of-MT7988.patch +++ b/target/linux/generic/backport-6.6/790-17-v6.9-net-dsa-mt7530-correct-port-capabilities-of-MT7988.patch @@ -25,7 +25,7 @@ Signed-off-by: Jakub Kicinski --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -2790,7 +2790,7 @@ static void mt7988_mac_port_get_caps(str +@@ -2786,7 +2786,7 @@ static void mt7988_mac_port_get_caps(str switch (port) { /* Ports which are connected to switch PHYs. There is no MII pinout. */ diff --git a/target/linux/generic/backport-6.6/790-18-v6.9-net-dsa-mt7530-do-not-clear-config-supported_interfa.patch b/target/linux/generic/backport-6.6/790-18-v6.9-net-dsa-mt7530-do-not-clear-config-supported_interfa.patch index 66a9158507..2b12c3bc71 100644 --- a/target/linux/generic/backport-6.6/790-18-v6.9-net-dsa-mt7530-do-not-clear-config-supported_interfa.patch +++ b/target/linux/generic/backport-6.6/790-18-v6.9-net-dsa-mt7530-do-not-clear-config-supported_interfa.patch @@ -27,7 +27,7 @@ Signed-off-by: Jakub Kicinski --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -2786,8 +2786,6 @@ static void mt7531_mac_port_get_caps(str +@@ -2782,8 +2782,6 @@ static void mt7531_mac_port_get_caps(str static void mt7988_mac_port_get_caps(struct dsa_switch *ds, int port, struct phylink_config *config) { diff --git a/target/linux/generic/backport-6.6/790-19-v6.9-net-dsa-mt7530-remove-.mac_port_config-for-MT7988-an.patch b/target/linux/generic/backport-6.6/790-19-v6.9-net-dsa-mt7530-remove-.mac_port_config-for-MT7988-an.patch index abc1108116..f38c0e80e8 100644 --- a/target/linux/generic/backport-6.6/790-19-v6.9-net-dsa-mt7530-remove-.mac_port_config-for-MT7988-an.patch +++ b/target/linux/generic/backport-6.6/790-19-v6.9-net-dsa-mt7530-remove-.mac_port_config-for-MT7988-an.patch @@ -33,7 +33,7 @@ Signed-off-by: Paolo Abeni --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -2869,17 +2869,6 @@ static bool mt753x_is_mac_port(u32 port) +@@ -2865,17 +2865,6 @@ static bool mt753x_is_mac_port(u32 port) } static int @@ -51,7 +51,7 @@ Signed-off-by: Paolo Abeni mt7531_mac_config(struct dsa_switch *ds, int port, unsigned int mode, phy_interface_t interface) { -@@ -2919,6 +2908,9 @@ mt753x_mac_config(struct dsa_switch *ds, +@@ -2915,6 +2904,9 @@ mt753x_mac_config(struct dsa_switch *ds, { struct mt7530_priv *priv = ds->priv; @@ -61,7 +61,7 @@ Signed-off-by: Paolo Abeni return priv->info->mac_port_config(ds, port, mode, state->interface); } -@@ -3382,7 +3374,6 @@ const struct mt753x_info mt753x_table[] +@@ -3378,7 +3370,6 @@ const struct mt753x_info mt753x_table[] .phy_write_c45 = mt7531_ind_c45_phy_write, .cpu_port_config = mt7988_cpu_port_config, .mac_port_get_caps = mt7988_mac_port_get_caps, @@ -69,7 +69,7 @@ Signed-off-by: Paolo Abeni }, }; EXPORT_SYMBOL_GPL(mt753x_table); -@@ -3410,8 +3401,7 @@ mt7530_probe_common(struct mt7530_priv * +@@ -3406,8 +3397,7 @@ mt7530_probe_common(struct mt7530_priv * * properly. */ if (!priv->info->sw_setup || !priv->info->phy_read_c22 || diff --git a/target/linux/generic/backport-6.6/790-21-v6.9-net-dsa-mt7530-do-not-use-SW_PHY_RST-to-reset-MT7531.patch b/target/linux/generic/backport-6.6/790-21-v6.9-net-dsa-mt7530-do-not-use-SW_PHY_RST-to-reset-MT7531.patch index 735775d97a..0ed8cbeded 100644 --- a/target/linux/generic/backport-6.6/790-21-v6.9-net-dsa-mt7530-do-not-use-SW_PHY_RST-to-reset-MT7531.patch +++ b/target/linux/generic/backport-6.6/790-21-v6.9-net-dsa-mt7530-do-not-use-SW_PHY_RST-to-reset-MT7531.patch @@ -22,7 +22,7 @@ Signed-off-by: Paolo Abeni --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -2657,14 +2657,12 @@ mt7531_setup(struct dsa_switch *ds) +@@ -2658,14 +2658,12 @@ mt7531_setup(struct dsa_switch *ds) val = mt7530_read(priv, MT7531_TOP_SIG_SR); priv->p5_sgmii = !!(val & PAD_DUAL_SGMII_EN); diff --git a/target/linux/generic/backport-6.6/790-22-v6.9-net-dsa-mt7530-get-rid-of-useless-error-returns-on-p.patch b/target/linux/generic/backport-6.6/790-22-v6.9-net-dsa-mt7530-get-rid-of-useless-error-returns-on-p.patch index c9159a1c68..e037c9883e 100644 --- a/target/linux/generic/backport-6.6/790-22-v6.9-net-dsa-mt7530-get-rid-of-useless-error-returns-on-p.patch +++ b/target/linux/generic/backport-6.6/790-22-v6.9-net-dsa-mt7530-get-rid-of-useless-error-returns-on-p.patch @@ -36,7 +36,7 @@ Signed-off-by: Paolo Abeni --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -2800,7 +2800,7 @@ static void mt7988_mac_port_get_caps(str +@@ -2796,7 +2796,7 @@ static void mt7988_mac_port_get_caps(str } } @@ -45,7 +45,7 @@ Signed-off-by: Paolo Abeni mt7530_mac_config(struct dsa_switch *ds, int port, unsigned int mode, phy_interface_t interface) { -@@ -2810,22 +2810,14 @@ mt7530_mac_config(struct dsa_switch *ds, +@@ -2806,22 +2806,14 @@ mt7530_mac_config(struct dsa_switch *ds, mt7530_setup_port5(priv->ds, interface); else if (port == 6) mt7530_setup_port6(priv->ds, interface); @@ -71,7 +71,7 @@ Signed-off-by: Paolo Abeni val = mt7530_read(priv, MT7531_CLKGEN_CTRL); val |= GP_CLK_EN; val &= ~GP_MODE_MASK; -@@ -2853,20 +2845,14 @@ static int mt7531_rgmii_setup(struct mt7 +@@ -2849,20 +2841,14 @@ static int mt7531_rgmii_setup(struct mt7 case PHY_INTERFACE_MODE_RGMII_ID: break; default: @@ -95,7 +95,7 @@ Signed-off-by: Paolo Abeni mt7531_mac_config(struct dsa_switch *ds, int port, unsigned int mode, phy_interface_t interface) { -@@ -2874,42 +2860,21 @@ mt7531_mac_config(struct dsa_switch *ds, +@@ -2870,42 +2856,21 @@ mt7531_mac_config(struct dsa_switch *ds, struct phy_device *phydev; struct dsa_port *dp; @@ -143,7 +143,7 @@ Signed-off-by: Paolo Abeni } static struct phylink_pcs * -@@ -2938,17 +2903,11 @@ mt753x_phylink_mac_config(struct dsa_swi +@@ -2934,17 +2899,11 @@ mt753x_phylink_mac_config(struct dsa_swi u32 mcr_cur, mcr_new; switch (port) { @@ -162,7 +162,7 @@ Signed-off-by: Paolo Abeni if (priv->p5_intf_sel != P5_DISABLED) priv->p5_interface = state->interface; -@@ -2957,16 +2916,10 @@ mt753x_phylink_mac_config(struct dsa_swi +@@ -2953,16 +2912,10 @@ mt753x_phylink_mac_config(struct dsa_swi if (priv->p6_interface == state->interface) break; @@ -180,7 +180,7 @@ Signed-off-by: Paolo Abeni } mcr_cur = mt7530_read(priv, MT7530_PMCR_P(port)); -@@ -3049,7 +3002,6 @@ mt7531_cpu_port_config(struct dsa_switch +@@ -3045,7 +2998,6 @@ mt7531_cpu_port_config(struct dsa_switch struct mt7530_priv *priv = ds->priv; phy_interface_t interface; int speed; @@ -188,7 +188,7 @@ Signed-off-by: Paolo Abeni switch (port) { case 5: -@@ -3074,9 +3026,8 @@ mt7531_cpu_port_config(struct dsa_switch +@@ -3070,9 +3022,8 @@ mt7531_cpu_port_config(struct dsa_switch else speed = SPEED_1000; diff --git a/target/linux/generic/backport-6.6/790-23-v6.9-net-dsa-mt7530-get-rid-of-priv-info-cpu_port_config.patch b/target/linux/generic/backport-6.6/790-23-v6.9-net-dsa-mt7530-get-rid-of-priv-info-cpu_port_config.patch index c52cb0d5ea..d85b40f91a 100644 --- a/target/linux/generic/backport-6.6/790-23-v6.9-net-dsa-mt7530-get-rid-of-priv-info-cpu_port_config.patch +++ b/target/linux/generic/backport-6.6/790-23-v6.9-net-dsa-mt7530-get-rid-of-priv-info-cpu_port_config.patch @@ -117,7 +117,7 @@ Signed-off-by: Paolo Abeni } else { mt7530_port_disable(ds, i); -@@ -2680,10 +2664,6 @@ mt7531_setup(struct dsa_switch *ds) +@@ -2681,10 +2665,6 @@ mt7531_setup(struct dsa_switch *ds) mt7530_rmw(priv, MT7531_GPIO_MODE0, MT7531_GPIO0_MASK, MT7531_GPIO0_INTERRUPT); @@ -128,7 +128,7 @@ Signed-off-by: Paolo Abeni /* Enable Energy-Efficient Ethernet (EEE) and PHY core PLL, since * phy_device has not yet been created provided for * phy_[read,write]_mmd_indirect is called, we provide our own -@@ -2902,26 +2882,9 @@ mt753x_phylink_mac_config(struct dsa_swi +@@ -2898,26 +2878,9 @@ mt753x_phylink_mac_config(struct dsa_swi struct mt7530_priv *priv = ds->priv; u32 mcr_cur, mcr_new; @@ -156,7 +156,7 @@ Signed-off-by: Paolo Abeni mcr_cur = mt7530_read(priv, MT7530_PMCR_P(port)); mcr_new = mcr_cur; mcr_new &= ~PMCR_LINK_SETTINGS_MASK; -@@ -2957,17 +2920,10 @@ static void mt753x_phylink_mac_link_up(s +@@ -2953,17 +2916,10 @@ static void mt753x_phylink_mac_link_up(s mcr = PMCR_RX_EN | PMCR_TX_EN | PMCR_FORCE_LNK; @@ -176,7 +176,7 @@ Signed-off-by: Paolo Abeni mcr |= PMCR_FORCE_SPEED_1000; break; case SPEED_100: -@@ -2985,6 +2941,7 @@ static void mt753x_phylink_mac_link_up(s +@@ -2981,6 +2937,7 @@ static void mt753x_phylink_mac_link_up(s if (mode == MLO_AN_PHY && phydev && phy_init_eee(phydev, false) >= 0) { switch (speed) { case SPEED_1000: @@ -184,7 +184,7 @@ Signed-off-by: Paolo Abeni mcr |= PMCR_FORCE_EEE1G; break; case SPEED_100: -@@ -2996,61 +2953,6 @@ static void mt753x_phylink_mac_link_up(s +@@ -2992,61 +2949,6 @@ static void mt753x_phylink_mac_link_up(s mt7530_set(priv, MT7530_PMCR_P(port), mcr); } @@ -246,7 +246,7 @@ Signed-off-by: Paolo Abeni static void mt753x_phylink_get_caps(struct dsa_switch *ds, int port, struct phylink_config *config) { -@@ -3309,7 +3211,6 @@ const struct mt753x_info mt753x_table[] +@@ -3305,7 +3207,6 @@ const struct mt753x_info mt753x_table[] .phy_write_c22 = mt7531_ind_c22_phy_write, .phy_read_c45 = mt7531_ind_c45_phy_read, .phy_write_c45 = mt7531_ind_c45_phy_write, @@ -254,7 +254,7 @@ Signed-off-by: Paolo Abeni .mac_port_get_caps = mt7531_mac_port_get_caps, .mac_port_config = mt7531_mac_config, }, -@@ -3321,7 +3222,6 @@ const struct mt753x_info mt753x_table[] +@@ -3317,7 +3218,6 @@ const struct mt753x_info mt753x_table[] .phy_write_c22 = mt7531_ind_c22_phy_write, .phy_read_c45 = mt7531_ind_c45_phy_read, .phy_write_c45 = mt7531_ind_c45_phy_write, diff --git a/target/linux/generic/backport-6.6/790-24-v6.9-net-dsa-mt7530-get-rid-of-mt753x_mac_config.patch b/target/linux/generic/backport-6.6/790-24-v6.9-net-dsa-mt7530-get-rid-of-mt753x_mac_config.patch index 7fe77c506e..47b77fca52 100644 --- a/target/linux/generic/backport-6.6/790-24-v6.9-net-dsa-mt7530-get-rid-of-mt753x_mac_config.patch +++ b/target/linux/generic/backport-6.6/790-24-v6.9-net-dsa-mt7530-get-rid-of-mt753x_mac_config.patch @@ -18,7 +18,7 @@ Signed-off-by: Paolo Abeni --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -2847,16 +2847,6 @@ mt7531_mac_config(struct dsa_switch *ds, +@@ -2843,16 +2843,6 @@ mt7531_mac_config(struct dsa_switch *ds, } } @@ -35,7 +35,7 @@ Signed-off-by: Paolo Abeni static struct phylink_pcs * mt753x_phylink_mac_select_pcs(struct dsa_switch *ds, int port, phy_interface_t interface) -@@ -2882,8 +2872,8 @@ mt753x_phylink_mac_config(struct dsa_swi +@@ -2878,8 +2868,8 @@ mt753x_phylink_mac_config(struct dsa_swi struct mt7530_priv *priv = ds->priv; u32 mcr_cur, mcr_new; diff --git a/target/linux/generic/backport-6.6/790-25-v6.9-net-dsa-mt7530-put-initialising-PCS-devices-code-bac.patch b/target/linux/generic/backport-6.6/790-25-v6.9-net-dsa-mt7530-put-initialising-PCS-devices-code-bac.patch index bd5c9b9772..84b6430937 100644 --- a/target/linux/generic/backport-6.6/790-25-v6.9-net-dsa-mt7530-put-initialising-PCS-devices-code-bac.patch +++ b/target/linux/generic/backport-6.6/790-25-v6.9-net-dsa-mt7530-put-initialising-PCS-devices-code-bac.patch @@ -20,7 +20,7 @@ Signed-off-by: Paolo Abeni --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -3025,17 +3025,9 @@ static int +@@ -3021,17 +3021,9 @@ static int mt753x_setup(struct dsa_switch *ds) { struct mt7530_priv *priv = ds->priv; @@ -40,7 +40,7 @@ Signed-off-by: Paolo Abeni if (ret) return ret; -@@ -3047,6 +3039,14 @@ mt753x_setup(struct dsa_switch *ds) +@@ -3043,6 +3035,14 @@ mt753x_setup(struct dsa_switch *ds) if (ret && priv->irq) mt7530_free_irq_common(priv); diff --git a/target/linux/generic/backport-6.6/790-27-v6.9-net-dsa-mt7530-simplify-link-operations.patch b/target/linux/generic/backport-6.6/790-27-v6.9-net-dsa-mt7530-simplify-link-operations.patch index 54f5a59a64..51ccc69351 100644 --- a/target/linux/generic/backport-6.6/790-27-v6.9-net-dsa-mt7530-simplify-link-operations.patch +++ b/target/linux/generic/backport-6.6/790-27-v6.9-net-dsa-mt7530-simplify-link-operations.patch @@ -45,7 +45,7 @@ Signed-off-by: Paolo Abeni --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -2880,23 +2880,13 @@ mt753x_phylink_mac_config(struct dsa_swi +@@ -2876,23 +2876,13 @@ mt753x_phylink_mac_config(struct dsa_swi const struct phylink_link_state *state) { struct mt7530_priv *priv = ds->priv; diff --git a/target/linux/generic/backport-6.6/790-33-v6.10-net-dsa-mt7530-provide-own-phylink-MAC-operations.patch b/target/linux/generic/backport-6.6/790-33-v6.10-net-dsa-mt7530-provide-own-phylink-MAC-operations.patch index 5eade735ec..15d876d29c 100644 --- a/target/linux/generic/backport-6.6/790-33-v6.10-net-dsa-mt7530-provide-own-phylink-MAC-operations.patch +++ b/target/linux/generic/backport-6.6/790-33-v6.10-net-dsa-mt7530-provide-own-phylink-MAC-operations.patch @@ -19,7 +19,7 @@ Signed-off-by: Paolo Abeni --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -2858,28 +2858,34 @@ mt7531_mac_config(struct dsa_switch *ds, +@@ -2854,28 +2854,34 @@ mt7531_mac_config(struct dsa_switch *ds, } static struct phylink_pcs * @@ -60,7 +60,7 @@ Signed-off-by: Paolo Abeni if ((port == 5 || port == 6) && priv->info->mac_port_config) priv->info->mac_port_config(ds, port, mode, state->interface); -@@ -2889,23 +2895,25 @@ mt753x_phylink_mac_config(struct dsa_swi +@@ -2885,23 +2891,25 @@ mt753x_phylink_mac_config(struct dsa_swi mt7530_set(priv, MT7530_PMCR_P(port), PMCR_EXT_PHY); } @@ -92,7 +92,7 @@ Signed-off-by: Paolo Abeni u32 mcr; mcr = PMCR_RX_EN | PMCR_TX_EN | PMCR_FORCE_LNK; -@@ -2940,7 +2948,7 @@ static void mt753x_phylink_mac_link_up(s +@@ -2936,7 +2944,7 @@ static void mt753x_phylink_mac_link_up(s } } @@ -101,7 +101,7 @@ Signed-off-by: Paolo Abeni } static void mt753x_phylink_get_caps(struct dsa_switch *ds, int port, -@@ -3160,16 +3168,19 @@ const struct dsa_switch_ops mt7530_switc +@@ -3156,16 +3164,19 @@ const struct dsa_switch_ops mt7530_switc .port_mirror_add = mt753x_port_mirror_add, .port_mirror_del = mt753x_port_mirror_del, .phylink_get_caps = mt753x_phylink_get_caps, @@ -125,7 +125,7 @@ Signed-off-by: Paolo Abeni const struct mt753x_info mt753x_table[] = { [ID_MT7621] = { .id = ID_MT7621, -@@ -3247,6 +3258,7 @@ mt7530_probe_common(struct mt7530_priv * +@@ -3243,6 +3254,7 @@ mt7530_probe_common(struct mt7530_priv * priv->dev = dev; priv->ds->priv = priv; priv->ds->ops = &mt7530_switch_ops; diff --git a/target/linux/generic/backport-6.6/790-36-v6.10-net-dsa-mt7530-mdio-read-PHY-address-of-switch-from-.patch b/target/linux/generic/backport-6.6/790-36-v6.10-net-dsa-mt7530-mdio-read-PHY-address-of-switch-from-.patch index a6cbb0fc6b..6a93090c44 100644 --- a/target/linux/generic/backport-6.6/790-36-v6.10-net-dsa-mt7530-mdio-read-PHY-address-of-switch-from-.patch +++ b/target/linux/generic/backport-6.6/790-36-v6.10-net-dsa-mt7530-mdio-read-PHY-address-of-switch-from-.patch @@ -184,7 +184,7 @@ Signed-off-by: Paolo Abeni err: if (ret < 0) dev_err(&bus->dev, -@@ -2679,16 +2687,19 @@ mt7531_setup(struct dsa_switch *ds) +@@ -2680,16 +2688,19 @@ mt7531_setup(struct dsa_switch *ds) * phy_[read,write]_mmd_indirect is called, we provide our own * mt7531_ind_mmd_phy_[read,write] to complete this function. */ diff --git a/target/linux/generic/backport-6.6/790-39-v6.10-net-dsa-mt7530-refactor-MT7530_PMCR_P.patch b/target/linux/generic/backport-6.6/790-39-v6.10-net-dsa-mt7530-refactor-MT7530_PMCR_P.patch index 89fad45dd5..1d42750aff 100644 --- a/target/linux/generic/backport-6.6/790-39-v6.10-net-dsa-mt7530-refactor-MT7530_PMCR_P.patch +++ b/target/linux/generic/backport-6.6/790-39-v6.10-net-dsa-mt7530-refactor-MT7530_PMCR_P.patch @@ -64,7 +64,7 @@ Signed-off-by: Arınç ÜNAL /* Disable forwarding by default on all ports */ mt7530_rmw(priv, MT7530_PCR_P(i), PCR_MATRIX_MASK, -@@ -2639,7 +2639,7 @@ mt7531_setup(struct dsa_switch *ds) +@@ -2640,7 +2640,7 @@ mt7531_setup(struct dsa_switch *ds) /* Force link down on all ports before internal reset */ for (i = 0; i < MT7530_NUM_PORTS; i++) @@ -73,7 +73,7 @@ Signed-off-by: Arınç ÜNAL /* Reset the switch through internal reset */ mt7530_write(priv, MT7530_SYS_CTRL, SYS_CTRL_SW_RST | SYS_CTRL_REG_RST); -@@ -2881,7 +2881,7 @@ mt753x_phylink_mac_config(struct phylink +@@ -2877,7 +2877,7 @@ mt753x_phylink_mac_config(struct phylink /* Are we connected to external phy */ if (port == 5 && dsa_is_user_port(ds, 5)) @@ -82,7 +82,7 @@ Signed-off-by: Arınç ÜNAL } static void mt753x_phylink_mac_link_down(struct phylink_config *config, -@@ -2891,7 +2891,7 @@ static void mt753x_phylink_mac_link_down +@@ -2887,7 +2887,7 @@ static void mt753x_phylink_mac_link_down struct dsa_port *dp = dsa_phylink_to_port(config); struct mt7530_priv *priv = dp->ds->priv; @@ -91,7 +91,7 @@ Signed-off-by: Arınç ÜNAL } static void mt753x_phylink_mac_link_up(struct phylink_config *config, -@@ -2905,7 +2905,7 @@ static void mt753x_phylink_mac_link_up(s +@@ -2901,7 +2901,7 @@ static void mt753x_phylink_mac_link_up(s struct mt7530_priv *priv = dp->ds->priv; u32 mcr; @@ -100,7 +100,7 @@ Signed-off-by: Arınç ÜNAL switch (speed) { case SPEED_1000: -@@ -2920,9 +2920,9 @@ static void mt753x_phylink_mac_link_up(s +@@ -2916,9 +2916,9 @@ static void mt753x_phylink_mac_link_up(s if (duplex == DUPLEX_FULL) { mcr |= PMCR_FORCE_FDX; if (tx_pause) @@ -112,7 +112,7 @@ Signed-off-by: Arınç ÜNAL } if (mode == MLO_AN_PHY && phydev && phy_init_eee(phydev, false) >= 0) { -@@ -2937,7 +2937,7 @@ static void mt753x_phylink_mac_link_up(s +@@ -2933,7 +2933,7 @@ static void mt753x_phylink_mac_link_up(s } } diff --git a/target/linux/generic/backport-6.6/790-40-v6.10-net-dsa-mt7530-rename-p5_intf_sel-and-use-only-for-M.patch b/target/linux/generic/backport-6.6/790-40-v6.10-net-dsa-mt7530-rename-p5_intf_sel-and-use-only-for-M.patch index 601171a594..3bcdc1a27c 100644 --- a/target/linux/generic/backport-6.6/790-40-v6.10-net-dsa-mt7530-rename-p5_intf_sel-and-use-only-for-M.patch +++ b/target/linux/generic/backport-6.6/790-40-v6.10-net-dsa-mt7530-rename-p5_intf_sel-and-use-only-for-M.patch @@ -135,7 +135,7 @@ Signed-off-by: Arınç ÜNAL mt7530_setup_port5(ds, interface); } -@@ -2654,9 +2647,6 @@ mt7531_setup(struct dsa_switch *ds) +@@ -2655,9 +2648,6 @@ mt7531_setup(struct dsa_switch *ds) MT7531_EXT_P_MDIO_12); } diff --git a/target/linux/generic/backport-6.6/790-42-v6.10-net-dsa-mt7530-refactor-MT7530_MFC-and-MT7531_CFC-ad.patch b/target/linux/generic/backport-6.6/790-42-v6.10-net-dsa-mt7530-refactor-MT7530_MFC-and-MT7531_CFC-ad.patch index a5d293b509..e72424c5f1 100644 --- a/target/linux/generic/backport-6.6/790-42-v6.10-net-dsa-mt7530-refactor-MT7530_MFC-and-MT7531_CFC-ad.patch +++ b/target/linux/generic/backport-6.6/790-42-v6.10-net-dsa-mt7530-refactor-MT7530_MFC-and-MT7531_CFC-ad.patch @@ -101,7 +101,7 @@ Signed-off-by: Arınç ÜNAL UNU_FFP_MASK); for (i = 0; i < MT7530_NUM_PORTS; i++) { -@@ -3089,10 +3075,12 @@ mt753x_conduit_state_change(struct dsa_s +@@ -3085,10 +3071,12 @@ mt753x_conduit_state_change(struct dsa_s else priv->active_cpu_ports &= ~mask; diff --git a/target/linux/generic/backport-6.6/790-43-v6.10-net-dsa-mt7530-refactor-MT7530_HWTRAP-and-MT7530_MHW.patch b/target/linux/generic/backport-6.6/790-43-v6.10-net-dsa-mt7530-refactor-MT7530_HWTRAP-and-MT7530_MHW.patch index 1f66575f02..1e907c51a0 100644 --- a/target/linux/generic/backport-6.6/790-43-v6.10-net-dsa-mt7530-refactor-MT7530_HWTRAP-and-MT7530_MHW.patch +++ b/target/linux/generic/backport-6.6/790-43-v6.10-net-dsa-mt7530-refactor-MT7530_HWTRAP-and-MT7530_MHW.patch @@ -189,7 +189,7 @@ Signed-off-by: Arınç ÜNAL mt7530_pll_setup(priv); mt753x_trap_frames(priv); -@@ -2586,7 +2587,7 @@ mt7531_setup(struct dsa_switch *ds) +@@ -2587,7 +2588,7 @@ mt7531_setup(struct dsa_switch *ds) } /* Waiting for MT7530 got to stable */ diff --git a/target/linux/generic/backport-6.6/790-45-v6.10-net-dsa-mt7530-return-mt7530_setup_mdio-mt7531_setup.patch b/target/linux/generic/backport-6.6/790-45-v6.10-net-dsa-mt7530-return-mt7530_setup_mdio-mt7531_setup.patch index 2eaa77c8cf..5b1ff14de6 100644 --- a/target/linux/generic/backport-6.6/790-45-v6.10-net-dsa-mt7530-return-mt7530_setup_mdio-mt7531_setup.patch +++ b/target/linux/generic/backport-6.6/790-45-v6.10-net-dsa-mt7530-return-mt7530_setup_mdio-mt7531_setup.patch @@ -17,7 +17,7 @@ Signed-off-by: Arınç ÜNAL --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -2667,7 +2667,9 @@ mt7531_setup(struct dsa_switch *ds) +@@ -2668,7 +2668,9 @@ mt7531_setup(struct dsa_switch *ds) 0); } @@ -26,9 +26,9 @@ Signed-off-by: Arınç ÜNAL + if (ret) + return ret; - /* Setup VLAN ID 0 for VLAN-unaware bridges */ - ret = mt7530_setup_vlan0(priv); -@@ -3020,6 +3022,8 @@ mt753x_setup(struct dsa_switch *ds) + ds->assisted_learning_on_cpu_port = true; + ds->mtu_enforcement_ingress = true; +@@ -3016,6 +3018,8 @@ mt753x_setup(struct dsa_switch *ds) ret = mt7530_setup_mdio(priv); if (ret && priv->irq) mt7530_free_irq_common(priv); diff --git a/target/linux/generic/backport-6.6/790-46-v6.10-net-dsa-mt7530-define-MAC-speed-capabilities-per-swi.patch b/target/linux/generic/backport-6.6/790-46-v6.10-net-dsa-mt7530-define-MAC-speed-capabilities-per-swi.patch index 9a592c759d..b7c2edf4c3 100644 --- a/target/linux/generic/backport-6.6/790-46-v6.10-net-dsa-mt7530-define-MAC-speed-capabilities-per-swi.patch +++ b/target/linux/generic/backport-6.6/790-46-v6.10-net-dsa-mt7530-define-MAC-speed-capabilities-per-swi.patch @@ -24,7 +24,7 @@ Signed-off-by: Arınç ÜNAL --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -2685,6 +2685,8 @@ mt7531_setup(struct dsa_switch *ds) +@@ -2681,6 +2681,8 @@ mt7531_setup(struct dsa_switch *ds) static void mt7530_mac_port_get_caps(struct dsa_switch *ds, int port, struct phylink_config *config) { @@ -33,7 +33,7 @@ Signed-off-by: Arınç ÜNAL switch (port) { /* Ports which are connected to switch PHYs. There is no MII pinout. */ case 0 ... 4: -@@ -2716,6 +2718,8 @@ static void mt7531_mac_port_get_caps(str +@@ -2712,6 +2714,8 @@ static void mt7531_mac_port_get_caps(str { struct mt7530_priv *priv = ds->priv; @@ -42,7 +42,7 @@ Signed-off-by: Arınç ÜNAL switch (port) { /* Ports which are connected to switch PHYs. There is no MII pinout. */ case 0 ... 4: -@@ -2755,14 +2759,17 @@ static void mt7988_mac_port_get_caps(str +@@ -2751,14 +2755,17 @@ static void mt7988_mac_port_get_caps(str case 0 ... 3: __set_bit(PHY_INTERFACE_MODE_INTERNAL, config->supported_interfaces); @@ -62,7 +62,7 @@ Signed-off-by: Arınç ÜNAL } } -@@ -2932,9 +2939,7 @@ static void mt753x_phylink_get_caps(stru +@@ -2928,9 +2935,7 @@ static void mt753x_phylink_get_caps(stru { struct mt7530_priv *priv = ds->priv; diff --git a/target/linux/generic/backport-6.6/790-47-v6.10-net-dsa-mt7530-get-rid-of-function-sanity-check.patch b/target/linux/generic/backport-6.6/790-47-v6.10-net-dsa-mt7530-get-rid-of-function-sanity-check.patch index bc84ecb778..8a933f0066 100644 --- a/target/linux/generic/backport-6.6/790-47-v6.10-net-dsa-mt7530-get-rid-of-function-sanity-check.patch +++ b/target/linux/generic/backport-6.6/790-47-v6.10-net-dsa-mt7530-get-rid-of-function-sanity-check.patch @@ -17,7 +17,7 @@ Signed-off-by: Arınç ÜNAL --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -3232,13 +3232,6 @@ mt7530_probe_common(struct mt7530_priv * +@@ -3228,13 +3228,6 @@ mt7530_probe_common(struct mt7530_priv * if (!priv->info) return -EINVAL; diff --git a/target/linux/generic/backport-6.6/790-48-v6.10-net-dsa-mt7530-refactor-MT7530_PMEEECR_P.patch b/target/linux/generic/backport-6.6/790-48-v6.10-net-dsa-mt7530-refactor-MT7530_PMEEECR_P.patch index e75db9ba30..50616f0524 100644 --- a/target/linux/generic/backport-6.6/790-48-v6.10-net-dsa-mt7530-refactor-MT7530_PMEEECR_P.patch +++ b/target/linux/generic/backport-6.6/790-48-v6.10-net-dsa-mt7530-refactor-MT7530_PMEEECR_P.patch @@ -19,7 +19,7 @@ Signed-off-by: Arınç ÜNAL --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -3051,10 +3051,10 @@ static int mt753x_get_mac_eee(struct dsa +@@ -3047,10 +3047,10 @@ static int mt753x_get_mac_eee(struct dsa struct ethtool_eee *e) { struct mt7530_priv *priv = ds->priv; @@ -32,7 +32,7 @@ Signed-off-by: Arınç ÜNAL return 0; } -@@ -3068,11 +3068,11 @@ static int mt753x_set_mac_eee(struct dsa +@@ -3064,11 +3064,11 @@ static int mt753x_set_mac_eee(struct dsa if (e->tx_lpi_timer > 0xFFF) return -EINVAL; diff --git a/target/linux/generic/backport-6.6/790-50-v6.10-net-dsa-mt7530-use-priv-ds-num_ports-instead-of-MT75.patch b/target/linux/generic/backport-6.6/790-50-v6.10-net-dsa-mt7530-use-priv-ds-num_ports-instead-of-MT75.patch index f63d4d7705..12749812ba 100644 --- a/target/linux/generic/backport-6.6/790-50-v6.10-net-dsa-mt7530-use-priv-ds-num_ports-instead-of-MT75.patch +++ b/target/linux/generic/backport-6.6/790-50-v6.10-net-dsa-mt7530-use-priv-ds-num_ports-instead-of-MT75.patch @@ -46,7 +46,7 @@ Signed-off-by: Arınç ÜNAL /* Clear link settings and enable force mode to force link down * on all ports until they're enabled later. */ -@@ -2626,7 +2626,7 @@ mt7531_setup(struct dsa_switch *ds) +@@ -2627,7 +2627,7 @@ mt7531_setup(struct dsa_switch *ds) priv->p5_sgmii = !!(val & PAD_DUAL_SGMII_EN); /* Force link down on all ports before internal reset */ diff --git a/target/linux/generic/backport-6.6/790-51-v6.10-net-dsa-mt7530-do-not-pass-port-variable-to-mt7531_r.patch b/target/linux/generic/backport-6.6/790-51-v6.10-net-dsa-mt7530-do-not-pass-port-variable-to-mt7531_r.patch index 9ba12b1269..5d2a815cce 100644 --- a/target/linux/generic/backport-6.6/790-51-v6.10-net-dsa-mt7530-do-not-pass-port-variable-to-mt7531_r.patch +++ b/target/linux/generic/backport-6.6/790-51-v6.10-net-dsa-mt7530-do-not-pass-port-variable-to-mt7531_r.patch @@ -17,7 +17,7 @@ Signed-off-by: Arınç ÜNAL --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -2785,7 +2785,7 @@ mt7530_mac_config(struct dsa_switch *ds, +@@ -2781,7 +2781,7 @@ mt7530_mac_config(struct dsa_switch *ds, mt7530_setup_port6(priv->ds, interface); } @@ -26,7 +26,7 @@ Signed-off-by: Arınç ÜNAL phy_interface_t interface, struct phy_device *phydev) { -@@ -2836,7 +2836,7 @@ mt7531_mac_config(struct dsa_switch *ds, +@@ -2832,7 +2832,7 @@ mt7531_mac_config(struct dsa_switch *ds, if (phy_interface_mode_is_rgmii(interface)) { dp = dsa_to_port(ds, port); phydev = dp->slave->phydev; diff --git a/target/linux/generic/backport-6.6/790-52-v6.10-net-dsa-mt7530-explain-exposing-MDIO-bus-of-MT7531AE.patch b/target/linux/generic/backport-6.6/790-52-v6.10-net-dsa-mt7530-explain-exposing-MDIO-bus-of-MT7531AE.patch index 58c3e0bc3c..8a0a068508 100644 --- a/target/linux/generic/backport-6.6/790-52-v6.10-net-dsa-mt7530-explain-exposing-MDIO-bus-of-MT7531AE.patch +++ b/target/linux/generic/backport-6.6/790-52-v6.10-net-dsa-mt7530-explain-exposing-MDIO-bus-of-MT7531AE.patch @@ -19,7 +19,7 @@ Signed-off-by: Arınç ÜNAL --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -2635,7 +2635,10 @@ mt7531_setup(struct dsa_switch *ds) +@@ -2636,7 +2636,10 @@ mt7531_setup(struct dsa_switch *ds) if (!priv->p5_sgmii) { mt7531_pll_setup(priv); } else { diff --git a/target/linux/generic/pending-6.6/680-net-add-TCP-fraglist-GRO-support.patch b/target/linux/generic/pending-6.6/680-net-add-TCP-fraglist-GRO-support.patch index ca7c624447..fcc6a1f14f 100644 --- a/target/linux/generic/pending-6.6/680-net-add-TCP-fraglist-GRO-support.patch +++ b/target/linux/generic/pending-6.6/680-net-add-TCP-fraglist-GRO-support.patch @@ -81,7 +81,7 @@ Signe-off-by: Felix Fietkau { --- a/net/ipv4/tcp_offload.c +++ b/net/ipv4/tcp_offload.c -@@ -28,6 +28,70 @@ static void tcp_gso_tstamp(struct sk_buf +@@ -31,6 +31,70 @@ static void tcp_gso_tstamp(struct sk_buf } } @@ -152,7 +152,7 @@ Signe-off-by: Felix Fietkau static struct sk_buff *tcp4_gso_segment(struct sk_buff *skb, netdev_features_t features) { -@@ -37,6 +101,9 @@ static struct sk_buff *tcp4_gso_segment( +@@ -40,6 +104,9 @@ static struct sk_buff *tcp4_gso_segment( if (!pskb_may_pull(skb, sizeof(struct tcphdr))) return ERR_PTR(-EINVAL); @@ -162,7 +162,7 @@ Signe-off-by: Felix Fietkau if (unlikely(skb->ip_summed != CHECKSUM_PARTIAL)) { const struct iphdr *iph = ip_hdr(skb); struct tcphdr *th = tcp_hdr(skb); -@@ -181,61 +248,76 @@ out: +@@ -184,61 +251,76 @@ out: return segs; } @@ -269,7 +269,7 @@ Signe-off-by: Felix Fietkau flush = NAPI_GRO_CB(p)->flush; flush |= (__force int)(flags & TCP_FLAG_CWR); flush |= (__force int)((flags ^ tcp_flag_word(th2)) & -@@ -272,6 +354,19 @@ found: +@@ -275,6 +357,19 @@ found: flush |= p->decrypted ^ skb->decrypted; #endif @@ -289,7 +289,7 @@ Signe-off-by: Felix Fietkau if (flush || skb_gro_receive(p, skb)) { mss = 1; goto out_check_final; -@@ -293,7 +388,6 @@ out_check_final: +@@ -296,7 +391,6 @@ out_check_final: if (p && (!NAPI_GRO_CB(skb)->same_flow || flush)) pp = p; @@ -297,7 +297,7 @@ Signe-off-by: Felix Fietkau NAPI_GRO_CB(skb)->flush |= (flush != 0); return pp; -@@ -317,18 +411,58 @@ void tcp_gro_complete(struct sk_buff *sk +@@ -320,18 +414,58 @@ void tcp_gro_complete(struct sk_buff *sk } EXPORT_SYMBOL(tcp_gro_complete); @@ -361,7 +361,7 @@ Signe-off-by: Felix Fietkau } INDIRECT_CALLABLE_SCOPE int tcp4_gro_complete(struct sk_buff *skb, int thoff) -@@ -336,6 +470,15 @@ INDIRECT_CALLABLE_SCOPE int tcp4_gro_com +@@ -339,6 +473,15 @@ INDIRECT_CALLABLE_SCOPE int tcp4_gro_com const struct iphdr *iph = ip_hdr(skb); struct tcphdr *th = tcp_hdr(skb); @@ -379,7 +379,7 @@ Signe-off-by: Felix Fietkau skb_shinfo(skb)->gso_type |= SKB_GSO_TCPV4; --- a/net/ipv4/udp_offload.c +++ b/net/ipv4/udp_offload.c -@@ -470,33 +470,6 @@ out: +@@ -474,33 +474,6 @@ out: return segs; } diff --git a/target/linux/generic/pending-6.6/685-net-gso-fix-tcp-fraglist-segmentation-after-pull-fro.patch b/target/linux/generic/pending-6.6/685-net-gso-fix-tcp-fraglist-segmentation-after-pull-fro.patch index 235762b5c0..ea0fe0c9ab 100644 --- a/target/linux/generic/pending-6.6/685-net-gso-fix-tcp-fraglist-segmentation-after-pull-fro.patch +++ b/target/linux/generic/pending-6.6/685-net-gso-fix-tcp-fraglist-segmentation-after-pull-fro.patch @@ -36,7 +36,7 @@ Signed-off-by: Felix Fietkau --- a/net/ipv4/tcp_offload.c +++ b/net/ipv4/tcp_offload.c -@@ -101,8 +101,14 @@ static struct sk_buff *tcp4_gso_segment( +@@ -104,8 +104,14 @@ static struct sk_buff *tcp4_gso_segment( if (!pskb_may_pull(skb, sizeof(struct tcphdr))) return ERR_PTR(-EINVAL); diff --git a/target/linux/ipq40xx/patches-6.6/999-atm-mpoa-intel-dsl-phy-support.patch b/target/linux/ipq40xx/patches-6.6/999-atm-mpoa-intel-dsl-phy-support.patch index eab26ccb11..6a9bd44ab1 100644 --- a/target/linux/ipq40xx/patches-6.6/999-atm-mpoa-intel-dsl-phy-support.patch +++ b/target/linux/ipq40xx/patches-6.6/999-atm-mpoa-intel-dsl-phy-support.patch @@ -4,7 +4,7 @@ Subject: [PATCH] UGW_SW-29163: ATM oam support --- a/drivers/net/ppp/ppp_generic.c +++ b/drivers/net/ppp/ppp_generic.c -@@ -2968,6 +2968,22 @@ char *ppp_dev_name(struct ppp_channel *c +@@ -2978,6 +2978,22 @@ char *ppp_dev_name(struct ppp_channel *c return name; } @@ -27,7 +27,7 @@ Subject: [PATCH] UGW_SW-29163: ATM oam support /* * Disconnect a channel from the generic layer. -@@ -3614,6 +3630,7 @@ EXPORT_SYMBOL(ppp_unregister_channel); +@@ -3624,6 +3640,7 @@ EXPORT_SYMBOL(ppp_unregister_channel); EXPORT_SYMBOL(ppp_channel_index); EXPORT_SYMBOL(ppp_unit_number); EXPORT_SYMBOL(ppp_dev_name); diff --git a/target/linux/rockchip/patches-6.6/034-v6.7-usb-dwc3-add-optional-PHY-interface-clocks.patch b/target/linux/rockchip/patches-6.6/034-v6.7-usb-dwc3-add-optional-PHY-interface-clocks.patch index 26fedf0a65..4d358ea219 100644 --- a/target/linux/rockchip/patches-6.6/034-v6.7-usb-dwc3-add-optional-PHY-interface-clocks.patch +++ b/target/linux/rockchip/patches-6.6/034-v6.7-usb-dwc3-add-optional-PHY-interface-clocks.patch @@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c -@@ -845,8 +845,20 @@ static int dwc3_clk_enable(struct dwc3 * +@@ -860,8 +860,20 @@ static int dwc3_clk_enable(struct dwc3 * if (ret) goto disable_ref_clk; @@ -39,7 +39,7 @@ Signed-off-by: Greg Kroah-Hartman disable_ref_clk: clk_disable_unprepare(dwc->ref_clk); disable_bus_clk: -@@ -856,6 +868,8 @@ disable_bus_clk: +@@ -871,6 +883,8 @@ disable_bus_clk: static void dwc3_clk_disable(struct dwc3 *dwc) { @@ -48,7 +48,7 @@ Signed-off-by: Greg Kroah-Hartman clk_disable_unprepare(dwc->susp_clk); clk_disable_unprepare(dwc->ref_clk); clk_disable_unprepare(dwc->bus_clk); -@@ -1875,6 +1889,20 @@ static int dwc3_get_clocks(struct dwc3 * +@@ -1886,6 +1900,20 @@ static int dwc3_get_clocks(struct dwc3 * } } diff --git a/target/linux/starfive/patches-6.6/0109-usb-xhci-To-improve-performance-usb-using-lowmem-for.patch b/target/linux/starfive/patches-6.6/0109-usb-xhci-To-improve-performance-usb-using-lowmem-for.patch index 7c5c522f91..b5d9802d90 100644 --- a/target/linux/starfive/patches-6.6/0109-usb-xhci-To-improve-performance-usb-using-lowmem-for.patch +++ b/target/linux/starfive/patches-6.6/0109-usb-xhci-To-improve-performance-usb-using-lowmem-for.patch @@ -128,7 +128,7 @@ Signed-off-by: minda.chen int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags) { dma_addr_t dma; -@@ -2436,6 +2494,12 @@ int xhci_mem_init(struct xhci_hcd *xhci, +@@ -2437,6 +2495,12 @@ int xhci_mem_init(struct xhci_hcd *xhci, xhci->isoc_bei_interval = AVOID_BEI_INTERVAL_MAX; diff --git a/target/linux/starfive/patches-6.6/0110-usb-xhci-using-dma_alloc_noncoherent-to-alloc-low-me.patch b/target/linux/starfive/patches-6.6/0110-usb-xhci-using-dma_alloc_noncoherent-to-alloc-low-me.patch index a9c03feecf..fad99301e6 100644 --- a/target/linux/starfive/patches-6.6/0110-usb-xhci-using-dma_alloc_noncoherent-to-alloc-low-me.patch +++ b/target/linux/starfive/patches-6.6/0110-usb-xhci-using-dma_alloc_noncoherent-to-alloc-low-me.patch @@ -71,7 +71,7 @@ Signed-off-by: Minda Chen INIT_LIST_HEAD(&xhci->cmd_list); -@@ -2495,9 +2496,11 @@ int xhci_mem_init(struct xhci_hcd *xhci, +@@ -2496,9 +2497,11 @@ int xhci_mem_init(struct xhci_hcd *xhci, xhci->isoc_bei_interval = AVOID_BEI_INTERVAL_MAX; if (xhci->quirks & XHCI_LOCAL_BUFFER) { From de9ad11dac094b6074c9b23341acbc28806404ae Mon Sep 17 00:00:00 2001 From: Michel Lespinasse Date: Thu, 16 Jan 2025 00:50:01 -0800 Subject: [PATCH 32/40] rockchip: show boot stages on nanopi R6 system LED Set up openwrt to show boot progress on the nanopi R6S or R6C system LED. The LED blinking states indicate the boot stage. The LED is defined as a power LED, but can still be set to heartbeat in /etc/config/system after the system is done booting. Signed-off-by: Michel Lespinasse Link: https://github.com/openwrt/openwrt/pull/17638 Signed-off-by: Hauke Mehrtens --- ...1-nanopi-r6-show-boot-status-on-system-led | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 target/linux/rockchip/patches-6.6/401-1-nanopi-r6-show-boot-status-on-system-led diff --git a/target/linux/rockchip/patches-6.6/401-1-nanopi-r6-show-boot-status-on-system-led b/target/linux/rockchip/patches-6.6/401-1-nanopi-r6-show-boot-status-on-system-led new file mode 100644 index 0000000000..f891cf5f16 --- /dev/null +++ b/target/linux/rockchip/patches-6.6/401-1-nanopi-r6-show-boot-status-on-system-led @@ -0,0 +1,33 @@ +Nanopi R6: show boot progress on the system LED + +Set up openwrt to show boot progress on the nanopi R6S or R6C system LED. + +The LED blinking states indicate the boot stage. The led is defined as +a power LED, but can still be set to heartbeat in /etc/config/system +after the system is done booting. + +--- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi +@@ -16,6 +16,10 @@ + ethernet0 = &gmac1; + mmc0 = &sdmmc; + mmc1 = &sdhci; ++ led-boot = &sys_led; ++ led-failsafe = &sys_led; ++ led-running = &sys_led; ++ led-upgrade = &sys_led; + }; + + chosen { +@@ -54,9 +58,9 @@ + + sys_led: led-0 { + color = ; +- function = LED_FUNCTION_HEARTBEAT; ++ function = LED_FUNCTION_POWER; + gpios = <&gpio1 RK_PC1 GPIO_ACTIVE_HIGH>; +- linux,default-trigger = "heartbeat"; ++ default-state = "on"; + pinctrl-names = "default"; + pinctrl-0 = <&sys_led_pin>; + }; From 2e7d060fd1ba6160067df1a2ba303c7c2efe2a7e Mon Sep 17 00:00:00 2001 From: Michel Lespinasse Date: Thu, 16 Jan 2025 00:50:23 -0800 Subject: [PATCH 33/40] rockchip: configure reset button on nanopi R6 Set up openwrt to handle the reset button appropriately (so that it can trigger the various recovery modes) on the nanopi R6S and R6C models. Signed-off-by: Michel Lespinasse Link: https://github.com/openwrt/openwrt/pull/17638 Signed-off-by: Hauke Mehrtens --- .../patches-6.6/401-2-nanopi-r6-reset-button | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 target/linux/rockchip/patches-6.6/401-2-nanopi-r6-reset-button diff --git a/target/linux/rockchip/patches-6.6/401-2-nanopi-r6-reset-button b/target/linux/rockchip/patches-6.6/401-2-nanopi-r6-reset-button new file mode 100644 index 0000000000..5ca4aff115 --- /dev/null +++ b/target/linux/rockchip/patches-6.6/401-2-nanopi-r6-reset-button @@ -0,0 +1,18 @@ +Nanopi R6: set up reset button to be handled by openwrt + +Set up openwrt to handle the reset button appropriately (so that it +can trigger the various recovery modes) on the nanopi R6S and R6C models. + +--- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi +@@ -48,8 +48,8 @@ + button-user { + debounce-interval = <50>; + gpios = <&gpio1 RK_PC0 GPIO_ACTIVE_LOW>; +- label = "User Button"; +- linux,code = ; ++ label = "reset"; ++ linux,code = ; + }; + }; + From 59215154a0eba77f0a79a6e30069a3037603ebf2 Mon Sep 17 00:00:00 2001 From: Michel Lespinasse Date: Thu, 16 Jan 2025 00:50:58 -0800 Subject: [PATCH 34/40] rockchip: set network IRQ affinity to fast CPU cores The nanopi R6S, R6C and nanopc T6 platforms are based on rk3588(s) SoC, which has fast and slow CPU cores. Set up network interrupt affinity to be on the fast CPU cores by default. This is similar to the way this was already configured on nanopi R4S. Signed-off-by: Michel Lespinasse Link: https://github.com/openwrt/openwrt/pull/17638 Signed-off-by: Hauke Mehrtens --- .../etc/hotplug.d/net/40-net-smp-affinity | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity b/target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity index 27d469bb47..f5cdd9be8a 100644 --- a/target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity +++ b/target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity @@ -30,10 +30,8 @@ set_interface_core() { case "$(board_name)" in armsom,sige7|\ -friendlyarm,nanopc-t6|\ friendlyarm,nanopi-r3s|\ friendlyarm,nanopi-r5c|\ -friendlyarm,nanopi-r6c|\ radxa,e25|\ sinovoip,rk3568-bpi-r2pro) set_interface_core 2 "eth0" @@ -49,15 +47,21 @@ xunlong,orangepi-r1-plus-lts) set_interface_core 4 "eth1" "xhci-hcd:usb[0-9]+" ;; friendlyarm,nanopi-r4s|\ -friendlyarm,nanopi-r4s-enterprise) +friendlyarm,nanopi-r4s-enterprise|\ +friendlyarm,nanopi-r6c|\ +friendlyarm,nanopc-t6) set_interface_core 10 "eth0" set_interface_core 20 "eth1" ;; -friendlyarm,nanopi-r5s|\ -friendlyarm,nanopi-r6s) +friendlyarm,nanopi-r5s) set_interface_core 2 "eth0" set_interface_core 4 "eth1" set_interface_core 8 "eth2" ;; +friendlyarm,nanopi-r6s) + set_interface_core 10 "eth0" + set_interface_core 20 "eth1" + set_interface_core 40 "eth2" + ;; esac From effcb6e4c3f6638ad4dde7a7e9218c4f7189019b Mon Sep 17 00:00:00 2001 From: Michel Lespinasse Date: Thu, 16 Jan 2025 00:54:06 -0800 Subject: [PATCH 35/40] kernel: load r8169 network module at boot time This allows the network interface naming to be stable, free from any possible interaction from external USB network devices that might claim usb* interface names. (This was a real problem I encountered with a nanopi R6S device and an external rtl8152 usb3 network controller - the USB controller would claim the eth1 name, causing much confusion). Signed-off-by: Michel Lespinasse Link: https://github.com/openwrt/openwrt/pull/17638 Signed-off-by: Hauke Mehrtens --- package/kernel/linux/modules/netdevices.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk index 308958eb68..541202c5e3 100644 --- a/package/kernel/linux/modules/netdevices.mk +++ b/package/kernel/linux/modules/netdevices.mk @@ -1024,7 +1024,7 @@ define KernelPackage/r8169 CONFIG_R8169 \ CONFIG_R8169_LEDS=y FILES:=$(LINUX_DIR)/drivers/net/ethernet/realtek/r8169.ko - AUTOLOAD:=$(call AutoProbe,r8169) + AUTOLOAD:=$(call AutoProbe,r8169,1) endef define KernelPackage/r8169/description From 4efb4a26d28ecdd5fec9dc3a85bcb46a45a75f60 Mon Sep 17 00:00:00 2001 From: Shiji Yang Date: Fri, 14 Mar 2025 19:19:11 +0800 Subject: [PATCH 36/40] stm32: modules: fix stm32-hash package build * Remove misplaced backslash to fix the build warning: WARNING: can't parse line: FILES:=/drivers/crypto/stm32/stm32-hash.ko * Add missing dependency package kmod-crypto-engine: Package kmod-stm32-hash is missing dependencies for the following libraries: crypto_engine.ko Signed-off-by: Shiji Yang Link: https://github.com/openwrt/openwrt/pull/18241 Signed-off-by: Hauke Mehrtens --- target/linux/stm32/modules.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/linux/stm32/modules.mk b/target/linux/stm32/modules.mk index baba80baba..2a9ec36e46 100644 --- a/target/linux/stm32/modules.mk +++ b/target/linux/stm32/modules.mk @@ -216,13 +216,14 @@ define KernelPackage/stm32-hash SUBMENU:=$(CRYPTO_MENU) TITLE:=Support for STM32 hash accelerators DEPENDS:=@TARGET_stm32 \ + +kmod-crypto-engine \ +kmod-crypto-md5 \ +kmod-crypto-sha1 \ +kmod-crypto-sha256 \ +kmod-crypto-sha3 \ +kmod-crypto-rsa KCONFIG:=CONFIG_CRYPTO_DEV_STM32_HASH \ - CONFIG_CRYPTO_ENGINE=y \ + CONFIG_CRYPTO_ENGINE=y FILES:=$(LINUX_DIR)/drivers/crypto/stm32/stm32-hash.ko AUTOLOAD:=$(call AutoProbe,stm32-hash) endef From c13a050d5ad55ab090a592823a9f964af8614fc2 Mon Sep 17 00:00:00 2001 From: Roland Reinl Date: Wed, 12 Mar 2025 19:11:08 +0100 Subject: [PATCH 37/40] ramips: Add support for Cudy M1200 v1 The M1200 v1 is similar to the TR1200 series from Cudy. Differences: - Only 1 LAN port - No USB Specifications: - MT7628 - MT7628AN (2.4G b/g/n) and MT7613BE (5G ac/n) wifi - 128 MB RAM - 16 MB flash MAC Addresses: - There is one on the label, e.g. xx:xx:xx:xx:xx:A4 - LAN (bottom connector) is the same as the label, e.g. xx:xx:xx:xx:xx:A4 - WAN (top connector) is label + 1, e.g. xx:xx:xx:xx:xx:A5 - WLAN (2.4G) is the same as the label, e.g. xx:xx:xx:xx:xx:A4 - WLAN (5G) is label + 2, e.g. xx:xx:xx:xx:xx:A6 UART: - is available via the pin holes on the board - The pinout is printed to the board: P: VCC, G: GND, R: RX, T:TX - RX and TX require solder bridges to be installed - Do NOT connect VCC - Settings: 3.3V, 115200, 8N1 GPIO: - There are two LEDs: Red (GPIO 4) and White (GPIO 0) - There are two buttons: Reset (GPIO 11) and WPS (GPIO 5) Migration to OpenWrt: - Download the migration image from the Cudy website (it should be available as soon as OpenWrt officially supports the device) - Connect computer to LAN (bottom connector) and flash the migration image via OEM web interface - OpenWrt is now accessible via 192.168.1.1 Revert back to OEM firmware: - Set up a TFTP server on IP 192.168.1.88 and connect to the WAN port (upper port) - Provide the Cudy firmware as recovery.bin in the TFTP server - Press the reset button while powering on the device - Recovery process is started now - When recovery process is done, OEM firmware is accessible via 192.168.10.1 again General information: - No possibility to load a initramfs image via U-Boot because there is no option to interrupt U-Boot Signed-off-by: Roland Reinl Link: https://github.com/openwrt/openwrt/pull/18233 Signed-off-by: Hauke Mehrtens --- .../ramips/dts/mt7628an_cudy_m1200-v1.dts | 187 ++++++++++++++++++ target/linux/ramips/image/mt76x8.mk | 11 ++ .../mt76x8/base-files/etc/board.d/02_network | 1 + 3 files changed, 199 insertions(+) create mode 100644 target/linux/ramips/dts/mt7628an_cudy_m1200-v1.dts diff --git a/target/linux/ramips/dts/mt7628an_cudy_m1200-v1.dts b/target/linux/ramips/dts/mt7628an_cudy_m1200-v1.dts new file mode 100644 index 0000000000..05721d9984 --- /dev/null +++ b/target/linux/ramips/dts/mt7628an_cudy_m1200-v1.dts @@ -0,0 +1,187 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +#include "mt7628an.dtsi" + +#include +#include +#include + +/ { + compatible = "cudy,m1200-v1", "mediatek,mt7628an-soc"; + model = "Cudy M1200 v1"; + + aliases { + led-boot = &led_status_white; + led-running = &led_status_white; + led-failsafe = &led_status_red; + led-upgrade = &led_status_red; + label-mac-device = ðernet; + }; + + chosen { + bootargs = "console=ttyS0,115200"; + }; + + gpio-keys { + compatible = "gpio-keys"; + + reset { + label = "reset"; + linux,code = ; + gpios = <&gpio 11 GPIO_ACTIVE_LOW>; + }; + + + wps { + label = "wps"; + linux,code = ; + gpios = <&gpio 5 GPIO_ACTIVE_LOW>; + }; + }; + + leds { + compatible = "gpio-leds"; + + led_status_red: led-status-red { + function = LED_FUNCTION_STATUS; + color = ; + gpios = <&gpio 4 GPIO_ACTIVE_LOW>; + }; + + led_status_white: led-status-white { + function = LED_FUNCTION_STATUS; + color = ; + gpios = <&gpio 0 GPIO_ACTIVE_LOW>; + }; + }; +}; + +&spi0 { + status = "okay"; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <40000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "u-boot"; + reg = <0x0 0x30000>; + read-only; + }; + + partition@30000 { + label = "u-boot-env"; + reg = <0x30000 0x10000>; + read-only; + }; + + partition@40000 { + label = "factory"; + reg = <0x40000 0x10000>; + read-only; + + nvmem-layout { + compatible = "fixed-layout"; + #address-cells = <1>; + #size-cells = <1>; + + eeprom_factory_0: eeprom@0 { + reg = <0x0 0x400>; + }; + + eeprom_factory_8000: eeprom@8000 { + reg = <0x8000 0x4da8>; + }; + }; + }; + + partition@50000 { + compatible = "denx,uimage"; + label = "firmware"; + reg = <0x50000 0xf80000>; + }; + + partition@fd0000 { + label = "debug"; + reg = <0xfd0000 0x10000>; + read-only; + }; + + partition@fe0000 { + label = "backup"; + reg = <0xfe000 0x10000>; + read-only; + }; + + partition@ff0000 { + label = "bdinfo"; + reg = <0xff0000 0x10000>; + read-only; + + nvmem-layout { + compatible = "fixed-layout"; + #address-cells = <1>; + #size-cells = <1>; + + macaddr_bdinfo_de00: macaddr@de00 { + compatible = "mac-base"; + reg = <0xde00 0x6>; + #nvmem-cell-cells = <1>; + }; + }; + }; + }; + }; +}; + +&state_default { + gpio { + groups = "i2c", "gpio", "wdt", "p0led_an", "wled_an"; + function = "gpio"; + }; +}; + +&ehci { + status = "okay"; +}; + +&ohci { + status = "okay"; +}; + +&pcie { + status = "okay"; +}; + +&pcie0 { + wifi@0,0 { + compatible = "mediatek,mt76"; + reg = <0x0000 0 0 0 0>; + nvmem-cells = <&eeprom_factory_8000>, <&macaddr_bdinfo_de00 2>; + nvmem-cell-names = "eeprom", "mac-address"; + ieee80211-freq-limit = <5000000 6000000>; + }; +}; + +&wmac { + status = "okay"; + + nvmem-cells = <&eeprom_factory_0>, <&macaddr_bdinfo_de00 1>; + nvmem-cell-names = "eeprom", "mac-address"; +}; + +ðernet { + nvmem-cells = <&macaddr_bdinfo_de00 0>; + nvmem-cell-names = "mac-address"; +}; + +&esw { + mediatek,portmap = <0x3d>; + mediatek,portdisable = <0x3c>; +}; diff --git a/target/linux/ramips/image/mt76x8.mk b/target/linux/ramips/image/mt76x8.mk index 9c1d4d6298..8c8cfee23b 100644 --- a/target/linux/ramips/image/mt76x8.mk +++ b/target/linux/ramips/image/mt76x8.mk @@ -167,6 +167,17 @@ define Device/comfast_cf-wr758ac-v2 endef TARGET_DEVICES += comfast_cf-wr758ac-v2 +define Device/cudy_m1200-v1 + IMAGE_SIZE := 15872k + DEVICE_VENDOR := Cudy + DEVICE_MODEL := M1200 + DEVICE_VARIANT := v1 + DEVICE_PACKAGES := kmod-mt7615e kmod-mt7663-firmware-ap + UIMAGE_NAME := R22 + SUPPORTED_DEVICES += R22 +endef +TARGET_DEVICES += cudy_m1200-v1 + define Device/cudy_tr1200-v1 IMAGE_SIZE := 15872k DEVICE_VENDOR := Cudy diff --git a/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network b/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network index 496bb809ef..fbdc7fb5a2 100644 --- a/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network +++ b/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network @@ -98,6 +98,7 @@ ramips_setup_interfaces() ucidef_add_switch "switch0" \ "4:lan" "6@eth0" ;; + cudy,m1200-v1|\ cudy,tr1200-v1) ucidef_add_switch "switch0" \ "0:lan" "1:wan" "6@eth0" From 3d8d807373746d6b3c1674bc450d78090954346f Mon Sep 17 00:00:00 2001 From: Shiji Yang Date: Thu, 20 Feb 2025 20:03:26 +0800 Subject: [PATCH 38/40] uboot-mediatek: move custom uart config symbol to board defconfigs This helps to solve the issue of waiting for "SERIAL_RX_BUFFER_SIZE" input when enabling verbose log output option (V=s). Fixes: https://github.com/openwrt/openwrt/issues/18036 Signed-off-by: Shiji Yang Link: https://github.com/openwrt/openwrt/pull/18043 Signed-off-by: Robert Marko --- package/boot/uboot-mediatek/Makefile | 3 +- ...figs-add-usefull-stuff-to-mt7988-rfb.patch | 12 +- ...igs-add-useful-options-to-mt7981-rfb.patch | 580 +++++++++--------- .../patches/314-mt7981-select-rootdisk.patch | 35 -- .../patches/400-update-bpir2-defconfig.patch | 5 +- .../patches/401-update-u7623-defconfig.patch | 5 +- .../404-add-bananapi_bpi-r64_defconfigs.patch | 9 +- ...22-enable-environment-for-mt7622_rfb.patch | 6 +- .../patches/410-add-linksys-e8450.patch | 3 +- .../patches/412-add-ubnt-unifi-6-lr.patch | 9 +- ...20-add-support-for-RAVPower-RP-WD009.patch | 3 +- .../patches/421-zbtlink_zbt-wg3526-16m.patch | 3 +- .../patches/429-add-netcore-n60.patch | 3 +- .../patches/430-add-bpi-r3.patch | 12 +- .../patches/431-add-xiaomi_redmi-ax6000.patch | 3 +- .../patches/432-add-tplink-xdr608x.patch | 9 +- .../patches/433-add-qihoo_360t7.patch | 3 +- .../434-add-xiaomi_mi-router-wr30u.patch | 3 +- .../patches/435-add-h3c_magic-nx30-pro.patch | 3 +- .../patches/436-add-glinet-mt6000.patch | 3 +- .../patches/437-add-cmcc_rax3000m.patch | 6 +- .../patches/438-add-jcg_q30-pro.patch | 3 +- .../patches/439-add-zyxel_ex5601-t0.patch | 3 +- .../440-add-xiaomi_mi-router-ax3000t.patch | 3 +- .../patches/441-add-jdcloud_re-cp-03.patch | 3 +- .../patches/442-add-bpi-r3-mini.patch | 6 +- .../patches/443-add-nokia_ea0326gmp.patch | 3 +- .../patches/444-add-abt_asr3000.patch | 3 +- .../patches/450-add-bpi-r4.patch | 18 +- .../patches/451-add-tplink-xtr8488.patch | 3 +- .../patches/452-add-xiaomi-redmi-ax6s.patch | 3 +- .../patches/453-add-openwrt-one.patch | 6 +- .../patches/454-add-glinet-x3000.patch | 3 +- .../patches/456-add-arcadyan-mozart.patch | 3 +- .../patches/458-add-GatoNetworks-GDSP.patch | 3 +- .../patches/459-add-mercusys-mr90x-v1.patch | 3 +- .../patches/460-add-routerich-ax3000.patch | 3 +- 37 files changed, 392 insertions(+), 395 deletions(-) diff --git a/package/boot/uboot-mediatek/Makefile b/package/boot/uboot-mediatek/Makefile index 356b2bb8ea..62325cb73d 100644 --- a/package/boot/uboot-mediatek/Makefile +++ b/package/boot/uboot-mediatek/Makefile @@ -897,8 +897,7 @@ UBOOT_TARGETS := \ UBOOT_CUSTOMIZE_CONFIG := \ --disable TOOLS_KWBIMAGE \ --disable TOOLS_LIBCRYPTO \ - --disable TOOLS_MKEFICAPSULE \ - --enable SERIAL_RX_BUFFER + --disable TOOLS_MKEFICAPSULE ifdef CONFIG_TARGET_mediatek UBOOT_MAKE_FLAGS += $(UBOOT_IMAGE:.fip=.bin) diff --git a/package/boot/uboot-mediatek/patches/105-configs-add-usefull-stuff-to-mt7988-rfb.patch b/package/boot/uboot-mediatek/patches/105-configs-add-usefull-stuff-to-mt7988-rfb.patch index b9357ea6f9..085491c371 100644 --- a/package/boot/uboot-mediatek/patches/105-configs-add-usefull-stuff-to-mt7988-rfb.patch +++ b/package/boot/uboot-mediatek/patches/105-configs-add-usefull-stuff-to-mt7988-rfb.patch @@ -81,7 +81,7 @@ CONFIG_USE_IPADDR=y CONFIG_IPADDR="192.168.1.1" CONFIG_USE_NETMASK=y -@@ -44,21 +83,32 @@ CONFIG_USE_SERVERIP=y +@@ -44,28 +83,43 @@ CONFIG_USE_SERVERIP=y CONFIG_SERVERIP="192.168.1.2" CONFIG_PROT_TCP=y CONFIG_NET_RANDOM_ETHADDR=y @@ -116,7 +116,9 @@ CONFIG_DM_PWM=y CONFIG_PWM_MTK=y CONFIG_RAM=y -@@ -67,5 +117,8 @@ CONFIG_MTK_SERIAL=y + CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y + CONFIG_MTK_SERIAL=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_MTK_SPIM=y @@ -226,7 +228,7 @@ CONFIG_MMC_HS200_SUPPORT=y CONFIG_MMC_MTK=y CONFIG_MTD=y -@@ -64,13 +108,20 @@ CONFIG_SPI_FLASH_WINBOND=y +@@ -64,20 +108,31 @@ CONFIG_SPI_FLASH_WINBOND=y CONFIG_SPI_FLASH_XMC=y CONFIG_SPI_FLASH_XTX=y CONFIG_SPI_FLASH_MTD=y @@ -247,7 +249,9 @@ CONFIG_DM_PWM=y CONFIG_PWM_MTK=y CONFIG_RAM=y -@@ -79,5 +130,8 @@ CONFIG_MTK_SERIAL=y + CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y + CONFIG_MTK_SERIAL=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_MTK_SPIM=y diff --git a/package/boot/uboot-mediatek/patches/107-configs-add-useful-options-to-mt7981-rfb.patch b/package/boot/uboot-mediatek/patches/107-configs-add-useful-options-to-mt7981-rfb.patch index 20c618e065..608eff64d6 100644 --- a/package/boot/uboot-mediatek/patches/107-configs-add-useful-options-to-mt7981-rfb.patch +++ b/package/boot/uboot-mediatek/patches/107-configs-add-useful-options-to-mt7981-rfb.patch @@ -1,472 +1,452 @@ --- a/configs/mt7981_emmc_rfb_defconfig +++ b/configs/mt7981_emmc_rfb_defconfig -@@ -14,7 +14,22 @@ CONFIG_DEBUG_UART_BASE=0x11002000 +@@ -8,37 +8,56 @@ CONFIG_NR_DRAM_BANKS=1 + CONFIG_ENV_SIZE=0x80000 + CONFIG_ENV_OFFSET=0x300000 + CONFIG_DEFAULT_DEVICE_TREE="mt7981-emmc-rfb" ++CONFIG_OF_LIBFDT_OVERLAY=y + CONFIG_TARGET_MT7981=y + CONFIG_SYS_LOAD_ADDR=0x46000000 + CONFIG_DEBUG_UART_BASE=0x11002000 CONFIG_DEBUG_UART_CLOCK=40000000 CONFIG_DEBUG_UART=y # CONFIG_EFI_LOADER is not set -# CONFIG_AUTOBOOT is not set -+CONFIG_OF_LIBFDT_OVERLAY=y -+CONFIG_SMBIOS_PRODUCT_NAME="" -+CONFIG_CFB_CONSOLE_ANSI=y -+CONFIG_BOARD_LATE_INIT=y -+CONFIG_BUTTON=y -+CONFIG_BUTTON_GPIO=y -+CONFIG_GPIO_HOG=y -+CONFIG_CMD_ENV_FLAGS=y +CONFIG_FIT=y -+CONFIG_FIT_ENABLE_SHA256_SUPPORT=y -+CONFIG_LED=y -+CONFIG_LED_BLINK=y -+CONFIG_LED_GPIO=y -+CONFIG_MMC_BOOT=y -+CONFIG_BOOTSTD_DEFAULTS=y +CONFIG_BOOTSTD_FULL=y ++CONFIG_OF_SYSTEM_SETUP=y CONFIG_DEFAULT_FDT_FILE="mt7981-emmc-rfb" CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=1049 -@@ -25,9 +40,23 @@ CONFIG_SYS_PROMPT="MT7981> " + CONFIG_LOGLEVEL=7 + CONFIG_LOG=y ++CONFIG_BOARD_LATE_INIT=y + CONFIG_SYS_PROMPT="MT7981> " ++CONFIG_CMD_CPU=y ++CONFIG_CMD_LICENSE=y + # CONFIG_BOOTM_NETBSD is not set # CONFIG_BOOTM_PLAN9 is not set # CONFIG_BOOTM_RTEMS is not set # CONFIG_BOOTM_VXWORKS is not set -# CONFIG_CMD_ELF is not set ++CONFIG_CMD_BOOTMENU=y ++CONFIG_CMD_ASKENV=y ++CONFIG_CMD_ERASEENV=y ++CONFIG_CMD_ENV_FLAGS=y ++CONFIG_CMD_STRINGS=y # CONFIG_CMD_UNLZ4 is not set # CONFIG_CMD_UNZIP is not set -+CONFIG_CMD_BOOTMENU=y -+CONFIG_CMD_BOOTP=y -+CONFIG_CMD_BUTTON=y -+CONFIG_CMD_CACHE=y -+CONFIG_CMD_CDP=y -+CONFIG_CMD_CPU=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_DM=y -+CONFIG_CMD_ELF=y -+CONFIG_CMD_DNS=y -+CONFIG_CMD_ECHO=y -+CONFIG_CMD_ENV_READMEM=y -+CONFIG_CMD_ERASEENV=y -+CONFIG_CMD_FDT=y -+CONFIG_CMD_FS_UUID=y CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=y CONFIG_CMD_GPT_RENAME=y -@@ -37,13 +66,35 @@ CONFIG_CMD_PART=y + CONFIG_CMD_LSBLK=y + CONFIG_CMD_MMC=y +-CONFIG_CMD_PART=y CONFIG_CMD_READ=y - CONFIG_CMD_PING=y - CONFIG_CMD_SMC=y -+CONFIG_CMD_TFTPBOOT=y +-CONFIG_CMD_PING=y +CONFIG_CMD_TFTPSRV=y -+CONFIG_CMD_ASKENV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_SETEXPR=y -+CONFIG_CMD_SLEEP=y ++CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_SOURCE=y -+CONFIG_CMD_STRINGS=y -+CONFIG_CMD_UUID=y - CONFIG_CMD_FAT=y - CONFIG_CMD_FS_GENERIC=y -+CONFIG_CMD_HASH=y -+CONFIG_CMD_ITEST=y -+CONFIG_CMD_LED=y -+CONFIG_CMD_LICENSE=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y +CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000 -+CONFIG_CMD_SF=y -+CONFIG_CMD_SF_TEST=y -+CONFIG_CMD_PING=y -+CONFIG_CMD_PXE=y ++CONFIG_CMD_UUID=y ++CONFIG_CMD_HASH=y + CONFIG_CMD_SMC=y +-CONFIG_CMD_FAT=y +-CONFIG_CMD_FS_GENERIC=y ++CONFIG_CMD_FS_UUID=y CONFIG_PARTITION_TYPE_GUID=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y - CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +@@ -46,7 +65,13 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_NET_RANDOM_ETHADDR=y -+CONFIG_REGEX=y CONFIG_REGMAP=y CONFIG_SYSCON=y ++CONFIG_BUTTON=y ++CONFIG_BUTTON_GPIO=y CONFIG_CLK=y ++CONFIG_GPIO_HOG=y ++CONFIG_LED=y ++CONFIG_LED_BLINK=y ++CONFIG_LED_GPIO=y + CONFIG_MMC_HS200_SUPPORT=y + CONFIG_MMC_MTK=y + CONFIG_PHY_FIXED=y +@@ -59,6 +84,7 @@ CONFIG_MTK_POWER_DOMAIN=y + CONFIG_DM_REGULATOR=y + CONFIG_DM_REGULATOR_FIXED=y + CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y + CONFIG_MTK_SERIAL=y + CONFIG_FAT_WRITE=y + CONFIG_HEXDUMP=y --- a/configs/mt7981_rfb_defconfig +++ b/configs/mt7981_rfb_defconfig -@@ -12,7 +12,22 @@ CONFIG_DEBUG_UART_BASE=0x11002000 +@@ -6,39 +6,79 @@ CONFIG_TEXT_BASE=0x41e00000 + CONFIG_SYS_MALLOC_F_LEN=0x4000 + CONFIG_NR_DRAM_BANKS=1 + CONFIG_DEFAULT_DEVICE_TREE="mt7981-rfb" ++CONFIG_OF_LIBFDT_OVERLAY=y + CONFIG_TARGET_MT7981=y + CONFIG_SYS_LOAD_ADDR=0x46000000 + CONFIG_DEBUG_UART_BASE=0x11002000 CONFIG_DEBUG_UART_CLOCK=40000000 CONFIG_DEBUG_UART=y # CONFIG_EFI_LOADER is not set -# CONFIG_AUTOBOOT is not set -+CONFIG_OF_LIBFDT_OVERLAY=y -+CONFIG_SMBIOS_PRODUCT_NAME="" -+CONFIG_CFB_CONSOLE_ANSI=y -+CONFIG_BOARD_LATE_INIT=y -+CONFIG_BUTTON=y -+CONFIG_BUTTON_GPIO=y -+CONFIG_GPIO_HOG=y -+CONFIG_CMD_ENV_FLAGS=y +CONFIG_FIT=y -+CONFIG_FIT_ENABLE_SHA256_SUPPORT=y -+CONFIG_LED=y -+CONFIG_LED_BLINK=y -+CONFIG_LED_GPIO=y +CONFIG_SPI_BOOT=y -+CONFIG_BOOTSTD_DEFAULTS=y -+CONFIG_BOOTSTD_FULL=y ++CONFIG_OF_SYSTEM_SETUP=y CONFIG_DEFAULT_FDT_FILE="mt7981-rfb" CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=1049 -@@ -23,23 +38,74 @@ CONFIG_SYS_PROMPT="MT7981> " + CONFIG_LOGLEVEL=7 + CONFIG_LOG=y ++CONFIG_BOARD_LATE_INIT=y ++CONFIG_HUSH_PARSER=y + CONFIG_SYS_PROMPT="MT7981> " ++CONFIG_CMD_CPU=y ++CONFIG_CMD_LICENSE=y + # CONFIG_BOOTM_NETBSD is not set # CONFIG_BOOTM_PLAN9 is not set # CONFIG_BOOTM_RTEMS is not set # CONFIG_BOOTM_VXWORKS is not set -# CONFIG_CMD_ELF is not set ++CONFIG_CMD_BOOTMENU=y ++CONFIG_CMD_ASKENV=y ++CONFIG_CMD_ERASEENV=y ++CONFIG_CMD_ENV_FLAGS=y ++CONFIG_CMD_STRINGS=y # CONFIG_CMD_UNLZ4 is not set # CONFIG_CMD_UNZIP is not set -+CONFIG_CMD_BOOTMENU=y -+CONFIG_CMD_BOOTP=y -+CONFIG_CMD_BUTTON=y -+CONFIG_CMD_CACHE=y -+CONFIG_CMD_CDP=y -+CONFIG_CMD_CPU=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_DM=y -+CONFIG_CMD_ELF=y -+CONFIG_CMD_DNS=y -+CONFIG_CMD_ECHO=y -+CONFIG_CMD_ENV_READMEM=y -+CONFIG_CMD_ERASEENV=y -+CONFIG_CMD_FDT=y -+CONFIG_CMD_FS_GENERIC=y -+CONFIG_CMD_FS_UUID=y CONFIG_CMD_GPIO=y CONFIG_CMD_MTD=y --CONFIG_CMD_SF_TEST=y -+CONFIG_CMD_HASH=y -+CONFIG_CMD_ITEST=y -+CONFIG_CMD_LED=y -+CONFIG_CMD_LICENSE=y -+CONFIG_CMD_LINK_LOCAL=y -+CONFIG_CMD_MTD=y -+CONFIG_CMD_NAND=y -+# CONFIG_MTD_RAW_NAND is not set -+CONFIG_CMD_NAND_TRIMFFS=y +CONFIG_CMD_PCI=y -+CONFIG_CMD_PSTORE=y -+CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000 + CONFIG_CMD_SF_TEST=y ++CONFIG_CMD_TFTPSRV=y ++CONFIG_CMD_RARP=y ++CONFIG_CMD_CDP=y ++CONFIG_CMD_SNTP=y ++CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y -+CONFIG_CMD_SF=y -+CONFIG_CMD_SF_TEST=y ++CONFIG_CMD_CACHE=y ++CONFIG_CMD_PSTORE=y ++CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000 ++CONFIG_CMD_UUID=y ++CONFIG_CMD_HASH=y CONFIG_CMD_SMC=y ++CONFIG_CMD_FS_GENERIC=y ++CONFIG_CMD_FS_UUID=y CONFIG_CMD_UBI=y CONFIG_CMD_UBI_RENAME=y -+CONFIG_CMD_UBIFS=y -+CONFIG_CMD_TFTPBOOT=y -+CONFIG_CMD_TFTPSRV=y -+CONFIG_CMD_ASKENV=y -+CONFIG_CMD_RARP=y -+CONFIG_CMD_SETEXPR=y -+CONFIG_CMD_SLEEP=y -+CONFIG_CMD_SNTP=y -+CONFIG_CMD_SOURCE=y -+CONFIG_CMD_STRINGS=y -+CONFIG_CMD_UUID=y + CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_UBI=y ++CONFIG_SYS_REDUNDAND_ENVIRONMENT=y +CONFIG_ENV_UBI_PART="ubi" -+CONFIG_ENV_SIZE=0x1f000 -+CONFIG_ENV_SIZE_REDUND=0x1f000 +CONFIG_ENV_UBI_VOLUME="ubootenv" +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" -+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y - CONFIG_ENV_OVERWRITE=y ++CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_NET_RANDOM_ETHADDR=y -+CONFIG_REGEX=y CONFIG_REGMAP=y CONFIG_SYSCON=y ++CONFIG_BUTTON=y ++CONFIG_BUTTON_GPIO=y CONFIG_CLK=y ++CONFIG_GPIO_HOG=y ++CONFIG_LED=y ++CONFIG_LED_BLINK=y ++CONFIG_LED_GPIO=y # CONFIG_MMC is not set -+CONFIG_HUSH_PARSER=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_MTD=y CONFIG_DM_MTD=y - CONFIG_MTD_SPI_NAND=y +@@ -63,6 +103,7 @@ CONFIG_PINCTRL_MT7981=y + CONFIG_POWER_DOMAIN=y + CONFIG_MTK_POWER_DOMAIN=y + CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y + CONFIG_MTK_SERIAL=y + CONFIG_SPI=y + CONFIG_DM_SPI=y --- a/configs/mt7981_sd_rfb_defconfig +++ b/configs/mt7981_sd_rfb_defconfig -@@ -14,7 +14,22 @@ CONFIG_DEBUG_UART_BASE=0x11002000 +@@ -8,37 +8,56 @@ CONFIG_NR_DRAM_BANKS=1 + CONFIG_ENV_SIZE=0x80000 + CONFIG_ENV_OFFSET=0x300000 + CONFIG_DEFAULT_DEVICE_TREE="mt7981-sd-rfb" ++CONFIG_OF_LIBFDT_OVERLAY=y + CONFIG_TARGET_MT7981=y + CONFIG_SYS_LOAD_ADDR=0x46000000 + CONFIG_DEBUG_UART_BASE=0x11002000 CONFIG_DEBUG_UART_CLOCK=40000000 CONFIG_DEBUG_UART=y # CONFIG_EFI_LOADER is not set -# CONFIG_AUTOBOOT is not set -+CONFIG_OF_LIBFDT_OVERLAY=y -+CONFIG_SMBIOS_PRODUCT_NAME="" -+CONFIG_CFB_CONSOLE_ANSI=y -+CONFIG_BOARD_LATE_INIT=y -+CONFIG_BUTTON=y -+CONFIG_BUTTON_GPIO=y -+CONFIG_GPIO_HOG=y -+CONFIG_CMD_ENV_FLAGS=y +CONFIG_FIT=y -+CONFIG_FIT_ENABLE_SHA256_SUPPORT=y -+CONFIG_LED=y -+CONFIG_LED_BLINK=y -+CONFIG_LED_GPIO=y -+CONFIG_MMC_BOOT=y -+CONFIG_BOOTSTD_DEFAULTS=y +CONFIG_BOOTSTD_FULL=y ++CONFIG_OF_SYSTEM_SETUP=y CONFIG_DEFAULT_FDT_FILE="mt7981-sd-rfb" CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=1049 -@@ -25,9 +40,23 @@ CONFIG_SYS_PROMPT="MT7981> " + CONFIG_LOGLEVEL=7 + CONFIG_LOG=y ++CONFIG_BOARD_LATE_INIT=y + CONFIG_SYS_PROMPT="MT7981> " ++CONFIG_CMD_CPU=y ++CONFIG_CMD_LICENSE=y + # CONFIG_BOOTM_NETBSD is not set # CONFIG_BOOTM_PLAN9 is not set # CONFIG_BOOTM_RTEMS is not set # CONFIG_BOOTM_VXWORKS is not set -# CONFIG_CMD_ELF is not set ++CONFIG_CMD_BOOTMENU=y ++CONFIG_CMD_ASKENV=y ++CONFIG_CMD_ERASEENV=y ++CONFIG_CMD_ENV_FLAGS=y ++CONFIG_CMD_STRINGS=y # CONFIG_CMD_UNLZ4 is not set # CONFIG_CMD_UNZIP is not set -+CONFIG_CMD_BOOTMENU=y -+CONFIG_CMD_BOOTP=y -+CONFIG_CMD_BUTTON=y -+CONFIG_CMD_CACHE=y -+CONFIG_CMD_CDP=y -+CONFIG_CMD_CPU=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_DM=y -+CONFIG_CMD_ELF=y -+CONFIG_CMD_DNS=y -+CONFIG_CMD_ECHO=y -+CONFIG_CMD_ENV_READMEM=y -+CONFIG_CMD_ERASEENV=y -+CONFIG_CMD_FDT=y -+CONFIG_CMD_FS_UUID=y CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=y CONFIG_CMD_GPT_RENAME=y -@@ -37,13 +66,35 @@ CONFIG_CMD_PART=y + CONFIG_CMD_LSBLK=y + CONFIG_CMD_MMC=y +-CONFIG_CMD_PART=y CONFIG_CMD_READ=y - CONFIG_CMD_PING=y - CONFIG_CMD_SMC=y -+CONFIG_CMD_TFTPBOOT=y +-CONFIG_CMD_PING=y +CONFIG_CMD_TFTPSRV=y -+CONFIG_CMD_ASKENV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_SETEXPR=y -+CONFIG_CMD_SLEEP=y ++CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_SOURCE=y -+CONFIG_CMD_STRINGS=y -+CONFIG_CMD_UUID=y - CONFIG_CMD_FAT=y - CONFIG_CMD_FS_GENERIC=y -+CONFIG_CMD_HASH=y -+CONFIG_CMD_ITEST=y -+CONFIG_CMD_LED=y -+CONFIG_CMD_LICENSE=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y +CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000 -+CONFIG_CMD_SF=y -+CONFIG_CMD_SF_TEST=y -+CONFIG_CMD_PING=y -+CONFIG_CMD_PXE=y ++CONFIG_CMD_UUID=y ++CONFIG_CMD_HASH=y + CONFIG_CMD_SMC=y +-CONFIG_CMD_FAT=y +-CONFIG_CMD_FS_GENERIC=y ++CONFIG_CMD_FS_UUID=y CONFIG_PARTITION_TYPE_GUID=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y - CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +@@ -46,7 +65,13 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_NET_RANDOM_ETHADDR=y -+CONFIG_REGEX=y CONFIG_REGMAP=y CONFIG_SYSCON=y ++CONFIG_BUTTON=y ++CONFIG_BUTTON_GPIO=y CONFIG_CLK=y ++CONFIG_GPIO_HOG=y ++CONFIG_LED=y ++CONFIG_LED_BLINK=y ++CONFIG_LED_GPIO=y + CONFIG_MMC_HS200_SUPPORT=y + CONFIG_MMC_MTK=y + CONFIG_PHY_FIXED=y +@@ -59,6 +84,7 @@ CONFIG_MTK_POWER_DOMAIN=y + CONFIG_DM_REGULATOR=y + CONFIG_DM_REGULATOR_FIXED=y + CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y + CONFIG_MTK_SERIAL=y + CONFIG_FAT_WRITE=y + CONFIG_HEXDUMP=y --- a/configs/mt7981_snfi_nand_rfb_defconfig +++ b/configs/mt7981_snfi_nand_rfb_defconfig -@@ -12,7 +12,22 @@ CONFIG_DEBUG_UART_BASE=0x11002000 +@@ -6,37 +6,73 @@ CONFIG_TEXT_BASE=0x41e00000 + CONFIG_SYS_MALLOC_F_LEN=0x4000 + CONFIG_NR_DRAM_BANKS=1 + CONFIG_DEFAULT_DEVICE_TREE="mt7981-snfi-nand-rfb" +-CONFIG_SYS_PROMPT="MT7981> " ++CONFIG_OF_LIBFDT_OVERLAY=y + CONFIG_TARGET_MT7981=y ++CONFIG_SYS_LOAD_ADDR=0x46000000 + CONFIG_DEBUG_UART_BASE=0x11002000 CONFIG_DEBUG_UART_CLOCK=40000000 - CONFIG_SYS_LOAD_ADDR=0x46000000 +-CONFIG_SYS_LOAD_ADDR=0x46000000 CONFIG_DEBUG_UART=y -# CONFIG_AUTOBOOT is not set -+CONFIG_OF_LIBFDT_OVERLAY=y -+CONFIG_SMBIOS_PRODUCT_NAME="" -+CONFIG_CFB_CONSOLE_ANSI=y -+CONFIG_BOARD_LATE_INIT=y -+CONFIG_BUTTON=y -+CONFIG_BUTTON_GPIO=y -+CONFIG_GPIO_HOG=y -+CONFIG_CMD_ENV_FLAGS=y +CONFIG_FIT=y -+CONFIG_FIT_ENABLE_SHA256_SUPPORT=y -+CONFIG_LED=y -+CONFIG_LED_BLINK=y -+CONFIG_LED_GPIO=y -+CONFIG_SPI_BOOT=y -+CONFIG_BOOTSTD_DEFAULTS=y +CONFIG_BOOTSTD_FULL=y ++CONFIG_SPI_BOOT=y ++CONFIG_OF_SYSTEM_SETUP=y CONFIG_DEFAULT_FDT_FILE="mt7981-snfi-nand-rfb" - CONFIG_LOGLEVEL=7 - CONFIG_LOG=y -@@ -22,22 +37,73 @@ CONFIG_SYS_PBSIZE=1049 +-CONFIG_LOGLEVEL=7 +-CONFIG_LOG=y + CONFIG_SYS_CBSIZE=512 + CONFIG_SYS_PBSIZE=1049 ++CONFIG_LOGLEVEL=7 ++CONFIG_LOG=y ++CONFIG_BOARD_LATE_INIT=y ++CONFIG_SYS_PROMPT="MT7981> " ++CONFIG_CMD_CPU=y ++CONFIG_CMD_LICENSE=y + # CONFIG_BOOTM_NETBSD is not set # CONFIG_BOOTM_PLAN9 is not set # CONFIG_BOOTM_RTEMS is not set # CONFIG_BOOTM_VXWORKS is not set -# CONFIG_CMD_ELF is not set ++CONFIG_CMD_BOOTMENU=y ++CONFIG_CMD_ASKENV=y ++CONFIG_CMD_ERASEENV=y ++CONFIG_CMD_ENV_FLAGS=y ++CONFIG_CMD_STRINGS=y # CONFIG_CMD_UNLZ4 is not set # CONFIG_CMD_UNZIP is not set -+CONFIG_CMD_BOOTMENU=y -+CONFIG_CMD_BOOTP=y -+CONFIG_CMD_BUTTON=y -+CONFIG_CMD_CACHE=y -+CONFIG_CMD_CDP=y -+CONFIG_CMD_CPU=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_DM=y -+CONFIG_CMD_ELF=y -+CONFIG_CMD_DNS=y -+CONFIG_CMD_ECHO=y -+CONFIG_CMD_ENV_READMEM=y -+CONFIG_CMD_ERASEENV=y -+CONFIG_CMD_FDT=y -+CONFIG_CMD_FS_GENERIC=y -+CONFIG_CMD_FS_UUID=y CONFIG_CMD_GPIO=y CONFIG_CMD_MTD=y -+CONFIG_CMD_HASH=y -+CONFIG_CMD_ITEST=y -+CONFIG_CMD_LED=y -+CONFIG_CMD_LICENSE=y -+CONFIG_CMD_LINK_LOCAL=y -+CONFIG_CMD_MTD=y -+CONFIG_CMD_NAND=y -+# CONFIG_MTD_RAW_NAND is not set -+CONFIG_CMD_NAND_TRIMFFS=y +-CONFIG_CMD_PING=y +CONFIG_CMD_PCI=y ++CONFIG_CMD_TFTPSRV=y ++CONFIG_CMD_RARP=y ++CONFIG_CMD_CDP=y ++CONFIG_CMD_SNTP=y ++CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y +CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000 -+CONFIG_CMD_SF=y -+CONFIG_CMD_SF_TEST=y - CONFIG_CMD_PING=y -+CONFIG_CMD_PXE=y ++CONFIG_CMD_UUID=y ++CONFIG_CMD_HASH=y CONFIG_CMD_SMC=y ++CONFIG_CMD_FS_UUID=y CONFIG_CMD_UBI=y CONFIG_CMD_UBI_RENAME=y -+CONFIG_CMD_UBIFS=y -+CONFIG_CMD_TFTPBOOT=y -+CONFIG_CMD_TFTPSRV=y -+CONFIG_CMD_ASKENV=y -+CONFIG_CMD_RARP=y -+CONFIG_CMD_SETEXPR=y -+CONFIG_CMD_SLEEP=y -+CONFIG_CMD_SNTP=y -+CONFIG_CMD_SOURCE=y -+CONFIG_CMD_STRINGS=y -+CONFIG_CMD_UUID=y CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_UBI=y ++CONFIG_SYS_REDUNDAND_ENVIRONMENT=y +CONFIG_ENV_UBI_PART="ubi" -+CONFIG_ENV_SIZE=0x1f000 -+CONFIG_ENV_SIZE_REDUND=0x1f000 +CONFIG_ENV_UBI_VOLUME="ubootenv" +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" ++CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_NET_RANDOM_ETHADDR=y -+CONFIG_REGEX=y CONFIG_REGMAP=y CONFIG_SYSCON=y - CONFIG_CLK=y - # CONFIG_MMC is not set -+CONFIG_HUSH_PARSER=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y - CONFIG_MTD=y - CONFIG_DM_MTD=y - CONFIG_MTK_SPI_NAND=y ---- a/configs/mt7981_nor_rfb_defconfig -+++ b/configs/mt7981_nor_rfb_defconfig -@@ -12,7 +12,22 @@ CONFIG_DEBUG_UART_BASE=0x11002000 - CONFIG_DEBUG_UART_CLOCK=40000000 - CONFIG_SYS_LOAD_ADDR=0x46000000 - CONFIG_DEBUG_UART=y --# CONFIG_AUTOBOOT is not set -+CONFIG_OF_LIBFDT_OVERLAY=y -+CONFIG_SMBIOS_PRODUCT_NAME="" -+CONFIG_CFB_CONSOLE_ANSI=y -+CONFIG_BOARD_LATE_INIT=y +CONFIG_BUTTON=y +CONFIG_BUTTON_GPIO=y + CONFIG_CLK=y +CONFIG_GPIO_HOG=y -+CONFIG_CMD_ENV_FLAGS=y -+CONFIG_FIT=y -+CONFIG_FIT_ENABLE_SHA256_SUPPORT=y +CONFIG_LED=y +CONFIG_LED_BLINK=y +CONFIG_LED_GPIO=y -+CONFIG_SPI_BOOT=y -+CONFIG_BOOTSTD_DEFAULTS=y + # CONFIG_MMC is not set + CONFIG_MTD=y + CONFIG_DM_MTD=y +@@ -50,6 +86,6 @@ CONFIG_PINCTRL_MT7981=y + CONFIG_POWER_DOMAIN=y + CONFIG_MTK_POWER_DOMAIN=y + CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y + CONFIG_MTK_SERIAL=y + CONFIG_HEXDUMP=y +-CONFIG_LMB_MAX_REGIONS=64 +--- a/configs/mt7981_nor_rfb_defconfig ++++ b/configs/mt7981_nor_rfb_defconfig +@@ -5,37 +5,74 @@ CONFIG_ARCH_MEDIATEK=y + CONFIG_TEXT_BASE=0x41e00000 + CONFIG_SYS_MALLOC_F_LEN=0x4000 + CONFIG_NR_DRAM_BANKS=1 ++CONFIG_ENV_SIZE=0x4000 ++CONFIG_ENV_OFFSET=0x0 + CONFIG_DEFAULT_DEVICE_TREE="mt7981-rfb" +-CONFIG_SYS_PROMPT="MT7981> " ++CONFIG_OF_LIBFDT_OVERLAY=y + CONFIG_TARGET_MT7981=y ++CONFIG_SYS_LOAD_ADDR=0x46000000 + CONFIG_DEBUG_UART_BASE=0x11002000 + CONFIG_DEBUG_UART_CLOCK=40000000 +-CONFIG_SYS_LOAD_ADDR=0x46000000 + CONFIG_DEBUG_UART=y +-# CONFIG_AUTOBOOT is not set ++CONFIG_FIT=y +CONFIG_BOOTSTD_FULL=y ++CONFIG_SPI_BOOT=y ++CONFIG_OF_SYSTEM_SETUP=y CONFIG_DEFAULT_FDT_FILE="mt7981-rfb" - CONFIG_LOGLEVEL=7 - CONFIG_LOG=y -@@ -22,21 +37,66 @@ CONFIG_SYS_PBSIZE=1049 +-CONFIG_LOGLEVEL=7 +-CONFIG_LOG=y + CONFIG_SYS_CBSIZE=512 + CONFIG_SYS_PBSIZE=1049 ++CONFIG_LOGLEVEL=7 ++CONFIG_LOG=y ++CONFIG_BOARD_LATE_INIT=y ++CONFIG_SYS_PROMPT="MT7981> " ++CONFIG_CMD_CPU=y ++CONFIG_CMD_LICENSE=y + # CONFIG_BOOTM_NETBSD is not set # CONFIG_BOOTM_PLAN9 is not set # CONFIG_BOOTM_RTEMS is not set # CONFIG_BOOTM_VXWORKS is not set -# CONFIG_CMD_ELF is not set ++CONFIG_CMD_BOOTMENU=y ++CONFIG_CMD_ASKENV=y ++CONFIG_CMD_ERASEENV=y ++CONFIG_CMD_ENV_FLAGS=y ++CONFIG_CMD_STRINGS=y # CONFIG_CMD_UNLZ4 is not set # CONFIG_CMD_UNZIP is not set -+CONFIG_CMD_BOOTMENU=y -+CONFIG_CMD_BOOTP=y -+CONFIG_CMD_BUTTON=y -+CONFIG_CMD_CACHE=y -+CONFIG_CMD_CDP=y -+CONFIG_CMD_CPU=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_DM=y -+CONFIG_CMD_ELF=y -+CONFIG_CMD_DNS=y -+CONFIG_CMD_ECHO=y -+CONFIG_CMD_ENV_READMEM=y -+CONFIG_CMD_ERASEENV=y -+CONFIG_CMD_FDT=y -+CONFIG_CMD_FS_GENERIC=y -+CONFIG_CMD_FS_UUID=y CONFIG_CMD_GPIO=y CONFIG_CMD_MTD=y -+CONFIG_CMD_HASH=y -+CONFIG_CMD_ITEST=y -+CONFIG_CMD_LED=y -+CONFIG_CMD_LICENSE=y -+CONFIG_CMD_LINK_LOCAL=y -+CONFIG_CMD_MTD=y +CONFIG_CMD_PCI=y + CONFIG_CMD_SF_TEST=y +-CONFIG_CMD_PING=y ++CONFIG_CMD_TFTPSRV=y ++CONFIG_CMD_RARP=y ++CONFIG_CMD_CDP=y ++CONFIG_CMD_SNTP=y ++CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y +CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000 -+CONFIG_CMD_SF=y - CONFIG_CMD_SF_TEST=y - CONFIG_CMD_PING=y -+CONFIG_CMD_PXE=y - CONFIG_CMD_SMC=y -+CONFIG_CMD_TFTPBOOT=y -+CONFIG_CMD_TFTPSRV=y -+CONFIG_CMD_ASKENV=y -+CONFIG_CMD_RARP=y -+CONFIG_CMD_SETEXPR=y -+CONFIG_CMD_SLEEP=y -+CONFIG_CMD_SNTP=y -+CONFIG_CMD_SOURCE=y -+CONFIG_CMD_STRINGS=y +CONFIG_CMD_UUID=y ++CONFIG_CMD_HASH=y + CONFIG_CMD_SMC=y ++CONFIG_CMD_FS_UUID=y + CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_MTD=y ++CONFIG_SYS_REDUNDAND_ENVIRONMENT=y +CONFIG_ENV_MTD_NAME="u-boot-env" +CONFIG_ENV_SIZE_REDUND=0x4000 -+CONFIG_ENV_SIZE=0x4000 -+CONFIG_ENV_OFFSET=0x0 - CONFIG_ENV_OVERWRITE=y ++CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_NET_RANDOM_ETHADDR=y -+CONFIG_REGEX=y CONFIG_REGMAP=y CONFIG_SYSCON=y ++CONFIG_BUTTON=y ++CONFIG_BUTTON_GPIO=y CONFIG_CLK=y ++CONFIG_GPIO_HOG=y ++CONFIG_LED=y ++CONFIG_LED_BLINK=y ++CONFIG_LED_GPIO=y # CONFIG_MMC is not set -+CONFIG_HUSH_PARSER=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_MTD=y CONFIG_DM_MTD=y - CONFIG_MTD_SPI_NAND=y +@@ -60,9 +97,9 @@ CONFIG_PINCTRL_MT7981=y + CONFIG_POWER_DOMAIN=y + CONFIG_MTK_POWER_DOMAIN=y + CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y + CONFIG_MTK_SERIAL=y + CONFIG_SPI=y + CONFIG_DM_SPI=y + CONFIG_MTK_SPIM=y + CONFIG_HEXDUMP=y +-CONFIG_LMB_MAX_REGIONS=64 diff --git a/package/boot/uboot-mediatek/patches/314-mt7981-select-rootdisk.patch b/package/boot/uboot-mediatek/patches/314-mt7981-select-rootdisk.patch index 0d515384b7..73323f0b2a 100644 --- a/package/boot/uboot-mediatek/patches/314-mt7981-select-rootdisk.patch +++ b/package/boot/uboot-mediatek/patches/314-mt7981-select-rootdisk.patch @@ -65,38 +65,3 @@ + + return 0; +} ---- a/configs/mt7981_emmc_rfb_defconfig -+++ b/configs/mt7981_emmc_rfb_defconfig -@@ -113,3 +113,4 @@ CONFIG_DM_SERIAL=y - CONFIG_MTK_SERIAL=y - CONFIG_FAT_WRITE=y - CONFIG_HEXDUMP=y -+CONFIG_OF_SYSTEM_SETUP=y ---- a/configs/mt7981_nor_rfb_defconfig -+++ b/configs/mt7981_nor_rfb_defconfig -@@ -126,3 +126,4 @@ CONFIG_DM_SPI=y - CONFIG_MTK_SPIM=y - CONFIG_HEXDUMP=y - CONFIG_LMB_MAX_REGIONS=64 -+CONFIG_OF_SYSTEM_SETUP=y ---- a/configs/mt7981_rfb_defconfig -+++ b/configs/mt7981_rfb_defconfig -@@ -134,3 +134,4 @@ CONFIG_SPI=y - CONFIG_DM_SPI=y - CONFIG_MTK_SPIM=y - CONFIG_HEXDUMP=y -+CONFIG_OF_SYSTEM_SETUP=y ---- a/configs/mt7981_sd_rfb_defconfig -+++ b/configs/mt7981_sd_rfb_defconfig -@@ -113,3 +113,4 @@ CONFIG_DM_SERIAL=y - CONFIG_MTK_SERIAL=y - CONFIG_FAT_WRITE=y - CONFIG_HEXDUMP=y -+CONFIG_OF_SYSTEM_SETUP=y ---- a/configs/mt7981_snfi_nand_rfb_defconfig -+++ b/configs/mt7981_snfi_nand_rfb_defconfig -@@ -119,3 +119,4 @@ CONFIG_DM_SERIAL=y - CONFIG_MTK_SERIAL=y - CONFIG_HEXDUMP=y - CONFIG_LMB_MAX_REGIONS=64 -+CONFIG_OF_SYSTEM_SETUP=y diff --git a/package/boot/uboot-mediatek/patches/400-update-bpir2-defconfig.patch b/package/boot/uboot-mediatek/patches/400-update-bpir2-defconfig.patch index 05ccdb8c75..c0ed24d089 100644 --- a/package/boot/uboot-mediatek/patches/400-update-bpir2-defconfig.patch +++ b/package/boot/uboot-mediatek/patches/400-update-bpir2-defconfig.patch @@ -72,7 +72,7 @@ CONFIG_USE_IPADDR=y CONFIG_IPADDR="192.168.1.1" CONFIG_USE_SERVERIP=y -@@ -42,18 +75,31 @@ CONFIG_SERVERIP="192.168.1.2" +@@ -42,23 +75,38 @@ CONFIG_SERVERIP="192.168.1.2" CONFIG_NET_RANDOM_ETHADDR=y CONFIG_REGMAP=y CONFIG_SYSCON=y @@ -102,9 +102,10 @@ +CONFIG_DM_REGULATOR_GPIO=y +CONFIG_SCSI=y CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y CONFIG_MTK_SERIAL=y CONFIG_SYSRESET=y -@@ -61,4 +107,5 @@ CONFIG_SYSRESET_WATCHDOG=y + CONFIG_SYSRESET_WATCHDOG=y CONFIG_TIMER=y CONFIG_MTK_TIMER=y CONFIG_WDT_MTK=y diff --git a/package/boot/uboot-mediatek/patches/401-update-u7623-defconfig.patch b/package/boot/uboot-mediatek/patches/401-update-u7623-defconfig.patch index 243ba9d7c2..d90bf88c59 100644 --- a/package/boot/uboot-mediatek/patches/401-update-u7623-defconfig.patch +++ b/package/boot/uboot-mediatek/patches/401-update-u7623-defconfig.patch @@ -70,7 +70,7 @@ CONFIG_USE_IPADDR=y CONFIG_IPADDR="192.168.1.1" CONFIG_USE_SERVERIP=y -@@ -40,18 +73,31 @@ CONFIG_SERVERIP="192.168.1.2" +@@ -40,23 +73,38 @@ CONFIG_SERVERIP="192.168.1.2" CONFIG_NET_RANDOM_ETHADDR=y CONFIG_REGMAP=y CONFIG_SYSCON=y @@ -100,9 +100,10 @@ +CONFIG_DM_REGULATOR_GPIO=y +CONFIG_SCSI=y CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y CONFIG_MTK_SERIAL=y CONFIG_SYSRESET=y -@@ -59,4 +105,5 @@ CONFIG_SYSRESET_WATCHDOG=y + CONFIG_SYSRESET_WATCHDOG=y CONFIG_TIMER=y CONFIG_MTK_TIMER=y CONFIG_WDT_MTK=y diff --git a/package/boot/uboot-mediatek/patches/404-add-bananapi_bpi-r64_defconfigs.patch b/package/boot/uboot-mediatek/patches/404-add-bananapi_bpi-r64_defconfigs.patch index 3a2faf5aec..b8e50fc13f 100644 --- a/package/boot/uboot-mediatek/patches/404-add-bananapi_bpi-r64_defconfigs.patch +++ b/package/boot/uboot-mediatek/patches/404-add-bananapi_bpi-r64_defconfigs.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7622_bananapi_bpi-r64-sdmmc_defconfig -@@ -0,0 +1,128 @@ +@@ -0,0 +1,129 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -120,6 +120,7 @@ +CONFIG_RAM=y +CONFIG_SCSI=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y @@ -215,7 +216,7 @@ +_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title $ver" --- /dev/null +++ b/configs/mt7622_bananapi_bpi-r64-emmc_defconfig -@@ -0,0 +1,117 @@ +@@ -0,0 +1,118 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -325,6 +326,7 @@ +CONFIG_RAM=y +CONFIG_SCSI=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_USB=y +CONFIG_USB_XHCI_HCD=y @@ -394,7 +396,7 @@ +_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title $ver" --- /dev/null +++ b/configs/mt7622_bananapi_bpi-r64-snand_defconfig -@@ -0,0 +1,108 @@ +@@ -0,0 +1,109 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -495,6 +497,7 @@ +CONFIG_DM_REGULATOR_GPIO=y +CONFIG_RAM=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y diff --git a/package/boot/uboot-mediatek/patches/407-mtk-20-configs-mt7622-enable-environment-for-mt7622_rfb.patch b/package/boot/uboot-mediatek/patches/407-mtk-20-configs-mt7622-enable-environment-for-mt7622_rfb.patch index 395b4494af..95d6a3c475 100644 --- a/package/boot/uboot-mediatek/patches/407-mtk-20-configs-mt7622-enable-environment-for-mt7622_rfb.patch +++ b/package/boot/uboot-mediatek/patches/407-mtk-20-configs-mt7622-enable-environment-for-mt7622_rfb.patch @@ -12,15 +12,15 @@ Signed-off-by: Weijie Gao --- a/configs/mt7622_rfb_defconfig +++ b/configs/mt7622_rfb_defconfig -@@ -6,6 +6,8 @@ CONFIG_TEXT_BASE=0x41e00000 +@@ -5,6 +5,8 @@ CONFIG_ARCH_MEDIATEK=y + CONFIG_TEXT_BASE=0x41e00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 - CONFIG_DEFAULT_DEVICE_TREE="mt7622-rfb" +CONFIG_ENV_SIZE=0x20000 +CONFIG_ENV_OFFSET=0x280000 + CONFIG_DEFAULT_DEVICE_TREE="mt7622-rfb" CONFIG_SYS_LOAD_ADDR=0x4007ff28 CONFIG_DEBUG_UART_BASE=0x11002000 - CONFIG_DEBUG_UART_CLOCK=25000000 @@ -26,6 +28,9 @@ CONFIG_CMD_SF_TEST=y CONFIG_CMD_PING=y CONFIG_CMD_SMC=y diff --git a/package/boot/uboot-mediatek/patches/410-add-linksys-e8450.patch b/package/boot/uboot-mediatek/patches/410-add-linksys-e8450.patch index 3a76d8fd32..cf46dafd97 100644 --- a/package/boot/uboot-mediatek/patches/410-add-linksys-e8450.patch +++ b/package/boot/uboot-mediatek/patches/410-add-linksys-e8450.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7622_linksys_e8450_defconfig -@@ -0,0 +1,110 @@ +@@ -0,0 +1,111 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -102,6 +102,7 @@ +CONFIG_DM_REGULATOR_GPIO=y +CONFIG_RAM=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y 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 a80fd3576f..619c7d62fd 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 @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7622_ubnt_unifi-6-lr-v1_defconfig -@@ -0,0 +1,113 @@ +@@ -0,0 +1,114 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -107,6 +107,7 @@ +CONFIG_DM_REGULATOR_GPIO=y +CONFIG_RAM=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y @@ -116,7 +117,7 @@ +CONFIG_HEXDUMP=y --- /dev/null +++ b/configs/mt7622_ubnt_unifi-6-lr-v2_defconfig -@@ -0,0 +1,113 @@ +@@ -0,0 +1,114 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -223,6 +224,7 @@ +CONFIG_DM_REGULATOR_GPIO=y +CONFIG_RAM=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y @@ -232,7 +234,7 @@ +CONFIG_HEXDUMP=y --- /dev/null +++ b/configs/mt7622_ubnt_unifi-6-lr-v3_defconfig -@@ -0,0 +1,112 @@ +@@ -0,0 +1,113 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -338,6 +340,7 @@ +CONFIG_DM_REGULATOR_GPIO=y +CONFIG_RAM=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y diff --git a/package/boot/uboot-mediatek/patches/420-add-support-for-RAVPower-RP-WD009.patch b/package/boot/uboot-mediatek/patches/420-add-support-for-RAVPower-RP-WD009.patch index f117829316..df8d1f7ee4 100644 --- a/package/boot/uboot-mediatek/patches/420-add-support-for-RAVPower-RP-WD009.patch +++ b/package/boot/uboot-mediatek/patches/420-add-support-for-RAVPower-RP-WD009.patch @@ -125,7 +125,7 @@ Subject: [PATCH] add support for RAVPower RP-WD009 +} --- /dev/null +++ b/configs/ravpower-rp-wd009-ram_defconfig -@@ -0,0 +1,61 @@ +@@ -0,0 +1,62 @@ +CONFIG_MIPS=y +CONFIG_NR_DRAM_BANKS=1 +CONFIG_DEFAULT_DEVICE_TREE="ravpower-rp-wd009" @@ -181,6 +181,7 @@ Subject: [PATCH] add support for RAVPower RP-WD009 +CONFIG_MT7628_ETH=y +CONFIG_PHY=y +CONFIG_BAUDRATE=57600 ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_SPI=y +CONFIG_MT7621_SPI=y +CONFIG_SYSRESET_SYSCON=y diff --git a/package/boot/uboot-mediatek/patches/421-zbtlink_zbt-wg3526-16m.patch b/package/boot/uboot-mediatek/patches/421-zbtlink_zbt-wg3526-16m.patch index b53c48337f..754335de1b 100644 --- a/package/boot/uboot-mediatek/patches/421-zbtlink_zbt-wg3526-16m.patch +++ b/package/boot/uboot-mediatek/patches/421-zbtlink_zbt-wg3526-16m.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7621_zbtlink_zbt-wg3526-16m_defconfig -@@ -0,0 +1,97 @@ +@@ -0,0 +1,98 @@ +CONFIG_MIPS=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_SYS_MALLOC_LEN=0x100000 @@ -87,6 +87,7 @@ +CONFIG_MEDIATEK_ETH=y +CONFIG_PHY=y +CONFIG_PHY_MTK_TPHY=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_DEBUG_UART_SHIFT=2 +CONFIG_SPI=y +CONFIG_MT7621_SPI=y diff --git a/package/boot/uboot-mediatek/patches/429-add-netcore-n60.patch b/package/boot/uboot-mediatek/patches/429-add-netcore-n60.patch index 7526043760..22eee526b8 100644 --- a/package/boot/uboot-mediatek/patches/429-add-netcore-n60.patch +++ b/package/boot/uboot-mediatek/patches/429-add-netcore-n60.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7986_netcore_n60_defconfig -@@ -0,0 +1,127 @@ +@@ -0,0 +1,128 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -118,6 +118,7 @@ +CONFIG_RAM=y +CONFIG_SCSI=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y diff --git a/package/boot/uboot-mediatek/patches/430-add-bpi-r3.patch b/package/boot/uboot-mediatek/patches/430-add-bpi-r3.patch index 8a089f8e56..1a7bf70020 100644 --- a/package/boot/uboot-mediatek/patches/430-add-bpi-r3.patch +++ b/package/boot/uboot-mediatek/patches/430-add-bpi-r3.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7986a_bpi-r3-emmc_defconfig -@@ -0,0 +1,136 @@ +@@ -0,0 +1,137 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -127,6 +127,7 @@ +CONFIG_RAM=y +CONFIG_SCSI=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y @@ -139,7 +140,7 @@ +CONFIG_HEXDUMP=y --- /dev/null +++ b/configs/mt7986a_bpi-r3-nor_defconfig -@@ -0,0 +1,136 @@ +@@ -0,0 +1,137 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -265,6 +266,7 @@ +CONFIG_RAM=y +CONFIG_SCSI=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y @@ -278,7 +280,7 @@ +CONFIG_HEXDUMP=y --- /dev/null +++ b/configs/mt7986a_bpi-r3-sd_defconfig -@@ -0,0 +1,136 @@ +@@ -0,0 +1,137 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -405,6 +407,7 @@ +CONFIG_RAM=y +CONFIG_SCSI=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y @@ -417,7 +420,7 @@ +CONFIG_HEXDUMP=y --- /dev/null +++ b/configs/mt7986a_bpi-r3-snand_defconfig -@@ -0,0 +1,131 @@ +@@ -0,0 +1,132 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -539,6 +542,7 @@ +CONFIG_RAM=y +CONFIG_SCSI=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y diff --git a/package/boot/uboot-mediatek/patches/431-add-xiaomi_redmi-ax6000.patch b/package/boot/uboot-mediatek/patches/431-add-xiaomi_redmi-ax6000.patch index 81a1ac8f59..85d4f27d83 100644 --- a/package/boot/uboot-mediatek/patches/431-add-xiaomi_redmi-ax6000.patch +++ b/package/boot/uboot-mediatek/patches/431-add-xiaomi_redmi-ax6000.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7986_xiaomi_redmi-ax6000_defconfig -@@ -0,0 +1,103 @@ +@@ -0,0 +1,104 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -97,6 +97,7 @@ +CONFIG_DM_REGULATOR_GPIO=y +CONFIG_RAM=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y diff --git a/package/boot/uboot-mediatek/patches/432-add-tplink-xdr608x.patch b/package/boot/uboot-mediatek/patches/432-add-tplink-xdr608x.patch index 414334124a..3c9b94d1da 100644 --- a/package/boot/uboot-mediatek/patches/432-add-tplink-xdr608x.patch +++ b/package/boot/uboot-mediatek/patches/432-add-tplink-xdr608x.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7986_tplink_tl-xdr4288_defconfig -@@ -0,0 +1,127 @@ +@@ -0,0 +1,128 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -118,6 +118,7 @@ +CONFIG_RAM=y +CONFIG_SCSI=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y @@ -130,7 +131,7 @@ +CONFIG_HEXDUMP=y --- /dev/null +++ b/configs/mt7986_tplink_tl-xdr6086_defconfig -@@ -0,0 +1,127 @@ +@@ -0,0 +1,128 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -248,6 +249,7 @@ +CONFIG_RAM=y +CONFIG_SCSI=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y @@ -260,7 +262,7 @@ +CONFIG_HEXDUMP=y --- /dev/null +++ b/configs/mt7986_tplink_tl-xdr6088_defconfig -@@ -0,0 +1,127 @@ +@@ -0,0 +1,128 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -378,6 +380,7 @@ +CONFIG_RAM=y +CONFIG_SCSI=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y diff --git a/package/boot/uboot-mediatek/patches/433-add-qihoo_360t7.patch b/package/boot/uboot-mediatek/patches/433-add-qihoo_360t7.patch index 4758ad13c0..de7fa7c414 100644 --- a/package/boot/uboot-mediatek/patches/433-add-qihoo_360t7.patch +++ b/package/boot/uboot-mediatek/patches/433-add-qihoo_360t7.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7981_qihoo-360t7_defconfig -@@ -0,0 +1,122 @@ +@@ -0,0 +1,123 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -117,6 +117,7 @@ +CONFIG_RAM=y +CONFIG_SCSI=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y diff --git a/package/boot/uboot-mediatek/patches/434-add-xiaomi_mi-router-wr30u.patch b/package/boot/uboot-mediatek/patches/434-add-xiaomi_mi-router-wr30u.patch index 5fb150dc2c..e38b01c4e4 100644 --- a/package/boot/uboot-mediatek/patches/434-add-xiaomi_mi-router-wr30u.patch +++ b/package/boot/uboot-mediatek/patches/434-add-xiaomi_mi-router-wr30u.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7981_xiaomi_mi-router-wr30u_defconfig -@@ -0,0 +1,122 @@ +@@ -0,0 +1,123 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -117,6 +117,7 @@ +CONFIG_RAM=y +CONFIG_SCSI=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y diff --git a/package/boot/uboot-mediatek/patches/435-add-h3c_magic-nx30-pro.patch b/package/boot/uboot-mediatek/patches/435-add-h3c_magic-nx30-pro.patch index bbf100f8a7..8f89c54f11 100644 --- a/package/boot/uboot-mediatek/patches/435-add-h3c_magic-nx30-pro.patch +++ b/package/boot/uboot-mediatek/patches/435-add-h3c_magic-nx30-pro.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7981_h3c_magic-nx30-pro_defconfig -@@ -0,0 +1,122 @@ +@@ -0,0 +1,123 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -117,6 +117,7 @@ +CONFIG_RAM=y +CONFIG_SCSI=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y diff --git a/package/boot/uboot-mediatek/patches/436-add-glinet-mt6000.patch b/package/boot/uboot-mediatek/patches/436-add-glinet-mt6000.patch index aedf9fe4ba..2d98b0c4cc 100644 --- a/package/boot/uboot-mediatek/patches/436-add-glinet-mt6000.patch +++ b/package/boot/uboot-mediatek/patches/436-add-glinet-mt6000.patch @@ -138,7 +138,7 @@ +}; --- /dev/null +++ b/configs/mt7986a_glinet_gl-mt6000_defconfig -@@ -0,0 +1,103 @@ +@@ -0,0 +1,104 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -236,6 +236,7 @@ +CONFIG_PWM_MTK=y +CONFIG_RAM=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_USB=y +CONFIG_USB_XHCI_HCD=y diff --git a/package/boot/uboot-mediatek/patches/437-add-cmcc_rax3000m.patch b/package/boot/uboot-mediatek/patches/437-add-cmcc_rax3000m.patch index 70abc45ff3..e2ea87c64a 100644 --- a/package/boot/uboot-mediatek/patches/437-add-cmcc_rax3000m.patch +++ b/package/boot/uboot-mediatek/patches/437-add-cmcc_rax3000m.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7981_cmcc_rax3000m-emmc_defconfig -@@ -0,0 +1,122 @@ +@@ -0,0 +1,123 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -114,6 +114,7 @@ +CONFIG_RAM=y +CONFIG_SCSI=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_USB=y @@ -125,7 +126,7 @@ +CONFIG_HEXDUMP=y --- /dev/null +++ b/configs/mt7981_cmcc_rax3000m-nand_defconfig -@@ -0,0 +1,122 @@ +@@ -0,0 +1,123 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -242,6 +243,7 @@ +CONFIG_RAM=y +CONFIG_SCSI=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y diff --git a/package/boot/uboot-mediatek/patches/438-add-jcg_q30-pro.patch b/package/boot/uboot-mediatek/patches/438-add-jcg_q30-pro.patch index 3a23171dff..a5e1154380 100644 --- a/package/boot/uboot-mediatek/patches/438-add-jcg_q30-pro.patch +++ b/package/boot/uboot-mediatek/patches/438-add-jcg_q30-pro.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7981_jcg_q30-pro_defconfig -@@ -0,0 +1,122 @@ +@@ -0,0 +1,123 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -117,6 +117,7 @@ +CONFIG_RAM=y +CONFIG_SCSI=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y diff --git a/package/boot/uboot-mediatek/patches/439-add-zyxel_ex5601-t0.patch b/package/boot/uboot-mediatek/patches/439-add-zyxel_ex5601-t0.patch index c9094f377c..13e944d6c5 100644 --- a/package/boot/uboot-mediatek/patches/439-add-zyxel_ex5601-t0.patch +++ b/package/boot/uboot-mediatek/patches/439-add-zyxel_ex5601-t0.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7986_zyxel_ex5601-t0_defconfig -@@ -0,0 +1,127 @@ +@@ -0,0 +1,128 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -118,6 +118,7 @@ +CONFIG_RAM=y +CONFIG_SCSI=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y diff --git a/package/boot/uboot-mediatek/patches/440-add-xiaomi_mi-router-ax3000t.patch b/package/boot/uboot-mediatek/patches/440-add-xiaomi_mi-router-ax3000t.patch index c7bf7dd95c..9018a671ab 100644 --- a/package/boot/uboot-mediatek/patches/440-add-xiaomi_mi-router-ax3000t.patch +++ b/package/boot/uboot-mediatek/patches/440-add-xiaomi_mi-router-ax3000t.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7981_xiaomi_mi-router-ax3000t_defconfig -@@ -0,0 +1,106 @@ +@@ -0,0 +1,107 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -101,6 +101,7 @@ +CONFIG_DM_REGULATOR_GPIO=y +CONFIG_RAM=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y diff --git a/package/boot/uboot-mediatek/patches/441-add-jdcloud_re-cp-03.patch b/package/boot/uboot-mediatek/patches/441-add-jdcloud_re-cp-03.patch index 651188c958..8d6840c95f 100644 --- a/package/boot/uboot-mediatek/patches/441-add-jdcloud_re-cp-03.patch +++ b/package/boot/uboot-mediatek/patches/441-add-jdcloud_re-cp-03.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7986a_jdcloud_re-cp-03_defconfig -@@ -0,0 +1,109 @@ +@@ -0,0 +1,110 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -107,6 +107,7 @@ +CONFIG_RAM=y +CONFIG_SCSI=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y diff --git a/package/boot/uboot-mediatek/patches/442-add-bpi-r3-mini.patch b/package/boot/uboot-mediatek/patches/442-add-bpi-r3-mini.patch index e24b520c7b..67ddcfae1f 100644 --- a/package/boot/uboot-mediatek/patches/442-add-bpi-r3-mini.patch +++ b/package/boot/uboot-mediatek/patches/442-add-bpi-r3-mini.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7986a_bpi-r3-mini-emmc_defconfig -@@ -0,0 +1,143 @@ +@@ -0,0 +1,144 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -134,6 +134,7 @@ +CONFIG_RAM=y +CONFIG_SCSI=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y @@ -146,7 +147,7 @@ +CONFIG_HEXDUMP=y --- /dev/null +++ b/configs/mt7986a_bpi-r3-mini-snand_defconfig -@@ -0,0 +1,136 @@ +@@ -0,0 +1,137 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -273,6 +274,7 @@ +CONFIG_RAM=y +CONFIG_SCSI=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y diff --git a/package/boot/uboot-mediatek/patches/443-add-nokia_ea0326gmp.patch b/package/boot/uboot-mediatek/patches/443-add-nokia_ea0326gmp.patch index 086307cca6..026bc01056 100644 --- a/package/boot/uboot-mediatek/patches/443-add-nokia_ea0326gmp.patch +++ b/package/boot/uboot-mediatek/patches/443-add-nokia_ea0326gmp.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7981_nokia_ea0326gmp_defconfig -@@ -0,0 +1,106 @@ +@@ -0,0 +1,107 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -101,6 +101,7 @@ +CONFIG_DM_REGULATOR_GPIO=y +CONFIG_RAM=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y diff --git a/package/boot/uboot-mediatek/patches/444-add-abt_asr3000.patch b/package/boot/uboot-mediatek/patches/444-add-abt_asr3000.patch index 0d8601368f..2933a6ae6c 100644 --- a/package/boot/uboot-mediatek/patches/444-add-abt_asr3000.patch +++ b/package/boot/uboot-mediatek/patches/444-add-abt_asr3000.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7981_abt_asr3000_defconfig -@@ -0,0 +1,106 @@ +@@ -0,0 +1,107 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -101,6 +101,7 @@ +CONFIG_DM_REGULATOR_GPIO=y +CONFIG_RAM=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y diff --git a/package/boot/uboot-mediatek/patches/450-add-bpi-r4.patch b/package/boot/uboot-mediatek/patches/450-add-bpi-r4.patch index fe28a46c92..00c86abe75 100644 --- a/package/boot/uboot-mediatek/patches/450-add-bpi-r4.patch +++ b/package/boot/uboot-mediatek/patches/450-add-bpi-r4.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7988a_bananapi_bpi-r4-emmc_defconfig -@@ -0,0 +1,137 @@ +@@ -0,0 +1,138 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -128,6 +128,7 @@ +CONFIG_RAM=y +CONFIG_SCSI=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y @@ -140,7 +141,7 @@ +CONFIG_HEXDUMP=y --- /dev/null +++ b/configs/mt7988a_bananapi_bpi-r4-sdmmc_defconfig -@@ -0,0 +1,137 @@ +@@ -0,0 +1,138 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -268,6 +269,7 @@ +CONFIG_RAM=y +CONFIG_SCSI=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y @@ -280,7 +282,7 @@ +CONFIG_HEXDUMP=y --- /dev/null +++ b/configs/mt7988a_bananapi_bpi-r4-snand_defconfig -@@ -0,0 +1,137 @@ +@@ -0,0 +1,138 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -408,6 +410,7 @@ +CONFIG_RAM=y +CONFIG_SCSI=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y @@ -867,7 +870,7 @@ +}; --- /dev/null +++ b/configs/mt7988a_bananapi_bpi-r4-poe-emmc_defconfig -@@ -0,0 +1,137 @@ +@@ -0,0 +1,138 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -995,6 +998,7 @@ +CONFIG_RAM=y +CONFIG_SCSI=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y @@ -1007,7 +1011,7 @@ +CONFIG_HEXDUMP=y --- /dev/null +++ b/configs/mt7988a_bananapi_bpi-r4-poe-sdmmc_defconfig -@@ -0,0 +1,137 @@ +@@ -0,0 +1,138 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -1135,6 +1139,7 @@ +CONFIG_RAM=y +CONFIG_SCSI=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y @@ -1147,7 +1152,7 @@ +CONFIG_HEXDUMP=y --- /dev/null +++ b/configs/mt7988a_bananapi_bpi-r4-poe-snand_defconfig -@@ -0,0 +1,137 @@ +@@ -0,0 +1,138 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -1275,6 +1280,7 @@ +CONFIG_RAM=y +CONFIG_SCSI=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y diff --git a/package/boot/uboot-mediatek/patches/451-add-tplink-xtr8488.patch b/package/boot/uboot-mediatek/patches/451-add-tplink-xtr8488.patch index da6e31b203..49d19cba11 100644 --- a/package/boot/uboot-mediatek/patches/451-add-tplink-xtr8488.patch +++ b/package/boot/uboot-mediatek/patches/451-add-tplink-xtr8488.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7986_tplink_tl-xtr8488_defconfig -@@ -0,0 +1,127 @@ +@@ -0,0 +1,128 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -118,6 +118,7 @@ +CONFIG_RAM=y +CONFIG_SCSI=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y diff --git a/package/boot/uboot-mediatek/patches/452-add-xiaomi-redmi-ax6s.patch b/package/boot/uboot-mediatek/patches/452-add-xiaomi-redmi-ax6s.patch index 6fd39756d4..4bb62f2920 100644 --- a/package/boot/uboot-mediatek/patches/452-add-xiaomi-redmi-ax6s.patch +++ b/package/boot/uboot-mediatek/patches/452-add-xiaomi-redmi-ax6s.patch @@ -194,7 +194,7 @@ Subject: [PATCH] add xiaomi redmi ax6s +}; --- /dev/null +++ b/configs/mt7622_xiaomi_redmi-router-ax6s-ubi-loader_defconfig -@@ -0,0 +1,97 @@ +@@ -0,0 +1,98 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -285,6 +285,7 @@ Subject: [PATCH] add xiaomi redmi ax6s +CONFIG_DM_REGULATOR_GPIO=y +CONFIG_RAM=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y diff --git a/package/boot/uboot-mediatek/patches/453-add-openwrt-one.patch b/package/boot/uboot-mediatek/patches/453-add-openwrt-one.patch index d49b07f66e..e52346ce1e 100644 --- a/package/boot/uboot-mediatek/patches/453-add-openwrt-one.patch +++ b/package/boot/uboot-mediatek/patches/453-add-openwrt-one.patch @@ -206,7 +206,7 @@ +}; --- /dev/null +++ b/configs/mt7981_openwrt-one-nor_defconfig -@@ -0,0 +1,124 @@ +@@ -0,0 +1,125 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -321,6 +321,7 @@ +CONFIG_DM_PWM=y +CONFIG_PWM_MTK=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y @@ -333,7 +334,7 @@ +CONFIG_HEXDUMP=y --- /dev/null +++ b/configs/mt7981_openwrt-one-spi-nand_defconfig -@@ -0,0 +1,125 @@ +@@ -0,0 +1,126 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -450,6 +451,7 @@ +CONFIG_DM_PWM=y +CONFIG_PWM_MTK=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y diff --git a/package/boot/uboot-mediatek/patches/454-add-glinet-x3000.patch b/package/boot/uboot-mediatek/patches/454-add-glinet-x3000.patch index 00d58cd59b..9739abd250 100644 --- a/package/boot/uboot-mediatek/patches/454-add-glinet-x3000.patch +++ b/package/boot/uboot-mediatek/patches/454-add-glinet-x3000.patch @@ -147,7 +147,7 @@ +}; --- /dev/null +++ b/configs/mt7981_glinet_gl-x3000_defconfig -@@ -0,0 +1,98 @@ +@@ -0,0 +1,99 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -244,6 +244,7 @@ +CONFIG_DM_REGULATOR=y +CONFIG_DM_REGULATOR_FIXED=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_HEXDUMP=y --- /dev/null diff --git a/package/boot/uboot-mediatek/patches/456-add-arcadyan-mozart.patch b/package/boot/uboot-mediatek/patches/456-add-arcadyan-mozart.patch index 539f5bf4d3..39cd199d1c 100644 --- a/package/boot/uboot-mediatek/patches/456-add-arcadyan-mozart.patch +++ b/package/boot/uboot-mediatek/patches/456-add-arcadyan-mozart.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7988a_arcadyan_mozart_defconfig -@@ -0,0 +1,113 @@ +@@ -0,0 +1,114 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -111,6 +111,7 @@ +CONFIG_RAM=y +CONFIG_SCSI=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y diff --git a/package/boot/uboot-mediatek/patches/458-add-GatoNetworks-GDSP.patch b/package/boot/uboot-mediatek/patches/458-add-GatoNetworks-GDSP.patch index b7c70bb185..11b40dd383 100644 --- a/package/boot/uboot-mediatek/patches/458-add-GatoNetworks-GDSP.patch +++ b/package/boot/uboot-mediatek/patches/458-add-GatoNetworks-GDSP.patch @@ -218,7 +218,7 @@ Signed-off-by: Enrico Mioso +}; --- /dev/null +++ b/configs/mt7981_gatonetworks_gdsp_defconfig -@@ -0,0 +1,141 @@ +@@ -0,0 +1,142 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -348,6 +348,7 @@ Signed-off-by: Enrico Mioso +CONFIG_DM_PWM=y +CONFIG_PWM_MTK=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y diff --git a/package/boot/uboot-mediatek/patches/459-add-mercusys-mr90x-v1.patch b/package/boot/uboot-mediatek/patches/459-add-mercusys-mr90x-v1.patch index 5b0968aff6..23be627fe5 100644 --- a/package/boot/uboot-mediatek/patches/459-add-mercusys-mr90x-v1.patch +++ b/package/boot/uboot-mediatek/patches/459-add-mercusys-mr90x-v1.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7986_mercusys_mr90x-v1_defconfig -@@ -0,0 +1,106 @@ +@@ -0,0 +1,107 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -100,6 +100,7 @@ +CONFIG_DM_REGULATOR_GPIO=y +CONFIG_RAM=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y diff --git a/package/boot/uboot-mediatek/patches/460-add-routerich-ax3000.patch b/package/boot/uboot-mediatek/patches/460-add-routerich-ax3000.patch index 23d9917b79..99bb8a5031 100644 --- a/package/boot/uboot-mediatek/patches/460-add-routerich-ax3000.patch +++ b/package/boot/uboot-mediatek/patches/460-add-routerich-ax3000.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7981_routerich_ax3000_defconfig -@@ -0,0 +1,105 @@ +@@ -0,0 +1,106 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -100,6 +100,7 @@ +CONFIG_DM_REGULATOR_GPIO=y +CONFIG_RAM=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y From e41247ca2146bf62f32495741703a787a4a3b528 Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Sat, 15 Mar 2025 13:07:29 +0100 Subject: [PATCH 39/40] Revert "tools/coreutils: fix wrong PKG_HASH after update to version 9.6" This reverts commit c2a58fe875ff04ce956c7da8f42412053bfc7597. Signed-off-by: Robert Marko --- tools/coreutils/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/coreutils/Makefile b/tools/coreutils/Makefile index 2ffa052330..862f4d8bcb 100644 --- a/tools/coreutils/Makefile +++ b/tools/coreutils/Makefile @@ -12,7 +12,7 @@ PKG_VERSION:=9.6 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/coreutils -PKG_HASH:=2bec616375002c92c1ed5ead32a092b174fe44c14bc736d32e5961053b821d84 +PKG_HASH:=7a0124327b398fd9eb1a6abde583389821422c744ffa10734b24f557610d3283 HOST_BUILD_PARALLEL := 1 From a178d8966f7f0342a71f39fe1d5a742b433d6fe9 Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Sat, 15 Mar 2025 13:07:33 +0100 Subject: [PATCH 40/40] Revert "tools/coreutils: update to 9.6" This reverts commit 160e0b7ad866c9f52b81d95588c7b0a40cffd109. It seems that this was not tested on MacOS and will fail to compile, so revert it until a proper update is done. Fixes: 160e0b7ad866 ("tools/coreutils: update to 9.6") Signed-off-by: Robert Marko --- tools/coreutils/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/coreutils/Makefile b/tools/coreutils/Makefile index 862f4d8bcb..73b95912ee 100644 --- a/tools/coreutils/Makefile +++ b/tools/coreutils/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=coreutils PKG_CPE_ID:=cpe:/a:gnu:coreutils -PKG_VERSION:=9.6 +PKG_VERSION:=9.5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/coreutils -PKG_HASH:=7a0124327b398fd9eb1a6abde583389821422c744ffa10734b24f557610d3283 +PKG_HASH:=767ae6a22950ec42f3ba5f7c1de79dd27800ee8e9b8642da5dedb5974a1741e5 HOST_BUILD_PARALLEL := 1