From 3de653a0af35c2d6fbc0fd14909f362c6b977e4a Mon Sep 17 00:00:00 2001 From: Yan Cangang Date: Mon, 5 Aug 2024 12:35:56 +0000 Subject: [PATCH 01/11] filogic: add missing 2.5G PHY LEDs configuration for Zyxel EX5700 configure 2.5G PHY LEDs to: 2500/1000: green with blink on TX/RX 100/10: green+yellow with blink on TX/RX which is similar to other 1G PHY LEDs, which are: 1000: green with blink on TX/RX 100/10: green+yellow with blink on TX/RX Fixes: 6cc14bf66aa ("filogic: support Telenor branded ZyXEL EX5700") Signed-off-by: Yan Cangang Link: https://github.com/openwrt/openwrt/pull/16082 Signed-off-by: Hauke Mehrtens --- target/linux/mediatek/dts/mt7986a-zyxel-ex5700-telenor.dts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target/linux/mediatek/dts/mt7986a-zyxel-ex5700-telenor.dts b/target/linux/mediatek/dts/mt7986a-zyxel-ex5700-telenor.dts index 9e7449b17f..51147c1d81 100644 --- a/target/linux/mediatek/dts/mt7986a-zyxel-ex5700-telenor.dts +++ b/target/linux/mediatek/dts/mt7986a-zyxel-ex5700-telenor.dts @@ -158,11 +158,13 @@ phy5: phy@5 { compatible = "ethernet-phy-ieee802.3-c45"; reg = <5>; + mxl,led-config = <0x3f0 0x330 0x0 0x0>; }; phy6: phy@6 { compatible = "ethernet-phy-ieee802.3-c45"; reg = <6>; + mxl,led-config = <0x3f0 0x330 0x0 0x0>; }; switch: switch@1f { From 42a763ef0460d634a0bd744214617a99255b5e3a Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 14 Aug 2024 19:40:00 -0700 Subject: [PATCH 02/11] ltq-atm: propagate EPROBE_DEFER to probe Instead of ignoring errors, let the linux infrastructure handle it. Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/16262 Signed-off-by: Hauke Mehrtens --- .../ltq-atm/src/ifxmips_atm_amazon_se.c | 4 ++- .../lantiq/ltq-atm/src/ifxmips_atm_ar9.c | 4 ++- .../lantiq/ltq-atm/src/ifxmips_atm_core.h | 2 +- .../lantiq/ltq-atm/src/ifxmips_atm_danube.c | 4 ++- .../lantiq/ltq-atm/src/ifxmips_atm_vr9.c | 34 +++++++++---------- package/kernel/lantiq/ltq-atm/src/ltq_atm.c | 5 ++- 6 files changed, 30 insertions(+), 23 deletions(-) diff --git a/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_amazon_se.c b/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_amazon_se.c index 8777418dc5..0c6d9c101a 100644 --- a/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_amazon_se.c +++ b/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_amazon_se.c @@ -263,7 +263,7 @@ extern void ase_fw_ver(unsigned int *major, unsigned int *minor) *minor = FW_VER_ID->minor; } -void ase_init(struct platform_device *pdev) +int ase_init(struct platform_device *pdev) { init_pmu(); @@ -276,6 +276,8 @@ void ase_init(struct platform_device *pdev) init_atm_tc(); clear_share_buffer(); + + return 0; } void ase_shutdown(void) diff --git a/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_ar9.c b/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_ar9.c index 2100aea81e..d786557682 100644 --- a/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_ar9.c +++ b/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_ar9.c @@ -194,13 +194,15 @@ void ar9_fw_ver(unsigned int *major, unsigned int *minor) *minor = FW_VER_ID->minor; } -void ar9_init(struct platform_device *pdev) +int ar9_init(struct platform_device *pdev) { init_pmu(); reset_ppe(pdev); init_ema(); init_mailbox(); clear_share_buffer(); + + return 0; } void ar9_shutdown(void) diff --git a/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_core.h b/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_core.h index 20aa14445a..807b170b08 100644 --- a/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_core.h +++ b/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_core.h @@ -32,7 +32,7 @@ #define SET_BITS(x, msb, lsb, value) (((x) & ~(((1 << ((msb) + 1)) - 1) ^ ((1 << (lsb)) - 1))) | (((value) & ((1 << (1 + (msb) - (lsb))) - 1)) << (lsb))) struct ltq_atm_ops { - void (*init)(struct platform_device *pdev); + int (*init)(struct platform_device *pdev); void (*shutdown)(void); int (*start)(int pp32); diff --git a/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_danube.c b/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_danube.c index 8302ae743a..3ff21fa03e 100644 --- a/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_danube.c +++ b/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_danube.c @@ -141,7 +141,7 @@ static void danube_fw_ver(unsigned int *major, unsigned int *minor) *minor = FW_VER_ID->minor; } -static void danube_init(struct platform_device *pdev) +static int danube_init(struct platform_device *pdev) { volatile u32 *p = SB_RAM0_ADDR(0); unsigned int i; @@ -190,6 +190,8 @@ static void danube_init(struct platform_device *pdev) for ( i = 0; i < SB_RAM0_DWLEN + SB_RAM1_DWLEN + SB_RAM2_DWLEN + SB_RAM3_DWLEN; i++ ) IFX_REG_W32(0, p++); + + return 0; } static void danube_shutdown(void) diff --git a/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_vr9.c b/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_vr9.c index 85f27156b5..c6bb772e4c 100644 --- a/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_vr9.c +++ b/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_vr9.c @@ -58,7 +58,7 @@ #define IFX_PMU_MODULE_AHBS BIT(13) #define IFX_PMU_MODULE_DSL_DFE BIT(9) -static inline void vr9_reset_ppe(struct platform_device *pdev) +static inline int vr9_reset_ppe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct reset_control *dsp; @@ -66,25 +66,16 @@ static inline void vr9_reset_ppe(struct platform_device *pdev) struct reset_control *tc; dsp = devm_reset_control_get(dev, "dsp"); - if (IS_ERR(dsp)) { - if (PTR_ERR(dsp) != -EPROBE_DEFER) - dev_err(dev, "Failed to lookup dsp reset\n"); -// return PTR_ERR(dsp); - } + if (IS_ERR(dsp)) + return dev_err_probe(dev, PTR_ERR(dsp), "Failed to lookup dsp reset"); dfe = devm_reset_control_get(dev, "dfe"); - if (IS_ERR(dfe)) { - if (PTR_ERR(dfe) != -EPROBE_DEFER) - dev_err(dev, "Failed to lookup dfe reset\n"); -// return PTR_ERR(dfe); - } + if (IS_ERR(dfe)) + return dev_err_probe(dev, PTR_ERR(dfe), "Failed to lookup dfe reset"); tc = devm_reset_control_get(dev, "tc"); - if (IS_ERR(tc)) { - if (PTR_ERR(tc) != -EPROBE_DEFER) - dev_err(dev, "Failed to lookup tc reset\n"); -// return PTR_ERR(tc); - } + if (IS_ERR(tc)) + return dev_err_probe(dev, PTR_ERR(tc), "Failed to lookup tc reset"); reset_control_assert(dsp); udelay(1000); @@ -96,6 +87,8 @@ static inline void vr9_reset_ppe(struct platform_device *pdev) udelay(1000); *PP32_SRST |= 0x000303CF; udelay(1000); + + return 0; } static inline int vr9_pp32_download_code(int pp32, u32 *code_src, unsigned int code_dword_len, u32 *data_src, unsigned int data_dword_len) @@ -132,10 +125,11 @@ static void vr9_fw_ver(unsigned int *major, unsigned int *minor) *minor = FW_VER_ID->minor; } -static void vr9_init(struct platform_device *pdev) +static int vr9_init(struct platform_device *pdev) { volatile u32 *p; unsigned int i; + int ret; /* setup pmu */ ltq_pmu_enable(IFX_PMU_MODULE_PPE_SLL01 | @@ -145,7 +139,9 @@ static void vr9_init(struct platform_device *pdev) IFX_PMU_MODULE_AHBS | IFX_PMU_MODULE_DSL_DFE); - vr9_reset_ppe(pdev); + ret = vr9_reset_ppe(pdev); + if (ret) + return ret; /* pdma init */ IFX_REG_W32(0x08, PDMA_CFG); @@ -170,6 +166,8 @@ static void vr9_init(struct platform_device *pdev) p = SB_RAM6_ADDR(0); for ( i = 0; i < SB_RAM6_DWLEN; i++ ) IFX_REG_W32(0, p++); + + return 0; } static void vr9_shutdown(void) diff --git a/package/kernel/lantiq/ltq-atm/src/ltq_atm.c b/package/kernel/lantiq/ltq-atm/src/ltq_atm.c index bf2a4a50ec..0cb49a59bd 100644 --- a/package/kernel/lantiq/ltq-atm/src/ltq_atm.c +++ b/package/kernel/lantiq/ltq-atm/src/ltq_atm.c @@ -1782,7 +1782,10 @@ static int ltq_atm_probe(struct platform_device *pdev) goto INIT_PRIV_DATA_FAIL; } - ops->init(pdev); + ret = ops->init(pdev); + if (ret) + return ret; + init_rx_tables(); init_tx_tables(); From 4b7e7046bab2885607726b4c6966d0e9c138628e Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 4 Sep 2024 11:15:28 -0700 Subject: [PATCH 03/11] ltq-ptm: propagate reset errors to probe Instead of avoiding returning, propagate error so that the kernel infrastructure can handle it. Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/16262 Signed-off-by: Hauke Mehrtens --- package/kernel/lantiq/ltq-ptm/Makefile | 2 +- .../lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c | 4 +- .../lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.h | 2 +- .../lantiq/ltq-ptm/src/ifxmips_ptm_vr9.c | 37 +++++++++---------- 4 files changed, 23 insertions(+), 22 deletions(-) diff --git a/package/kernel/lantiq/ltq-ptm/Makefile b/package/kernel/lantiq/ltq-ptm/Makefile index b726cb1560..03b1218874 100644 --- a/package/kernel/lantiq/ltq-ptm/Makefile +++ b/package/kernel/lantiq/ltq-ptm/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=ltq-ptm -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_MAINTAINER:=John Crispin PKG_LICENSE:=GPL-2.0+ diff --git a/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c index 8a0ac331b7..6731904bba 100644 --- a/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c +++ b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c @@ -993,7 +993,9 @@ static int ltq_ptm_probe(struct platform_device *pdev) goto INIT_PRIV_DATA_FAIL; } - ifx_ptm_init_chip(pdev); + ret = ifx_ptm_init_chip(pdev); + if (ret) + goto INIT_PRIV_DATA_FAIL; ret = init_tables(); if ( ret != 0 ) { err("INIT_TABLES_FAIL"); diff --git a/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.h b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.h index 90ed9d9021..19a86867be 100644 --- a/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.h +++ b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.h @@ -112,7 +112,7 @@ extern unsigned int ifx_ptm_dbg_enable; extern void ifx_ptm_get_fw_ver(unsigned int *major, unsigned int *mid, unsigned int *minor); -extern void ifx_ptm_init_chip(struct platform_device *pdev); +extern int ifx_ptm_init_chip(struct platform_device *pdev); extern void ifx_ptm_uninit_chip(void); extern int ifx_pp32_start(int pp32); diff --git a/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vr9.c b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vr9.c index b1660274d0..c0d16fe34f 100644 --- a/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vr9.c +++ b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vr9.c @@ -54,7 +54,7 @@ static inline void init_pmu(void); static inline void uninit_pmu(void); -static inline void reset_ppe(struct platform_device *pdev); +static inline int reset_ppe(struct platform_device *pdev); static inline void init_pdma(void); static inline void init_mailbox(void); static inline void init_atm_tc(void); @@ -82,7 +82,7 @@ static inline void uninit_pmu(void) { } -static inline void reset_ppe(struct platform_device *pdev) +static inline int reset_ppe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct reset_control *dsp; @@ -90,25 +90,16 @@ static inline void reset_ppe(struct platform_device *pdev) struct reset_control *tc; dsp = devm_reset_control_get(dev, "dsp"); - if (IS_ERR(dsp)) { - if (PTR_ERR(dsp) != -EPROBE_DEFER) - dev_err(dev, "Failed to lookup dsp reset\n"); -// return PTR_ERR(dsp); - } + if (IS_ERR(dsp)) + return dev_err_probe(dev, PTR_ERR(dsp), "Failed to lookup dsp reset"); dfe = devm_reset_control_get(dev, "dfe"); - if (IS_ERR(dfe)) { - if (PTR_ERR(dfe) != -EPROBE_DEFER) - dev_err(dev, "Failed to lookup dfe reset\n"); -// return PTR_ERR(dfe); - } + if (IS_ERR(dfe)) + return dev_err_probe(dev, PTR_ERR(dfe), "Failed to lookup dfe reset"); tc = devm_reset_control_get(dev, "tc"); - if (IS_ERR(tc)) { - if (PTR_ERR(tc) != -EPROBE_DEFER) - dev_err(dev, "Failed to lookup tc reset\n"); -// return PTR_ERR(tc); - } + if (IS_ERR(tc)) + return dev_err_probe(dev, PTR_ERR(tc), "Failed to lookup tc reset"); reset_control_assert(dsp); udelay(1000); @@ -120,6 +111,8 @@ static inline void reset_ppe(struct platform_device *pdev) udelay(1000); *PP32_SRST |= 0x000303CF; udelay(1000); + + return 0; } static inline void init_pdma(void) @@ -263,11 +256,15 @@ void ifx_ptm_get_fw_ver(unsigned int *major, unsigned int *mid, unsigned int *mi } } -void ifx_ptm_init_chip(struct platform_device *pdev) +int ifx_ptm_init_chip(struct platform_device *pdev) { + int r; + init_pmu(); - reset_ppe(pdev); + r = reset_ppe(pdev); + if (r) + return r; init_pdma(); @@ -276,6 +273,8 @@ void ifx_ptm_init_chip(struct platform_device *pdev) init_atm_tc(); clear_share_buffer(); + + return 0; } void ifx_ptm_uninit_chip(void) From 77886246e03eb9d706eb7130deea99f3e111a9ba Mon Sep 17 00:00:00 2001 From: John Audia Date: Wed, 4 Sep 2024 15:32:54 -0400 Subject: [PATCH 04/11] kernel: bump 6.6 to 6.6.49 Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.49 All patches automatically rebased. Build system: x86/64 Build-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Run-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Signed-off-by: John Audia Link: https://github.com/openwrt/openwrt/pull/16328 Signed-off-by: Hauke Mehrtens --- include/kernel-6.6 | 4 ++-- ...b-dwc3-Set-DMA-and-coherent-masks-early.patch | 16 ++++++++-------- ...wc3-add-FS-LS-bus-instance-parkmode-dis.patch | 4 ++-- ...v6.8-net-ethtool-implement-ethtool_puts.patch | 2 +- .../780-usb-net-MeigLink_modem_support.patch | 4 ++-- ...-pinctrl-add-mt7988-pd-pulltype-support.patch | 16 ++++++++-------- ...-dwc3-add-optional-PHY-interface-clocks.patch | 6 +++--- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/include/kernel-6.6 b/include/kernel-6.6 index 5fbb10e052..511218f438 100644 --- a/include/kernel-6.6 +++ b/include/kernel-6.6 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.6 = .48 -LINUX_KERNEL_HASH-6.6.48 = 6b16df7b2aba3116b78fdfd8aea0b6cd7abe8f0cb699b04a66d3169141772029 +LINUX_VERSION-6.6 = .49 +LINUX_KERNEL_HASH-6.6.49 = 2c56dac2b70859c16b4ef651befb0d28c227498bd3eee08e8a45a357f22dd3b7 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 f4aca7bbba..78cdcc7139 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 -@@ -1194,6 +1194,24 @@ static void dwc3_config_threshold(struct +@@ -1202,6 +1202,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 -@@ -1259,6 +1277,8 @@ static int dwc3_core_init(struct dwc3 *d +@@ -1267,6 +1285,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; -@@ -1333,6 +1353,24 @@ static int dwc3_core_init(struct dwc3 *d +@@ -1341,6 +1361,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: -@@ -1476,6 +1514,7 @@ static void dwc3_get_properties(struct d +@@ -1484,6 +1522,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 const char *usb_psy_name; int ret; -@@ -1498,6 +1537,9 @@ static void dwc3_get_properties(struct d +@@ -1506,6 +1545,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); -@@ -1619,6 +1661,9 @@ static void dwc3_get_properties(struct d +@@ -1627,6 +1669,9 @@ static void dwc3_get_properties(struct d dwc->dis_split_quirk = device_property_read_bool(dev, "snps,dis-split-quirk"); @@ -299,7 +299,7 @@ Signed-off-by: Jonathan Bell dwc->lpm_nyet_threshold = lpm_nyet_threshold; dwc->tx_de_emphasis = tx_de_emphasis; -@@ -1636,6 +1681,8 @@ static void dwc3_get_properties(struct d +@@ -1644,6 +1689,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; @@ -308,7 +308,7 @@ Signed-off-by: Jonathan Bell dwc->imod_interval = 0; dwc->tx_fifo_resize_max_num = tx_fifo_resize_max_num; -@@ -1911,6 +1958,12 @@ static int dwc3_probe(struct platform_de +@@ -1919,6 +1966,12 @@ static int dwc3_probe(struct platform_de dwc3_get_properties(dwc); 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 1a5e84fe42..d91a989526 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 -@@ -1343,6 +1343,9 @@ static int dwc3_core_init(struct dwc3 *d +@@ -1351,6 +1351,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)) -@@ -1641,6 +1644,8 @@ static void dwc3_get_properties(struct d +@@ -1649,6 +1652,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/generic/backport-6.6/894-v6.8-net-ethtool-implement-ethtool_puts.patch b/target/linux/generic/backport-6.6/894-v6.8-net-ethtool-implement-ethtool_puts.patch index 9c61ff27ab..8e57193ef1 100644 --- a/target/linux/generic/backport-6.6/894-v6.8-net-ethtool-implement-ethtool_puts.patch +++ b/target/linux/generic/backport-6.6/894-v6.8-net-ethtool-implement-ethtool_puts.patch @@ -123,7 +123,7 @@ Signed-off-by: Justin Stitt #endif /* _LINUX_ETHTOOL_H */ --- a/net/ethtool/ioctl.c +++ b/net/ethtool/ioctl.c -@@ -1991,6 +1991,13 @@ __printf(2, 3) void ethtool_sprintf(u8 * +@@ -1994,6 +1994,13 @@ __printf(2, 3) void ethtool_sprintf(u8 * } EXPORT_SYMBOL(ethtool_sprintf); diff --git a/target/linux/generic/hack-6.6/780-usb-net-MeigLink_modem_support.patch b/target/linux/generic/hack-6.6/780-usb-net-MeigLink_modem_support.patch index 1d9cb9a0da..73a27ef6e2 100644 --- a/target/linux/generic/hack-6.6/780-usb-net-MeigLink_modem_support.patch +++ b/target/linux/generic/hack-6.6/780-usb-net-MeigLink_modem_support.patch @@ -43,7 +43,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support #define QUECTEL_VENDOR_ID 0x2c7c /* These Quectel products use Quectel's vendor ID */ -@@ -1156,6 +1161,11 @@ static const struct usb_device_id option +@@ -1158,6 +1163,11 @@ static const struct usb_device_id option { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */ { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000), /* SIMCom SIM5218 */ .driver_info = NCTRL(0) | NCTRL(1) | NCTRL(2) | NCTRL(3) | RSVD(4) }, @@ -55,7 +55,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support /* Quectel products using Qualcomm vendor ID */ { USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC15)}, { USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC20), -@@ -1197,6 +1207,11 @@ static const struct usb_device_id option +@@ -1199,6 +1209,11 @@ static const struct usb_device_id option .driver_info = ZLP }, { USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96), .driver_info = RSVD(4) }, diff --git a/target/linux/mediatek/patches-6.6/351-pinctrl-add-mt7988-pd-pulltype-support.patch b/target/linux/mediatek/patches-6.6/351-pinctrl-add-mt7988-pd-pulltype-support.patch index 1fcb1e64c7..fb65adb011 100644 --- a/target/linux/mediatek/patches-6.6/351-pinctrl-add-mt7988-pd-pulltype-support.patch +++ b/target/linux/mediatek/patches-6.6/351-pinctrl-add-mt7988-pd-pulltype-support.patch @@ -31,8 +31,8 @@ static int mtk_pinconf_bias_set_pullsel_pullen(struct mtk_pinctrl *hw, const struct mtk_pin_desc *desc, u32 pullup, u32 arg) -@@ -755,6 +779,12 @@ int mtk_pinconf_bias_set_combo(struct mt - return err; +@@ -758,6 +782,12 @@ int mtk_pinconf_bias_set_combo(struct mt + return 0; } + if (try_all_type & MTK_PULL_PD_TYPE) { @@ -44,7 +44,7 @@ if (try_all_type & MTK_PULL_PU_PD_TYPE) { err = mtk_pinconf_bias_set_pu_pd(hw, desc, pullup, arg); if (!err) -@@ -875,6 +905,29 @@ out: +@@ -878,6 +908,29 @@ out: return err; } @@ -74,19 +74,19 @@ static int mtk_pinconf_bias_get_pullsel_pullen(struct mtk_pinctrl *hw, const struct mtk_pin_desc *desc, u32 *pullup, u32 *enable) -@@ -943,6 +996,12 @@ int mtk_pinconf_bias_get_combo(struct mt - if (!err) - return err; +@@ -947,6 +1000,12 @@ int mtk_pinconf_bias_get_combo(struct mt + return 0; } -+ + + if (try_all_type & MTK_PULL_PD_TYPE) { + err = mtk_pinconf_bias_get_pd(hw, desc, pullup, enable); + if (!err) + return err; + } - ++ if (try_all_type & MTK_PULL_PU_PD_TYPE) { err = mtk_pinconf_bias_get_pu_pd(hw, desc, pullup, enable); + if (!err) --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h @@ -24,6 +24,7 @@ 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 2af7fc6c00..1b82072933 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 -@@ -831,8 +831,20 @@ static int dwc3_clk_enable(struct dwc3 * +@@ -839,8 +839,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: -@@ -842,6 +854,8 @@ disable_bus_clk: +@@ -850,6 +862,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); -@@ -1855,6 +1869,20 @@ static int dwc3_get_clocks(struct dwc3 * +@@ -1863,6 +1877,20 @@ static int dwc3_get_clocks(struct dwc3 * } } From 527bad0d5042d63d6651dae47b88be55cc51da1d Mon Sep 17 00:00:00 2001 From: Zxl hhyccc Date: Wed, 4 Sep 2024 20:43:31 +0800 Subject: [PATCH 05/11] kernel: bump 6.1 to 6.1.108 https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.108 All patches automatically rebased. Build system: bcm53xx octeon Signed-off-by: Zxl hhyccc Link: https://github.com/openwrt/openwrt/pull/16325 Signed-off-by: Hauke Mehrtens --- include/kernel-6.1 | 4 ++-- ...0001-of-base-add-of_parse_phandle_with_optional_args.patch | 2 +- .../828-v6.4-0003-of-Rename-of_modalias_node.patch | 2 +- .../828-v6.4-0004-of-Move-of_modalias-to-module.c.patch | 4 ++-- ...-of-Move-the-request-module-helper-logic-to-module.c.patch | 4 ++-- .../894-v6.8-net-ethtool-implement-ethtool_puts.patch | 2 +- .../generic/hack-6.1/780-usb-net-MeigLink_modem_support.patch | 4 ++-- target/linux/generic/pending-6.1/834-ledtrig-libata.patch | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/kernel-6.1 b/include/kernel-6.1 index 0e0d2702f2..3f35a92418 100644 --- a/include/kernel-6.1 +++ b/include/kernel-6.1 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.1 = .107 -LINUX_KERNEL_HASH-6.1.107 = f43229d1d73011fa0a37400320a26972946f8ff295c404c31c0dd0407228b0e8 +LINUX_VERSION-6.1 = .108 +LINUX_KERNEL_HASH-6.1.108 = 3f4e4e89a00e221a6dd1174779e0028794f44f4624ad6a31c79f3b7796688ca2 diff --git a/target/linux/generic/backport-6.1/827-v6.3-0001-of-base-add-of_parse_phandle_with_optional_args.patch b/target/linux/generic/backport-6.1/827-v6.3-0001-of-base-add-of_parse_phandle_with_optional_args.patch index f568c3f6ce..b4cb96d248 100644 --- a/target/linux/generic/backport-6.1/827-v6.3-0001-of-base-add-of_parse_phandle_with_optional_args.patch +++ b/target/linux/generic/backport-6.1/827-v6.3-0001-of-base-add-of_parse_phandle_with_optional_args.patch @@ -24,7 +24,7 @@ Signed-off-by: Greg Kroah-Hartman --- a/include/linux/of.h +++ b/include/linux/of.h -@@ -1009,6 +1009,31 @@ static inline int of_parse_phandle_with_ +@@ -1011,6 +1011,31 @@ static inline int of_parse_phandle_with_ } /** diff --git a/target/linux/generic/backport-6.1/828-v6.4-0003-of-Rename-of_modalias_node.patch b/target/linux/generic/backport-6.1/828-v6.4-0003-of-Rename-of_modalias_node.patch index c11ccc6c3e..69d316b8fa 100644 --- a/target/linux/generic/backport-6.1/828-v6.4-0003-of-Rename-of_modalias_node.patch +++ b/target/linux/generic/backport-6.1/828-v6.4-0003-of-Rename-of_modalias_node.patch @@ -161,7 +161,7 @@ Signed-off-by: Greg Kroah-Hartman goto err_out; --- a/include/linux/of.h +++ b/include/linux/of.h -@@ -362,7 +362,8 @@ extern int of_n_addr_cells(struct device +@@ -364,7 +364,8 @@ extern int of_n_addr_cells(struct device extern int of_n_size_cells(struct device_node *np); extern const struct of_device_id *of_match_node( const struct of_device_id *matches, const struct device_node *node); diff --git a/target/linux/generic/backport-6.1/828-v6.4-0004-of-Move-of_modalias-to-module.c.patch b/target/linux/generic/backport-6.1/828-v6.4-0004-of-Move-of_modalias-to-module.c.patch index 39a84161a2..16baed1187 100644 --- a/target/linux/generic/backport-6.1/828-v6.4-0004-of-Move-of_modalias-to-module.c.patch +++ b/target/linux/generic/backport-6.1/828-v6.4-0004-of-Move-of_modalias-to-module.c.patch @@ -135,7 +135,7 @@ Signed-off-by: Greg Kroah-Hartman +} --- a/include/linux/of.h +++ b/include/linux/of.h -@@ -374,6 +374,9 @@ extern int of_parse_phandle_with_args_ma +@@ -376,6 +376,9 @@ extern int of_parse_phandle_with_args_ma extern int of_count_phandle_with_args(const struct device_node *np, const char *list_name, const char *cells_name); @@ -145,7 +145,7 @@ Signed-off-by: Greg Kroah-Hartman /* phandle iterator functions */ extern int of_phandle_iterator_init(struct of_phandle_iterator *it, const struct device_node *np, -@@ -731,6 +734,12 @@ static inline int of_count_phandle_with_ +@@ -733,6 +736,12 @@ static inline int of_count_phandle_with_ return -ENOSYS; } diff --git a/target/linux/generic/backport-6.1/828-v6.4-0005-of-Move-the-request-module-helper-logic-to-module.c.patch b/target/linux/generic/backport-6.1/828-v6.4-0005-of-Move-the-request-module-helper-logic-to-module.c.patch index 046c1df561..67dcea0d19 100644 --- a/target/linux/generic/backport-6.1/828-v6.4-0005-of-Move-the-request-module-helper-logic-to-module.c.patch +++ b/target/linux/generic/backport-6.1/828-v6.4-0005-of-Move-the-request-module-helper-logic-to-module.c.patch @@ -109,7 +109,7 @@ Signed-off-by: Greg Kroah-Hartman +EXPORT_SYMBOL_GPL(of_request_module); --- a/include/linux/of.h +++ b/include/linux/of.h -@@ -376,6 +376,7 @@ extern int of_count_phandle_with_args(co +@@ -378,6 +378,7 @@ extern int of_count_phandle_with_args(co /* module functions */ extern ssize_t of_modalias(const struct device_node *np, char *str, ssize_t len); @@ -117,7 +117,7 @@ Signed-off-by: Greg Kroah-Hartman /* phandle iterator functions */ extern int of_phandle_iterator_init(struct of_phandle_iterator *it, -@@ -739,6 +740,11 @@ static inline ssize_t of_modalias(const +@@ -741,6 +742,11 @@ static inline ssize_t of_modalias(const { return -ENODEV; } diff --git a/target/linux/generic/backport-6.1/894-v6.8-net-ethtool-implement-ethtool_puts.patch b/target/linux/generic/backport-6.1/894-v6.8-net-ethtool-implement-ethtool_puts.patch index 5094a6d774..379a4fc7c0 100644 --- a/target/linux/generic/backport-6.1/894-v6.8-net-ethtool-implement-ethtool_puts.patch +++ b/target/linux/generic/backport-6.1/894-v6.8-net-ethtool-implement-ethtool_puts.patch @@ -123,7 +123,7 @@ Signed-off-by: Justin Stitt #endif /* _LINUX_ETHTOOL_H */ --- a/net/ethtool/ioctl.c +++ b/net/ethtool/ioctl.c -@@ -1974,6 +1974,13 @@ __printf(2, 3) void ethtool_sprintf(u8 * +@@ -1977,6 +1977,13 @@ __printf(2, 3) void ethtool_sprintf(u8 * } EXPORT_SYMBOL(ethtool_sprintf); diff --git a/target/linux/generic/hack-6.1/780-usb-net-MeigLink_modem_support.patch b/target/linux/generic/hack-6.1/780-usb-net-MeigLink_modem_support.patch index d010231e49..6e318a6e9a 100644 --- a/target/linux/generic/hack-6.1/780-usb-net-MeigLink_modem_support.patch +++ b/target/linux/generic/hack-6.1/780-usb-net-MeigLink_modem_support.patch @@ -43,7 +43,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support #define QUECTEL_VENDOR_ID 0x2c7c /* These Quectel products use Quectel's vendor ID */ -@@ -1156,6 +1161,11 @@ static const struct usb_device_id option +@@ -1158,6 +1163,11 @@ static const struct usb_device_id option { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */ { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000), /* SIMCom SIM5218 */ .driver_info = NCTRL(0) | NCTRL(1) | NCTRL(2) | NCTRL(3) | RSVD(4) }, @@ -55,7 +55,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support /* Quectel products using Qualcomm vendor ID */ { USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC15)}, { USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC20), -@@ -1197,6 +1207,11 @@ static const struct usb_device_id option +@@ -1199,6 +1209,11 @@ static const struct usb_device_id option .driver_info = ZLP }, { USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96), .driver_info = RSVD(4) }, diff --git a/target/linux/generic/pending-6.1/834-ledtrig-libata.patch b/target/linux/generic/pending-6.1/834-ledtrig-libata.patch index 39960bc090..7ca586c676 100644 --- a/target/linux/generic/pending-6.1/834-ledtrig-libata.patch +++ b/target/linux/generic/pending-6.1/834-ledtrig-libata.patch @@ -85,7 +85,7 @@ Signed-off-by: Daniel Golle ata_sff_port_init(ap); return ap; -@@ -5473,6 +5492,12 @@ static void ata_host_release(struct kref +@@ -5476,6 +5495,12 @@ static void ata_host_release(struct kref kfree(ap->pmp_link); kfree(ap->slave_link); @@ -98,7 +98,7 @@ Signed-off-by: Daniel Golle kfree(ap); host->ports[i] = NULL; } -@@ -5875,7 +5900,23 @@ int ata_host_register(struct ata_host *h +@@ -5878,7 +5903,23 @@ int ata_host_register(struct ata_host *h host->ports[i]->print_id = atomic_inc_return(&ata_print_id); host->ports[i]->local_port_no = i + 1; } From d760576132a1c37d0f533597b1742186d8692319 Mon Sep 17 00:00:00 2001 From: Gioacchino Mazzurco Date: Sat, 31 Aug 2024 14:33:52 +0200 Subject: [PATCH 06/11] hostapd: ensure that interface name is not null Include hotfix suggested by Sebastian Gottschall to fix bug introduced with APuP patchset Signed-off-by: Gioacchino Mazzurco Link: https://github.com/mirror/dd-wrt/commit/0c3001a69e8d8300569e416de856c96e903ad130 Link: https://github.com/openwrt/openwrt/pull/16298 Signed-off-by: Hauke Mehrtens --- package/network/services/hostapd/Makefile | 2 +- ...ement-APuP-Access-Point-Micro-Peering.patch | 18 +++++++++++++----- ...bus-notification-when-a-peer-comes-up.patch | 2 +- ...d-ucode-hook-for-when-a-peer-comes-up.patch | 2 +- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile index b62592b724..01a1729168 100644 --- a/package/network/services/hostapd/Makefile +++ b/package/network/services/hostapd/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hostapd -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE_URL:=https://w1.fi/hostap.git PKG_SOURCE_PROTO:=git diff --git a/package/network/services/hostapd/patches/780-Implement-APuP-Access-Point-Micro-Peering.patch b/package/network/services/hostapd/patches/780-Implement-APuP-Access-Point-Micro-Peering.patch index b6e4ef9571..b154a0d3cd 100644 --- a/package/network/services/hostapd/patches/780-Implement-APuP-Access-Point-Micro-Peering.patch +++ b/package/network/services/hostapd/patches/780-Implement-APuP-Access-Point-Micro-Peering.patch @@ -1,4 +1,4 @@ -From 40041ecea334c0106c0e840a32aef92b0cbb004b Mon Sep 17 00:00:00 2001 +From 806c84ac8e8f60eaec22772b627f85eb5ac13544 Mon Sep 17 00:00:00 2001 From: Gioacchino Mazzurco Date: Mon, 6 May 2024 13:53:48 +0200 Subject: [PATCH 1/3] Implement APuP Access Point Micro Peering @@ -18,11 +18,14 @@ automatically if wds_bridge is not an empty string), or feeded to a routing daemon. Signed-off-by: Gioacchino Mazzurco +Reviewed-by: Hauke Mehrtens +Reviewed-by: Moritz Warning +Hotfix-by: Sebastian Gottschall https://github.com/mirror/dd-wrt/commit/0c3001a69e8d8300569e416de856c96e903ad130 --- hostapd/Makefile | 5 ++ hostapd/config_file.c | 9 +++ src/ap/ap_config.h | 29 +++++++ - src/ap/ap_drv_ops.c | 26 ++++++ + src/ap/ap_drv_ops.c | 28 ++++++- src/ap/ap_drv_ops.h | 3 + src/ap/apup.c | 152 +++++++++++++++++++++++++++++++++++ src/ap/apup.h | 24 ++++++ @@ -30,7 +33,7 @@ Signed-off-by: Gioacchino Mazzurco src/ap/ieee802_11.h | 2 + src/drivers/driver.h | 2 +- src/drivers/driver_nl80211.c | 14 +--- - 11 files changed, 264 insertions(+), 16 deletions(-) + 11 files changed, 265 insertions(+), 17 deletions(-) create mode 100644 src/ap/apup.c create mode 100644 src/ap/apup.h @@ -111,10 +114,10 @@ index 0e52a9990d..9102db5ed0 100644 /** diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c -index e7396d9aea..05460e3d73 100644 +index e7396d9aea..0a49ae515e 100644 --- a/src/ap/ap_drv_ops.c +++ b/src/ap/ap_drv_ops.c -@@ -382,9 +382,35 @@ int hostapd_set_wds_sta(struct hostapd_data *hapd, char *ifname_wds, +@@ -382,13 +382,39 @@ int hostapd_set_wds_sta(struct hostapd_data *hapd, char *ifname_wds, const u8 *addr, int aid, int val) { const char *bridge = NULL; @@ -150,6 +153,11 @@ index e7396d9aea..05460e3d73 100644 if (hapd->conf->wds_bridge[0]) bridge = hapd->conf->wds_bridge; return hapd->driver->set_wds_sta(hapd->drv_priv, addr, aid, val, +- bridge, ifname_wds); ++ bridge, ifName); + } + + diff --git a/src/ap/ap_drv_ops.h b/src/ap/ap_drv_ops.h index fa89d2398e..ab4dc8eb16 100644 --- a/src/ap/ap_drv_ops.h diff --git a/package/network/services/hostapd/patches/790-APuP-add-ubus-notification-when-a-peer-comes-up.patch b/package/network/services/hostapd/patches/790-APuP-add-ubus-notification-when-a-peer-comes-up.patch index 3746dde00a..6a84aefdc4 100644 --- a/package/network/services/hostapd/patches/790-APuP-add-ubus-notification-when-a-peer-comes-up.patch +++ b/package/network/services/hostapd/patches/790-APuP-add-ubus-notification-when-a-peer-comes-up.patch @@ -1,4 +1,4 @@ -From 9a265f70b5e4e048c568564aed5f9ac4a4fd76b0 Mon Sep 17 00:00:00 2001 +From 5d139e62c018f2ff1ae8b0fc76cb9c79813c61ce Mon Sep 17 00:00:00 2001 From: Gioacchino Mazzurco Date: Tue, 7 May 2024 10:37:54 +0200 Subject: [PATCH 2/3] APuP add ubus notification when a peer comes up diff --git a/package/network/services/hostapd/patches/800-APuP-add-ucode-hook-for-when-a-peer-comes-up.patch b/package/network/services/hostapd/patches/800-APuP-add-ucode-hook-for-when-a-peer-comes-up.patch index c3e3633060..6abddc7071 100644 --- a/package/network/services/hostapd/patches/800-APuP-add-ucode-hook-for-when-a-peer-comes-up.patch +++ b/package/network/services/hostapd/patches/800-APuP-add-ucode-hook-for-when-a-peer-comes-up.patch @@ -1,4 +1,4 @@ -From aaeb60b39a72774c651187208ec47efd0daeb75b Mon Sep 17 00:00:00 2001 +From 484489e41a1ae4b43d9863d057f8afb29f1c41d5 Mon Sep 17 00:00:00 2001 From: Gioacchino Mazzurco Date: Tue, 7 May 2024 11:54:23 +0200 Subject: [PATCH 3/3] APuP add ucode hook for when a peer comes up From b1435f0af8db31f79b9767bca6e8438d3ee3ce74 Mon Sep 17 00:00:00 2001 From: Leo Barsky Date: Sun, 1 Sep 2024 15:54:05 -0400 Subject: [PATCH 07/11] kernel: activate *_FS_SECURITY and *_FS_ACL_ATTR options for all big flash targets This patch activate *_FS_SECURITY and *_FS_ACL_ATTR options for all big flash memory targets. Fixes docker error: "failed to register layer: lsetxattr security.capability /usr/bin/ping: operation not supported" Forum discussion: https://forum.openwrt.org/t/docker-pull-fails-failed-to-register-layer-operation-not-supported/138253 Signed-off-by: Leo Barsky Link: https://github.com/openwrt/openwrt/pull/16181 Signed-off-by: Hauke Mehrtens --- config/Config-kernel.in | 5 +++++ target/linux/archs38/config-6.6 | 1 - target/linux/bcm27xx/bcm2708/config-6.6 | 4 ---- target/linux/bcm27xx/bcm2709/config-6.6 | 4 ---- target/linux/bcm27xx/bcm2710/config-6.6 | 4 ---- target/linux/bcm27xx/bcm2711/config-6.6 | 4 ---- target/linux/bcm27xx/bcm2712/config-6.6 | 4 ---- target/linux/gemini/config-6.6 | 2 -- target/linux/imx/config-6.6 | 3 --- target/linux/layerscape/armv7/config-6.1 | 4 ---- target/linux/layerscape/armv7/config-6.6 | 4 ---- target/linux/layerscape/armv8_64b/config-6.1 | 5 ----- target/linux/layerscape/armv8_64b/config-6.6 | 5 ----- target/linux/loongarch64/config-6.6 | 4 ---- target/linux/malta/config-6.6 | 3 --- target/linux/omap/config-6.1 | 2 -- target/linux/pistachio/config-6.1 | 2 -- target/linux/pistachio/config-6.6 | 2 -- target/linux/qoriq/config-6.1 | 2 -- target/linux/qoriq/config-6.6 | 2 -- target/linux/rockchip/armv8/config-6.6 | 2 -- target/linux/starfive/config-6.1 | 3 --- target/linux/starfive/config-6.6 | 3 --- target/linux/sunxi/config-6.6 | 2 -- 24 files changed, 5 insertions(+), 71 deletions(-) diff --git a/config/Config-kernel.in b/config/Config-kernel.in index 73b26b631a..fdc5850bde 100644 --- a/config/Config-kernel.in +++ b/config/Config-kernel.in @@ -1247,6 +1247,7 @@ config KERNEL_BTRFS_FS menu "Filesystem ACL and attr support options" config USE_FS_ACL_ATTR bool "Use filesystem ACL and attr support by default" + default y if !SMALL_FLASH help Make using ACLs (e.g. POSIX ACL, NFSv4 ACL) the default for kernel and packages, except tmpfs, flash filesystems, @@ -1415,15 +1416,19 @@ config KERNEL_LSM config KERNEL_EXT4_FS_SECURITY bool "Ext4 Security Labels" + default y if !SMALL_FLASH config KERNEL_F2FS_FS_SECURITY bool "F2FS Security Labels" + default y if !SMALL_FLASH config KERNEL_UBIFS_FS_SECURITY bool "UBIFS Security Labels" + default y if !SMALL_FLASH config KERNEL_JFFS2_FS_SECURITY bool "JFFS2 Security Labels" + default y if !SMALL_FLASH config KERNEL_WERROR bool "Compile the kernel with warnings as errors" diff --git a/target/linux/archs38/config-6.6 b/target/linux/archs38/config-6.6 index 5eb67e1043..6298ce9e46 100644 --- a/target/linux/archs38/config-6.6 +++ b/target/linux/archs38/config-6.6 @@ -99,7 +99,6 @@ CONFIG_FB_IOMEM_FOPS=y CONFIG_FIXED_PHY=y CONFIG_FS_IOMAP=y CONFIG_FS_MBCACHE=y -CONFIG_FS_POSIX_ACL=y CONFIG_FUNCTION_ALIGNMENT=0 CONFIG_FWNODE_MDIO=y CONFIG_FW_LOADER_PAGED_BUF=y diff --git a/target/linux/bcm27xx/bcm2708/config-6.6 b/target/linux/bcm27xx/bcm2708/config-6.6 index cd978837ea..a50596e45e 100644 --- a/target/linux/bcm27xx/bcm2708/config-6.6 +++ b/target/linux/bcm27xx/bcm2708/config-6.6 @@ -142,8 +142,6 @@ CONFIG_EDAC_ATOMIC_SCRUB=y CONFIG_EDAC_SUPPORT=y CONFIG_EXCLUSIVE_SYSTEM_RAM=y CONFIG_EXT4_FS=y -CONFIG_EXT4_FS_POSIX_ACL=y -CONFIG_EXT4_FS_SECURITY=y CONFIG_EXTCON=y CONFIG_F2FS_FS=y CONFIG_FB=y @@ -168,7 +166,6 @@ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FREEZER=y CONFIG_FS_IOMAP=y CONFIG_FS_MBCACHE=y -CONFIG_FS_POSIX_ACL=y CONFIG_FUNCTION_ALIGNMENT=0 CONFIG_FWNODE_MDIO=y CONFIG_FW_CACHE=y @@ -372,7 +369,6 @@ CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_TIMER_OF=y CONFIG_TIMER_PROBE=y CONFIG_TINY_SRCU=y -CONFIG_TMPFS_POSIX_ACL=y CONFIG_UEVENT_HELPER_PATH="" # CONFIG_UID16 is not set CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" diff --git a/target/linux/bcm27xx/bcm2709/config-6.6 b/target/linux/bcm27xx/bcm2709/config-6.6 index 1a034b3e71..23e93241df 100644 --- a/target/linux/bcm27xx/bcm2709/config-6.6 +++ b/target/linux/bcm27xx/bcm2709/config-6.6 @@ -180,8 +180,6 @@ CONFIG_EDAC_ATOMIC_SCRUB=y CONFIG_EDAC_SUPPORT=y CONFIG_EXCLUSIVE_SYSTEM_RAM=y CONFIG_EXT4_FS=y -CONFIG_EXT4_FS_POSIX_ACL=y -CONFIG_EXT4_FS_SECURITY=y CONFIG_EXTCON=y CONFIG_F2FS_FS=y CONFIG_FB=y @@ -208,7 +206,6 @@ CONFIG_FS_ENCRYPTION=y CONFIG_FS_ENCRYPTION_ALGS=y CONFIG_FS_IOMAP=y CONFIG_FS_MBCACHE=y -CONFIG_FS_POSIX_ACL=y CONFIG_FUNCTION_ALIGNMENT=0 CONFIG_FWNODE_MDIO=y CONFIG_FW_CACHE=y @@ -466,7 +463,6 @@ CONFIG_THREAD_INFO_IN_TASK=y CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_TIMER_OF=y CONFIG_TIMER_PROBE=y -CONFIG_TMPFS_POSIX_ACL=y CONFIG_TREE_RCU=y CONFIG_TREE_SRCU=y # CONFIG_UCLAMP_TASK is not set diff --git a/target/linux/bcm27xx/bcm2710/config-6.6 b/target/linux/bcm27xx/bcm2710/config-6.6 index 0461028d9a..5b7d6ae4f1 100644 --- a/target/linux/bcm27xx/bcm2710/config-6.6 +++ b/target/linux/bcm27xx/bcm2710/config-6.6 @@ -185,8 +185,6 @@ CONFIG_DUMMY_CONSOLE=y CONFIG_EDAC_SUPPORT=y CONFIG_EXCLUSIVE_SYSTEM_RAM=y CONFIG_EXT4_FS=y -CONFIG_EXT4_FS_POSIX_ACL=y -CONFIG_EXT4_FS_SECURITY=y CONFIG_EXTCON=y CONFIG_F2FS_FS=y CONFIG_FB=y @@ -214,7 +212,6 @@ CONFIG_FS_ENCRYPTION=y CONFIG_FS_ENCRYPTION_ALGS=y CONFIG_FS_IOMAP=y CONFIG_FS_MBCACHE=y -CONFIG_FS_POSIX_ACL=y CONFIG_FUNCTION_ALIGNMENT=4 CONFIG_FUNCTION_ALIGNMENT_4B=y CONFIG_FWNODE_MDIO=y @@ -462,7 +459,6 @@ CONFIG_THREAD_INFO_IN_TASK=y CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_TIMER_OF=y CONFIG_TIMER_PROBE=y -CONFIG_TMPFS_POSIX_ACL=y CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=y CONFIG_TREE_RCU=y CONFIG_TREE_SRCU=y diff --git a/target/linux/bcm27xx/bcm2711/config-6.6 b/target/linux/bcm27xx/bcm2711/config-6.6 index 959b8986a5..33458c27d7 100644 --- a/target/linux/bcm27xx/bcm2711/config-6.6 +++ b/target/linux/bcm27xx/bcm2711/config-6.6 @@ -185,8 +185,6 @@ CONFIG_DUMMY_CONSOLE=y CONFIG_EDAC_SUPPORT=y CONFIG_EXCLUSIVE_SYSTEM_RAM=y CONFIG_EXT4_FS=y -CONFIG_EXT4_FS_POSIX_ACL=y -CONFIG_EXT4_FS_SECURITY=y CONFIG_EXTCON=y CONFIG_F2FS_FS=y CONFIG_FB=y @@ -214,7 +212,6 @@ CONFIG_FS_ENCRYPTION=y CONFIG_FS_ENCRYPTION_ALGS=y CONFIG_FS_IOMAP=y CONFIG_FS_MBCACHE=y -CONFIG_FS_POSIX_ACL=y CONFIG_FUNCTION_ALIGNMENT=4 CONFIG_FUNCTION_ALIGNMENT_4B=y CONFIG_FWNODE_MDIO=y @@ -468,7 +465,6 @@ CONFIG_THREAD_INFO_IN_TASK=y CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_TIMER_OF=y CONFIG_TIMER_PROBE=y -CONFIG_TMPFS_POSIX_ACL=y CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=y CONFIG_TREE_RCU=y CONFIG_TREE_SRCU=y diff --git a/target/linux/bcm27xx/bcm2712/config-6.6 b/target/linux/bcm27xx/bcm2712/config-6.6 index 96f0c5b38a..734b19612b 100644 --- a/target/linux/bcm27xx/bcm2712/config-6.6 +++ b/target/linux/bcm27xx/bcm2712/config-6.6 @@ -228,8 +228,6 @@ CONFIG_DUMMY_CONSOLE=y CONFIG_EDAC_SUPPORT=y CONFIG_EXCLUSIVE_SYSTEM_RAM=y CONFIG_EXT4_FS=y -CONFIG_EXT4_FS_POSIX_ACL=y -CONFIG_EXT4_FS_SECURITY=y CONFIG_EXTCON=y CONFIG_F2FS_FS=y CONFIG_FB=y @@ -257,7 +255,6 @@ CONFIG_FS_ENCRYPTION=y CONFIG_FS_ENCRYPTION_ALGS=y CONFIG_FS_IOMAP=y CONFIG_FS_MBCACHE=y -CONFIG_FS_POSIX_ACL=y CONFIG_FUNCTION_ALIGNMENT=4 CONFIG_FUNCTION_ALIGNMENT_4B=y CONFIG_FWNODE_MDIO=y @@ -587,7 +584,6 @@ CONFIG_THREAD_INFO_IN_TASK=y CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_TIMER_OF=y CONFIG_TIMER_PROBE=y -CONFIG_TMPFS_POSIX_ACL=y CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=y CONFIG_TREE_RCU=y CONFIG_TREE_SRCU=y diff --git a/target/linux/gemini/config-6.6 b/target/linux/gemini/config-6.6 index 87174d292f..a93297a423 100644 --- a/target/linux/gemini/config-6.6 +++ b/target/linux/gemini/config-6.6 @@ -180,7 +180,6 @@ CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set CONFIG_FS_IOMAP=y CONFIG_FS_MBCACHE=y -CONFIG_FS_POSIX_ACL=y CONFIG_FTTMR010_TIMER=y CONFIG_FTWDT010_WATCHDOG=y CONFIG_FUNCTION_ALIGNMENT=0 @@ -431,7 +430,6 @@ CONFIG_THREAD_INFO_IN_TASK=y CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_TIMER_OF=y CONFIG_TIMER_PROBE=y -CONFIG_TMPFS_POSIX_ACL=y CONFIG_TREE_RCU=y CONFIG_TREE_SRCU=y CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" diff --git a/target/linux/imx/config-6.6 b/target/linux/imx/config-6.6 index 6edc3560b4..6cb1d8a8f6 100644 --- a/target/linux/imx/config-6.6 +++ b/target/linux/imx/config-6.6 @@ -186,8 +186,6 @@ CONFIG_EDAC_SUPPORT=y CONFIG_ENCRYPTED_KEYS=y CONFIG_EXCLUSIVE_SYSTEM_RAM=y CONFIG_EXT4_FS=y -CONFIG_EXT4_FS_POSIX_ACL=y -CONFIG_EXT4_FS_SECURITY=y CONFIG_EXTCON=y CONFIG_F2FS_FS=y CONFIG_FEC=y @@ -199,7 +197,6 @@ CONFIG_FS_ENCRYPTION=y CONFIG_FS_ENCRYPTION_ALGS=y CONFIG_FS_IOMAP=y CONFIG_FS_MBCACHE=y -CONFIG_FS_POSIX_ACL=y CONFIG_FWNODE_MDIO=y CONFIG_FW_LOADER_PAGED_BUF=y CONFIG_FW_LOADER_SYSFS=y diff --git a/target/linux/layerscape/armv7/config-6.1 b/target/linux/layerscape/armv7/config-6.1 index d60e5824db..6606d53e95 100644 --- a/target/linux/layerscape/armv7/config-6.1 +++ b/target/linux/layerscape/armv7/config-6.1 @@ -205,8 +205,6 @@ CONFIG_ELF_CORE=y # CONFIG_ENABLE_DEFAULT_TRACERS is not set CONFIG_EXCLUSIVE_SYSTEM_RAM=y CONFIG_EXT4_FS=y -CONFIG_EXT4_FS_POSIX_ACL=y -CONFIG_EXT4_FS_SECURITY=y CONFIG_F2FS_FS=y CONFIG_FAILOVER=y CONFIG_FAT_FS=y @@ -225,7 +223,6 @@ CONFIG_FSL_RCPM=y CONFIG_FSL_XGMAC_MDIO=y CONFIG_FS_IOMAP=y CONFIG_FS_MBCACHE=y -CONFIG_FS_POSIX_ACL=y CONFIG_FTRACE=y # CONFIG_FTRACE_SYSCALLS is not set CONFIG_FUSE_FS=y @@ -645,7 +642,6 @@ CONFIG_THREAD_INFO_IN_TASK=y CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_TIMER_OF=y CONFIG_TIMER_PROBE=y -CONFIG_TMPFS_POSIX_ACL=y CONFIG_TREE_RCU=y CONFIG_TREE_SRCU=y CONFIG_UBIFS_FS=y diff --git a/target/linux/layerscape/armv7/config-6.6 b/target/linux/layerscape/armv7/config-6.6 index 63c49df174..ee397fc7c6 100644 --- a/target/linux/layerscape/armv7/config-6.6 +++ b/target/linux/layerscape/armv7/config-6.6 @@ -206,8 +206,6 @@ CONFIG_ELF_CORE=y # CONFIG_ENABLE_DEFAULT_TRACERS is not set CONFIG_EXCLUSIVE_SYSTEM_RAM=y CONFIG_EXT4_FS=y -CONFIG_EXT4_FS_POSIX_ACL=y -CONFIG_EXT4_FS_SECURITY=y CONFIG_F2FS_FS=y CONFIG_FAILOVER=y CONFIG_FAT_FS=y @@ -225,7 +223,6 @@ CONFIG_FSL_RCPM=y CONFIG_FSL_XGMAC_MDIO=y CONFIG_FS_IOMAP=y CONFIG_FS_MBCACHE=y -CONFIG_FS_POSIX_ACL=y CONFIG_FTRACE=y # CONFIG_FTRACE_SYSCALLS is not set CONFIG_FUNCTION_ALIGNMENT=0 @@ -652,7 +649,6 @@ CONFIG_THREAD_INFO_IN_TASK=y CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_TIMER_OF=y CONFIG_TIMER_PROBE=y -CONFIG_TMPFS_POSIX_ACL=y CONFIG_TREE_RCU=y CONFIG_TREE_SRCU=y CONFIG_UBIFS_FS=y diff --git a/target/linux/layerscape/armv8_64b/config-6.1 b/target/linux/layerscape/armv8_64b/config-6.1 index 3192aa56a6..d0b71a91f1 100644 --- a/target/linux/layerscape/armv8_64b/config-6.1 +++ b/target/linux/layerscape/armv8_64b/config-6.1 @@ -255,8 +255,6 @@ CONFIG_ELF_CORE=y # CONFIG_EMBEDDED is not set CONFIG_EXCLUSIVE_SYSTEM_RAM=y CONFIG_EXT4_FS=y -CONFIG_EXT4_FS_POSIX_ACL=y -CONFIG_EXT4_FS_SECURITY=y CONFIG_EXTCON=y CONFIG_EXTCON_USB_GPIO=y CONFIG_F2FS_FS=y @@ -313,7 +311,6 @@ CONFIG_FSL_RCPM=y CONFIG_FSL_XGMAC_MDIO=y CONFIG_FS_IOMAP=y CONFIG_FS_MBCACHE=y -CONFIG_FS_POSIX_ACL=y CONFIG_FUSE_FS=y CONFIG_FWNODE_MDIO=y CONFIG_FW_CACHE=y @@ -788,7 +785,6 @@ CONFIG_THREAD_INFO_IN_TASK=y CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_TIMER_OF=y CONFIG_TIMER_PROBE=y -CONFIG_TMPFS_POSIX_ACL=y CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=y CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y @@ -879,7 +875,6 @@ CONFIG_XEN_SYS_HYPERVISOR=y # CONFIG_XEN_WDT is not set CONFIG_XEN_XENBUS_FRONTEND=y CONFIG_XFS_FS=y -CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_RT=y CONFIG_XOR_BLOCKS=y CONFIG_XPS=y diff --git a/target/linux/layerscape/armv8_64b/config-6.6 b/target/linux/layerscape/armv8_64b/config-6.6 index aab2dc816b..3c052edb7d 100644 --- a/target/linux/layerscape/armv8_64b/config-6.6 +++ b/target/linux/layerscape/armv8_64b/config-6.6 @@ -262,8 +262,6 @@ CONFIG_EEPROM_AT24=y CONFIG_ELF_CORE=y CONFIG_EXCLUSIVE_SYSTEM_RAM=y CONFIG_EXT4_FS=y -CONFIG_EXT4_FS_POSIX_ACL=y -CONFIG_EXT4_FS_SECURITY=y CONFIG_EXTCON=y CONFIG_EXTCON_USB_GPIO=y CONFIG_F2FS_FS=y @@ -323,7 +321,6 @@ CONFIG_FSL_RCPM=y CONFIG_FSL_XGMAC_MDIO=y CONFIG_FS_IOMAP=y CONFIG_FS_MBCACHE=y -CONFIG_FS_POSIX_ACL=y CONFIG_FUNCTION_ALIGNMENT=4 CONFIG_FUNCTION_ALIGNMENT_4B=y CONFIG_FUSE_FS=y @@ -796,7 +793,6 @@ CONFIG_THREAD_INFO_IN_TASK=y CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_TIMER_OF=y CONFIG_TIMER_PROBE=y -CONFIG_TMPFS_POSIX_ACL=y CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=y CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y @@ -889,7 +885,6 @@ CONFIG_XEN_SYS_HYPERVISOR=y # CONFIG_XEN_WDT is not set CONFIG_XEN_XENBUS_FRONTEND=y CONFIG_XFS_FS=y -CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_RT=y CONFIG_XOR_BLOCKS=y CONFIG_XPS=y diff --git a/target/linux/loongarch64/config-6.6 b/target/linux/loongarch64/config-6.6 index 6f637a6f01..46a90c1284 100644 --- a/target/linux/loongarch64/config-6.6 +++ b/target/linux/loongarch64/config-6.6 @@ -234,8 +234,6 @@ CONFIG_ENCRYPTED_KEYS=y CONFIG_EXCLUSIVE_SYSTEM_RAM=y CONFIG_EXPORTFS_BLOCK_OPS=y CONFIG_EXT4_FS=y -CONFIG_EXT4_FS_POSIX_ACL=y -CONFIG_EXT4_FS_SECURITY=y CONFIG_FAILOVER=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_FANOTIFY=y @@ -282,7 +280,6 @@ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FREEZER=y CONFIG_FS_IOMAP=y CONFIG_FS_MBCACHE=y -CONFIG_FS_POSIX_ACL=y CONFIG_FUNCTION_ALIGNMENT=0 CONFIG_FW_CACHE=y # CONFIG_FW_DEVLINK_SYNC_STATE_TIMEOUT is not set @@ -752,7 +749,6 @@ CONFIG_THERMAL_STATISTICS=y CONFIG_THERMAL_WRITABLE_TRIPS=y CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_TMPFS_INODE64=y -CONFIG_TMPFS_POSIX_ACL=y # CONFIG_TMPFS_QUOTA is not set CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y diff --git a/target/linux/malta/config-6.6 b/target/linux/malta/config-6.6 index 7c72f49265..73db6cea21 100644 --- a/target/linux/malta/config-6.6 +++ b/target/linux/malta/config-6.6 @@ -81,7 +81,6 @@ CONFIG_EXT4_FS=y CONFIG_F2FS_FS=y CONFIG_FS_IOMAP=y CONFIG_FS_MBCACHE=y -CONFIG_FS_POSIX_ACL=y CONFIG_FUNCTION_ALIGNMENT=0 CONFIG_FW_LOADER_PAGED_BUF=y CONFIG_FW_LOADER_SYSFS=y @@ -131,8 +130,6 @@ CONFIG_IRQ_MIPS_CPU=y CONFIG_IRQ_WORK=y CONFIG_ISA_DMA_API=y CONFIG_JBD2=y -CONFIG_JFFS2_FS_POSIX_ACL=y -CONFIG_JFFS2_FS_SECURITY=y CONFIG_KALLSYMS=y CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_XZ is not set diff --git a/target/linux/omap/config-6.1 b/target/linux/omap/config-6.1 index d5ed19afe1..94c6b5922d 100644 --- a/target/linux/omap/config-6.1 +++ b/target/linux/omap/config-6.1 @@ -234,7 +234,6 @@ CONFIG_FIXED_PHY=y CONFIG_FIX_EARLYCON_MEM=y CONFIG_FS_IOMAP=y CONFIG_FS_MBCACHE=y -CONFIG_FS_POSIX_ACL=y CONFIG_FWNODE_MDIO=y CONFIG_FW_LOADER_PAGED_BUF=y CONFIG_FW_LOADER_SYSFS=y @@ -655,7 +654,6 @@ CONFIG_TI_PWMSS=y CONFIG_TI_SOC_THERMAL=y CONFIG_TI_SYSC=y CONFIG_TI_THERMAL=y -CONFIG_TMPFS_POSIX_ACL=y CONFIG_TREE_RCU=y CONFIG_TREE_SRCU=y CONFIG_TWL4030_CORE=y diff --git a/target/linux/pistachio/config-6.1 b/target/linux/pistachio/config-6.1 index 926b5e67f7..54145cd1f4 100644 --- a/target/linux/pistachio/config-6.1 +++ b/target/linux/pistachio/config-6.1 @@ -83,7 +83,6 @@ CONFIG_FIT_IMAGE_FDT_MARDUK=y CONFIG_FIXED_PHY=y CONFIG_FS_IOMAP=y CONFIG_FS_MBCACHE=y -CONFIG_FS_POSIX_ACL=y CONFIG_FWNODE_MDIO=y CONFIG_FW_LOADER_PAGED_BUF=y CONFIG_GENERIC_ALLOCATOR=y @@ -304,7 +303,6 @@ CONFIG_TARGET_ISA_REV=2 CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_TIMER_OF=y CONFIG_TIMER_PROBE=y -CONFIG_TMPFS_POSIX_ACL=y CONFIG_TREE_RCU=y CONFIG_TREE_SRCU=y CONFIG_UBIFS_FS=y diff --git a/target/linux/pistachio/config-6.6 b/target/linux/pistachio/config-6.6 index f1b98868e0..80ff36ebbb 100644 --- a/target/linux/pistachio/config-6.6 +++ b/target/linux/pistachio/config-6.6 @@ -98,7 +98,6 @@ CONFIG_FIT_IMAGE_FDT_MARDUK=y CONFIG_FIXED_PHY=y CONFIG_FS_IOMAP=y CONFIG_FS_MBCACHE=y -CONFIG_FS_POSIX_ACL=y CONFIG_FUNCTION_ALIGNMENT=0 CONFIG_FWNODE_MDIO=y CONFIG_FW_LOADER_PAGED_BUF=y @@ -333,7 +332,6 @@ CONFIG_TARGET_ISA_REV=2 CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_TIMER_OF=y CONFIG_TIMER_PROBE=y -CONFIG_TMPFS_POSIX_ACL=y CONFIG_TREE_RCU=y CONFIG_TREE_SRCU=y CONFIG_UBIFS_FS=y diff --git a/target/linux/qoriq/config-6.1 b/target/linux/qoriq/config-6.1 index bf3b2cfae8..4d803ffa80 100644 --- a/target/linux/qoriq/config-6.1 +++ b/target/linux/qoriq/config-6.1 @@ -115,7 +115,6 @@ CONFIG_EDAC_SUPPORT=y CONFIG_EPAPR_PARAVIRT=y CONFIG_EXCLUSIVE_SYSTEM_RAM=y CONFIG_EXT4_FS=y -CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_F2FS_FS=y CONFIG_FIXED_PHY=y # CONFIG_FSL_BMAN_TEST is not set @@ -139,7 +138,6 @@ CONFIG_FSL_SOC_BOOKE=y CONFIG_FSL_XGMAC_MDIO=y CONFIG_FS_IOMAP=y CONFIG_FS_MBCACHE=y -CONFIG_FS_POSIX_ACL=y CONFIG_FTL=y CONFIG_FUNCTION_ERROR_INJECTION=y CONFIG_FWNODE_MDIO=y diff --git a/target/linux/qoriq/config-6.6 b/target/linux/qoriq/config-6.6 index 6c661c0339..3f42563db1 100644 --- a/target/linux/qoriq/config-6.6 +++ b/target/linux/qoriq/config-6.6 @@ -118,7 +118,6 @@ CONFIG_EDAC_SUPPORT=y CONFIG_EPAPR_PARAVIRT=y CONFIG_EXCLUSIVE_SYSTEM_RAM=y CONFIG_EXT4_FS=y -CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_F2FS_FS=y CONFIG_FIXED_PHY=y # CONFIG_FSL_BMAN_TEST is not set @@ -143,7 +142,6 @@ CONFIG_FSL_SOC_BOOKE=y CONFIG_FSL_XGMAC_MDIO=y CONFIG_FS_IOMAP=y CONFIG_FS_MBCACHE=y -CONFIG_FS_POSIX_ACL=y CONFIG_FTL=y CONFIG_FUNCTION_ALIGNMENT=0 CONFIG_FUNCTION_ERROR_INJECTION=y diff --git a/target/linux/rockchip/armv8/config-6.6 b/target/linux/rockchip/armv8/config-6.6 index 4c2bb833dd..c92f2b1c48 100644 --- a/target/linux/rockchip/armv8/config-6.6 +++ b/target/linux/rockchip/armv8/config-6.6 @@ -245,7 +245,6 @@ CONFIG_EMAC_ROCKCHIP=y CONFIG_ENERGY_MODEL=y CONFIG_EXCLUSIVE_SYSTEM_RAM=y CONFIG_EXT4_FS=y -CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXTCON=y CONFIG_F2FS_FS=y CONFIG_FANOTIFY=y @@ -256,7 +255,6 @@ CONFIG_FIX_EARLYCON_MEM=y CONFIG_FRAME_POINTER=y CONFIG_FS_IOMAP=y CONFIG_FS_MBCACHE=y -CONFIG_FS_POSIX_ACL=y CONFIG_FUNCTION_ALIGNMENT=4 CONFIG_FUNCTION_ALIGNMENT_4B=y CONFIG_FWNODE_MDIO=y diff --git a/target/linux/starfive/config-6.1 b/target/linux/starfive/config-6.1 index 6da229ddb5..645bea8c51 100644 --- a/target/linux/starfive/config-6.1 +++ b/target/linux/starfive/config-6.1 @@ -166,7 +166,6 @@ CONFIG_ERRATA_SIFIVE_CIP_453=y # CONFIG_ERRATA_THEAD is not set CONFIG_EXCLUSIVE_SYSTEM_RAM=y CONFIG_EXT4_FS=y -CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXTCON=y CONFIG_FAILOVER=y CONFIG_FANOTIFY=y @@ -181,7 +180,6 @@ CONFIG_FONT_SUPPORT=y CONFIG_FPU=y CONFIG_FS_IOMAP=y CONFIG_FS_MBCACHE=y -CONFIG_FS_POSIX_ACL=y CONFIG_FWNODE_MDIO=y CONFIG_FW_LOADER_PAGED_BUF=y CONFIG_FW_LOADER_SYSFS=y @@ -498,7 +496,6 @@ CONFIG_THREAD_INFO_IN_TASK=y CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_TIMER_OF=y CONFIG_TIMER_PROBE=y -CONFIG_TMPFS_POSIX_ACL=y CONFIG_TOOLCHAIN_HAS_ZICBOM=y CONFIG_TOOLCHAIN_HAS_ZIHINTPAUSE=y CONFIG_TOOLCHAIN_NEEDS_EXPLICIT_ZICSR_ZIFENCEI=y diff --git a/target/linux/starfive/config-6.6 b/target/linux/starfive/config-6.6 index 3f1f1e4802..cb39210a42 100644 --- a/target/linux/starfive/config-6.6 +++ b/target/linux/starfive/config-6.6 @@ -173,7 +173,6 @@ CONFIG_ERRATA_SIFIVE_CIP_453=y # CONFIG_ERRATA_THEAD is not set CONFIG_EXCLUSIVE_SYSTEM_RAM=y CONFIG_EXT4_FS=y -CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXTCON=y CONFIG_FAILOVER=y CONFIG_FANOTIFY=y @@ -188,7 +187,6 @@ CONFIG_FONT_SUPPORT=y CONFIG_FPU=y CONFIG_FS_IOMAP=y CONFIG_FS_MBCACHE=y -CONFIG_FS_POSIX_ACL=y CONFIG_FWNODE_MDIO=y CONFIG_FW_LOADER_PAGED_BUF=y CONFIG_FW_LOADER_SYSFS=y @@ -522,7 +520,6 @@ CONFIG_THREAD_SIZE_ORDER=2 CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_TIMER_OF=y CONFIG_TIMER_PROBE=y -CONFIG_TMPFS_POSIX_ACL=y CONFIG_TOOLCHAIN_HAS_ZICBOM=y CONFIG_TOOLCHAIN_HAS_ZIHINTPAUSE=y CONFIG_TOOLCHAIN_NEEDS_EXPLICIT_ZICSR_ZIFENCEI=y diff --git a/target/linux/sunxi/config-6.6 b/target/linux/sunxi/config-6.6 index 3e73f44c90..6a31400b48 100644 --- a/target/linux/sunxi/config-6.6 +++ b/target/linux/sunxi/config-6.6 @@ -168,7 +168,6 @@ CONFIG_FRAME_WARN=2048 CONFIG_FREEZER=y CONFIG_FS_IOMAP=y CONFIG_FS_MBCACHE=y -CONFIG_FS_POSIX_ACL=y CONFIG_FWNODE_MDIO=y CONFIG_FW_CACHE=y CONFIG_FW_LOADER_PAGED_BUF=y @@ -482,7 +481,6 @@ CONFIG_THERMAL_OF=y CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_TIMER_OF=y CONFIG_TIMER_PROBE=y -CONFIG_TMPFS_POSIX_ACL=y CONFIG_TOUCHSCREEN_SUN4I=y CONFIG_TREE_RCU=y CONFIG_TREE_SRCU=y From 2a1dd184b7d78d5c37a0c9a34b13ec69a4b16e04 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Fri, 6 Sep 2024 23:10:45 +0200 Subject: [PATCH 08/11] kernel: Activate POSIX ACL for f2fs, jffs2 and tmpfs When CONFIG_USE_FS_ACL_ATTR is set we will also activate POSIX ACL support for the f2fs, jffs2 and tmpfs file system. This option is activated on all targets with big flash. Link: https://github.com/openwrt/openwrt/pull/16181 Signed-off-by: Hauke Mehrtens --- config/Config-kernel.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/config/Config-kernel.in b/config/Config-kernel.in index fdc5850bde..4bd2cde135 100644 --- a/config/Config-kernel.in +++ b/config/Config-kernel.in @@ -1250,8 +1250,8 @@ menu "Filesystem ACL and attr support options" default y if !SMALL_FLASH help Make using ACLs (e.g. POSIX ACL, NFSv4 ACL) the default - for kernel and packages, except tmpfs, flash filesystems, - and old NFS. Also enable userspace extended attribute support + for kernel and packages, except old NFS. + Also enable userspace extended attribute support by default. (OpenWrt already has an expection it will be present in the kernel). @@ -1272,14 +1272,17 @@ menu "Filesystem ACL and attr support options" config KERNEL_F2FS_FS_POSIX_ACL bool "Enable POSIX ACL for F2FS Filesystems" select KERNEL_FS_POSIX_ACL + default y if USE_FS_ACL_ATTR config KERNEL_JFFS2_FS_POSIX_ACL bool "Enable POSIX ACL for JFFS2 Filesystems" select KERNEL_FS_POSIX_ACL + default y if USE_FS_ACL_ATTR config KERNEL_TMPFS_POSIX_ACL bool "Enable POSIX ACL for TMPFS Filesystems" select KERNEL_FS_POSIX_ACL + default y if USE_FS_ACL_ATTR config KERNEL_CIFS_ACL bool "Enable CIFS ACLs" From 01ae39a0b2db32497ef3df75f4eee2aabd4f7c53 Mon Sep 17 00:00:00 2001 From: Christian Svensson Date: Sat, 3 Aug 2024 18:07:41 +0200 Subject: [PATCH 09/11] wireguard-tools: accept iproute2 as dependency If the user has ip-tiny or ip-full installed there is no need to depend on BusyBox having any form of `ip` or `ip link` applets. Signed-off-by: Christian Svensson Link: https://github.com/openwrt/openwrt/pull/16062 Signed-off-by: Hauke Mehrtens --- package/network/utils/wireguard-tools/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/network/utils/wireguard-tools/Makefile b/package/network/utils/wireguard-tools/Makefile index e2a86c97d8..d704577d2c 100644 --- a/package/network/utils/wireguard-tools/Makefile +++ b/package/network/utils/wireguard-tools/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wireguard-tools PKG_VERSION:=1.0.20210914 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=wireguard-tools-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://git.zx2c4.com/wireguard-tools/snapshot/ @@ -35,8 +35,8 @@ define Package/wireguard-tools MAINTAINER:=Jason A. Donenfeld TITLE:=WireGuard userspace control program (wg) DEPENDS:= \ - +@BUSYBOX_CONFIG_IP \ - +@BUSYBOX_CONFIG_FEATURE_IP_LINK \ + +!BUSYBOX_CONFIG_IP:ip \ + +!BUSYBOX_CONFIG_FEATURE_IP_LINK:ip \ +kmod-wireguard endef From 2b2a98b3eb0da3eb03ee8da05b88a448c3da2f0e Mon Sep 17 00:00:00 2001 From: Ivan Pavlov Date: Mon, 2 Sep 2024 10:46:12 +0300 Subject: [PATCH 10/11] uboot-envtools: add u-boot system env config for Xiaomi Redmi AX6S Adds u-boot config for access to system env variables on this board Signed-off-by: Ivan Pavlov Link: https://github.com/openwrt/openwrt/pull/16312 Signed-off-by: Hauke Mehrtens --- package/boot/uboot-envtools/files/mediatek_mt7622 | 1 + 1 file changed, 1 insertion(+) diff --git a/package/boot/uboot-envtools/files/mediatek_mt7622 b/package/boot/uboot-envtools/files/mediatek_mt7622 index 020c800e58..fd40b664e4 100644 --- a/package/boot/uboot-envtools/files/mediatek_mt7622 +++ b/package/boot/uboot-envtools/files/mediatek_mt7622 @@ -62,6 +62,7 @@ ubnt,unifi-6-lr-v3) ;; xiaomi,redmi-router-ax6s) ubootenv_add_uci_config "/dev/mtd3" "0x0" "0x10000" "0x40000" + ubootenv_add_uci_sys_config "/dev/mtd4" "0x0" "0x10000" "0x40000" ;; esac From 62d3773bf19a3e2f39935c08a8b5b2186777f314 Mon Sep 17 00:00:00 2001 From: Ivan Pavlov Date: Thu, 5 Sep 2024 11:21:57 +0300 Subject: [PATCH 11/11] openssl: update to 3.0.15 OpenSSL 3.0.15 is a security patch release. The most severe CVE fixed in this release is Moderate. This release incorporates the following bug fixes and mitigations: * Fixed possible denial of service in X.509 name checks (CVE-2024-6119) * Fixed possible buffer overread in SSL_select_next_proto() (CVE-2024-5535) Added github releases url as source mirror Signed-off-by: Ivan Pavlov Link: https://github.com/openwrt/openwrt/pull/16332 Signed-off-by: Hauke Mehrtens --- package/libs/openssl/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile index 82784dddde..554cde7a2d 100644 --- a/package/libs/openssl/Makefile +++ b/package/libs/openssl/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openssl -PKG_VERSION:=3.0.14 -PKG_RELEASE:=2 +PKG_VERSION:=3.0.15 +PKG_RELEASE:=1 PKG_BUILD_FLAGS:=no-mips16 gc-sections no-lto PKG_BUILD_PARALLEL:=1 @@ -19,12 +19,13 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:= \ http://www.openssl.org/source/ \ http://www.openssl.org/source/old/$(PKG_BASE)/ \ + https://github.com/openssl/openssl/releases/download/$(PKG_NAME)-$(PKG_VERSION)/ \ http://ftp.fi.muni.cz/pub/openssl/source/ \ http://ftp.fi.muni.cz/pub/openssl/source/old/$(PKG_BASE)/ \ ftp://ftp.pca.dfn.de/pub/tools/net/openssl/source/ \ ftp://ftp.pca.dfn.de/pub/tools/net/openssl/source/old/$(PKG_BASE)/ -PKG_HASH:=eeca035d4dd4e84fc25846d952da6297484afa0650a6f84c682e39df3a4123ca +PKG_HASH:=23c666d0edf20f14249b3d8f0368acaee9ab585b09e1de82107c66e1f3ec9533 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE