From edbd8d2e9839357f3a4f0a06174d243f362b1544 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Fri, 4 Feb 2022 23:20:16 +0800 Subject: [PATCH 01/32] ipq807x: drop all xiaomi devices support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 我只是执行者，有问题请找 “Redmi ax6 机友会”（522966467）里面的群主 和陈超（269806631）等狗管理和伪君子反馈。 I'm just an executor. If you have any questions, please contact the group owner and Chen Chao (269806631) management and hypocrites in the "Redmi ax6 Friends Club" (522966467) for feedback. 私はただの遺言執行者です。ご不明な点がございましたら、グループのオ ーナーである Chen Chao（269806631）や、「Redmi ax6 Friends Club」 （522966467）の他のマネージャーや偽善者にお問い合わせください。 Unanimous approval from the entire development team. Ref: https://t.me/chenchao_rip/4 Cc: lean Cc: asushugo <429632952@163.com> CC: CN_SZTL Cc: AmadeusGhost --- package/firmware/ipq-wifi/Makefile | 6 - .../firmware/ipq-wifi/board-redmi_ax6.ipq8074 | Bin 131172 -> 0 bytes .../ipq-wifi/board-xiaomi_ax3600.ipq8074 | Bin 131176 -> 0 bytes .../ipq-wifi/board-xiaomi_ax3600.qca9889 | Bin 2260 -> 0 bytes .../ipq-wifi/board-xiaomi_ax9000.ipq8074 | Bin 131176 -> 0 bytes .../ipq807x/base-files/etc/board.d/01_leds | 4 - .../ipq807x/base-files/etc/board.d/02_network | 4 - .../etc/hotplug.d/firmware/11-ath10k-caldata | 20 - .../etc/hotplug.d/firmware/11-ath11k-caldata | 5 +- .../base-files/lib/upgrade/platform.sh | 28 - .../arm64/boot/dts/qcom/ipq8071-ax3600.dts | 71 --- .../arm64/boot/dts/qcom/ipq8071-ax3600.dtsi | 498 ------------------ .../arch/arm64/boot/dts/qcom/ipq8071-ax6.dts | 39 -- target/linux/ipq807x/image/generic.mk | 22 - .../900-arm64-dts-add-OpenWrt-DTS-files.patch | 4 +- 15 files changed, 2 insertions(+), 699 deletions(-) delete mode 100644 package/firmware/ipq-wifi/board-redmi_ax6.ipq8074 delete mode 100644 package/firmware/ipq-wifi/board-xiaomi_ax3600.ipq8074 delete mode 100644 package/firmware/ipq-wifi/board-xiaomi_ax3600.qca9889 delete mode 100644 package/firmware/ipq-wifi/board-xiaomi_ax9000.ipq8074 delete mode 100644 target/linux/ipq807x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata delete mode 100644 target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/ipq8071-ax3600.dts delete mode 100644 target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/ipq8071-ax3600.dtsi delete mode 100644 target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/ipq8071-ax6.dts diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile index eb10e2171..d56a18265 100644 --- a/package/firmware/ipq-wifi/Makefile +++ b/package/firmware/ipq-wifi/Makefile @@ -57,9 +57,6 @@ ALLWIFIBOARDS:= \ p2w_r619ac \ qnap_301w \ qxwlan_e2600ac \ - redmi_ax6 \ - xiaomi_ax3600 \ - xiaomi_ax9000 \ zte_mf263 \ zte_mf269 @@ -163,9 +160,6 @@ $(eval $(call generate-ipq-wifi-package,plasmacloud_pa2200,Plasma Cloud PA2200)) $(eval $(call generate-ipq-wifi-package,p2w_r619ac,P&W R619AC)) $(eval $(call generate-ipq-wifi-package,qnap_301w,QNAP 301w)) $(eval $(call generate-ipq-wifi-package,qxwlan_e2600ac,Qxwlan E2600AC)) -$(eval $(call generate-ipq-wifi-package,redmi_ax6,Redmi AX6)) -$(eval $(call generate-ipq-wifi-package,xiaomi_ax3600,Xiaomi AX3600)) -$(eval $(call generate-ipq-wifi-package,xiaomi_ax9000,Xiaomi AX9000)) $(eval $(call generate-ipq-wifi-package,zte_mf263,ZTE MF263)) $(eval $(call generate-ipq-wifi-package,zte_mf269,ZTE MF269)) diff --git a/package/firmware/ipq-wifi/board-redmi_ax6.ipq8074 b/package/firmware/ipq-wifi/board-redmi_ax6.ipq8074 deleted file mode 100644 index 98ed9c6f65961ad496025053b64b5c340bda8d36..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 131172 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 diff --git a/package/firmware/ipq-wifi/board-xiaomi_ax3600.ipq8074 b/package/firmware/ipq-wifi/board-xiaomi_ax3600.ipq8074 deleted file mode 100644 index db8ef4cefbb50a6df27ebe3554e2d27cb72a88ec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 131176 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 diff --git a/package/firmware/ipq-wifi/board-xiaomi_ax3600.qca9889 b/package/firmware/ipq-wifi/board-xiaomi_ax3600.qca9889 deleted file mode 100644 index af4405cd53cb9ca94b9fd2b75856bf84ac0d22cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2260 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 */ - -/dts-v1/; - -#include "ipq8071-ax3600.dtsi" - -/ { - model = "Xiaomi AX3600"; - compatible = "xiaomi,ax3600", "qcom,ipq8074"; - - leds { - compatible = "gpio-leds"; - - led_system_blue: system-blue { - label = "blue:system"; - gpios = <&tlmm 42 GPIO_ACTIVE_HIGH>; - }; - - led_system_yellow: system-yellow { - label = "yellow:system"; - gpios = <&tlmm 43 GPIO_ACTIVE_HIGH>; - }; - - network-yellow { - label = "yellow:network"; - gpios = <&tlmm 22 GPIO_ACTIVE_HIGH>; - }; - - network-blue { - label = "blue:network"; - gpios = <&tlmm 21 GPIO_ACTIVE_HIGH>; - }; - - aiot { - label = "blue:aiot"; - gpios = <&tlmm 51 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "phy0tpt"; - }; - }; -}; - -&qmp_pcie_phy0 { - status = "okay"; -}; - -&pcie0 { - status = "okay"; - - perst-gpio = <&tlmm 52 GPIO_ACTIVE_HIGH>; - - bridge@0,0 { - reg = <0x00000000 0 0 0 0>; - #address-cells = <3>; - #size-cells = <2>; - ranges; - - wifi0: wifi@1,0 { - status = "okay"; - - compatible = "qcom,ath10k"; - reg = <0x00010000 0 0 0 0>; - - qcom,ath10k-calibration-variant = "Xiaomi-AX3600"; - }; - }; -}; - -&wifi { - qcom,ath11k-calibration-variant = "Xiaomi-AX3600"; -}; diff --git a/target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/ipq8071-ax3600.dtsi b/target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/ipq8071-ax3600.dtsi deleted file mode 100644 index 4d93bda5c..000000000 --- a/target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/ipq8071-ax3600.dtsi +++ /dev/null @@ -1,498 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later OR MIT -/* Copyright (c) 2021, Robert Marko */ - -#include "ipq8074.dtsi" -#include "ipq8074-ac-cpu.dtsi" -#include "ipq8074-ac-nss.dtsi" -#include "ipq8074-memory-512m.dtsi" -#include -#include - -/ { - #address-cells = <2>; - #size-cells = <2>; - - interrupt-parent = <&intc>; - - aliases { - serial0 = &blsp1_uart5; - led-boot = &led_system_yellow; - led-failsafe = &led_system_yellow; - led-running = &led_system_blue; - led-upgrade = &led_system_yellow; - /* Aliases as required by u-boot to patch MAC addresses */ - ethernet1 = &dp2; - ethernet2 = &dp3; - ethernet3 = &dp4; - ethernet4 = &dp5; - label-mac-device = &dp2; - }; - - chosen { - stdout-path = "serial0:115200n8"; - bootargs-append = " root=/dev/ubiblock0_1"; - }; - - keys { - compatible = "gpio-keys"; - - reset { - label = "reset"; - gpios = <&tlmm 34 GPIO_ACTIVE_LOW>; - linux,code = ; - }; - }; - - reserved-memory { - /delete-node/ tzapp@4a400000; - /delete-node/ q6_etr_dump@50f00000; - /delete-node/ m3_dump@51000000; - }; -}; - -&tlmm { - mdio_pins: mdio-pins { - mdc { - pins = "gpio68"; - function = "mdc"; - drive-strength = <8>; - bias-pull-up; - }; - - mdio { - pins = "gpio69"; - function = "mdio"; - drive-strength = <8>; - bias-pull-up; - }; - }; -}; - -&blsp1_uart5 { - status = "okay"; -}; - -&prng { - status = "okay"; -}; - -&cryptobam { - status = "okay"; -}; - -&crypto { - status = "okay"; -}; - -&qpic_bam { - status = "okay"; -}; - -&qpic_nand { - status = "okay"; - - nand@0 { - reg = <0>; - nand-ecc-strength = <4>; - nand-ecc-step-size = <512>; - nand-bus-width = <8>; - - partitions { - compatible = "qcom,smem-part"; - }; - }; -}; - -&mdio { - status = "okay"; - - pinctrl-0 = <&mdio_pins>; - pinctrl-names = "default"; - /* - * Disable the reset GPIO temporarely as it - * resets the 100Mbit LED configuration which - * the bootloader writes. - */ - //reset-gpios = <&tlmm 37 GPIO_ACTIVE_LOW>; - - ethernet-phy@1 { - reg = <1>; - }; - - ethernet-phy@2 { - reg = <2>; - }; - - ethernet-phy@3 { - reg = <3>; - }; - - ethernet-phy@4 { - reg = <4>; - }; -}; - -&ess_switch { - switch_cpu_bmp = <0x1>; /* cpu port bitmap */ - switch_lan_bmp = <0x1e>; /* lan port bitmap */ - switch_wan_bmp = <0x20>; /* wan port bitmap */ - switch_mac_mode = <0x0>; /* mac mode for uniphy instance0*/ - switch_mac_mode1 = <0xff>; /* mac mode for uniphy instance1*/ - switch_mac_mode2 = <0xff>; /* mac mode for uniphy instance2*/ - bm_tick_mode = <0>; /* bm tick mode */ - tm_tick_mode = <0>; /* tm tick mode */ - qcom,port_phyinfo { - port@0 { - port_id = <1>; - phy_address = <0>; - }; - port@1 { - port_id = <2>; - phy_address = <1>; - }; - port@2 { - port_id = <3>; - phy_address = <2>; - }; - port@3 { - port_id = <4>; - phy_address = <3>; - }; - port@4 { - port_id = <5>; - phy_address = <4>; - }; - }; - port_scheduler_resource { - port@0 { - port_id = <0>; - ucast_queue = <0 143>; - mcast_queue = <256 271>; - l0sp = <0 35>; - l0cdrr = <0 47>; - l0edrr = <0 47>; - l1cdrr = <0 7>; - l1edrr = <0 7>; - }; - port@1 { - port_id = <1>; - ucast_queue = <144 159>; - mcast_queue = <272 275>; - l0sp = <36 39>; - l0cdrr = <48 63>; - l0edrr = <48 63>; - l1cdrr = <8 11>; - l1edrr = <8 11>; - }; - port@2 { - port_id = <2>; - ucast_queue = <160 175>; - mcast_queue = <276 279>; - l0sp = <40 43>; - l0cdrr = <64 79>; - l0edrr = <64 79>; - l1cdrr = <12 15>; - l1edrr = <12 15>; - }; - port@3 { - port_id = <3>; - ucast_queue = <176 191>; - mcast_queue = <280 283>; - l0sp = <44 47>; - l0cdrr = <80 95>; - l0edrr = <80 95>; - l1cdrr = <16 19>; - l1edrr = <16 19>; - }; - port@4 { - port_id = <4>; - ucast_queue = <192 207>; - mcast_queue = <284 287>; - l0sp = <48 51>; - l0cdrr = <96 111>; - l0edrr = <96 111>; - l1cdrr = <20 23>; - l1edrr = <20 23>; - }; - port@5 { - port_id = <5>; - ucast_queue = <208 223>; - mcast_queue = <288 291>; - l0sp = <52 55>; - l0cdrr = <112 127>; - l0edrr = <112 127>; - l1cdrr = <24 27>; - l1edrr = <24 27>; - }; - port@6 { - port_id = <6>; - ucast_queue = <224 239>; - mcast_queue = <292 295>; - l0sp = <56 59>; - l0cdrr = <128 143>; - l0edrr = <128 143>; - l1cdrr = <28 31>; - l1edrr = <28 31>; - }; - port@7 { - port_id = <7>; - ucast_queue = <240 255>; - mcast_queue = <296 299>; - l0sp = <60 63>; - l0cdrr = <144 159>; - l0edrr = <144 159>; - l1cdrr = <32 35>; - l1edrr = <32 35>; - }; - }; - port_scheduler_config { - port@0 { - port_id = <0>; - l1scheduler { - group@0 { - sp = <0 1>; /*L0 SPs*/ - /*cpri cdrr epri edrr*/ - cfg = <0 0 0 0>; - }; - }; - l0scheduler { - group@0 { - /*unicast queues*/ - ucast_queue = <0 4 8>; - /*multicast queues*/ - mcast_queue = <256 260>; - /*sp cpri cdrr epri edrr*/ - cfg = <0 0 0 0 0>; - }; - group@1 { - ucast_queue = <1 5 9>; - mcast_queue = <257 261>; - cfg = <0 1 1 1 1>; - }; - group@2 { - ucast_queue = <2 6 10>; - mcast_queue = <258 262>; - cfg = <0 2 2 2 2>; - }; - group@3 { - ucast_queue = <3 7 11>; - mcast_queue = <259 263>; - cfg = <0 3 3 3 3>; - }; - }; - }; - port@1 { - port_id = <1>; - l1scheduler { - group@0 { - sp = <36>; - cfg = <0 8 0 8>; - }; - group@1 { - sp = <37>; - cfg = <1 9 1 9>; - }; - }; - l0scheduler { - group@0 { - ucast_queue = <144>; - ucast_loop_pri = <16>; - mcast_queue = <272>; - mcast_loop_pri = <4>; - cfg = <36 0 48 0 48>; - }; - }; - }; - port@2 { - port_id = <2>; - l1scheduler { - group@0 { - sp = <40>; - cfg = <0 12 0 12>; - }; - group@1 { - sp = <41>; - cfg = <1 13 1 13>; - }; - }; - l0scheduler { - group@0 { - ucast_queue = <160>; - ucast_loop_pri = <16>; - mcast_queue = <276>; - mcast_loop_pri = <4>; - cfg = <40 0 64 0 64>; - }; - }; - }; - port@3 { - port_id = <3>; - l1scheduler { - group@0 { - sp = <44>; - cfg = <0 16 0 16>; - }; - group@1 { - sp = <45>; - cfg = <1 17 1 17>; - }; - }; - l0scheduler { - group@0 { - ucast_queue = <176>; - ucast_loop_pri = <16>; - mcast_queue = <280>; - mcast_loop_pri = <4>; - cfg = <44 0 80 0 80>; - }; - }; - }; - port@4 { - port_id = <4>; - l1scheduler { - group@0 { - sp = <48>; - cfg = <0 20 0 20>; - }; - group@1 { - sp = <49>; - cfg = <1 21 1 21>; - }; - }; - l0scheduler { - group@0 { - ucast_queue = <192>; - ucast_loop_pri = <16>; - mcast_queue = <284>; - mcast_loop_pri = <4>; - cfg = <48 0 96 0 96>; - }; - }; - }; - port@5 { - port_id = <5>; - l1scheduler { - group@0 { - sp = <52>; - cfg = <0 24 0 24>; - }; - group@1 { - sp = <53>; - cfg = <1 25 1 25>; - }; - }; - l0scheduler { - group@0 { - ucast_queue = <208>; - ucast_loop_pri = <16>; - mcast_queue = <288>; - mcast_loop_pri = <4>; - cfg = <52 0 112 0 112>; - }; - }; - }; - port@6 { - port_id = <6>; - l1scheduler { - group@0 { - sp = <56>; - cfg = <0 28 0 28>; - }; - group@1 { - sp = <57>; - cfg = <1 29 1 29>; - }; - }; - l0scheduler { - group@0 { - ucast_queue = <224>; - ucast_loop_pri = <16>; - mcast_queue = <292>; - mcast_loop_pri = <4>; - cfg = <56 0 128 0 128>; - }; - }; - }; - port@7 { - port_id = <7>; - l1scheduler { - group@0 { - sp = <60>; - cfg = <0 32 0 32>; - }; - group@1 { - sp = <61>; - cfg = <1 33 1 33>; - }; - }; - l0scheduler { - group@0 { - ucast_queue = <240>; - ucast_loop_pri = <16>; - mcast_queue = <296>; - cfg = <60 0 144 0 144>; - }; - }; - }; - }; -}; - -&soc { - dp2: dp2 { - device_type = "network"; - compatible = "qcom,nss-dp"; - qcom,id = <2>; - reg = <0x3a001200 0x200>; - qcom,mactype = <0>; - local-mac-address = [000000000000]; - qcom,link-poll = <1>; - qcom,phy-mdio-addr = <1>; - phy-mode = "sgmii"; - mdio-bus = <&mdio>; - }; - - dp3: dp3 { - device_type = "network"; - compatible = "qcom,nss-dp"; - qcom,id = <3>; - reg = <0x3a001400 0x200>; - qcom,mactype = <0>; - local-mac-address = [000000000000]; - qcom,link-poll = <1>; - qcom,phy-mdio-addr = <2>; - phy-mode = "sgmii"; - mdio-bus = <&mdio>; - }; - - dp4: dp4 { - device_type = "network"; - compatible = "qcom,nss-dp"; - qcom,id = <4>; - reg = <0x3a001600 0x200>; - qcom,mactype = <0>; - local-mac-address = [000000000000]; - qcom,link-poll = <1>; - qcom,phy-mdio-addr = <3>; - phy-mode = "sgmii"; - mdio-bus = <&mdio>; - }; - - dp5: dp5 { - device_type = "network"; - compatible = "qcom,nss-dp"; - qcom,id = <5>; - reg = <0x3a001800 0x200>; - qcom,mactype = <0>; - local-mac-address = [000000000000]; - qcom,link-poll = <1>; - qcom,phy-mdio-addr = <4>; - phy-mode = "sgmii"; - mdio-bus = <&mdio>; - }; -}; - -&wifi { - status = "okay"; - - qcom,board_id = <658>; -}; diff --git a/target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/ipq8071-ax6.dts b/target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/ipq8071-ax6.dts deleted file mode 100644 index c66fb95bc..000000000 --- a/target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/ipq8071-ax6.dts +++ /dev/null @@ -1,39 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later OR MIT -/* Copyright (c) 2021, Zhijun You */ - -/dts-v1/; - -#include "ipq8071-ax3600.dtsi" - -/ { - model = "Redmi AX6"; - compatible = "redmi,ax6", "qcom,ipq8074"; - - leds { - compatible = "gpio-leds"; - - led_system_blue: system-blue { - label = "blue:system"; - gpios = <&tlmm 21 GPIO_ACTIVE_HIGH>; - }; - - led_system_yellow: system-yellow { - label = "yellow:system"; - gpios = <&tlmm 22 GPIO_ACTIVE_HIGH>; - }; - - network-blue { - label = "blue:network"; - gpios = <&tlmm 42 GPIO_ACTIVE_HIGH>; - }; - - network-yellow { - label = "yellow:network"; - gpios = <&tlmm 43 GPIO_ACTIVE_HIGH>; - }; - }; -}; - -&wifi { - qcom,ath11k-calibration-variant = "Redmi-AX6"; -}; diff --git a/target/linux/ipq807x/image/generic.mk b/target/linux/ipq807x/image/generic.mk index dd1802ce4..e8440c83c 100644 --- a/target/linux/ipq807x/image/generic.mk +++ b/target/linux/ipq807x/image/generic.mk @@ -32,28 +32,6 @@ define Device/qnap_301w endef TARGET_DEVICES += qnap_301w -define Device/redmi_ax6 - $(call Device/xiaomi_ax3600) - DEVICE_VENDOR := Redmi - DEVICE_MODEL := AX6 - DEVICE_PACKAGES := ipq-wifi-redmi_ax6 uboot-envtools -endef -TARGET_DEVICES += redmi_ax6 - -define Device/xiaomi_ax3600 - $(call Device/FitImage) - $(call Device/UbiFit) - DEVICE_VENDOR := Xiaomi - DEVICE_MODEL := AX3600 - BLOCKSIZE := 128k - PAGESIZE := 2048 - DEVICE_DTS_CONFIG := config@ac04 - SOC := ipq8071 - DEVICE_PACKAGES := ath10k-firmware-qca9887-ct ipq-wifi-xiaomi_ax3600 \ - kmod-ath10k-ct uboot-envtools -endef -TARGET_DEVICES += xiaomi_ax3600 - define Device/zte_mf269 $(call Device/FitImage) $(call Device/UbiFit) diff --git a/target/linux/ipq807x/patches-5.10/900-arm64-dts-add-OpenWrt-DTS-files.patch b/target/linux/ipq807x/patches-5.10/900-arm64-dts-add-OpenWrt-DTS-files.patch index 14ed1e1d2..12af650f0 100644 --- a/target/linux/ipq807x/patches-5.10/900-arm64-dts-add-OpenWrt-DTS-files.patch +++ b/target/linux/ipq807x/patches-5.10/900-arm64-dts-add-OpenWrt-DTS-files.patch @@ -12,13 +12,11 @@ Signed-off-by: Robert Marko --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile -@@ -3,6 +3,10 @@ dtb-$(CONFIG_ARCH_QCOM) += apq8016-sbc.d +@@ -3,6 +3,8 @@ dtb-$(CONFIG_ARCH_QCOM) += apq8016-sbc.d dtb-$(CONFIG_ARCH_QCOM) += apq8096-db820c.dtb dtb-$(CONFIG_ARCH_QCOM) += apq8096-ifc6640.dtb dtb-$(CONFIG_ARCH_QCOM) += ipq6018-cp01-c1.dtb +dtb-$(CONFIG_ARCH_QCOM) += ipq8072-301w.dtb -+dtb-$(CONFIG_ARCH_QCOM) += ipq8071-ax6.dtb -+dtb-$(CONFIG_ARCH_QCOM) += ipq8071-ax3600.dtb +dtb-$(CONFIG_ARCH_QCOM) += ipq8071-mf269.dtb dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk01.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8916-longcheer-l8150.dtb From 4d5770a6cfc8faf9ee1b229c495fd33788d82c85 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Fri, 25 Feb 2022 23:06:02 +0800 Subject: [PATCH 02/32] ipq807x: zte mf269: optimize related code Since this part will not be accepted by upstream. --- .../ipq807x/base-files/etc/board.d/02_network | 24 ++++++++-- .../arm64/boot/dts/qcom/ipq8071-mf269.dts | 48 +------------------ 2 files changed, 22 insertions(+), 50 deletions(-) mode change 100755 => 100644 target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/ipq8071-mf269.dts diff --git a/target/linux/ipq807x/base-files/etc/board.d/02_network b/target/linux/ipq807x/base-files/etc/board.d/02_network index 43329eade..93421fbb8 100644 --- a/target/linux/ipq807x/base-files/etc/board.d/02_network +++ b/target/linux/ipq807x/base-files/etc/board.d/02_network @@ -16,9 +16,6 @@ ipq807x_setup_interfaces() ;; zte,mf269) ucidef_set_interfaces_lan_wan "eth0" "eth1" - hw_mac_addr=$(mtd_get_mac_binary "mac" 0x0) - ucidef_set_interface_macaddr "wan" "$hw_mac_addr" - ucidef_set_interface_macaddr "lan" "$(macaddr_add $hw_mac_addr 1)" ;; *) echo "Unsupported hardware. Network interfaces not initialized" @@ -26,9 +23,30 @@ ipq807x_setup_interfaces() esac } +ipq807x_setup_macs() +{ + local board="$1" + local lan_mac="" + local wan_mac="" + local label_mac="" + + case "$board" in + zte,mf269) + wan_mac=$(mtd_get_mac_binary mac 0x0) + lan_mac=$(macaddr_add "$wan_mac" 1) + label_mac=$wan_mac + ;; + esac + + [ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" $lan_mac + [ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" $wan_mac + [ -n "$label_mac" ] && ucidef_set_label_macaddr $label_mac +} + board_config_update board=$(board_name) ipq807x_setup_interfaces $board +ipq807x_setup_macs $board board_config_flush exit 0 diff --git a/target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/ipq8071-mf269.dts b/target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/ipq8071-mf269.dts old mode 100755 new mode 100644 index 4f6eac40d..62a57cfe5 --- a/target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/ipq8071-mf269.dts +++ b/target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/ipq8071-mf269.dts @@ -106,42 +106,6 @@ }; }; -/* -&blsp1_spi6 { - status = "okay"; - pinctrl-0 = <&spi_5_pins>; - pinctrl-names = "default"; - cs-select = <0>; - - si3217x@0 { - compatible = "si3217x"; - num_slic = <1>; - reg = <0>; - spi-cpha; - spi-cpol; - spi-max-frequency = <960000>; - pinctrl-0 = <&slic_ctl_pins>; - pinctrl-names = "default"; - ctl-gpio = <&tlmm 57 0>; - rst-gpio = <&tlmm 58 0>; - irq-gpio = <&tlmm 59 0>; - }; -}; - -&blsp1_i2c5 { - status = "okay"; - - pinctrl-0 = <&i2c_4_pins>; - pinctrl-names = "default"; - - aw9106b@5b { - compatible = "aw9106b"; - reg = <0x5b>; - reset-gpio = <&tlmm 54 0>; - }; -}; -*/ - &blsp1_uart5 { status = "okay"; }; @@ -559,20 +523,10 @@ output-high; }; }; - - usb_cc_pins: usb_cc_pins { - mux { - pins = "gpio47", "gpio48"; - function = "gpio"; - drive-strength = <8>; - bias-disable; - output-high; - }; - }; }; &usb_0 { - pinctrl-0 = <&usb_vbus_pins &usb_cc_pins>; + pinctrl-0 = <&usb_vbus_pins>; pinctrl-names = "default"; status = "okay"; }; From fbd027c5dadd179ab520f54df8d34a402aee22d0 Mon Sep 17 00:00:00 2001 From: John Audia Date: Wed, 16 Feb 2022 09:46:00 -0500 Subject: [PATCH 03/32] kernel: bump 5.10 to 5.10.101 Removed upstreamed: pending-5.10/841-USB-serial-option-add-ZTE-MF286D-modem.patch[1] bcm27xx/950-0592-drm-vc4-Allow-DBLCLK-modes-even-if-horz-timing-is-od.patch[2] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.101&id=7113440a36c741efd7c76e3d70b3634100120cdb 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.101&id=21c890ca8eaecea06cabb92be2a53a6f26f56383 Build system: x86_64 Build-tested: bcm2711/RPi4B, mt7622/RT3200 Run-tested: bcm2711/RPi4B, mt7622/RT3200 Signed-off-by: John Audia --- include/kernel-5.10 | 4 +- ...cec_available-flag-as-always-support.patch | 4 +- .../950-0313-vc4_hdmi-Set-HDMI_MAI_FMT.patch | 6 +-- ...-vc4-add-iec958-controls-to-vc4_hdmi.patch | 6 +-- ...move-setup-from-hw_params-to-prepare.patch | 6 +-- ...enable-HBR-MAI-format-on-HBR-streams.patch | 2 +- ...firmware-logic-for-MAI-threshold-set.patch | 2 +- ...t-VC4_HDMI_MAI_CONFIG_FORMAT_REVERSE.patch | 2 +- ...tft-Add-support-for-display-variants.patch | 2 +- ...resent-but-empty-dmas-disables-audio.patch | 2 +- ...the-HDMI-registers-into-the-debugfs-.patch | 4 +- ...re-pixel-frequency-in-the-connector-.patch | 2 +- ...drm-vc4-hdmi-Enable-10-12-bpc-output.patch | 2 +- ...7-drm-vc4-hdmi-Introduce-a-CEC-clock.patch | 4 +- ...c4-hdmi-Split-the-interrupt-handlers.patch | 6 +-- ...-Support-BCM2711-CEC-interrupt-setup.patch | 10 ++--- ...-t-register-the-CEC-adapter-if-there.patch | 2 +- ...metadata-property-to-the-VC5-HDMI-co.patch | 6 +-- ...rm-Avoid-full-hdmi-audio-fifo-writes.patch | 2 +- ...c4-hdmi-Raise-the-maximum-clock-rate.patch | 2 +- ...LCLK-modes-even-if-horz-timing-is-od.patch | 42 ------------------- ...-interface-in-mode6-for-18-bit-color.patch | 4 +- ...efiles-dt-Always-set-on-ARCH_BCM2835.patch | 2 +- ...equest-assisted-learning-on-CPU-port.patch | 2 +- .../0069-arm-boot-add-dts-files.patch | 2 +- 25 files changed, 43 insertions(+), 85 deletions(-) delete mode 100644 target/linux/bcm27xx/patches-5.10/950-0592-drm-vc4-Allow-DBLCLK-modes-even-if-horz-timing-is-od.patch diff --git a/include/kernel-5.10 b/include/kernel-5.10 index c71d0deac..47c2fd41f 100644 --- a/include/kernel-5.10 +++ b/include/kernel-5.10 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.10 = .100 -LINUX_KERNEL_HASH-5.10.100 = d56965afc9b6a3d26d53db40ccd37fd9d15f2ca6bfd54ef6f0f8b6e92c170999 +LINUX_VERSION-5.10 = .101 +LINUX_KERNEL_HASH-5.10.101 = 0749258cb7ee47c478dfc34857e8930d41bfe0b074e80e9f57cbfa56d0ba1c8e diff --git a/target/linux/bcm27xx/patches-5.10/950-0310-vc4_hdmi-Remove-cec_available-flag-as-always-support.patch b/target/linux/bcm27xx/patches-5.10/950-0310-vc4_hdmi-Remove-cec_available-flag-as-always-support.patch index d7610cabb..4c9e0d71f 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0310-vc4_hdmi-Remove-cec_available-flag-as-always-support.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0310-vc4_hdmi-Remove-cec_available-flag-as-always-support.patch @@ -12,7 +12,7 @@ Signed-off-by: Dom Cobley --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1491,9 +1491,6 @@ static int vc4_hdmi_cec_init(struct vc4_ +@@ -1493,9 +1493,6 @@ static int vc4_hdmi_cec_init(struct vc4_ u32 value; int ret; @@ -22,7 +22,7 @@ Signed-off-by: Dom Cobley vc4_hdmi->cec_adap = cec_allocate_adapter(&vc4_hdmi_cec_adap_ops, vc4_hdmi, "vc4", CEC_CAP_DEFAULTS | -@@ -1926,7 +1923,6 @@ static const struct vc4_hdmi_variant bcm +@@ -1928,7 +1925,6 @@ static const struct vc4_hdmi_variant bcm .debugfs_name = "hdmi_regs", .card_name = "vc4-hdmi", .max_pixel_clock = 162000000, diff --git a/target/linux/bcm27xx/patches-5.10/950-0313-vc4_hdmi-Set-HDMI_MAI_FMT.patch b/target/linux/bcm27xx/patches-5.10/950-0313-vc4_hdmi-Set-HDMI_MAI_FMT.patch index 3cebccc10..e4f6f8795 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0313-vc4_hdmi-Set-HDMI_MAI_FMT.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0313-vc4_hdmi-Set-HDMI_MAI_FMT.patch @@ -14,7 +14,7 @@ Signed-off-by: Dom Cobley --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -989,6 +989,44 @@ static void vc4_hdmi_audio_shutdown(stru +@@ -991,6 +991,44 @@ static void vc4_hdmi_audio_shutdown(stru vc4_hdmi->audio.substream = NULL; } @@ -59,7 +59,7 @@ Signed-off-by: Dom Cobley /* HDMI audio codec callbacks */ static int vc4_hdmi_audio_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, -@@ -999,6 +1037,8 @@ static int vc4_hdmi_audio_hw_params(stru +@@ -1001,6 +1039,8 @@ static int vc4_hdmi_audio_hw_params(stru struct device *dev = &vc4_hdmi->pdev->dev; u32 audio_packet_config, channel_mask; u32 channel_map; @@ -68,7 +68,7 @@ Signed-off-by: Dom Cobley if (substream != vc4_hdmi->audio.substream) return -EINVAL; -@@ -1019,6 +1059,14 @@ static int vc4_hdmi_audio_hw_params(stru +@@ -1021,6 +1061,14 @@ static int vc4_hdmi_audio_hw_params(stru vc4_hdmi_audio_set_mai_clock(vc4_hdmi); diff --git a/target/linux/bcm27xx/patches-5.10/950-0314-drm-vc4-add-iec958-controls-to-vc4_hdmi.patch b/target/linux/bcm27xx/patches-5.10/950-0314-drm-vc4-add-iec958-controls-to-vc4_hdmi.patch index c5caa739b..9582c8687 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0314-drm-vc4-add-iec958-controls-to-vc4_hdmi.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0314-drm-vc4-add-iec958-controls-to-vc4_hdmi.patch @@ -26,7 +26,7 @@ Signed-off-by: Matthias Reichl #include #include #include -@@ -1180,6 +1181,47 @@ static int vc4_hdmi_audio_eld_ctl_get(st +@@ -1182,6 +1183,47 @@ static int vc4_hdmi_audio_eld_ctl_get(st return 0; } @@ -74,7 +74,7 @@ Signed-off-by: Matthias Reichl static const struct snd_kcontrol_new vc4_hdmi_audio_controls[] = { { .access = SNDRV_CTL_ELEM_ACCESS_READ | -@@ -1189,6 +1231,19 @@ static const struct snd_kcontrol_new vc4 +@@ -1191,6 +1233,19 @@ static const struct snd_kcontrol_new vc4 .info = vc4_hdmi_audio_eld_ctl_info, .get = vc4_hdmi_audio_eld_ctl_get, }, @@ -94,7 +94,7 @@ Signed-off-by: Matthias Reichl }; static const struct snd_soc_dapm_widget vc4_hdmi_audio_widgets[] = { -@@ -1309,6 +1364,11 @@ static int vc4_hdmi_audio_init(struct vc +@@ -1311,6 +1366,11 @@ static int vc4_hdmi_audio_init(struct vc vc4_hdmi->audio.dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; vc4_hdmi->audio.dma_data.maxburst = 2; diff --git a/target/linux/bcm27xx/patches-5.10/950-0315-drm-vc4-move-setup-from-hw_params-to-prepare.patch b/target/linux/bcm27xx/patches-5.10/950-0315-drm-vc4-move-setup-from-hw_params-to-prepare.patch index 109718017..9b9042639 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0315-drm-vc4-move-setup-from-hw_params-to-prepare.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0315-drm-vc4-move-setup-from-hw_params-to-prepare.patch @@ -14,7 +14,7 @@ Signed-off-by: Matthias Reichl --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1029,9 +1029,8 @@ static int sample_rate_to_mai_fmt(int sa +@@ -1031,9 +1031,8 @@ static int sample_rate_to_mai_fmt(int sa } /* HDMI audio codec callbacks */ @@ -26,7 +26,7 @@ Signed-off-by: Matthias Reichl { struct vc4_hdmi *vc4_hdmi = dai_to_hdmi(dai); struct drm_encoder *encoder = &vc4_hdmi->encoder.base.base; -@@ -1044,12 +1043,15 @@ static int vc4_hdmi_audio_hw_params(stru +@@ -1046,12 +1045,15 @@ static int vc4_hdmi_audio_hw_params(stru if (substream != vc4_hdmi->audio.substream) return -EINVAL; @@ -47,7 +47,7 @@ Signed-off-by: Matthias Reichl HDMI_WRITE(HDMI_MAI_CTL, VC4_HD_MAI_CTL_RESET | -@@ -1271,7 +1273,7 @@ static const struct snd_soc_component_dr +@@ -1273,7 +1275,7 @@ static const struct snd_soc_component_dr static const struct snd_soc_dai_ops vc4_hdmi_audio_dai_ops = { .startup = vc4_hdmi_audio_startup, .shutdown = vc4_hdmi_audio_shutdown, diff --git a/target/linux/bcm27xx/patches-5.10/950-0316-drm-vc4-enable-HBR-MAI-format-on-HBR-streams.patch b/target/linux/bcm27xx/patches-5.10/950-0316-drm-vc4-enable-HBR-MAI-format-on-HBR-streams.patch index b700930c8..1fbda2013 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0316-drm-vc4-enable-HBR-MAI-format-on-HBR-streams.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0316-drm-vc4-enable-HBR-MAI-format-on-HBR-streams.patch @@ -10,7 +10,7 @@ Signed-off-by: Matthias Reichl --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1063,7 +1063,11 @@ static int vc4_hdmi_audio_prepare(struct +@@ -1065,7 +1065,11 @@ static int vc4_hdmi_audio_prepare(struct vc4_hdmi_audio_set_mai_clock(vc4_hdmi); mai_sample_rate = sample_rate_to_mai_fmt(vc4_hdmi->audio.samplerate); diff --git a/target/linux/bcm27xx/patches-5.10/950-0317-vc4_hdmi-Remove-firmware-logic-for-MAI-threshold-set.patch b/target/linux/bcm27xx/patches-5.10/950-0317-vc4_hdmi-Remove-firmware-logic-for-MAI-threshold-set.patch index 8f16329b0..ef776face 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0317-vc4_hdmi-Remove-firmware-logic-for-MAI-threshold-set.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0317-vc4_hdmi-Remove-firmware-logic-for-MAI-threshold-set.patch @@ -16,7 +16,7 @@ Signed-off-by: Dom Cobley --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1084,22 +1084,12 @@ static int vc4_hdmi_audio_prepare(struct +@@ -1086,22 +1086,12 @@ static int vc4_hdmi_audio_prepare(struct audio_packet_config |= VC4_SET_FIELD(channel_mask, VC4_HDMI_AUDIO_PACKET_CEA_MASK); diff --git a/target/linux/bcm27xx/patches-5.10/950-0318-vc_hdmi-Set-VC4_HDMI_MAI_CONFIG_FORMAT_REVERSE.patch b/target/linux/bcm27xx/patches-5.10/950-0318-vc_hdmi-Set-VC4_HDMI_MAI_CONFIG_FORMAT_REVERSE.patch index 6f09dac58..1767ccf4a 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0318-vc_hdmi-Set-VC4_HDMI_MAI_CONFIG_FORMAT_REVERSE.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0318-vc_hdmi-Set-VC4_HDMI_MAI_CONFIG_FORMAT_REVERSE.patch @@ -14,7 +14,7 @@ Signed-off-by: Dom Cobley --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1093,6 +1093,7 @@ static int vc4_hdmi_audio_prepare(struct +@@ -1095,6 +1095,7 @@ static int vc4_hdmi_audio_prepare(struct HDMI_WRITE(HDMI_MAI_CONFIG, VC4_HDMI_MAI_CONFIG_BIT_REVERSE | diff --git a/target/linux/bcm27xx/patches-5.10/950-0332-staging-fbtft-Add-support-for-display-variants.patch b/target/linux/bcm27xx/patches-5.10/950-0332-staging-fbtft-Add-support-for-display-variants.patch index 7bdc80b46..9bb513628 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0332-staging-fbtft-Add-support-for-display-variants.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0332-staging-fbtft-Add-support-for-display-variants.patch @@ -191,7 +191,7 @@ Signed-off-by: Phil Elwell {}, \ }; \ \ -@@ -344,6 +355,11 @@ static void __exit fbtft_driver_module_e +@@ -347,6 +358,11 @@ static void __exit fbtft_driver_module_e module_init(fbtft_driver_module_init); \ module_exit(fbtft_driver_module_exit); diff --git a/target/linux/bcm27xx/patches-5.10/950-0346-drm-vc4-A-present-but-empty-dmas-disables-audio.patch b/target/linux/bcm27xx/patches-5.10/950-0346-drm-vc4-A-present-but-empty-dmas-disables-audio.patch index 0c104b178..373f98cbd 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0346-drm-vc4-A-present-but-empty-dmas-disables-audio.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0346-drm-vc4-A-present-but-empty-dmas-disables-audio.patch @@ -16,7 +16,7 @@ Signed-off-by: Phil Elwell --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1331,10 +1331,12 @@ static int vc4_hdmi_audio_init(struct vc +@@ -1333,10 +1333,12 @@ static int vc4_hdmi_audio_init(struct vc const __be32 *addr; int index; int ret; diff --git a/target/linux/bcm27xx/patches-5.10/950-0349-drm-vc4-Add-all-the-HDMI-registers-into-the-debugfs-.patch b/target/linux/bcm27xx/patches-5.10/950-0349-drm-vc4-Add-all-the-HDMI-registers-into-the-debugfs-.patch index edc5be80a..4a4c53570 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0349-drm-vc4-Add-all-the-HDMI-registers-into-the-debugfs-.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0349-drm-vc4-Add-all-the-HDMI-registers-into-the-debugfs-.patch @@ -29,7 +29,7 @@ Signed-off-by: Dave Stevenson return 0; } -@@ -1732,6 +1738,7 @@ static int vc5_hdmi_init_resources(struc +@@ -1734,6 +1740,7 @@ static int vc5_hdmi_init_resources(struc struct platform_device *pdev = vc4_hdmi->pdev; struct device *dev = &pdev->dev; struct resource *res; @@ -37,7 +37,7 @@ Signed-off-by: Dave Stevenson res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "hdmi"); if (!res) -@@ -1822,6 +1829,38 @@ static int vc5_hdmi_init_resources(struc +@@ -1824,6 +1831,38 @@ static int vc5_hdmi_init_resources(struc return PTR_ERR(vc4_hdmi->reset); } diff --git a/target/linux/bcm27xx/patches-5.10/950-0415-drm-vc4-hdmi-Store-pixel-frequency-in-the-connector-.patch b/target/linux/bcm27xx/patches-5.10/950-0415-drm-vc4-hdmi-Store-pixel-frequency-in-the-connector-.patch index 5e51b008f..719f9235e 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0415-drm-vc4-hdmi-Store-pixel-frequency-in-the-connector-.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0415-drm-vc4-hdmi-Store-pixel-frequency-in-the-connector-.patch @@ -76,7 +76,7 @@ Signed-off-by: Maxime Ripard struct drm_display_mode *mode = &crtc_state->adjusted_mode; struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder); unsigned long long pixel_rate = mode->clock * 1000; -@@ -875,6 +897,8 @@ static int vc4_hdmi_encoder_atomic_check +@@ -876,6 +898,8 @@ static int vc4_hdmi_encoder_atomic_check if (pixel_rate > vc4_hdmi->variant->max_pixel_clock) return -EINVAL; diff --git a/target/linux/bcm27xx/patches-5.10/950-0417-drm-vc4-hdmi-Enable-10-12-bpc-output.patch b/target/linux/bcm27xx/patches-5.10/950-0417-drm-vc4-hdmi-Enable-10-12-bpc-output.patch index 69f255627..646475fa8 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0417-drm-vc4-hdmi-Enable-10-12-bpc-output.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0417-drm-vc4-hdmi-Enable-10-12-bpc-output.patch @@ -141,7 +141,7 @@ Reviewed-by: Dave Stevenson } static void vc4_hdmi_encoder_pre_crtc_enable(struct drm_encoder *encoder, -@@ -891,6 +951,14 @@ static int vc4_hdmi_encoder_atomic_check +@@ -892,6 +952,14 @@ static int vc4_hdmi_encoder_atomic_check pixel_rate = mode->clock * 1000; } diff --git a/target/linux/bcm27xx/patches-5.10/950-0457-drm-vc4-hdmi-Introduce-a-CEC-clock.patch b/target/linux/bcm27xx/patches-5.10/950-0457-drm-vc4-hdmi-Introduce-a-CEC-clock.patch index 36f46a71b..f20685c45 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0457-drm-vc4-hdmi-Introduce-a-CEC-clock.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0457-drm-vc4-hdmi-Introduce-a-CEC-clock.patch @@ -27,7 +27,7 @@ Signed-off-by: Maxime Ripard value |= clk_cnt << VC4_HDMI_CEC_DIV_CLK_CNT_SHIFT; HDMI_WRITE(HDMI_CEC_CNTRL_1, value); } -@@ -1867,6 +1867,7 @@ static int vc4_hdmi_init_resources(struc +@@ -1869,6 +1869,7 @@ static int vc4_hdmi_init_resources(struc return PTR_ERR(vc4_hdmi->hsm_clock); } vc4_hdmi->audio_clock = vc4_hdmi->hsm_clock; @@ -35,7 +35,7 @@ Signed-off-by: Maxime Ripard return 0; } -@@ -1961,6 +1962,12 @@ static int vc5_hdmi_init_resources(struc +@@ -1963,6 +1964,12 @@ static int vc5_hdmi_init_resources(struc return PTR_ERR(vc4_hdmi->audio_clock); } diff --git a/target/linux/bcm27xx/patches-5.10/950-0458-drm-vc4-hdmi-Split-the-interrupt-handlers.patch b/target/linux/bcm27xx/patches-5.10/950-0458-drm-vc4-hdmi-Split-the-interrupt-handlers.patch index 7e16acfac..5447b3325 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0458-drm-vc4-hdmi-Split-the-interrupt-handlers.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0458-drm-vc4-hdmi-Split-the-interrupt-handlers.patch @@ -19,7 +19,7 @@ Reviewed-by: Dave Stevenson --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1572,15 +1572,22 @@ static int vc4_hdmi_audio_init(struct vc +@@ -1574,15 +1574,22 @@ static int vc4_hdmi_audio_init(struct vc } #ifdef CONFIG_DRM_VC4_HDMI_CEC @@ -48,7 +48,7 @@ Reviewed-by: Dave Stevenson cec_transmit_done(vc4_hdmi->cec_adap, CEC_TX_STATUS_OK, 0, 0, 0, 0); } else { -@@ -1594,6 +1601,19 @@ static irqreturn_t vc4_cec_irq_handler_t +@@ -1596,6 +1603,19 @@ static irqreturn_t vc4_cec_irq_handler_t return IRQ_HANDLED; } @@ -68,7 +68,7 @@ Reviewed-by: Dave Stevenson static void vc4_cec_read_msg(struct vc4_hdmi *vc4_hdmi, u32 cntrl1) { struct drm_device *dev = vc4_hdmi->connector.dev; -@@ -1618,31 +1638,55 @@ static void vc4_cec_read_msg(struct vc4_ +@@ -1620,31 +1640,55 @@ static void vc4_cec_read_msg(struct vc4_ } } diff --git a/target/linux/bcm27xx/patches-5.10/950-0459-drm-vc4-hdmi-Support-BCM2711-CEC-interrupt-setup.patch b/target/linux/bcm27xx/patches-5.10/950-0459-drm-vc4-hdmi-Support-BCM2711-CEC-interrupt-setup.patch index 39b80a2a2..8c399b6c7 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0459-drm-vc4-hdmi-Support-BCM2711-CEC-interrupt-setup.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0459-drm-vc4-hdmi-Support-BCM2711-CEC-interrupt-setup.patch @@ -20,7 +20,7 @@ Reviewed-by: Dave Stevenson --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1723,9 +1723,11 @@ static int vc4_hdmi_cec_adap_enable(stru +@@ -1725,9 +1725,11 @@ static int vc4_hdmi_cec_adap_enable(stru ((3600 / usecs) << VC4_HDMI_CEC_CNT_TO_3600_US_SHIFT) | ((3500 / usecs) << VC4_HDMI_CEC_CNT_TO_3500_US_SHIFT)); @@ -34,7 +34,7 @@ Reviewed-by: Dave Stevenson HDMI_WRITE(HDMI_CEC_CNTRL_5, val | VC4_HDMI_CEC_TX_SW_RESET | VC4_HDMI_CEC_RX_SW_RESET); } -@@ -1797,8 +1799,6 @@ static int vc4_hdmi_cec_init(struct vc4_ +@@ -1799,8 +1801,6 @@ static int vc4_hdmi_cec_init(struct vc4_ cec_fill_conn_info_from_drm(&conn_info, &vc4_hdmi->connector); cec_s_conn_info(vc4_hdmi->cec_adap, &conn_info); @@ -43,7 +43,7 @@ Reviewed-by: Dave Stevenson value = HDMI_READ(HDMI_CEC_CNTRL_1); /* Set the logical address to Unregistered */ value |= VC4_HDMI_CEC_ADDR_MASK; -@@ -1806,12 +1806,32 @@ static int vc4_hdmi_cec_init(struct vc4_ +@@ -1808,12 +1808,32 @@ static int vc4_hdmi_cec_init(struct vc4_ vc4_hdmi_cec_update_clk_div(vc4_hdmi); @@ -82,7 +82,7 @@ Reviewed-by: Dave Stevenson ret = cec_register_adapter(vc4_hdmi->cec_adap, &pdev->dev); if (ret < 0) -@@ -2286,6 +2306,7 @@ static const struct vc4_hdmi_variant bcm +@@ -2288,6 +2308,7 @@ static const struct vc4_hdmi_variant bcm PHY_LANE_CK, }, .unsupported_odd_h_timings = true, @@ -90,7 +90,7 @@ Reviewed-by: Dave Stevenson .init_resources = vc5_hdmi_init_resources, .csc_setup = vc5_hdmi_csc_setup, -@@ -2312,6 +2333,7 @@ static const struct vc4_hdmi_variant bcm +@@ -2314,6 +2335,7 @@ static const struct vc4_hdmi_variant bcm PHY_LANE_2, }, .unsupported_odd_h_timings = true, diff --git a/target/linux/bcm27xx/patches-5.10/950-0460-drm-vc4-hdmi-Don-t-register-the-CEC-adapter-if-there.patch b/target/linux/bcm27xx/patches-5.10/950-0460-drm-vc4-hdmi-Don-t-register-the-CEC-adapter-if-there.patch index 2ead4e366..cbace6303 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0460-drm-vc4-hdmi-Don-t-register-the-CEC-adapter-if-there.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0460-drm-vc4-hdmi-Don-t-register-the-CEC-adapter-if-there.patch @@ -19,7 +19,7 @@ Signed-off-by: Maxime Ripard --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1785,9 +1785,15 @@ static int vc4_hdmi_cec_init(struct vc4_ +@@ -1787,9 +1787,15 @@ static int vc4_hdmi_cec_init(struct vc4_ { struct cec_connector_info conn_info; struct platform_device *pdev = vc4_hdmi->pdev; diff --git a/target/linux/bcm27xx/patches-5.10/950-0475-drm-vc4-Add-HDR-metadata-property-to-the-VC5-HDMI-co.patch b/target/linux/bcm27xx/patches-5.10/950-0475-drm-vc4-Add-HDR-metadata-property-to-the-VC5-HDMI-co.patch index 01bf5901a..554fffc09 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0475-drm-vc4-Add-HDR-metadata-property-to-the-VC5-HDMI-co.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0475-drm-vc4-Add-HDR-metadata-property-to-the-VC5-HDMI-co.patch @@ -61,7 +61,7 @@ Signed-off-by: Dave Stevenson } static void vc4_hdmi_encoder_post_crtc_disable(struct drm_encoder *encoder, -@@ -2296,6 +2321,7 @@ static const struct vc4_hdmi_variant bcm +@@ -2298,6 +2323,7 @@ static const struct vc4_hdmi_variant bcm .phy_rng_enable = vc4_hdmi_phy_rng_enable, .phy_rng_disable = vc4_hdmi_phy_rng_disable, .channel_map = vc4_hdmi_channel_map, @@ -69,7 +69,7 @@ Signed-off-by: Dave Stevenson }; static const struct vc4_hdmi_variant bcm2711_hdmi0_variant = { -@@ -2323,6 +2349,7 @@ static const struct vc4_hdmi_variant bcm +@@ -2325,6 +2351,7 @@ static const struct vc4_hdmi_variant bcm .phy_rng_enable = vc5_hdmi_phy_rng_enable, .phy_rng_disable = vc5_hdmi_phy_rng_disable, .channel_map = vc5_hdmi_channel_map, @@ -77,7 +77,7 @@ Signed-off-by: Dave Stevenson }; static const struct vc4_hdmi_variant bcm2711_hdmi1_variant = { -@@ -2350,6 +2377,7 @@ static const struct vc4_hdmi_variant bcm +@@ -2352,6 +2379,7 @@ static const struct vc4_hdmi_variant bcm .phy_rng_enable = vc5_hdmi_phy_rng_enable, .phy_rng_disable = vc5_hdmi_phy_rng_disable, .channel_map = vc5_hdmi_channel_map, diff --git a/target/linux/bcm27xx/patches-5.10/950-0505-vc4-drm-Avoid-full-hdmi-audio-fifo-writes.patch b/target/linux/bcm27xx/patches-5.10/950-0505-vc4-drm-Avoid-full-hdmi-audio-fifo-writes.patch index 98e477aec..4f89ad56e 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0505-vc4-drm-Avoid-full-hdmi-audio-fifo-writes.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0505-vc4-drm-Avoid-full-hdmi-audio-fifo-writes.patch @@ -15,7 +15,7 @@ Signed-off-by: Dom Cobley --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1295,10 +1295,10 @@ static int vc4_hdmi_audio_prepare(struct +@@ -1297,10 +1297,10 @@ static int vc4_hdmi_audio_prepare(struct /* Set the MAI threshold */ HDMI_WRITE(HDMI_MAI_THR, diff --git a/target/linux/bcm27xx/patches-5.10/950-0576-drm-vc4-hdmi-Raise-the-maximum-clock-rate.patch b/target/linux/bcm27xx/patches-5.10/950-0576-drm-vc4-hdmi-Raise-the-maximum-clock-rate.patch index d1deaa884..99fd4f485 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0576-drm-vc4-hdmi-Raise-the-maximum-clock-rate.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0576-drm-vc4-hdmi-Raise-the-maximum-clock-rate.patch @@ -19,7 +19,7 @@ Signed-off-by: Maxime Ripard --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -2432,7 +2432,7 @@ static const struct vc4_hdmi_variant bcm +@@ -2434,7 +2434,7 @@ static const struct vc4_hdmi_variant bcm .encoder_type = VC4_ENCODER_TYPE_HDMI0, .debugfs_name = "hdmi0_regs", .card_name = "vc4-hdmi-0", diff --git a/target/linux/bcm27xx/patches-5.10/950-0592-drm-vc4-Allow-DBLCLK-modes-even-if-horz-timing-is-od.patch b/target/linux/bcm27xx/patches-5.10/950-0592-drm-vc4-Allow-DBLCLK-modes-even-if-horz-timing-is-od.patch deleted file mode 100644 index 459f228c1..000000000 --- a/target/linux/bcm27xx/patches-5.10/950-0592-drm-vc4-Allow-DBLCLK-modes-even-if-horz-timing-is-od.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 9f7c0728efb0036f6f197126aa62da40cdf4713a Mon Sep 17 00:00:00 2001 -From: Dave Stevenson -Date: Wed, 28 Apr 2021 16:14:21 +0100 -Subject: [PATCH] drm/vc4: Allow DBLCLK modes even if horz timing is - odd. - -The 2711 pixel valve can't produce odd horizontal timings, and -checks were added to vc4_hdmi_encoder_atomic_check and -vc4_hdmi_encoder_mode_valid to filter out/block selection of -such modes. - -Modes with DRM_MODE_FLAG_DBLCLK double all the horizontal timing -values before programming them into the PV. The PV values, -therefore, can not be odd, and so the modes can be supported. - -Amend the filtering appropriately. - -See https://github.com/raspberrypi/linux/issues/4307 - -Signed-off-by: Dave Stevenson ---- - drivers/gpu/drm/vc4/vc4_hdmi.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/drivers/gpu/drm/vc4/vc4_hdmi.c -+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1067,6 +1067,7 @@ static int vc4_hdmi_encoder_atomic_check - unsigned long long tmds_rate; - - if (vc4_hdmi->variant->unsupported_odd_h_timings && -+ !(mode->flags & DRM_MODE_FLAG_DBLCLK) && - ((mode->hdisplay % 2) || (mode->hsync_start % 2) || - (mode->hsync_end % 2) || (mode->htotal % 2))) - return -EINVAL; -@@ -1111,6 +1112,7 @@ vc4_hdmi_encoder_mode_valid(struct drm_e - struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder); - - if (vc4_hdmi->variant->unsupported_odd_h_timings && -+ !(mode->flags & DRM_MODE_FLAG_DBLCLK) && - ((mode->hdisplay % 2) || (mode->hsync_start % 2) || - (mode->hsync_end % 2) || (mode->htotal % 2))) - return MODE_H_ILLEGAL; diff --git a/target/linux/bcm27xx/patches-5.10/950-0650-Support-RPi-DPI-interface-in-mode6-for-18-bit-color.patch b/target/linux/bcm27xx/patches-5.10/950-0650-Support-RPi-DPI-interface-in-mode6-for-18-bit-color.patch index 56a1e6862..a5fe88856 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0650-Support-RPi-DPI-interface-in-mode6-for-18-bit-color.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0650-Support-RPi-DPI-interface-in-mode6-for-18-bit-color.patch @@ -118,7 +118,7 @@ Signed-off-by: Joerg Quinten - MEDIA_BUS_FMT_RGB666_1X24_CPADHI --- a/drivers/gpu/drm/panel/panel-simple.c +++ b/drivers/gpu/drm/panel/panel-simple.c -@@ -2093,6 +2093,38 @@ static const struct panel_desc innolux_a +@@ -2094,6 +2094,38 @@ static const struct panel_desc innolux_a .bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE, }; @@ -157,7 +157,7 @@ Signed-off-by: Joerg Quinten static const struct drm_display_mode innolux_at070tn92_mode = { .clock = 33333, .hdisplay = 800, -@@ -4076,6 +4108,9 @@ static const struct of_device_id platfor +@@ -4077,6 +4109,9 @@ static const struct of_device_id platfor .compatible = "innolux,at043tn24", .data = &innolux_at043tn24, }, { diff --git a/target/linux/bcm27xx/patches-5.10/950-0738-Makefiles-dt-Always-set-on-ARCH_BCM2835.patch b/target/linux/bcm27xx/patches-5.10/950-0738-Makefiles-dt-Always-set-on-ARCH_BCM2835.patch index 0cb30474b..db966ef86 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0738-Makefiles-dt-Always-set-on-ARCH_BCM2835.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0738-Makefiles-dt-Always-set-on-ARCH_BCM2835.patch @@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -1432,5 +1432,5 @@ subdir-y := overlays +@@ -1433,5 +1433,5 @@ subdir-y := overlays # Enable fixups to support overlays on BCM2835 platforms ifeq ($(CONFIG_ARCH_BCM2835),y) diff --git a/target/linux/generic/pending-5.10/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch b/target/linux/generic/pending-5.10/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch index 99f42ff21..924740114 100644 --- a/target/linux/generic/pending-5.10/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch +++ b/target/linux/generic/pending-5.10/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch @@ -17,7 +17,7 @@ Signed-off-by: Tobias Waldekranz --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -5431,6 +5431,7 @@ static int mv88e6xxx_register_switch(str +@@ -5436,6 +5436,7 @@ static int mv88e6xxx_register_switch(str ds->ops = &mv88e6xxx_switch_ops; ds->ageing_time_min = chip->info->age_time_coeff; ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX; diff --git a/target/linux/ipq806x/patches-5.10/0069-arm-boot-add-dts-files.patch b/target/linux/ipq806x/patches-5.10/0069-arm-boot-add-dts-files.patch index 6e43c485b..5f8e3fc0e 100644 --- a/target/linux/ipq806x/patches-5.10/0069-arm-boot-add-dts-files.patch +++ b/target/linux/ipq806x/patches-5.10/0069-arm-boot-add-dts-files.patch @@ -10,7 +10,7 @@ Signed-off-by: John Crispin --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -907,8 +907,33 @@ dtb-$(CONFIG_ARCH_QCOM) += \ +@@ -908,8 +908,29 @@ dtb-$(CONFIG_ARCH_QCOM) += \ qcom-ipq4019-ap.dk04.1-c3.dtb \ qcom-ipq4019-ap.dk07.1-c1.dtb \ qcom-ipq4019-ap.dk07.1-c2.dtb \ From 2f2e7bec8e772c9135c3d0334d455d83a0378121 Mon Sep 17 00:00:00 2001 From: John Audia Date: Wed, 23 Feb 2022 06:58:46 -0500 Subject: [PATCH 04/32] kernel: bump 5.10 to 5.10.102 Removed upstreamed: bcm4908/patches-5.10/180-i2c-brcmstb-fix-support-for-DSL-and-CM-variants.patch[1] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.102&id=f333c1916fd6b55900029bf8f918cc00009e2111 Build system: x86_64 Build-tested: bcm2711/RPi4B, mt7622/RT3200 Run-tested: bcm2711/RPi4B, mt7622/RT3200 Signed-off-by: John Audia --- include/kernel-5.10 | 4 +- .../910-unaligned_access_hacks.patch | 10 ++--- .../patches-5.10/920-mikrotik-rb4xx.patch | 2 +- .../patches-5.10/939-mikrotik-rb91x.patch | 2 +- ...ce-quirks-for-Freeway-Airmouse-T3-an.patch | 2 +- .../950-0348-gpio-Add-gpio-fsm-driver.patch | 2 +- ...ng-with-source-address-failed-policy.patch | 2 +- .../pending-5.10/834-ledtrig-libata.patch | 8 ++-- ...m_nandc-add-boot_layout_mode-support.patch | 38 +++++++++---------- .../oxnas/patches-5.10/999-libata-hacks.patch | 4 +- ...alink-add-gpio-driver-for-ralink-SoC.patch | 2 +- 11 files changed, 38 insertions(+), 38 deletions(-) diff --git a/include/kernel-5.10 b/include/kernel-5.10 index 47c2fd41f..0522a1432 100644 --- a/include/kernel-5.10 +++ b/include/kernel-5.10 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.10 = .101 -LINUX_KERNEL_HASH-5.10.101 = 0749258cb7ee47c478dfc34857e8930d41bfe0b074e80e9f57cbfa56d0ba1c8e +LINUX_VERSION-5.10 = .102 +LINUX_KERNEL_HASH-5.10.102 = e6414895b1c2e406a41a8744160e2b4ef2095e6cebe5363be460d1b198f0e379 diff --git a/target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch index d1e70a5b5..c65361fa0 100644 --- a/target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch +++ b/target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch @@ -579,7 +579,7 @@ #define IP6_MF 0x0001 #define IP6_OFFSET 0xFFF8 -@@ -557,8 +557,8 @@ static inline void __ipv6_addr_set_half( +@@ -560,8 +560,8 @@ static inline void __ipv6_addr_set_half( } #endif #endif @@ -590,7 +590,7 @@ } static inline void ipv6_addr_set(struct in6_addr *addr, -@@ -617,6 +617,8 @@ static inline bool ipv6_prefix_equal(con +@@ -620,6 +620,8 @@ static inline bool ipv6_prefix_equal(con const __be32 *a1 = addr1->s6_addr32; const __be32 *a2 = addr2->s6_addr32; unsigned int pdw, pbi; @@ -599,7 +599,7 @@ /* check complete u32 in prefix */ pdw = prefixlen >> 5; -@@ -625,7 +627,9 @@ static inline bool ipv6_prefix_equal(con +@@ -628,7 +630,9 @@ static inline bool ipv6_prefix_equal(con /* check incomplete u32 in prefix */ pbi = prefixlen & 0x1f; @@ -610,7 +610,7 @@ return false; return true; -@@ -746,13 +750,13 @@ static inline void ipv6_addr_set_v4mappe +@@ -749,13 +753,13 @@ static inline void ipv6_addr_set_v4mappe */ static inline int __ipv6_addr_diff32(const void *token1, const void *token2, int addrlen) { @@ -626,7 +626,7 @@ if (xb) return i * 32 + 31 - __fls(ntohl(xb)); } -@@ -938,17 +942,18 @@ static inline int ip6_multipath_hash_pol +@@ -941,17 +945,18 @@ static inline int ip6_multipath_hash_pol static inline void ip6_flow_hdr(struct ipv6hdr *hdr, unsigned int tclass, __be32 flowlabel) { diff --git a/target/linux/ath79/patches-5.10/920-mikrotik-rb4xx.patch b/target/linux/ath79/patches-5.10/920-mikrotik-rb4xx.patch index 7c3c91817..1314ed834 100644 --- a/target/linux/ath79/patches-5.10/920-mikrotik-rb4xx.patch +++ b/target/linux/ath79/patches-5.10/920-mikrotik-rb4xx.patch @@ -42,7 +42,7 @@ menu "SPI GPIO expanders" --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile -@@ -120,6 +120,7 @@ obj-$(CONFIG_GPIO_PL061) += gpio-pl061. +@@ -121,6 +121,7 @@ obj-$(CONFIG_GPIO_PL061) += gpio-pl061. obj-$(CONFIG_GPIO_PMIC_EIC_SPRD) += gpio-pmic-eic-sprd.o obj-$(CONFIG_GPIO_PXA) += gpio-pxa.o obj-$(CONFIG_GPIO_RASPBERRYPI_EXP) += gpio-raspberrypi-exp.o diff --git a/target/linux/ath79/patches-5.10/939-mikrotik-rb91x.patch b/target/linux/ath79/patches-5.10/939-mikrotik-rb91x.patch index 5bbab93c5..5253b21c6 100644 --- a/target/linux/ath79/patches-5.10/939-mikrotik-rb91x.patch +++ b/target/linux/ath79/patches-5.10/939-mikrotik-rb91x.patch @@ -16,7 +16,7 @@ depends on MFD_SYSCON && OF --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile -@@ -72,6 +72,7 @@ obj-$(CONFIG_GPIO_IT87) += gpio-it87.o +@@ -73,6 +73,7 @@ obj-$(CONFIG_GPIO_IT87) += gpio-it87.o obj-$(CONFIG_GPIO_IXP4XX) += gpio-ixp4xx.o obj-$(CONFIG_GPIO_JANZ_TTL) += gpio-janz-ttl.o obj-$(CONFIG_GPIO_KEMPLD) += gpio-kempld.o diff --git a/target/linux/bcm27xx/patches-5.10/950-0151-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch b/target/linux/bcm27xx/patches-5.10/950-0151-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch index fa76e0a82..26ced7adf 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0151-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0151-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch @@ -53,7 +53,7 @@ Signed-off-by: Jonathan Bell { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_MULTI_TOUCH), HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE), HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE2), HID_QUIRK_ALWAYS_POLL }, -@@ -194,6 +195,7 @@ static const struct hid_device_id hid_qu +@@ -195,6 +196,7 @@ static const struct hid_device_id hid_qu { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD), HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_XIN_MO, USB_DEVICE_ID_XIN_MO_DUAL_ARCADE), HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_GROUP_AUDIO), HID_QUIRK_NOGET }, diff --git a/target/linux/bcm27xx/patches-5.10/950-0348-gpio-Add-gpio-fsm-driver.patch b/target/linux/bcm27xx/patches-5.10/950-0348-gpio-Add-gpio-fsm-driver.patch index 9d2e2f87c..2fdef53ea 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0348-gpio-Add-gpio-fsm-driver.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0348-gpio-Add-gpio-fsm-driver.patch @@ -42,7 +42,7 @@ Signed-off-by: Phil Elwell depends on MFD_JANZ_CMODIO --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile -@@ -60,6 +60,7 @@ obj-$(CONFIG_GPIO_EP93XX) += gpio-ep93x +@@ -61,6 +61,7 @@ obj-$(CONFIG_GPIO_EP93XX) += gpio-ep93x obj-$(CONFIG_GPIO_EXAR) += gpio-exar.o obj-$(CONFIG_GPIO_F7188X) += gpio-f7188x.o obj-$(CONFIG_GPIO_FTGPIO010) += gpio-ftgpio010.o diff --git a/target/linux/generic/pending-5.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch b/target/linux/generic/pending-5.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch index 68edf37bf..d85735531 100644 --- a/target/linux/generic/pending-5.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch +++ b/target/linux/generic/pending-5.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch @@ -20,7 +20,7 @@ Signed-off-by: Jonas Gorski --- a/include/net/netns/ipv6.h +++ b/include/net/netns/ipv6.h -@@ -87,6 +87,7 @@ struct netns_ipv6 { +@@ -88,6 +88,7 @@ struct netns_ipv6 { unsigned int fib6_routes_require_src; #endif struct rt6_info *ip6_prohibit_entry; diff --git a/target/linux/generic/pending-5.10/834-ledtrig-libata.patch b/target/linux/generic/pending-5.10/834-ledtrig-libata.patch index e43a97bfe..25cffb144 100644 --- a/target/linux/generic/pending-5.10/834-ledtrig-libata.patch +++ b/target/linux/generic/pending-5.10/834-ledtrig-libata.patch @@ -65,7 +65,7 @@ Signed-off-by: Daniel Golle /** * ata_build_rw_tf - Build ATA taskfile for given read/write request * @tf: Target ATA taskfile -@@ -4547,6 +4560,9 @@ struct ata_queued_cmd *ata_qc_new_init(s +@@ -4548,6 +4561,9 @@ struct ata_queued_cmd *ata_qc_new_init(s if (tag < 0) return NULL; } @@ -75,7 +75,7 @@ Signed-off-by: Daniel Golle qc = __ata_qc_from_tag(ap, tag); qc->tag = qc->hw_tag = tag; -@@ -5325,6 +5341,9 @@ struct ata_port *ata_port_alloc(struct a +@@ -5326,6 +5342,9 @@ struct ata_port *ata_port_alloc(struct a ap->stats.unhandled_irq = 1; ap->stats.idle_irq = 1; #endif @@ -85,7 +85,7 @@ Signed-off-by: Daniel Golle ata_sff_port_init(ap); return ap; -@@ -5360,6 +5379,12 @@ static void ata_host_release(struct kref +@@ -5361,6 +5380,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; } -@@ -5766,7 +5791,23 @@ int ata_host_register(struct ata_host *h +@@ -5767,7 +5792,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; } diff --git a/target/linux/ipq806x/patches-5.10/099-1-mtd-nand-raw-qcom_nandc-add-boot_layout_mode-support.patch b/target/linux/ipq806x/patches-5.10/099-1-mtd-nand-raw-qcom_nandc-add-boot_layout_mode-support.patch index 6106dfb8d..37501bc64 100644 --- a/target/linux/ipq806x/patches-5.10/099-1-mtd-nand-raw-qcom_nandc-add-boot_layout_mode-support.patch +++ b/target/linux/ipq806x/patches-5.10/099-1-mtd-nand-raw-qcom_nandc-add-boot_layout_mode-support.patch @@ -16,7 +16,7 @@ Signed-off-by: Ansuel Smith --- a/drivers/mtd/nand/raw/qcom_nandc.c +++ b/drivers/mtd/nand/raw/qcom_nandc.c -@@ -159,6 +159,11 @@ +@@ -158,6 +158,11 @@ /* NAND_CTRL bits */ #define BAM_MODE_EN BIT(0) @@ -28,7 +28,7 @@ Signed-off-by: Ansuel Smith /* * the NAND controller performs reads/writes with ECC in 516 byte chunks. * the driver calls the chunks 'step' or 'codeword' interchangeably -@@ -430,6 +435,13 @@ struct qcom_nand_controller { +@@ -429,6 +434,13 @@ struct qcom_nand_controller { * @cfg0, cfg1, cfg0_raw..: NANDc register configurations needed for * ecc/non-ecc mode for the current nand flash * device @@ -42,7 +42,7 @@ Signed-off-by: Ansuel Smith */ struct qcom_nand_host { struct nand_chip chip; -@@ -452,6 +464,9 @@ struct qcom_nand_host { +@@ -451,6 +463,9 @@ struct qcom_nand_host { u32 ecc_bch_cfg; u32 clrflashstatus; u32 clrreadstatus; @@ -52,7 +52,7 @@ Signed-off-by: Ansuel Smith }; /* -@@ -460,12 +475,14 @@ struct qcom_nand_host { +@@ -459,12 +474,14 @@ struct qcom_nand_host { * @ecc_modes - ecc mode for NAND * @is_bam - whether NAND controller is using BAM * @is_qpic - whether NAND CTRL is part of qpic IP @@ -67,7 +67,7 @@ Signed-off-by: Ansuel Smith u32 dev_cmd_reg_start; }; -@@ -1604,7 +1621,7 @@ qcom_nandc_read_cw_raw(struct mtd_info * +@@ -1603,7 +1620,7 @@ qcom_nandc_read_cw_raw(struct mtd_info * data_size1 = mtd->writesize - host->cw_size * (ecc->steps - 1); oob_size1 = host->bbm_size; @@ -76,7 +76,7 @@ Signed-off-by: Ansuel Smith data_size2 = ecc->size - data_size1 - ((ecc->steps - 1) * 4); oob_size2 = (ecc->steps * 4) + host->ecc_bytes_hw + -@@ -1685,7 +1702,7 @@ check_for_erased_page(struct qcom_nand_h +@@ -1684,7 +1701,7 @@ check_for_erased_page(struct qcom_nand_h } for_each_set_bit(cw, &uncorrectable_cws, ecc->steps) { @@ -85,7 +85,7 @@ Signed-off-by: Ansuel Smith data_size = ecc->size - ((ecc->steps - 1) * 4); oob_size = (ecc->steps * 4) + host->ecc_bytes_hw; } else { -@@ -1844,7 +1861,7 @@ static int read_page_ecc(struct qcom_nan +@@ -1843,7 +1860,7 @@ static int read_page_ecc(struct qcom_nan for (i = 0; i < ecc->steps; i++) { int data_size, oob_size; @@ -94,7 +94,7 @@ Signed-off-by: Ansuel Smith data_size = ecc->size - ((ecc->steps - 1) << 2); oob_size = (ecc->steps << 2) + host->ecc_bytes_hw + host->spare_bytes; -@@ -1941,6 +1958,30 @@ static int copy_last_cw(struct qcom_nand +@@ -1940,6 +1957,30 @@ static int copy_last_cw(struct qcom_nand return ret; } @@ -125,7 +125,7 @@ Signed-off-by: Ansuel Smith /* implements ecc->read_page() */ static int qcom_nandc_read_page(struct nand_chip *chip, uint8_t *buf, int oob_required, int page) -@@ -1949,6 +1990,9 @@ static int qcom_nandc_read_page(struct n +@@ -1948,6 +1989,9 @@ static int qcom_nandc_read_page(struct n struct qcom_nand_controller *nandc = get_qcom_nand_controller(chip); u8 *data_buf, *oob_buf = NULL; @@ -135,7 +135,7 @@ Signed-off-by: Ansuel Smith nand_read_page_op(chip, page, 0, NULL, 0); data_buf = buf; oob_buf = oob_required ? chip->oob_poi : NULL; -@@ -1968,6 +2012,9 @@ static int qcom_nandc_read_page_raw(stru +@@ -1967,6 +2011,9 @@ static int qcom_nandc_read_page_raw(stru int cw, ret; u8 *data_buf = buf, *oob_buf = chip->oob_poi; @@ -145,7 +145,7 @@ Signed-off-by: Ansuel Smith for (cw = 0; cw < ecc->steps; cw++) { ret = qcom_nandc_read_cw_raw(mtd, chip, data_buf, oob_buf, page, cw); -@@ -1988,6 +2035,9 @@ static int qcom_nandc_read_oob(struct na +@@ -1987,6 +2034,9 @@ static int qcom_nandc_read_oob(struct na struct qcom_nand_controller *nandc = get_qcom_nand_controller(chip); struct nand_ecc_ctrl *ecc = &chip->ecc; @@ -155,7 +155,7 @@ Signed-off-by: Ansuel Smith clear_read_regs(nandc); clear_bam_transaction(nandc); -@@ -2008,6 +2058,9 @@ static int qcom_nandc_write_page(struct +@@ -2007,6 +2057,9 @@ static int qcom_nandc_write_page(struct u8 *data_buf, *oob_buf; int i, ret; @@ -165,7 +165,7 @@ Signed-off-by: Ansuel Smith nand_prog_page_begin_op(chip, page, 0, NULL, 0); clear_read_regs(nandc); -@@ -2023,7 +2076,7 @@ static int qcom_nandc_write_page(struct +@@ -2022,7 +2075,7 @@ static int qcom_nandc_write_page(struct for (i = 0; i < ecc->steps; i++) { int data_size, oob_size; @@ -174,7 +174,7 @@ Signed-off-by: Ansuel Smith data_size = ecc->size - ((ecc->steps - 1) << 2); oob_size = (ecc->steps << 2) + host->ecc_bytes_hw + host->spare_bytes; -@@ -2080,6 +2133,9 @@ static int qcom_nandc_write_page_raw(str +@@ -2079,6 +2132,9 @@ static int qcom_nandc_write_page_raw(str u8 *data_buf, *oob_buf; int i, ret; @@ -184,7 +184,7 @@ Signed-off-by: Ansuel Smith nand_prog_page_begin_op(chip, page, 0, NULL, 0); clear_read_regs(nandc); clear_bam_transaction(nandc); -@@ -2098,7 +2154,7 @@ static int qcom_nandc_write_page_raw(str +@@ -2097,7 +2153,7 @@ static int qcom_nandc_write_page_raw(str data_size1 = mtd->writesize - host->cw_size * (ecc->steps - 1); oob_size1 = host->bbm_size; @@ -193,7 +193,7 @@ Signed-off-by: Ansuel Smith data_size2 = ecc->size - data_size1 - ((ecc->steps - 1) << 2); oob_size2 = (ecc->steps << 2) + host->ecc_bytes_hw + -@@ -2158,6 +2214,9 @@ static int qcom_nandc_write_oob(struct n +@@ -2157,6 +2213,9 @@ static int qcom_nandc_write_oob(struct n int data_size, oob_size; int ret; @@ -203,7 +203,7 @@ Signed-off-by: Ansuel Smith host->use_ecc = true; clear_bam_transaction(nandc); -@@ -2806,6 +2865,7 @@ static int qcom_nand_host_init_and_regis +@@ -2805,6 +2864,7 @@ static int qcom_nand_host_init_and_regis struct nand_chip *chip = &host->chip; struct mtd_info *mtd = nand_to_mtd(chip); struct device *dev = nandc->dev; @@ -211,7 +211,7 @@ Signed-off-by: Ansuel Smith int ret; ret = of_property_read_u32(dn, "reg", &host->cs); -@@ -2866,6 +2926,17 @@ static int qcom_nand_host_init_and_regis +@@ -2865,6 +2925,17 @@ static int qcom_nand_host_init_and_regis if (ret) nand_cleanup(chip); @@ -229,7 +229,7 @@ Signed-off-by: Ansuel Smith return ret; } -@@ -3032,6 +3103,7 @@ static int qcom_nandc_remove(struct plat +@@ -3030,6 +3101,7 @@ static int qcom_nandc_remove(struct plat static const struct qcom_nandc_props ipq806x_nandc_props = { .ecc_modes = (ECC_RS_4BIT | ECC_BCH_8BIT), .is_bam = false, diff --git a/target/linux/oxnas/patches-5.10/999-libata-hacks.patch b/target/linux/oxnas/patches-5.10/999-libata-hacks.patch index 61c0c045a..84d418887 100644 --- a/target/linux/oxnas/patches-5.10/999-libata-hacks.patch +++ b/target/linux/oxnas/patches-5.10/999-libata-hacks.patch @@ -15,7 +15,7 @@ /* initialize internal qc */ qc = __ata_qc_from_tag(ap, ATA_TAG_INTERNAL); -@@ -4554,6 +4562,9 @@ struct ata_queued_cmd *ata_qc_new_init(s +@@ -4555,6 +4563,9 @@ struct ata_queued_cmd *ata_qc_new_init(s if (unlikely(ap->pflags & ATA_PFLAG_FROZEN)) return NULL; @@ -25,7 +25,7 @@ /* libsas case */ if (ap->flags & ATA_FLAG_SAS_HOST) { tag = ata_sas_allocate_tag(ap); -@@ -4599,6 +4610,8 @@ void ata_qc_free(struct ata_queued_cmd * +@@ -4600,6 +4611,8 @@ void ata_qc_free(struct ata_queued_cmd * qc->tag = ATA_TAG_POISON; if (ap->flags & ATA_FLAG_SAS_HOST) ata_sas_free_tag(tag, ap); diff --git a/target/linux/ramips/patches-5.10/802-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch b/target/linux/ramips/patches-5.10/802-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch index c17333692..52d40215f 100644 --- a/target/linux/ramips/patches-5.10/802-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch +++ b/target/linux/ramips/patches-5.10/802-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch @@ -62,7 +62,7 @@ Cc: linux-gpio@vger.kernel.org depends on PLAT_SPEAR --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile -@@ -119,6 +119,7 @@ obj-$(CONFIG_GPIO_PISOSR) += gpio-pisos +@@ -120,6 +120,7 @@ obj-$(CONFIG_GPIO_PISOSR) += gpio-pisos obj-$(CONFIG_GPIO_PL061) += gpio-pl061.o obj-$(CONFIG_GPIO_PMIC_EIC_SPRD) += gpio-pmic-eic-sprd.o obj-$(CONFIG_GPIO_PXA) += gpio-pxa.o From 971d60ec508c1956882689176a70cfcde7bde401 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Fri, 25 Feb 2022 12:30:08 +0100 Subject: [PATCH 05/32] ipset: update to 7.15 Update to the latest upstream version. In this version there is a new tool with which you can convert ipsets into nftables sets. Since we are now using nftables as default firewall, this could be a useful tool for porting ipsets to nftables sets. Signed-off-by: Florian Eckert --- package/network/utils/ipset/Makefile | 5 +++-- .../patches/0001-lib-ipset-fix-printf-warning.patch | 11 +++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 package/network/utils/ipset/patches/0001-lib-ipset-fix-printf-warning.patch diff --git a/package/network/utils/ipset/Makefile b/package/network/utils/ipset/Makefile index bc4945e0f..7b8d03519 100644 --- a/package/network/utils/ipset/Makefile +++ b/package/network/utils/ipset/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=ipset -PKG_VERSION:=7.6 +PKG_VERSION:=7.15 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://ipset.netfilter.org -PKG_HASH:=0e7d44caa9c153d96a9b5f12644fbe35a632537a5a7f653792b72e53d9d5c2db +PKG_HASH:=0a5545aaadb640142c1f888d366a78ddf8724799967fa20686a70053bd621751 PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=GPL-2.0 @@ -62,6 +62,7 @@ endef define Package/ipset/install $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ipset $(1)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ipset-translate $(1)/usr/sbin/ endef define Package/libipset/install diff --git a/package/network/utils/ipset/patches/0001-lib-ipset-fix-printf-warning.patch b/package/network/utils/ipset/patches/0001-lib-ipset-fix-printf-warning.patch new file mode 100644 index 000000000..90dfacab8 --- /dev/null +++ b/package/network/utils/ipset/patches/0001-lib-ipset-fix-printf-warning.patch @@ -0,0 +1,11 @@ +--- a/lib/ipset.c ++++ b/lib/ipset.c +@@ -1847,7 +1847,7 @@ static int ipset_xlate(struct ipset *ips + return -1; + case IPSET_CMD_LIST: + if (!set) { +- printf("list sets %s\n", ++ printf("list sets %s %s\n", + ipset_xlate_family(family), table); + } else { + printf("list set %s %s %s\n", From 50ad8ab612923ba10909bdef63d6af4ce1c6107e Mon Sep 17 00:00:00 2001 From: Beginner-Go <70857188+Beginner-Go@users.noreply.github.com> Date: Thu, 3 Mar 2022 00:55:21 +0800 Subject: [PATCH 06/32] kernel: bump 5.15 to 5.15.26 Signed-off-by: Beginner-Go <70857188+Beginner-Go@users.noreply.github.com> --- include/kernel-5.15 | 4 +- ...rans-call-add-disks-after-mtd-device.patch | 2 +- .../420-mtd-set-rootfs-to-be-root-dev.patch | 2 +- .../710-net-dsa-mv88e6xxx-default-VID-1.patch | 2 +- ...-dsa-mv88e6xxx-disable-ATU-violation.patch | 2 +- .../800-GPIO-add-named-gpio-exports.patch | 4 +- .../generic/hack-5.15/902-debloat_proc.patch | 4 +- ...k-events-support-multiple-registrant.patch | 35 +++++------------ ...-linux-kernel-to-support-shortcut-fe.patch | 38 ++++++------------- ...include-asm-rwonce.h-for-kernel-code.patch | 4 +- ...-mtd-core-add-get_mtd_device_by_node.patch | 2 +- ...-netfilter_optional_tcp_window_check.patch | 6 +-- ...ng-with-source-address-failed-policy.patch | 14 +++---- ...d-knob-for-filtering-rx-tx-BPDU-pack.patch | 2 +- ...equest-assisted-learning-on-CPU-port.patch | 2 +- .../pending-5.15/834-ledtrig-libata.patch | 8 ++-- ...328-Add-support-for-OrangePi-R1-Plus.patch | 2 +- ...8-Add-support-for-EmbedFire-DoorNet1.patch | 2 +- ...9-Add-support-for-EmbedFire-DoorNet2.patch | 2 +- ...Add-support-for-OrangePi-R1-Plus-LTS.patch | 9 +---- ...-support-for-FriendlyARM-NanoPi-Neo3.patch | 10 +---- ...rk3399-add-support-for-GuangMiao-G4C.patch | 2 +- ...ip-add-devfreq-driver-for-rk3328-dmc.patch | 4 +- ...anopi-r2s-add-rk3328-dmc-relate-node.patch | 8 ++-- ...overclock-to-2.2-1.8-GHz-for-NanoPi4.patch | 2 +- ...x2x_warpcore_8727_2_5g_sgmii_txfault.patch | 4 +- 26 files changed, 65 insertions(+), 111 deletions(-) diff --git a/include/kernel-5.15 b/include/kernel-5.15 index ff16326b8..48ba1e9df 100644 --- a/include/kernel-5.15 +++ b/include/kernel-5.15 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.15 = .25 -LINUX_KERNEL_HASH-5.15.25 = 4399ffbe524a11b3c44bff6dd858ed31417341f58513f04cb6ae15e527543879 +LINUX_VERSION-5.15 = .26 +LINUX_KERNEL_HASH-5.15.26 = 58122134f2613fcbb200bb2399ef2117852166a8e11eed4b632a86b20b6bbe3a diff --git a/target/linux/generic/hack-5.15/402-mtd-blktrans-call-add-disks-after-mtd-device.patch b/target/linux/generic/hack-5.15/402-mtd-blktrans-call-add-disks-after-mtd-device.patch index c9821b57e..d0f81c485 100644 --- a/target/linux/generic/hack-5.15/402-mtd-blktrans-call-add-disks-after-mtd-device.patch +++ b/target/linux/generic/hack-5.15/402-mtd-blktrans-call-add-disks-after-mtd-device.patch @@ -77,7 +77,7 @@ Signed-off-by: Daniel Golle #include "mtdcore.h" -@@ -1000,6 +1001,8 @@ int mtd_device_parse_register(struct mtd +@@ -1002,6 +1003,8 @@ int mtd_device_parse_register(struct mtd ret = mtd_otp_nvmem_add(mtd); diff --git a/target/linux/generic/hack-5.15/420-mtd-set-rootfs-to-be-root-dev.patch b/target/linux/generic/hack-5.15/420-mtd-set-rootfs-to-be-root-dev.patch index aa1d4df0f..9ff1e7a12 100644 --- a/target/linux/generic/hack-5.15/420-mtd-set-rootfs-to-be-root-dev.patch +++ b/target/linux/generic/hack-5.15/420-mtd-set-rootfs-to-be-root-dev.patch @@ -20,7 +20,7 @@ Signed-off-by: Gabor Juhos #include #include -@@ -696,6 +697,19 @@ int add_mtd_device(struct mtd_info *mtd) +@@ -697,6 +698,19 @@ int add_mtd_device(struct mtd_info *mtd) of this try_ nonsense, and no bitching about it either. :) */ __module_get(THIS_MODULE); diff --git a/target/linux/generic/hack-5.15/710-net-dsa-mv88e6xxx-default-VID-1.patch b/target/linux/generic/hack-5.15/710-net-dsa-mv88e6xxx-default-VID-1.patch index 7a41fe360..fd6731ad1 100644 --- a/target/linux/generic/hack-5.15/710-net-dsa-mv88e6xxx-default-VID-1.patch +++ b/target/linux/generic/hack-5.15/710-net-dsa-mv88e6xxx-default-VID-1.patch @@ -8,7 +8,7 @@ mv88e6xxx_reg_lock(chip); err = mv88e6xxx_port_db_load_purge(chip, port, addr, vid, MV88E6XXX_G1_ATU_DATA_STATE_UC_STATIC); -@@ -2342,6 +2342,7 @@ static int mv88e6xxx_port_fdb_del(struct +@@ -2342,6 +2343,7 @@ static int mv88e6xxx_port_fdb_del(struct struct mv88e6xxx_chip *chip = ds->priv; int err; diff --git a/target/linux/generic/hack-5.15/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch b/target/linux/generic/hack-5.15/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch index 34fe2ae6a..422c3d6fd 100644 --- a/target/linux/generic/hack-5.15/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch +++ b/target/linux/generic/hack-5.15/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch @@ -1,6 +1,6 @@ --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -2988,6 +2988,9 @@ static int mv88e6xxx_setup_port(struct m +@@ -2990,6 +2990,9 @@ static int mv88e6xxx_setup_port(struct m else reg = 1 << port; diff --git a/target/linux/generic/hack-5.15/800-GPIO-add-named-gpio-exports.patch b/target/linux/generic/hack-5.15/800-GPIO-add-named-gpio-exports.patch index 2137abdbe..f24fe9d19 100644 --- a/target/linux/generic/hack-5.15/800-GPIO-add-named-gpio-exports.patch +++ b/target/linux/generic/hack-5.15/800-GPIO-add-named-gpio-exports.patch @@ -138,7 +138,7 @@ Signed-off-by: John Crispin { struct gpio_chip *chip; struct gpio_device *gdev; -@@ -626,6 +626,8 @@ int gpiod_export(struct gpio_desc *desc, +@@ -623,6 +623,8 @@ int gpiod_export(struct gpio_desc *desc, offset = gpio_chip_hwgpio(desc); if (chip->names && chip->names[offset]) ioname = chip->names[offset]; @@ -147,7 +147,7 @@ Signed-off-by: John Crispin dev = device_create_with_groups(&gpio_class, &gdev->dev, MKDEV(0, 0), data, gpio_groups, -@@ -647,6 +649,12 @@ err_unlock: +@@ -644,6 +646,12 @@ err_unlock: gpiod_dbg(desc, "%s: status %d\n", __func__, status); return status; } diff --git a/target/linux/generic/hack-5.15/902-debloat_proc.patch b/target/linux/generic/hack-5.15/902-debloat_proc.patch index 1e458d052..4852071d5 100644 --- a/target/linux/generic/hack-5.15/902-debloat_proc.patch +++ b/target/linux/generic/hack-5.15/902-debloat_proc.patch @@ -341,7 +341,7 @@ Signed-off-by: Felix Fietkau --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c -@@ -3018,11 +3018,13 @@ static const struct seq_operations fib_r +@@ -3019,11 +3019,13 @@ static const struct seq_operations fib_r int __net_init fib_proc_init(struct net *net) { @@ -357,7 +357,7 @@ Signed-off-by: Felix Fietkau fib_triestat_seq_show, NULL)) goto out2; -@@ -3033,17 +3035,21 @@ int __net_init fib_proc_init(struct net +@@ -3034,17 +3036,21 @@ int __net_init fib_proc_init(struct net return 0; out3: diff --git a/target/linux/generic/hack-5.15/952-add-net-conntrack-events-support-multiple-registrant.patch b/target/linux/generic/hack-5.15/952-add-net-conntrack-events-support-multiple-registrant.patch index b6c83a1ba..f237b48ab 100644 --- a/target/linux/generic/hack-5.15/952-add-net-conntrack-events-support-multiple-registrant.patch +++ b/target/linux/generic/hack-5.15/952-add-net-conntrack-events-support-multiple-registrant.patch @@ -20,8 +20,6 @@ Signed-off-by: Zhi Chen net/netfilter/nf_conntrack_netlink.c | 17 ++++ 6 files changed, 146 insertions(+), 4 deletions(-) -diff --git a/include/net/netfilter/nf_conntrack_ecache.h b/include/net/netfilter/nf_conntrack_ecache.h -index d932e22ed..c45657013 100644 --- a/include/net/netfilter/nf_conntrack_ecache.h +++ b/include/net/netfilter/nf_conntrack_ecache.h @@ -83,9 +83,14 @@ struct nf_ct_event_notifier { @@ -55,7 +53,7 @@ index d932e22ed..c45657013 100644 e = nf_ct_ecache_find(ct); if (e == NULL) -@@ -130,10 +137,12 @@ nf_conntrack_event_report(enum ip_conntrack_events event, struct nf_conn *ct, +@@ -130,10 +137,12 @@ nf_conntrack_event_report(enum ip_conntr u32 portid, int report) { #ifdef CONFIG_NF_CONNTRACK_EVENTS @@ -81,11 +79,9 @@ index d932e22ed..c45657013 100644 return nf_conntrack_eventmask_report(1 << event, ct, 0, 0); #else -diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h -index 0294f3d47..9bc2a1eba 100644 --- a/include/net/netns/conntrack.h +++ b/include/net/netns/conntrack.h -@@ -112,6 +112,9 @@ struct netns_ct { +@@ -113,6 +113,9 @@ struct netns_ct { struct ct_pcpu __percpu *pcpu_lists; struct ip_conntrack_stat __percpu *stat; @@ -95,8 +91,6 @@ index 0294f3d47..9bc2a1eba 100644 struct nf_ct_event_notifier __rcu *nf_conntrack_event_cb; struct nf_ip_net nf_ct_proto; #if defined(CONFIG_NF_CONNTRACK_LABELS) -diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig -index 92a747896..258bdeac9 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig @@ -151,6 +151,14 @@ config NF_CONNTRACK_EVENTS @@ -114,11 +108,9 @@ index 92a747896..258bdeac9 100644 config NF_CONNTRACK_TIMEOUT bool 'Connection tracking timeout' depends on NETFILTER_ADVANCED -diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c -index 4712a90a1..ac05af611 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c -@@ -2825,6 +2825,10 @@ int nf_conntrack_init_net(struct net *net) +@@ -2827,6 +2827,10 @@ int nf_conntrack_init_net(struct net *ne nf_conntrack_helper_pernet_init(net); nf_conntrack_proto_pernet_init(net); @@ -129,8 +121,6 @@ index 4712a90a1..ac05af611 100644 return 0; err_expect: -diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c -index 41768ff19..9d8075db0 100644 --- a/net/netfilter/nf_conntrack_ecache.c +++ b/net/netfilter/nf_conntrack_ecache.c @@ -18,6 +18,9 @@ @@ -143,7 +133,7 @@ index 41768ff19..9d8075db0 100644 #include #include #include -@@ -167,6 +170,35 @@ static int __nf_conntrack_eventmask_report(struct nf_conntrack_ecache *e, +@@ -167,6 +170,35 @@ static int __nf_conntrack_eventmask_repo return ret; } @@ -179,7 +169,7 @@ index 41768ff19..9d8075db0 100644 int nf_conntrack_eventmask_report(unsigned int events, struct nf_conn *ct, u32 portid, int report) { -@@ -203,10 +235,52 @@ int nf_conntrack_eventmask_report(unsigned int events, struct nf_conn *ct, +@@ -203,10 +235,52 @@ int nf_conntrack_eventmask_report(unsign return ret; } @@ -232,7 +222,7 @@ index 41768ff19..9d8075db0 100644 void nf_ct_deliver_cached_events(struct nf_conn *ct) { struct nf_conntrack_ecache *e; -@@ -232,6 +306,7 @@ void nf_ct_deliver_cached_events(struct nf_conn *ct) +@@ -232,6 +306,7 @@ void nf_ct_deliver_cached_events(struct */ __nf_conntrack_eventmask_report(e, events, e->missed, &item); } @@ -286,7 +276,7 @@ index 41768ff19..9d8075db0 100644 void nf_conntrack_unregister_notifier(struct net *net) { mutex_lock(&nf_ct_ecache_mutex); -@@ -285,6 +383,7 @@ void nf_conntrack_unregister_notifier(struct net *net) +@@ -285,6 +383,7 @@ void nf_conntrack_unregister_notifier(st mutex_unlock(&nf_ct_ecache_mutex); /* synchronize_rcu() is called after netns pre_exit */ } @@ -294,11 +284,9 @@ index 41768ff19..9d8075db0 100644 EXPORT_SYMBOL_GPL(nf_conntrack_unregister_notifier); void nf_conntrack_ecache_work(struct net *net, enum nf_ct_ecache_state state) -diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c -index 81d03acf6..f99de87c1 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c -@@ -706,12 +706,19 @@ static size_t ctnetlink_nlmsg_size(const struct nf_conn *ct) +@@ -706,12 +706,19 @@ static size_t ctnetlink_nlmsg_size(const } static int @@ -318,7 +306,7 @@ index 81d03acf6..f99de87c1 100644 struct nf_conn *ct = item->ct; struct sk_buff *skb; unsigned int type; -@@ -3760,11 +3767,17 @@ static int ctnetlink_stat_exp_cpu(struct sk_buff *skb, +@@ -3761,11 +3768,17 @@ static int ctnetlink_stat_exp_cpu(struct } #ifdef CONFIG_NF_CONNTRACK_EVENTS @@ -336,7 +324,7 @@ index 81d03acf6..f99de87c1 100644 static const struct nfnl_callback ctnl_cb[IPCTNL_MSG_MAX] = { [IPCTNL_MSG_CT_NEW] = { -@@ -3863,8 +3876,12 @@ static int __net_init ctnetlink_net_init(struct net *net) +@@ -3864,8 +3877,12 @@ static int __net_init ctnetlink_net_init static void ctnetlink_net_pre_exit(struct net *net) { #ifdef CONFIG_NF_CONNTRACK_EVENTS @@ -349,6 +337,3 @@ index 81d03acf6..f99de87c1 100644 } static struct pernet_operations ctnetlink_net_ops = { --- -2.17.1 - diff --git a/target/linux/generic/hack-5.15/953-net-patch-linux-kernel-to-support-shortcut-fe.patch b/target/linux/generic/hack-5.15/953-net-patch-linux-kernel-to-support-shortcut-fe.patch index b763354f2..361cf8d29 100644 --- a/target/linux/generic/hack-5.15/953-net-patch-linux-kernel-to-support-shortcut-fe.patch +++ b/target/linux/generic/hack-5.15/953-net-patch-linux-kernel-to-support-shortcut-fe.patch @@ -1,8 +1,6 @@ -diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h -index 509e18c7e..d0ea4afbb 100644 --- a/include/linux/if_bridge.h +++ b/include/linux/if_bridge.h -@@ -68,6 +68,9 @@ void brioctl_set(int (*hook)(struct net *net, struct net_bridge *br, +@@ -69,6 +69,9 @@ void brioctl_set(int (*hook)(struct net int br_ioctl_call(struct net *net, struct net_bridge *br, unsigned int cmd, struct ifreq *ifr, void __user *uarg); @@ -12,11 +10,9 @@ index 509e18c7e..d0ea4afbb 100644 #if IS_ENABLED(CONFIG_BRIDGE) && IS_ENABLED(CONFIG_BRIDGE_IGMP_SNOOPING) int br_multicast_list_adjacent(struct net_device *dev, struct list_head *br_ip_list); -diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h -index b8c273af2..2e238037c 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -873,6 +873,10 @@ struct sk_buff { +@@ -877,6 +877,10 @@ struct sk_buff { #endif __u8 slow_gro:1; @@ -27,8 +23,6 @@ index b8c273af2..2e238037c 100644 #ifdef CONFIG_NET_SCHED __u16 tc_index; /* traffic control index */ #endif -diff --git a/include/linux/timer.h b/include/linux/timer.h -index fda13c9d1..b69492fd4 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h @@ -18,6 +18,10 @@ struct timer_list { @@ -42,8 +36,6 @@ index fda13c9d1..b69492fd4 100644 #ifdef CONFIG_LOCKDEP struct lockdep_map lockdep_map; #endif -diff --git a/include/net/netfilter/nf_conntrack_ecache.h b/include/net/netfilter/nf_conntrack_ecache.h -index c45657013..3c02392ea 100644 --- a/include/net/netfilter/nf_conntrack_ecache.h +++ b/include/net/netfilter/nf_conntrack_ecache.h @@ -86,6 +86,8 @@ struct nf_ct_event_notifier { @@ -55,11 +47,9 @@ index c45657013..3c02392ea 100644 #else int nf_conntrack_register_notifier(struct net *net, const struct nf_ct_event_notifier *nb); -diff --git a/net/Kconfig b/net/Kconfig -index fb13460c6..2e926a2ed 100644 --- a/net/Kconfig +++ b/net/Kconfig -@@ -447,6 +447,9 @@ config FAILOVER +@@ -456,6 +456,9 @@ config FAILOVER migration of VMs with direct attached VFs by failing over to the paravirtual datapath when the VF is unplugged. @@ -69,11 +59,9 @@ index fb13460c6..2e926a2ed 100644 config ETHTOOL_NETLINK bool "Netlink interface for ethtool" default y -diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c -index 4a02f8bb2..8a85ab557 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c -@@ -773,6 +773,28 @@ void br_port_flags_change(struct net_bridge_port *p, unsigned long mask) +@@ -773,6 +773,28 @@ void br_port_flags_change(struct net_bri br_recalculate_neigh_suppress_enabled(br); } @@ -102,11 +90,9 @@ index 4a02f8bb2..8a85ab557 100644 bool br_port_flag_is_set(const struct net_device *dev, unsigned long flag) { struct net_bridge_port *p; -diff --git a/net/core/dev.c b/net/core/dev.c -index e0878a500..4a9846b64 100644 --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -3574,9 +3574,17 @@ static int xmit_one(struct sk_buff *skb, struct net_device *dev, +@@ -3574,9 +3574,17 @@ static int xmit_one(struct sk_buff *skb, { unsigned int len; int rc; @@ -125,7 +111,7 @@ index e0878a500..4a9846b64 100644 #ifdef CONFIG_ETHERNET_PACKET_MANGLE if (dev->eth_mangle_tx && !(skb = dev->eth_mangle_tx(dev, skb))) -@@ -5198,6 +5205,11 @@ void netdev_rx_handler_unregister(struct net_device *dev) +@@ -5203,6 +5211,11 @@ void netdev_rx_handler_unregister(struct } EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister); @@ -137,7 +123,7 @@ index e0878a500..4a9846b64 100644 /* * Limit the use of PFMEMALLOC reserves to those protocols that implement * the special handling of PFMEMALLOC skbs. -@@ -5246,6 +5258,10 @@ static int __netif_receive_skb_core(struct sk_buff **pskb, bool pfmemalloc, +@@ -5251,6 +5264,10 @@ static int __netif_receive_skb_core(stru int ret = NET_RX_DROP; __be16 type; @@ -148,7 +134,7 @@ index e0878a500..4a9846b64 100644 net_timestamp_check(!netdev_tstamp_prequeue, skb); trace_netif_receive_skb(skb); -@@ -5283,6 +5299,15 @@ another_round: +@@ -5288,6 +5305,15 @@ another_round: goto out; } @@ -164,11 +150,9 @@ index e0878a500..4a9846b64 100644 if (skb_skip_tc_classify(skb)) goto skip_classify; -diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c -index 9d8075db0..fc49b77e4 100644 --- a/net/netfilter/nf_conntrack_ecache.c +++ b/net/netfilter/nf_conntrack_ecache.c -@@ -149,12 +149,23 @@ static int __nf_conntrack_eventmask_report(struct nf_conntrack_ecache *e, +@@ -149,12 +149,23 @@ static int __nf_conntrack_eventmask_repo rcu_read_lock(); notify = rcu_dereference(net->ct.nf_conntrack_event_cb); @@ -194,7 +178,7 @@ index 9d8075db0..fc49b77e4 100644 rcu_read_unlock(); if (likely(ret >= 0 && missed == 0)) -@@ -345,6 +356,11 @@ int nf_conntrack_register_notifier(struct net *net, +@@ -345,6 +356,11 @@ int nf_conntrack_register_notifier(struc { return atomic_notifier_chain_register(&net->ct.nf_conntrack_chain, nb); } @@ -206,7 +190,7 @@ index 9d8075db0..fc49b77e4 100644 #else int nf_conntrack_register_notifier(struct net *net, const struct nf_ct_event_notifier *new) -@@ -375,6 +391,11 @@ int nf_conntrack_unregister_notifier(struct net *net, struct notifier_block *nb) +@@ -375,6 +391,11 @@ int nf_conntrack_unregister_notifier(str { return atomic_notifier_chain_unregister(&net->ct.nf_conntrack_chain, nb); } diff --git a/target/linux/generic/pending-5.15/100-compiler.h-only-include-asm-rwonce.h-for-kernel-code.patch b/target/linux/generic/pending-5.15/100-compiler.h-only-include-asm-rwonce.h-for-kernel-code.patch index c90806157..22f52c1d4 100644 --- a/target/linux/generic/pending-5.15/100-compiler.h-only-include-asm-rwonce.h-for-kernel-code.patch +++ b/target/linux/generic/pending-5.15/100-compiler.h-only-include-asm-rwonce.h-for-kernel-code.patch @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau --- a/include/linux/compiler.h +++ b/include/linux/compiler.h -@@ -231,6 +231,8 @@ void ftrace_likely_update(struct ftrace_ +@@ -220,6 +220,8 @@ void ftrace_likely_update(struct ftrace_ #define function_nocfi(x) (x) #endif @@ -20,7 +20,7 @@ Signed-off-by: Felix Fietkau #endif /* __KERNEL__ */ /* -@@ -263,6 +265,4 @@ static inline void *offset_to_ptr(const +@@ -252,6 +254,4 @@ static inline void *offset_to_ptr(const */ #define prevent_tail_call_optimization() mb() diff --git a/target/linux/generic/pending-5.15/495-mtd-core-add-get_mtd_device_by_node.patch b/target/linux/generic/pending-5.15/495-mtd-core-add-get_mtd_device_by_node.patch index 14fad125c..a708a46b0 100644 --- a/target/linux/generic/pending-5.15/495-mtd-core-add-get_mtd_device_by_node.patch +++ b/target/linux/generic/pending-5.15/495-mtd-core-add-get_mtd_device_by_node.patch @@ -17,7 +17,7 @@ Reviewed-by: Miquel Raynal --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c -@@ -1201,6 +1201,44 @@ out_unlock: +@@ -1203,6 +1203,44 @@ out_unlock: } EXPORT_SYMBOL_GPL(get_mtd_device_nm); diff --git a/target/linux/generic/pending-5.15/613-netfilter_optional_tcp_window_check.patch b/target/linux/generic/pending-5.15/613-netfilter_optional_tcp_window_check.patch index db0b17845..af6bee7db 100644 --- a/target/linux/generic/pending-5.15/613-netfilter_optional_tcp_window_check.patch +++ b/target/linux/generic/pending-5.15/613-netfilter_optional_tcp_window_check.patch @@ -37,7 +37,7 @@ Signed-off-by: Felix Fietkau __NF_SYSCTL_CT_LAST_SYSCTL, }; -@@ -1026,6 +1027,15 @@ static struct ctl_table nf_ct_sysctl_table[] = { +@@ -1026,6 +1027,15 @@ static struct ctl_table nf_ct_sysctl_tab .proc_handler = nf_hooks_lwtunnel_sysctl_handler, }, #endif @@ -53,7 +53,7 @@ Signed-off-by: Felix Fietkau {} }; -@@ -1153,6 +1163,7 @@ static int nf_conntrack_standalone_init_sysctl(struct net *net) +@@ -1153,6 +1163,7 @@ static int nf_conntrack_standalone_init_ #ifdef CONFIG_NF_CONNTRACK_EVENTS table[NF_SYSCTL_CT_EVENTS].data = &net->ct.sysctl_events; #endif @@ -61,7 +61,7 @@ Signed-off-by: Felix Fietkau #ifdef CONFIG_NF_CONNTRACK_TIMESTAMP table[NF_SYSCTL_CT_TIMESTAMP].data = &net->ct.sysctl_tstamp; #endif -@@ -1222,6 +1233,7 @@ static int nf_conntrack_pernet_init(struct net *net) +@@ -1222,6 +1233,7 @@ static int nf_conntrack_pernet_init(stru int ret; net->ct.sysctl_checksum = 1; diff --git a/target/linux/generic/pending-5.15/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch b/target/linux/generic/pending-5.15/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch index 05a4a5ee1..3fb053ab4 100644 --- a/target/linux/generic/pending-5.15/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch +++ b/target/linux/generic/pending-5.15/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch @@ -185,7 +185,7 @@ Signed-off-by: Jonas Gorski cfg->fc_flags |= RTF_REJECT; if (rtm->rtm_type == RTN_LOCAL) -@@ -6291,6 +6322,8 @@ static int ip6_route_dev_notify(struct n +@@ -6292,6 +6323,8 @@ static int ip6_route_dev_notify(struct n #ifdef CONFIG_IPV6_MULTIPLE_TABLES net->ipv6.ip6_prohibit_entry->dst.dev = dev; net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev); @@ -194,7 +194,7 @@ Signed-off-by: Jonas Gorski net->ipv6.ip6_blk_hole_entry->dst.dev = dev; net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev); #endif -@@ -6302,6 +6335,7 @@ static int ip6_route_dev_notify(struct n +@@ -6303,6 +6336,7 @@ static int ip6_route_dev_notify(struct n in6_dev_put_clear(&net->ipv6.ip6_null_entry->rt6i_idev); #ifdef CONFIG_IPV6_MULTIPLE_TABLES in6_dev_put_clear(&net->ipv6.ip6_prohibit_entry->rt6i_idev); @@ -202,7 +202,7 @@ Signed-off-by: Jonas Gorski in6_dev_put_clear(&net->ipv6.ip6_blk_hole_entry->rt6i_idev); #endif } -@@ -6493,6 +6527,8 @@ static int __net_init ip6_route_net_init +@@ -6494,6 +6528,8 @@ static int __net_init ip6_route_net_init #ifdef CONFIG_IPV6_MULTIPLE_TABLES net->ipv6.fib6_has_custom_rules = false; @@ -211,7 +211,7 @@ Signed-off-by: Jonas Gorski net->ipv6.ip6_prohibit_entry = kmemdup(&ip6_prohibit_entry_template, sizeof(*net->ipv6.ip6_prohibit_entry), GFP_KERNEL); -@@ -6503,11 +6539,21 @@ static int __net_init ip6_route_net_init +@@ -6504,11 +6540,21 @@ static int __net_init ip6_route_net_init ip6_template_metrics, true); INIT_LIST_HEAD(&net->ipv6.ip6_prohibit_entry->rt6i_uncached); @@ -234,7 +234,7 @@ Signed-off-by: Jonas Gorski net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops; dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst, ip6_template_metrics, true); -@@ -6534,6 +6580,8 @@ out: +@@ -6535,6 +6581,8 @@ out: return ret; #ifdef CONFIG_IPV6_MULTIPLE_TABLES @@ -243,7 +243,7 @@ Signed-off-by: Jonas Gorski out_ip6_prohibit_entry: kfree(net->ipv6.ip6_prohibit_entry); out_ip6_null_entry: -@@ -6553,6 +6601,7 @@ static void __net_exit ip6_route_net_exi +@@ -6554,6 +6602,7 @@ static void __net_exit ip6_route_net_exi kfree(net->ipv6.ip6_null_entry); #ifdef CONFIG_IPV6_MULTIPLE_TABLES kfree(net->ipv6.ip6_prohibit_entry); @@ -251,7 +251,7 @@ Signed-off-by: Jonas Gorski kfree(net->ipv6.ip6_blk_hole_entry); #endif dst_entries_destroy(&net->ipv6.ip6_dst_ops); -@@ -6630,6 +6679,9 @@ void __init ip6_route_init_special_entri +@@ -6631,6 +6680,9 @@ void __init ip6_route_init_special_entri init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev); init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev; init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev); diff --git a/target/linux/generic/pending-5.15/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch b/target/linux/generic/pending-5.15/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch index 516f545b1..f30887fcc 100644 --- a/target/linux/generic/pending-5.15/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch +++ b/target/linux/generic/pending-5.15/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch @@ -161,7 +161,7 @@ Signed-off-by: Felix Fietkau struct rtnl_link { rtnl_doit_func doit; -@@ -4687,7 +4687,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu +@@ -4689,7 +4689,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu brport_nla_put_flag(skb, flags, mask, IFLA_BRPORT_MCAST_FLOOD, BR_MCAST_FLOOD) || brport_nla_put_flag(skb, flags, mask, diff --git a/target/linux/generic/pending-5.15/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch b/target/linux/generic/pending-5.15/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch index 2ad843fc5..3a264e3dc 100644 --- a/target/linux/generic/pending-5.15/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch +++ b/target/linux/generic/pending-5.15/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch @@ -17,7 +17,7 @@ Signed-off-by: Tobias Waldekranz --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -6325,6 +6325,7 @@ static int mv88e6xxx_register_switch(str +@@ -6326,6 +6326,7 @@ static int mv88e6xxx_register_switch(str ds->ops = &mv88e6xxx_switch_ops; ds->ageing_time_min = chip->info->age_time_coeff; ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX; diff --git a/target/linux/generic/pending-5.15/834-ledtrig-libata.patch b/target/linux/generic/pending-5.15/834-ledtrig-libata.patch index ee911e3cf..dca9f333b 100644 --- a/target/linux/generic/pending-5.15/834-ledtrig-libata.patch +++ b/target/linux/generic/pending-5.15/834-ledtrig-libata.patch @@ -65,7 +65,7 @@ Signed-off-by: Daniel Golle /** * ata_build_rw_tf - Build ATA taskfile for given read/write request * @tf: Target ATA taskfile -@@ -4572,6 +4585,9 @@ struct ata_queued_cmd *ata_qc_new_init(s +@@ -4573,6 +4586,9 @@ struct ata_queued_cmd *ata_qc_new_init(s if (tag < 0) return NULL; } @@ -75,7 +75,7 @@ Signed-off-by: Daniel Golle qc = __ata_qc_from_tag(ap, tag); qc->tag = qc->hw_tag = tag; -@@ -5350,6 +5366,9 @@ struct ata_port *ata_port_alloc(struct a +@@ -5351,6 +5367,9 @@ struct ata_port *ata_port_alloc(struct a ap->stats.unhandled_irq = 1; ap->stats.idle_irq = 1; #endif @@ -85,7 +85,7 @@ Signed-off-by: Daniel Golle ata_sff_port_init(ap); return ap; -@@ -5385,6 +5404,12 @@ static void ata_host_release(struct kref +@@ -5386,6 +5405,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; } -@@ -5791,7 +5816,23 @@ int ata_host_register(struct ata_host *h +@@ -5792,7 +5817,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; } diff --git a/target/linux/rockchip/patches-5.15/202-rockchip-rk3328-Add-support-for-OrangePi-R1-Plus.patch b/target/linux/rockchip/patches-5.15/202-rockchip-rk3328-Add-support-for-OrangePi-R1-Plus.patch index dc62c5b97..3eb923183 100644 --- a/target/linux/rockchip/patches-5.15/202-rockchip-rk3328-Add-support-for-OrangePi-R1-Plus.patch +++ b/target/linux/rockchip/patches-5.15/202-rockchip-rk3328-Add-support-for-OrangePi-R1-Plus.patch @@ -1,6 +1,6 @@ --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile -@@ -10,6 +10,7 @@ +@@ -10,6 +10,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-od dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-a1.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2s.dtb diff --git a/target/linux/rockchip/patches-5.15/203-rockchip-rk3328-Add-support-for-EmbedFire-DoorNet1.patch b/target/linux/rockchip/patches-5.15/203-rockchip-rk3328-Add-support-for-EmbedFire-DoorNet1.patch index 63c3c82f0..aa675117f 100644 --- a/target/linux/rockchip/patches-5.15/203-rockchip-rk3328-Add-support-for-EmbedFire-DoorNet1.patch +++ b/target/linux/rockchip/patches-5.15/203-rockchip-rk3328-Add-support-for-EmbedFire-DoorNet1.patch @@ -415,7 +415,7 @@ +}; --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile -@@ -5,6 +5,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-ro +@@ -8,6 +8,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-ro dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3318-a95x-z2.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-odroid-go2.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-a1.dtb diff --git a/target/linux/rockchip/patches-5.15/205-rockchip-rk3399-Add-support-for-EmbedFire-DoorNet2.patch b/target/linux/rockchip/patches-5.15/205-rockchip-rk3399-Add-support-for-EmbedFire-DoorNet2.patch index 02e5c74e1..6f9a77f7b 100644 --- a/target/linux/rockchip/patches-5.15/205-rockchip-rk3399-Add-support-for-EmbedFire-DoorNet2.patch +++ b/target/linux/rockchip/patches-5.15/205-rockchip-rk3399-Add-support-for-EmbedFire-DoorNet2.patch @@ -1,6 +1,6 @@ --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile -@@ -13,6 +13,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-li +@@ -22,6 +22,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-li dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-orion-r68-meta.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-px5-evb.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-r88.dtb diff --git a/target/linux/rockchip/patches-5.15/206-rockchip-rk3328-Add-support-for-OrangePi-R1-Plus-LTS.patch b/target/linux/rockchip/patches-5.15/206-rockchip-rk3328-Add-support-for-OrangePi-R1-Plus-LTS.patch index a21ec13a4..4b3a3d0d5 100644 --- a/target/linux/rockchip/patches-5.15/206-rockchip-rk3328-Add-support-for-OrangePi-R1-Plus-LTS.patch +++ b/target/linux/rockchip/patches-5.15/206-rockchip-rk3328-Add-support-for-OrangePi-R1-Plus-LTS.patch @@ -9,11 +9,9 @@ Subject: [PATCH] Add support for OrangePi R1 Plus LTS 2 files changed, 45 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts.dts -diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile -index 23373c752..552d97555 100644 --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile -@@ -13,6 +13,7 @@ +@@ -13,6 +13,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-ev dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2c.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2s.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-orangepi-r1-plus.dtb @@ -21,9 +19,6 @@ index 23373c752..552d97555 100644 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock64.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock-pi-e.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-roc-cc.dtb -diff --git a/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts.dts b/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts.dts -new file mode 100644 -index 000000000..c65f7c417 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts.dts @@ -0,0 +1,70 @@ @@ -97,5 +92,3 @@ index 000000000..c65f7c417 +&lan_led { + label = "orangepi-r1-plus-lts:green:lan"; +}; --- -2.25.1 diff --git a/target/linux/rockchip/patches-5.15/207-rockchip-rk3328-add-support-for-FriendlyARM-NanoPi-Neo3.patch b/target/linux/rockchip/patches-5.15/207-rockchip-rk3328-add-support-for-FriendlyARM-NanoPi-Neo3.patch index a07ad0ac7..c7ef38c27 100644 --- a/target/linux/rockchip/patches-5.15/207-rockchip-rk3328-add-support-for-FriendlyARM-NanoPi-Neo3.patch +++ b/target/linux/rockchip/patches-5.15/207-rockchip-rk3328-add-support-for-FriendlyARM-NanoPi-Neo3.patch @@ -33,11 +33,9 @@ to status_led in accordance with the board schematics. 2 files changed, 397 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-nanopi-neo3.dts -diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile -index 479906f3a..5f6ffb496 100644 --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile -@@ -8,8 +8,8 @@ +@@ -8,8 +8,8 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-ro dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3318-a95x-z2.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-odroid-go2.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-a1.dtb @@ -47,9 +45,6 @@ index 479906f3a..5f6ffb496 100644 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2c.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2s.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-orangepi-r1-plus.dtb -diff --git a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-neo3.dts b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-neo3.dts -new file mode 100644 -index 000000000..1eb7fd5f7 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-neo3.dts @@ -0,0 +1,394 @@ @@ -447,6 +442,3 @@ index 000000000..1eb7fd5f7 + realtek,led-data = <0x87>; + }; +}; --- -2.34.1 - diff --git a/target/linux/rockchip/patches-5.15/208-rockchip-rk3399-add-support-for-GuangMiao-G4C.patch b/target/linux/rockchip/patches-5.15/208-rockchip-rk3399-add-support-for-GuangMiao-G4C.patch index 886ce0f3a..f0356a0dd 100644 --- a/target/linux/rockchip/patches-5.15/208-rockchip-rk3399-add-support-for-GuangMiao-G4C.patch +++ b/target/linux/rockchip/patches-5.15/208-rockchip-rk3399-add-support-for-GuangMiao-G4C.patch @@ -1,6 +1,6 @@ --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile -@@ -31,6 +31,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3318-a9 +@@ -31,6 +31,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gr dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-kevin.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-inx.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-kd.dtb diff --git a/target/linux/rockchip/patches-5.15/803-PM-devfreq-rockchip-add-devfreq-driver-for-rk3328-dmc.patch b/target/linux/rockchip/patches-5.15/803-PM-devfreq-rockchip-add-devfreq-driver-for-rk3328-dmc.patch index 12d519fd0..ef06b0d59 100644 --- a/target/linux/rockchip/patches-5.15/803-PM-devfreq-rockchip-add-devfreq-driver-for-rk3328-dmc.patch +++ b/target/linux/rockchip/patches-5.15/803-PM-devfreq-rockchip-add-devfreq-driver-for-rk3328-dmc.patch @@ -13,7 +13,7 @@ Signed-off-by: hmz007 --- a/drivers/devfreq/Kconfig +++ b/drivers/devfreq/Kconfig -@@ -120,6 +120,18 @@ config ARM_TEGRA20_DEVFREQ +@@ -120,6 +120,18 @@ config ARM_TEGRA_DEVFREQ It reads ACTMON counters of memory controllers and adjusts the operating frequencies and voltages with OPP support. @@ -34,7 +34,7 @@ Signed-off-by: hmz007 depends on (ARCH_ROCKCHIP && HAVE_ARM_SMCCC) || \ --- a/drivers/devfreq/Makefile +++ b/drivers/devfreq/Makefile -@@ -11,6 +11,7 @@ obj-$(CONFIG_ARM_EXYNOS_BUS_DEVFREQ) += +@@ -11,6 +11,7 @@ obj-$(CONFIG_DEVFREQ_GOV_PASSIVE) += gov obj-$(CONFIG_ARM_EXYNOS_BUS_DEVFREQ) += exynos-bus.o obj-$(CONFIG_ARM_IMX_BUS_DEVFREQ) += imx-bus.o obj-$(CONFIG_ARM_IMX8M_DDRC_DEVFREQ) += imx8m-ddrc.o diff --git a/target/linux/rockchip/patches-5.15/807-arm64-dts-nanopi-r2s-add-rk3328-dmc-relate-node.patch b/target/linux/rockchip/patches-5.15/807-arm64-dts-nanopi-r2s-add-rk3328-dmc-relate-node.patch index 6fcadd917..f195f2aa3 100644 --- a/target/linux/rockchip/patches-5.15/807-arm64-dts-nanopi-r2s-add-rk3328-dmc-relate-node.patch +++ b/target/linux/rockchip/patches-5.15/807-arm64-dts-nanopi-r2s-add-rk3328-dmc-relate-node.patch @@ -24,7 +24,7 @@ Signed-off-by: hmz007 #include "rk3328.dtsi" / { -@@ -114,6 +115,72 @@ +@@ -119,6 +120,72 @@ regulator-boot-on; vin-supply = <&vdd_5v>; }; @@ -97,7 +97,7 @@ Signed-off-by: hmz007 }; &cpu0 { -@@ -132,6 +199,10 @@ +@@ -137,6 +204,10 @@ cpu-supply = <&vdd_arm>; }; @@ -108,7 +108,7 @@ Signed-off-by: hmz007 &display_subsystem { status = "disabled"; }; -@@ -195,6 +266,7 @@ +@@ -206,6 +277,7 @@ regulator-name = "vdd_log"; regulator-always-on; regulator-boot-on; @@ -116,7 +116,7 @@ Signed-off-by: hmz007 regulator-min-microvolt = <712500>; regulator-max-microvolt = <1450000>; regulator-ramp-delay = <12500>; -@@ -209,6 +281,7 @@ +@@ -220,6 +292,7 @@ regulator-name = "vdd_arm"; regulator-always-on; regulator-boot-on; diff --git a/target/linux/rockchip/patches-5.15/992-rockchip-rk3399-overclock-to-2.2-1.8-GHz-for-NanoPi4.patch b/target/linux/rockchip/patches-5.15/992-rockchip-rk3399-overclock-to-2.2-1.8-GHz-for-NanoPi4.patch index ba31f0751..9f0e480d9 100644 --- a/target/linux/rockchip/patches-5.15/992-rockchip-rk3399-overclock-to-2.2-1.8-GHz-for-NanoPi4.patch +++ b/target/linux/rockchip/patches-5.15/992-rockchip-rk3399-overclock-to-2.2-1.8-GHz-for-NanoPi4.patch @@ -179,7 +179,7 @@ Co-authored-by: gzelvis +#include "rk3399-nanopi4-opp.dtsi" / { - chosen { + aliases { --- a/arch/arm64/boot/dts/rockchip/rk3399-doornet2.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-doornet2.dtsi @@ -3,7 +3,7 @@ diff --git a/target/linux/x86/patches-5.15/993-bnx2x_warpcore_8727_2_5g_sgmii_txfault.patch b/target/linux/x86/patches-5.15/993-bnx2x_warpcore_8727_2_5g_sgmii_txfault.patch index e6ae5d75c..2e14e040c 100644 --- a/target/linux/x86/patches-5.15/993-bnx2x_warpcore_8727_2_5g_sgmii_txfault.patch +++ b/target/linux/x86/patches-5.15/993-bnx2x_warpcore_8727_2_5g_sgmii_txfault.patch @@ -182,7 +182,7 @@ /* Clean trail, interrupt corrects the leds */ --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c -@@ -110,6 +110,10 @@ static int disable_tpa; +@@ -113,6 +113,10 @@ static int disable_tpa; module_param(disable_tpa, int, 0444); MODULE_PARM_DESC(disable_tpa, " Disable the TPA (LRO) feature"); @@ -193,7 +193,7 @@ static int int_mode; module_param(int_mode, int, 0444); MODULE_PARM_DESC(int_mode, " Force interrupt mode other than MSI-X " -@@ -12343,6 +12347,8 @@ static int bnx2x_init_bp(struct bnx2x *b +@@ -12346,6 +12350,8 @@ static int bnx2x_init_bp(struct bnx2x *b if (BP_NOMCP(bp) && (func == 0)) dev_err(&bp->pdev->dev, "MCP disabled, must load devices in order!\n"); From 9ae0f60bbf77904141cc25584f459099f22615f3 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 18 Sep 2021 01:02:51 -0700 Subject: [PATCH 07/32] tools/autoconf-archive: update to 2021.02.19 Signed-off-by: Rosen Penev --- tools/autoconf-archive/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/autoconf-archive/Makefile b/tools/autoconf-archive/Makefile index b3d729f41..228a27cf6 100644 --- a/tools/autoconf-archive/Makefile +++ b/tools/autoconf-archive/Makefile @@ -1,11 +1,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=autoconf-archive -PKG_VERSION:=2019.01.06 +PKG_VERSION:=2021.02.19 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/autoconf-archive -PKG_HASH:=17195c833098da79de5778ee90948f4c5d90ed1a0cf8391b4ab348e2ec511e3f +PKG_HASH:=e8a6eb9d28ddcba8ffef3fa211653239e9bf239aba6a01a6b7cfc7ceaec69cbd include $(INCLUDE_DIR)/host-build.mk From 237fe5bf855b751dbcff19392d9c58cff47cba19 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 22 Nov 2021 00:49:50 -0800 Subject: [PATCH 08/32] tools/ccache: update to 4.5.1 Signed-off-by: Rosen Penev --- tools/ccache/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ccache/Makefile b/tools/ccache/Makefile index 002b77f8c..3efbcea32 100644 --- a/tools/ccache/Makefile +++ b/tools/ccache/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/target.mk PKG_NAME:=ccache -PKG_VERSION:=4.4.2 +PKG_VERSION:=4.5.1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/ccache/ccache/releases/download/v$(PKG_VERSION) -PKG_HASH:=9200cafbaa5fd62c2600fccb40a18214e57747825e6cdcd76688b4b61c2dcba0 +PKG_HASH:=51186ebe0326365f4e6131e1caa8911de7da4aa6718efc00680322d63a759517 HOST_BUILD_PARALLEL:=1 From 66d5921a527e1ce306e98516a5d41811ec550834 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 24 Feb 2022 20:53:13 -0800 Subject: [PATCH 09/32] tools/cmake: update to 3.22.2 Mostly random Python 3.10 fixes. Signed-off-by: Rosen Penev --- tools/cmake/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/cmake/Makefile b/tools/cmake/Makefile index 8f0631eb7..d1d5b58a4 100644 --- a/tools/cmake/Makefile +++ b/tools/cmake/Makefile @@ -7,14 +7,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cmake -PKG_VERSION:=3.22.1 +PKG_VERSION:=3.22.2 PKG_RELEASE:=1 PKG_CPE_ID:=cpe:/a:kitware:cmake PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/Kitware/CMake/releases/download/v$(PKG_VERSION)/ \ https://cmake.org/files/v3.19/ -PKG_HASH:=0e998229549d7b3f368703d20e248e7ee1f853910d42704aa87918c213ea82c0 +PKG_HASH:=3c1c478b9650b107d452c5bd545c72e2fad4e37c09b89a1984b9a2f46df6aced HOST_BUILD_PARALLEL:=1 HOST_CONFIGURE_PARALLEL:=1 From 31ab8070884f79440d9db2c4f99d233934db2f0f Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 17 Jun 2021 22:50:51 -0700 Subject: [PATCH 10/32] tools/expat: update to 2.4.6 Switched to CMake for faster compilation and greater parallel friendliness. Added CMake options from the packages feed. This release fixes various CVEs. Signed-off-by: Rosen Penev --- tools/Makefile | 1 + tools/expat/Makefile | 24 ++++++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index eb1ad84b9..25a8c1f84 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -46,6 +46,7 @@ $(curdir)/bison/compile := $(curdir)/flex/compile $(curdir)/cbootimage/compile += $(curdir)/automake/compile $(curdir)/cmake/compile += $(curdir)/libressl/compile $(curdir)/ninja/compile $(curdir)/dosfstools/compile := $(curdir)/autoconf/compile $(curdir)/automake/compile +$(curdir)/expat/compile := $(curdir)/cmake/compile $(curdir)/e2fsprogs/compile := $(curdir)/libtool/compile $(curdir)/fakeroot/compile := $(curdir)/libtool/compile $(curdir)/findutils/compile := $(curdir)/bison/compile diff --git a/tools/expat/Makefile b/tools/expat/Makefile index cfc70b2a4..0bc54a3d4 100644 --- a/tools/expat/Makefile +++ b/tools/expat/Makefile @@ -9,21 +9,25 @@ include $(TOPDIR)/rules.mk PKG_NAME:=expat PKG_CPE_ID:=cpe:/a:libexpat:expat -PKG_VERSION:=2.2.10 +PKG_VERSION:=2.4.6 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_HASH:=b2c160f1b60e92da69de8e12333096aeb0c3bf692d41c60794de278af72135a5 +PKG_HASH:=ce317706b07cae150f90cddd4253f5b4fba929607488af5ac47bf2bc08e31f09 PKG_SOURCE_URL:=https://github.com/libexpat/libexpat/releases/download/R_$(subst .,_,$(PKG_VERSION)) -HOST_BUILD_PARALLEL:=1 - include $(INCLUDE_DIR)/host-build.mk +include $(INCLUDE_DIR)/cmake.mk -HOST_CONFIGURE_ARGS += \ - --without-docbook - -define Host/Install - $(MAKE) -C $(HOST_BUILD_DIR) install -endef +CMAKE_HOST_OPTIONS += \ + -DDOCBOOK_TO_MAN=OFF \ + -DEXPAT_BUILD_TOOLS=OFF \ + -DEXPAT_BUILD_EXAMPLES=OFF \ + -DEXPAT_BUILD_TESTS=OFF \ + -DEXPAT_BUILD_DOCS=OFF \ + -DEXPAT_WITH_LIBBSD=OFF \ + -DEXPAT_ENABLE_INSTALL=ON \ + -DEXPAT_DTD=OFF \ + -DEXPAT_NS=OFF \ + -DEXPAT_DEV_URANDOM=OFF $(eval $(call HostBuild)) From bf8516cf5d60a6903586539ddefc66e0a1dbb1d1 Mon Sep 17 00:00:00 2001 From: msylgj <1388852+msylgj@users.noreply.github.com> Date: Thu, 3 Mar 2022 10:19:42 +0000 Subject: [PATCH 11/32] r8168: add support for kernel over 5.10 --- ...168-add-support-for-kernel-over-5.10.patch | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 package/lean/r8168/patches/002-r8168-add-support-for-kernel-over-5.10.patch diff --git a/package/lean/r8168/patches/002-r8168-add-support-for-kernel-over-5.10.patch b/package/lean/r8168/patches/002-r8168-add-support-for-kernel-over-5.10.patch new file mode 100644 index 000000000..10519448e --- /dev/null +++ b/package/lean/r8168/patches/002-r8168-add-support-for-kernel-over-5.10.patch @@ -0,0 +1,50 @@ +--- a/src/r8168_n.c 2021-07-05 01:30:48.000000000 +0100 ++++ b/src/r8168_n.c 2022-02-02 09:13:11.165555448 +0000 +@@ -96,6 +96,10 @@ + #include + #endif + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0)) ++#define PDE_DATA pde_data ++#endif ++ + #define FIRMWARE_8168D_1 "rtl_nic/rtl8168d-1.fw" + #define FIRMWARE_8168D_2 "rtl_nic/rtl8168d-2.fw" + #define FIRMWARE_8168E_1 "rtl_nic/rtl8168e-1.fw" +@@ -524,6 +528,12 @@ + + MODULE_VERSION(RTL8168_VERSION); + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0) ++static inline void dev_addr_mod(struct net_device *dev, unsigned int offset, const void *addr, size_t len) { ++ memcpy(&dev->dev_addr[offset], addr, len); ++} ++#endif ++ + static void rtl8168_sleep_rx_enable(struct net_device *dev); + static void rtl8168_dsm(struct net_device *dev, int dev_state); + +@@ -24146,11 +24156,13 @@ + } + + rtl8168_rar_set(tp, mac_addr); + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0) + for (i = 0; i < MAC_ADDR_LEN; i++) { + dev->dev_addr[i] = RTL_R8(tp, MAC0 + i); + tp->org_mac_addr[i] = dev->dev_addr[i]; /* keep the original MAC address */ + } ++#endif + #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) + memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); + #endif +@@ -24178,9 +24190,9 @@ + return -EADDRNOTAVAIL; + + spin_lock_irqsave(&tp->lock, flags); +- +- memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); ++ dev_addr_mod(dev, 0, addr->sa_data, dev->addr_len); ++ /* memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);*/ + + rtl8168_rar_set(tp, dev->dev_addr); From ba003bdf27ec61b404562fc62c5a6e6c02ac08ba Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Wed, 23 Jun 2021 11:58:51 -1000 Subject: [PATCH 12/32] dante: move to packages.git Rather than maintaining it in core, move it to packages.git where it's maintained by a community. Signed-off-by: Paul Spooren --- package/network/utils/dante/Makefile | 118 ------------------ .../dante/patches/200-fix-RTLD_NEXT.patch | 36 ------ .../210-deactivate-sched_setscheduler.patch | 53 -------- 3 files changed, 207 deletions(-) delete mode 100644 package/network/utils/dante/Makefile delete mode 100644 package/network/utils/dante/patches/200-fix-RTLD_NEXT.patch delete mode 100644 package/network/utils/dante/patches/210-deactivate-sched_setscheduler.patch diff --git a/package/network/utils/dante/Makefile b/package/network/utils/dante/Makefile deleted file mode 100644 index 15bd6d2af..000000000 --- a/package/network/utils/dante/Makefile +++ /dev/null @@ -1,118 +0,0 @@ -# -# Copyright (C) 2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=dante -PKG_VERSION:=1.4.1 -PKG_RELEASE:=4 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://www.inet.no/dante/files/ -PKG_HASH:=b6d232bd6fefc87d14bf97e447e4fcdeef4b28b16b048d804b50b48f261c4f53 - -PKG_MAINTAINER:=Jo-Philipp Wich -PKG_LICENSE:=BSD-4-Clause - -PKG_FIXUP:=autoreconf -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -CONFIGURE_ARGS += \ - --without-upnp \ - --without-pam \ - --disable-libwrap - -CONFIGURE_VARS += \ - ac_cv_search_pam_start="" \ - ac_cv_func_sched_setscheduler=no - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{a,so*,la} $(1)/usr/lib/ -endef - - -define Package/dante/default - TITLE:=Dante SOCKS - URL:=http://www.inet.no/dante/ -endef - -define Package/dante/default/description -Dante is a circuit-level firewall/proxy that can be used to provide convenient -and secure network connectivity, requiring only that the server Dante runs on -has external network connectivity. Dante is used daily by Fortune 100 companies -and large international organizations, either as a standard SOCKS server or as -a "reverse proxy". -endef - -define Package/libsocks - $(call Package/dante/default) - SECTION:=libs - CATEGORY:=Libraries - TITLE+= Library - ABI_VERSION:=0 -endef - -define Package/libsocks/description -$(call Package/dante/default/description) -This package provides the shared libsocks library. -endef - -define Package/libsocks/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsocks.so.* $(1)/usr/lib/ -endef - - -define Package/sockd - $(call Package/dante/default) - SUBMENU:=Web Servers/Proxies - SECTION:=net - CATEGORY:=Network - TITLE+= Daemon -endef - -define Package/sockd/description -$(call Package/dante/default/description) -This package provides the Dante sockd daemon. -endef - -define Package/sockd/install - $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/sockd $(1)/usr/sbin/ -endef - - -define Package/socksify - $(call Package/dante/default) - SECTION:=net - CATEGORY:=Network - SUBMENU:=Web Servers/Proxies - TITLE+= Client -endef - -define Package/socksify/description -$(call Package/dante/default/description) -This package provides the Dante socksify client. -endef - -define Package/socksify/install - $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/socksify $(1)/usr/bin/ - - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdsocks.so* $(1)/usr/lib/ -endef - - -$(eval $(call BuildPackage,libsocks)) -$(eval $(call BuildPackage,sockd)) -$(eval $(call BuildPackage,socksify)) diff --git a/package/network/utils/dante/patches/200-fix-RTLD_NEXT.patch b/package/network/utils/dante/patches/200-fix-RTLD_NEXT.patch deleted file mode 100644 index 594a6f900..000000000 --- a/package/network/utils/dante/patches/200-fix-RTLD_NEXT.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/lib/address.c -+++ b/lib/address.c -@@ -48,11 +48,12 @@ - - #include "upnp.h" - --#ifndef __USE_GNU --#define __USE_GNU /* XXX for RTLD_NEXT on Linux */ --#endif /* !__USE_GNU */ - #include - -+#ifndef RTLD_NEXT -+#define RTLD_NEXT ((void *) -1l) -+#endif -+ - static const char rcsid[] = - "$Id: address.c,v 1.288.4.4 2014/08/15 18:16:40 karls Exp $"; - ---- a/dlib/interposition.c -+++ b/dlib/interposition.c -@@ -93,11 +93,12 @@ write$NOCANCEL(HAVE_PROT_WRITE_1, HAVE_P - - #endif /* HAVE_DARWIN */ - --#ifndef __USE_GNU --#define __USE_GNU /* XXX for RTLD_NEXT on Linux */ --#endif /* !__USE_GNU */ - #include - -+#ifndef RTLD_NEXT -+#define RTLD_NEXT ((void *) -1l) -+#endif -+ - #ifdef __COVERITY__ - /* - * Coverity naturally has no idea what the function sys_foo calls does, diff --git a/package/network/utils/dante/patches/210-deactivate-sched_setscheduler.patch b/package/network/utils/dante/patches/210-deactivate-sched_setscheduler.patch deleted file mode 100644 index e711189c5..000000000 --- a/package/network/utils/dante/patches/210-deactivate-sched_setscheduler.patch +++ /dev/null @@ -1,53 +0,0 @@ -When compiled with glibc the config_scan.c wants to use the -cpupolicy2numeric() function which is only available when -HAVE_SCHED_SETSCHEDULER is set. It looks like the wrong define was used here. - -This fixes a build problem with glibc in combination with the force -ac_cv_func_sched_setscheduler=no in the OpenWrt CONFIGURE_VARS. - ---- a/lib/config_scan.c -+++ b/lib/config_scan.c -@@ -3891,7 +3891,7 @@ YY_RULE_SETUP - SERRX(0); - - #else /* !SOCKS_CLIENT */ --#if HAVE_SCHED_SETAFFINITY -+#if HAVE_SCHED_SETSCHEDULER - - BEGIN(0); - -@@ -3899,9 +3899,9 @@ YY_RULE_SETUP - yyerrorx("unknown scheduling policy \"%s\"", yytext); - - return SCHEDULEPOLICY; --#else /* !HAVE_SCHED_SETAFFINITY */ -+#else /* !HAVE_SCHED_SETSCHEDULER */ - yyerrorx("setting cpu scheduling policy is not supported on this platform"); --#endif /* !HAVE_SCHED_SETAFFINITY */ -+#endif /* !HAVE_SCHED_SETSCHEDULER */ - - #endif /* SOCKS_CLIENT */ - } ---- a/lib/config_scan.l -+++ b/lib/config_scan.l -@@ -456,7 +456,7 @@ cpu { - SERRX(0); - - #else /* !SOCKS_CLIENT */ --#if HAVE_SCHED_SETAFFINITY -+#if HAVE_SCHED_SETSCHEDULER - - BEGIN(0); - -@@ -464,9 +464,9 @@ cpu { - yyerrorx("unknown scheduling policy \"%s\"", yytext); - - return SCHEDULEPOLICY; --#else /* !HAVE_SCHED_SETAFFINITY */ -+#else /* !HAVE_SCHED_SETSCHEDULER */ - yyerrorx("setting cpu scheduling policy is not supported on this platform"); --#endif /* !HAVE_SCHED_SETAFFINITY */ -+#endif /* !HAVE_SCHED_SETSCHEDULER */ - - #endif /* SOCKS_CLIENT */ - } From cc72381156c4f915b6960f6b0cdc9d76d77efd23 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 1 Sep 2021 19:53:39 -0700 Subject: [PATCH 13/32] tools/bison: update to 3.7.6 Signed-off-by: Rosen Penev --- tools/bison/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/bison/Makefile b/tools/bison/Makefile index 8f3043fcb..f46894c71 100644 --- a/tools/bison/Makefile +++ b/tools/bison/Makefile @@ -7,11 +7,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bison -PKG_VERSION:=3.7.4 +PKG_VERSION:=3.7.6 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/$(PKG_NAME) -PKG_HASH:=a3b5813f48a11e540ef26f46e4d288c0c25c7907d9879ae50e430ec49f63c010 +PKG_HASH:=67d68ce1e22192050525643fc0a7a22297576682bef6a5c51446903f5aeef3cf HOST_BUILD_PARALLEL:=1 From 1b8c19d95a948b5da0681be2b508f40957124416 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 18 Sep 2021 00:10:56 -0700 Subject: [PATCH 14/32] tools/bison: update to 3.8.1 Remove upstreamed patch. Signed-off-by: Rosen Penev --- tools/bison/Makefile | 4 ++-- tools/bison/patches/100-fix-gets-removal.patch | 17 ----------------- 2 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 tools/bison/patches/100-fix-gets-removal.patch diff --git a/tools/bison/Makefile b/tools/bison/Makefile index f46894c71..ba3dd946e 100644 --- a/tools/bison/Makefile +++ b/tools/bison/Makefile @@ -7,11 +7,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bison -PKG_VERSION:=3.7.6 +PKG_VERSION:=3.8.1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/$(PKG_NAME) -PKG_HASH:=67d68ce1e22192050525643fc0a7a22297576682bef6a5c51446903f5aeef3cf +PKG_HASH:=31fc602488aad6bdecf0ccc556e0fc72fc57cdc595cf92398f020e0cf4980f15 HOST_BUILD_PARALLEL:=1 diff --git a/tools/bison/patches/100-fix-gets-removal.patch b/tools/bison/patches/100-fix-gets-removal.patch deleted file mode 100644 index 534713f18..000000000 --- a/tools/bison/patches/100-fix-gets-removal.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/lib/stdio.in.h -+++ b/lib/stdio.in.h -@@ -835,14 +835,6 @@ _GL_WARN_ON_USE (getline, "getline is un - # endif - #endif - --/* It is very rare that the developer ever has full control of stdin, -- so any use of gets warrants an unconditional warning; besides, C11 -- removed it. */ --#undef gets --#if HAVE_RAW_DECL_GETS && !defined __cplusplus --_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); --#endif -- - #if defined _WIN32 && !defined __CYGWIN__ - # undef getw - # define getw _getw From 0c75a8aaec8bcb76b7f3d09da92c1767c7588629 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 4 Oct 2021 18:30:12 -0700 Subject: [PATCH 15/32] tools/bison: update to 3.8.2 Signed-off-by: Rosen Penev --- tools/bison/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/bison/Makefile b/tools/bison/Makefile index ba3dd946e..5f96463ae 100644 --- a/tools/bison/Makefile +++ b/tools/bison/Makefile @@ -7,11 +7,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bison -PKG_VERSION:=3.8.1 +PKG_VERSION:=3.8.2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/$(PKG_NAME) -PKG_HASH:=31fc602488aad6bdecf0ccc556e0fc72fc57cdc595cf92398f020e0cf4980f15 +PKG_HASH:=9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2 HOST_BUILD_PARALLEL:=1 From 2a0cff821f9a20aeef68e682aada7bf9b81b0663 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 19 Jun 2021 15:11:23 -0700 Subject: [PATCH 16/32] tools/e2fsprogs: update to 1.46.2 Fix wrong FPIC flag to fix compilation under sparc64 Signed-off-by: Rosen Penev --- tools/e2fsprogs/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/e2fsprogs/Makefile b/tools/e2fsprogs/Makefile index d7c994c33..408097f74 100644 --- a/tools/e2fsprogs/Makefile +++ b/tools/e2fsprogs/Makefile @@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=e2fsprogs PKG_CPE_ID:=cpe:/a:e2fsprogs_project:e2fsprogs -PKG_VERSION:=1.45.6 -PKG_HASH:=ffa7ae6954395abdc50d0f8605d8be84736465afc53b8938ef473fcf7ff44256 +PKG_VERSION:=1.46.2 +PKG_HASH:=23aa093295c94e71ef1be490c4004871c5b01d216a8cb4d111fa6c0aac354168 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz @@ -23,7 +23,7 @@ include $(INCLUDE_DIR)/host-build.mk ifneq ($(shell $(HOSTCC) --version | grep clang),) HOST_CFLAGS += -D__GNUC_PREREQ\(...\)=0 -Dloff_t=off_t endif -HOST_CFLAGS += $(FPIC) +HOST_CFLAGS += $(HOST_FPIC) HOST_CONFIGURE_ARGS += \ --disable-elf-shlibs \ From 648b653d66d520fd888ce55eec68d5938c40a07f Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 18 Sep 2021 01:09:29 -0700 Subject: [PATCH 17/32] tools/e2fsprogs: update to 1.46.4 Refresh patches. Signed-off-by: Rosen Penev --- tools/e2fsprogs/Makefile | 4 ++-- tools/e2fsprogs/patches/001-exit_0_on_corrected_errors.patch | 2 +- tools/e2fsprogs/patches/002-dont-build-e4defrag.patch | 2 +- tools/e2fsprogs/patches/003-no-crond.patch | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/e2fsprogs/Makefile b/tools/e2fsprogs/Makefile index 408097f74..f8ca48222 100644 --- a/tools/e2fsprogs/Makefile +++ b/tools/e2fsprogs/Makefile @@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=e2fsprogs PKG_CPE_ID:=cpe:/a:e2fsprogs_project:e2fsprogs -PKG_VERSION:=1.46.2 -PKG_HASH:=23aa093295c94e71ef1be490c4004871c5b01d216a8cb4d111fa6c0aac354168 +PKG_VERSION:=1.46.4 +PKG_HASH:=b11042533c1b1dcf17512f0da48e05b0c573dada1dd8b762864d10f4dc399713 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz diff --git a/tools/e2fsprogs/patches/001-exit_0_on_corrected_errors.patch b/tools/e2fsprogs/patches/001-exit_0_on_corrected_errors.patch index 67a30f610..9b9b06d54 100644 --- a/tools/e2fsprogs/patches/001-exit_0_on_corrected_errors.patch +++ b/tools/e2fsprogs/patches/001-exit_0_on_corrected_errors.patch @@ -1,6 +1,6 @@ --- a/e2fsck/e2fsck.h +++ b/e2fsck/e2fsck.h -@@ -73,7 +73,7 @@ +@@ -74,7 +74,7 @@ * Exit codes used by fsck-type programs */ #define FSCK_OK 0 /* No errors */ diff --git a/tools/e2fsprogs/patches/002-dont-build-e4defrag.patch b/tools/e2fsprogs/patches/002-dont-build-e4defrag.patch index 2a7842f65..f59cd317a 100644 --- a/tools/e2fsprogs/patches/002-dont-build-e4defrag.patch +++ b/tools/e2fsprogs/patches/002-dont-build-e4defrag.patch @@ -1,6 +1,6 @@ --- a/misc/Makefile.in +++ b/misc/Makefile.in -@@ -11,7 +11,7 @@ INSTALL = @INSTALL@ +@@ -12,7 +12,7 @@ MKDIR_P = @MKDIR_P@ @MCONFIG@ diff --git a/tools/e2fsprogs/patches/003-no-crond.patch b/tools/e2fsprogs/patches/003-no-crond.patch index 87b50bff2..a7ea52b1a 100644 --- a/tools/e2fsprogs/patches/003-no-crond.patch +++ b/tools/e2fsprogs/patches/003-no-crond.patch @@ -1,6 +1,6 @@ --- a/configure +++ b/configure -@@ -14525,7 +14525,7 @@ $as_echo_n "checking for system crontab +@@ -12538,7 +12538,7 @@ $as_echo_n "checking for system crontab { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${crond_dir}" >&5 $as_echo "${crond_dir}" >&6; } From 56660f4cb927cac2d2bfa34781012ec76f18fb5b Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 1 Sep 2021 20:03:01 -0700 Subject: [PATCH 18/32] tools/findutils: update to 4.8.0 Signed-off-by: Rosen Penev --- tools/findutils/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/findutils/Makefile b/tools/findutils/Makefile index 606df4fa2..c40fa6efc 100644 --- a/tools/findutils/Makefile +++ b/tools/findutils/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=findutils PKG_CPE_ID:=cpe:/a:gnu:findutils -PKG_VERSION:=4.7.0 +PKG_VERSION:=4.8.0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/$(PKG_NAME) -PKG_HASH:=c5fefbdf9858f7e4feb86f036e1247a54c79fc2d8e4b7064d5aaa1f47dfa789a +PKG_HASH:=57127b7e97d91282c6ace556378d5455a9509898297e46e10443016ea1387164 HOST_BUILD_PARALLEL:=1 From da2fb9c54644f14a77427b3d24388e60a4e048d2 Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Sun, 5 Sep 2021 23:28:16 +0100 Subject: [PATCH 19/32] tools/findutils: fix build on macos Use same fix as homebrew: https://github.com/Homebrew/homebrew-core/pull/69761 Signed-off-by: Kevin Darbyshire-Bryant --- tools/findutils/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/findutils/Makefile b/tools/findutils/Makefile index c40fa6efc..37cd89735 100644 --- a/tools/findutils/Makefile +++ b/tools/findutils/Makefile @@ -18,6 +18,10 @@ HOST_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/host-build.mk +ifeq ($(HOST_OS),Darwin) + HOST_CFLAGS +=-D__nonnull\\(params\\)= +endif + HOST_CONFIGURE_ARGS += \ --enable-threads=pth \ --disable-rpath \ From 7d4741a5a3a76e48f170b0aa696dc1e4508fc191 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 21 Feb 2022 15:47:13 -0800 Subject: [PATCH 20/32] tools/findutils: update to 4.9.0 Add compilation fix for Ubuntu 20.04. Provided by upstream maintainer: https://github.com/openwrt/packages/issues/17912#issuecomment-1046726426 Signed-off-by: Rosen Penev --- tools/findutils/Makefile | 4 ++-- tools/findutils/patches/010-endpwent.patch | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 tools/findutils/patches/010-endpwent.patch diff --git a/tools/findutils/Makefile b/tools/findutils/Makefile index 37cd89735..d0d780689 100644 --- a/tools/findutils/Makefile +++ b/tools/findutils/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=findutils PKG_CPE_ID:=cpe:/a:gnu:findutils -PKG_VERSION:=4.8.0 +PKG_VERSION:=4.9.0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/$(PKG_NAME) -PKG_HASH:=57127b7e97d91282c6ace556378d5455a9509898297e46e10443016ea1387164 +PKG_HASH:=a2bfb8c09d436770edc59f50fa483e785b161a3b7b9d547573cb08065fd462fe HOST_BUILD_PARALLEL:=1 diff --git a/tools/findutils/patches/010-endpwent.patch b/tools/findutils/patches/010-endpwent.patch new file mode 100644 index 000000000..dc346f3f7 --- /dev/null +++ b/tools/findutils/patches/010-endpwent.patch @@ -0,0 +1,20 @@ +--- a/find/parser.c ++++ b/find/parser.c +@@ -67,12 +67,12 @@ + #include "findutils-version.h" + #include "system.h" + +- +-#ifndef HAVE_ENDGRENT +-# define endgrent () ++#if ! HAVE_ENDGRENT ++# define endgrent() ((void) 0) + #endif +-#ifndef HAVE_ENDPWENT +-# define endpwent () ++ ++#if ! HAVE_ENDPWENT ++# define endpwent() ((void) 0) + #endif + + static bool parse_accesscheck (const struct parser_table*, char *argv[], int *arg_ptr); From dc49e9cf9dd54213ae92b41b1b2ba3ef722bb133 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 18 Sep 2021 00:40:41 -0700 Subject: [PATCH 21/32] tools/mtools: update to 4.0.35 Signed-off-by: Rosen Penev --- tools/mtools/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/mtools/Makefile b/tools/mtools/Makefile index b7fdcb388..5e3c950ba 100644 --- a/tools/mtools/Makefile +++ b/tools/mtools/Makefile @@ -7,11 +7,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mtools -PKG_VERSION:=4.0.24 +PKG_VERSION:=4.0.35 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@GNU/$(PKG_NAME) -PKG_HASH:=24f4a2da9219f98498eb1b340cd96db7ef9b684c067d1bdeb6e85efdd13b2fb9 +PKG_HASH:=34769e173751d2f0d891a08c76c80427e929b8ee43438019b8666cc3d7a44749 HOST_BUILD_PARALLEL:=1 From 4ff4c1f5fd850eabf1a0463484e186c472424cba Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 24 Feb 2022 20:21:35 -0800 Subject: [PATCH 22/32] tools/mtools: update to 4.0.37 No changelog is available. Signed-off-by: Rosen Penev --- tools/mtools/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/mtools/Makefile b/tools/mtools/Makefile index 5e3c950ba..c10e887b3 100644 --- a/tools/mtools/Makefile +++ b/tools/mtools/Makefile @@ -7,11 +7,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mtools -PKG_VERSION:=4.0.35 +PKG_VERSION:=4.0.37 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@GNU/$(PKG_NAME) -PKG_HASH:=34769e173751d2f0d891a08c76c80427e929b8ee43438019b8666cc3d7a44749 +PKG_HASH:=799b197e23e47b61259628810b27790efb7a1fe36037ef1da8a27b0ae4fa8342 HOST_BUILD_PARALLEL:=1 From a2846e5838f79af5dc273f18b79d47e0e48fc864 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 1 Sep 2021 20:04:43 -0700 Subject: [PATCH 23/32] tools/tar: update to 1.34 Refresh patch. Signed-off-by: Rosen Penev --- tools/tar/Makefile | 4 ++-- tools/tar/patches/110-symlink-force-permissions.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/tar/Makefile b/tools/tar/Makefile index d69ee40f0..f1dfc11f9 100644 --- a/tools/tar/Makefile +++ b/tools/tar/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tar PKG_CPE_ID:=cpe:/a:gnu:tar -PKG_VERSION:=1.32 +PKG_VERSION:=1.34 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/tar -PKG_HASH:=d0d3ae07f103323be809bc3eac0dcc386d52c5262499fe05511ac4788af1fdd8 +PKG_HASH:=63bebd26879c5e1eea4352f0d03c991f966aeb3ddeb3c7445c902568d5411d28 HOST_BUILD_PARALLEL:=1 diff --git a/tools/tar/patches/110-symlink-force-permissions.patch b/tools/tar/patches/110-symlink-force-permissions.patch index e9a32f7d1..4a80de6ef 100644 --- a/tools/tar/patches/110-symlink-force-permissions.patch +++ b/tools/tar/patches/110-symlink-force-permissions.patch @@ -1,6 +1,6 @@ --- a/src/create.c +++ b/src/create.c -@@ -1852,6 +1852,7 @@ dump_file0 (struct tar_stat_info *st, ch +@@ -1844,6 +1844,7 @@ dump_file0 (struct tar_stat_info *st, ch #ifdef HAVE_READLINK else if (S_ISLNK (st->stat.st_mode)) { From 0d27397119daab7181d0ae8f83bef881f866f6ba Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 18 Sep 2021 00:20:45 -0700 Subject: [PATCH 24/32] tools/fakeroot: update to 1.26 Remove upstreamed patches. Refresh other. Signed-off-by: Rosen Penev --- tools/fakeroot/Makefile | 4 +- tools/fakeroot/patches/100-portability.patch | 138 ----------------- .../300-glibc-2.33-compatibility.patch | 145 ------------------ .../patches/301-glibc-2.33-compat-fixes.patch | 42 ----- .../patches/400-alpine-libc.musl-fix.patch | 2 +- 5 files changed, 3 insertions(+), 328 deletions(-) delete mode 100644 tools/fakeroot/patches/100-portability.patch delete mode 100644 tools/fakeroot/patches/300-glibc-2.33-compatibility.patch delete mode 100644 tools/fakeroot/patches/301-glibc-2.33-compat-fixes.patch diff --git a/tools/fakeroot/Makefile b/tools/fakeroot/Makefile index 61bc27b90..5c5f25e22 100644 --- a/tools/fakeroot/Makefile +++ b/tools/fakeroot/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fakeroot -PKG_VERSION:=1.25.3 +PKG_VERSION:=1.26 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz PKG_SOURCE_URL:=@DEBIAN/pool/main/f/fakeroot -PKG_HASH:=8e903683357f7f5bcc31b879fd743391ad47691d4be33d24a76be3b6c21e956c +PKG_HASH:=480a578ffdc5592e73df4c086950d321b4adc78dbdaec56c82e4fe1fb68de8e9 PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=COPYING PKG_FIXUP:=autoreconf diff --git a/tools/fakeroot/patches/100-portability.patch b/tools/fakeroot/patches/100-portability.patch deleted file mode 100644 index 7ba12996b..000000000 --- a/tools/fakeroot/patches/100-portability.patch +++ /dev/null @@ -1,138 +0,0 @@ ---- a/libfakeroot.c -+++ b/libfakeroot.c -@@ -112,8 +112,16 @@ - #define INT_SEND_STAT(a,b) SEND_STAT(a,b,_STAT_VER) - #define INT_SEND_GET_XATTR(a,b) SEND_GET_XATTR(a,b,_STAT_VER) - #define INT_SEND_GET_STAT(a,b) SEND_GET_STAT(a,b) -+ -+/* 10.10 uses id_t in getpriority/setpriority calls, so pretend -+ id_t is used everywhere, just happens to be int on some OSes */ -+#ifndef _ID_T -+#define _ID_T -+typedef int id_t; -+#endif - #endif - -+#include - #include - #include - #include -@@ -125,7 +133,6 @@ - #include - #include - #include --#include - #ifdef HAVE_SYS_ACL_H - #include - #endif /* HAVE_SYS_ACL_H */ -@@ -188,6 +195,15 @@ extern int unsetenv (const char *name); - #undef __lxstat64 - #undef _FILE_OFFSET_BITS - -+ -+#ifndef AT_EMPTY_PATH -+#define AT_EMPTY_PATH 0 -+#endif -+ -+#ifndef AT_NO_AUTOMOUNT -+#define AT_NO_AUTOMOUNT 0 -+#endif -+ - /* - // next_wrap_st: - // this structure is used in next_wrap, which is defined in -@@ -1911,7 +1927,7 @@ ssize_t fremovexattr(int fd, const char - } - #endif /* HAVE_FREMOVEXATTR */ - --int setpriority(int which, int who, int prio){ -+int setpriority(int which, id_t who, int prio){ - if (fakeroot_disabled) - return next_setpriority(which, who, prio); - next_setpriority(which, who, prio); -@@ -2520,3 +2536,19 @@ int sysinfo(int command, char *buf, long - } - } - #endif -+ -+#ifdef HAVE_OPENAT -+int openat(int dir_fd, const char *pathname, int flags, ...) -+{ -+ mode_t mode; -+ -+ if (flags & O_CREAT) { -+ va_list args; -+ va_start(args, flags); -+ mode = va_arg(args, int); -+ va_end(args); -+ } -+ -+ return next_openat(dir_fd, pathname, flags, mode); -+} -+#endif ---- a/wrapfunc.inp -+++ b/wrapfunc.inp -@@ -146,7 +146,7 @@ setfsgid;gid_t;(gid_t fsgid);(fsgid) - initgroups;int;(const char *user, INITGROUPS_SECOND_ARG group);(user, group) - getgroups;int;(int size, gid_t list[]);(size, list) - setgroups;int;(SETGROUPS_SIZE_TYPE size, const gid_t *list);(size, list) --setpriority;int;(int which, int who, int prio);(which, who, prio) -+setpriority;int;(int which, id_t who, int prio);(which, who, prio) - #ifdef HAVE_CAPSET - capset;int;(cap_user_header_t hdrp, const cap_user_data_t datap);(hdrp, datap) - #endif /* HAVE_CAPSET */ -@@ -198,7 +198,7 @@ fchownat;int;(int dir_fd, const char *pa - mkdirat;int;(int dir_fd, const char *pathname, mode_t mode);(dir_fd, pathname, mode) - #endif /* HAVE_MKDIRAT */ - #ifdef HAVE_OPENAT --openat;int;(int dir_fd, const char *pathname, int flags);(dir_fd, pathname, flags) -+openat;int;(int dir_fd, const char *pathname, int flags, mode_t mode);(dir_fd, pathname, flags, mode);;(int dir_fd, const char *pathname, int flags, ...) - #endif /* HAVE_OPENAT */ - #ifdef HAVE_RENAMEAT - renameat;int;(int olddir_fd, const char *oldpath, int newdir_fd, const char *newpath);(olddir_fd, oldpath, newdir_fd, newpath) ---- a/wrapawk_macosx -+++ b/wrapawk_macosx -@@ -46,26 +46,30 @@ BEGIN{ - argtype=$3; - argname=$4; - MACRO=$5; -+ argtype_def=$6 -+ if(!argtype_def) { -+ argtype_def = argtype -+ } - if(MACRO){ - print "extern " ret " MY_DEF(" name ")" argtype " __attribute__((visibility(\"hidden\")));" > headerfile; - print "INTERPOSE(MY_DEF(" name "_RAW)," name "_RAW);" > structfile; - print "#undef " name > deffile - print "#define " name " MY_DEF(" name "_RAW)" > deffile - -- print "extern " ret, name, argtype ";" > tmpffile; -+ print "extern " ret, name, argtype_def ";" > tmpffile; - print "static __inline__ " ret " NEXT_" MACRO "_NOARG " argtype " __attribute__((always_inline));" > tmpffile; - print "static __inline__ " ret " NEXT_" MACRO "_NOARG " argtype " {" > tmpffile; - print " return " name, argname ";" > tmpffile; - print "}" > tmpffile; - print "" > tmpffile; - } else { -- print "extern " ret " my_" name, argtype " __attribute__((visibility(\"hidden\")));" > headerfile; -+ print "extern " ret " my_" name, argtype_def " __attribute__((visibility(\"hidden\")));" > headerfile; - print "#undef " name > structfile; - print "INTERPOSE(my_" name "," name ");" > structfile; - print "#define " name " my_" name > structfile - print "#define " name " my_" name > deffile - -- print "extern " ret, name, argtype ";" > tmpffile; -+ print "extern " ret, name, argtype_def ";" > tmpffile; - if(argname){ - print "static __inline__ " ret " next_" name, argtype " __attribute__((always_inline));" > tmpffile; - print "static __inline__ " ret " next_" name, argtype " {" > tmpffile; ---- a/configure.ac -+++ b/configure.ac -@@ -146,6 +146,7 @@ for first in size_t int; do - #include - #endif - #include -+#include - #ifdef HAVE_GRP_H - #include - #endif diff --git a/tools/fakeroot/patches/300-glibc-2.33-compatibility.patch b/tools/fakeroot/patches/300-glibc-2.33-compatibility.patch deleted file mode 100644 index a460cace0..000000000 --- a/tools/fakeroot/patches/300-glibc-2.33-compatibility.patch +++ /dev/null @@ -1,145 +0,0 @@ ---- a/libfakeroot.c -+++ b/libfakeroot.c -@@ -90,6 +90,16 @@ - #define SEND_GET_XATTR64(a,b,c) send_get_xattr64(a,b) - #endif - -+#ifndef _STAT_VER -+ #if defined (__aarch64__) -+ #define _STAT_VER 0 -+ #elif defined (__x86_64__) -+ #define _STAT_VER 1 -+ #else -+ #define _STAT_VER 3 -+ #endif -+#endif -+ - /* - These INT_* (which stands for internal) macros should always be used when - the fakeroot library owns the storage of the stat variable. -@@ -1358,6 +1368,54 @@ int renameat(int olddir_fd, const char * - #endif /* HAVE_FSTATAT */ - - -+#if defined(__GLIBC__) && __GLIBC_PREREQ(2,33) -+/* Glibc 2.33 exports symbols for these functions in the shared lib */ -+ int lstat(const char *file_name, struct stat *statbuf) { -+ return WRAP_LSTAT LSTAT_ARG(_STAT_VER, file_name, statbuf); -+ } -+ int stat(const char *file_name, struct stat *st) { -+ return WRAP_STAT STAT_ARG(_STAT_VER, file_name, st); -+ } -+ int fstat(int fd, struct stat *st) { -+ return WRAP_FSTAT FSTAT_ARG(_STAT_VER, fd, st); -+ } -+ -+ #ifdef HAVE_FSTATAT -+ int fstatat(int dir_fd, const char *path, struct stat *st, int flags) { -+ return WRAP_FSTATAT FSTATAT_ARG(_STAT_VER, dir_fd, path, st, flags); -+ } -+ #endif -+ -+ #ifdef STAT64_SUPPORT -+ int lstat64(const char *file_name, struct stat64 *st) { -+ return WRAP_LSTAT64 LSTAT64_ARG(_STAT_VER, file_name, st); -+ } -+ int stat64(const char *file_name, struct stat64 *st) { -+ return WRAP_STAT64 STAT64_ARG(_STAT_VER, file_name, st); -+ } -+ int fstat64(int fd, struct stat64 *st) { -+ return WRAP_FSTAT64 FSTAT64_ARG(_STAT_VER, fd, st); -+ } -+ -+ #ifdef HAVE_FSTATAT -+ int fstatat64(int dir_fd, const char *path, struct stat64 *st, int flags) { -+ return WRAP_FSTATAT64 FSTATAT64_ARG(_STAT_VER, dir_fd, path, st, flags); -+ } -+ #endif -+ #endif -+ -+ int mknod(const char *pathname, mode_t mode, dev_t dev) { -+ return WRAP_MKNOD MKNOD_ARG(_STAT_VER, pathname, mode, &dev); -+ } -+ -+ #if defined(HAVE_FSTATAT) && defined(HAVE_MKNODAT) -+ int mknodat(int dir_fd, const char *pathname, mode_t mode, dev_t dev) { -+ return WRAP_MKNODAT MKNODAT_ARG(_STAT_VER, dir_fd, pathname, mode, &dev); -+ } -+ #endif -+#endif /* GLIBC_PREREQ */ -+ -+ - #ifdef FAKEROOT_FAKENET - pid_t fork(void) - { -@@ -2024,11 +2082,7 @@ FTSENT *fts_read(FTS *ftsp) { - || r->fts_info == FTS_NS || r->fts_info == FTS_NSOK)) - r->fts_statp = NULL; /* Otherwise fts_statp may be a random pointer */ - if(r && r->fts_statp) { /* Should we bother checking fts_info here? */ --# if defined(STAT64_SUPPORT) && !defined(__APPLE__) -- SEND_GET_STAT64(r->fts_statp, _STAT_VER); --# else - SEND_GET_STAT(r->fts_statp, _STAT_VER); --# endif - } - - return r; -@@ -2047,11 +2101,7 @@ FTSENT *fts_children(FTS *ftsp, int opti - first=next_fts_children(ftsp, options); - for(r = first; r; r = r->fts_link) { - if(r && r->fts_statp) { /* Should we bother checking fts_info here? */ --# if defined(STAT64_SUPPORT) && !defined(__APPLE__) -- SEND_GET_STAT64(r->fts_statp, _STAT_VER); --# else - SEND_GET_STAT(r->fts_statp, _STAT_VER); --# endif - } - } - -@@ -2483,7 +2533,7 @@ int statx (int dirfd, const char *path, - - #ifdef LIBFAKEROOT_DEBUGGING - if (fakeroot_debug) { -- fprintf(stderr, "statx fd %d\n", fd); -+ fprintf(stderr, "statx fd %d\n", dirfd); - } - #endif /* LIBFAKEROOT_DEBUGGING */ - r=INT_NEXT_FSTATAT(dirfd, path, &st, flags); ---- a/configure.ac -+++ b/configure.ac -@@ -184,13 +184,13 @@ AC_MSG_CHECKING([for type of arg of __xm - ]], [[ - int __xmknod ( int ver, - const char *pathname , -- mode_t mode , dev_t dev); -+ mode_t mode , dev_t *dev); - ]])],[ -- AC_DEFINE(XMKNOD_FRTH_ARG,) -- AC_MSG_RESULT([no extra *]) -- ],[ - AC_DEFINE(XMKNOD_FRTH_ARG,[*]) - AC_MSG_RESULT([needs *]) -+ ],[ -+ AC_DEFINE(XMKNOD_FRTH_ARG,) -+ AC_MSG_RESULT([no extra *]) - - ]) - -@@ -211,13 +211,13 @@ AC_MSG_CHECKING([for type of arg of __xm - int __xmknodat ( int ver, - int dirfd, - const char *pathname , -- mode_t mode , dev_t dev); -+ mode_t mode , dev_t *dev); - ]])],[ -- AC_DEFINE(XMKNODAT_FIFTH_ARG,) -- AC_MSG_RESULT([no extra *]) -- ],[ - AC_DEFINE(XMKNODAT_FIFTH_ARG,[*]) - AC_MSG_RESULT([needs *]) -+ ],[ -+ AC_DEFINE(XMKNODAT_FIFTH_ARG,) -+ AC_MSG_RESULT([no extra *]) - - ]) - diff --git a/tools/fakeroot/patches/301-glibc-2.33-compat-fixes.patch b/tools/fakeroot/patches/301-glibc-2.33-compat-fixes.patch deleted file mode 100644 index 0b91d65ed..000000000 --- a/tools/fakeroot/patches/301-glibc-2.33-compat-fixes.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/libfakeroot.c -+++ b/libfakeroot.c -@@ -1368,7 +1368,8 @@ int renameat(int olddir_fd, const char * - #endif /* HAVE_FSTATAT */ - - --#if defined(__GLIBC__) && __GLIBC_PREREQ(2,33) -+#if defined(__GLIBC__) -+#if __GLIBC_PREREQ(2,33) - /* Glibc 2.33 exports symbols for these functions in the shared lib */ - int lstat(const char *file_name, struct stat *statbuf) { - return WRAP_LSTAT LSTAT_ARG(_STAT_VER, file_name, statbuf); -@@ -1413,6 +1414,7 @@ int renameat(int olddir_fd, const char * - return WRAP_MKNODAT MKNODAT_ARG(_STAT_VER, dir_fd, pathname, mode, &dev); - } - #endif -+#endif /* __GLIBC__ */ - #endif /* GLIBC_PREREQ */ - - ---- a/configure.ac -+++ b/configure.ac -@@ -182,6 +182,9 @@ AC_MSG_CHECKING([for type of arg of __xm - #include - #include - ]], [[ -+#ifndef __GLIBC__ -+#error no extra * -+#endif - int __xmknod ( int ver, - const char *pathname , - mode_t mode , dev_t *dev); -@@ -208,6 +211,9 @@ AC_MSG_CHECKING([for type of arg of __xm - #include - #include - ]], [[ -+#ifndef __GLIBC__ -+#error no extra * -+#endif - int __xmknodat ( int ver, - int dirfd, - const char *pathname , diff --git a/tools/fakeroot/patches/400-alpine-libc.musl-fix.patch b/tools/fakeroot/patches/400-alpine-libc.musl-fix.patch index 619b092ca..c37282af5 100644 --- a/tools/fakeroot/patches/400-alpine-libc.musl-fix.patch +++ b/tools/fakeroot/patches/400-alpine-libc.musl-fix.patch @@ -21,7 +21,7 @@ Error relocating openwrt/staging_dir/host/lib/libfakeroot.so: SEND_GET_XATTR: sy #define SEND_GET_XATTR64(a,b,c) send_get_xattr64(a,b) #endif -@@ -125,8 +127,9 @@ +@@ -131,8 +133,9 @@ /* 10.10 uses id_t in getpriority/setpriority calls, so pretend id_t is used everywhere, just happens to be int on some OSes */ From 796fd9c0d715c82ce89ba2e7c85d29bfdb5ffe6c Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 24 Sep 2021 18:38:24 +0200 Subject: [PATCH 25/32] tools/fakeroot: fix build error on macOS Signed-off-by: Felix Fietkau --- tools/fakeroot/patches/100-macos_compile_fix.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 tools/fakeroot/patches/100-macos_compile_fix.patch diff --git a/tools/fakeroot/patches/100-macos_compile_fix.patch b/tools/fakeroot/patches/100-macos_compile_fix.patch new file mode 100644 index 000000000..64c0b472c --- /dev/null +++ b/tools/fakeroot/patches/100-macos_compile_fix.patch @@ -0,0 +1,11 @@ +--- a/libfakeroot_inode64.c ++++ b/libfakeroot_inode64.c +@@ -36,6 +36,8 @@ + #include + #endif /* HAVE_FTS_H */ + ++void load_library_symbols(void); ++ + #include "wrapped.h" + #include "wraptmpf.h" + #include "wrapdef.h" From 2c5d9f0a553c718699c96d6e6d361227eec8092d Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 13 Oct 2021 16:36:16 +0200 Subject: [PATCH 26/32] tools/fakeroot: explicitly pass CPP variable For some reason, the generated configure script fails to properly set up the internal preprocessor command variable, causing the host OS check for Darwin to fail after the last update. Explicitly setting CPP fixes this issue Signed-off-by: Felix Fietkau --- tools/fakeroot/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/fakeroot/Makefile b/tools/fakeroot/Makefile index 5c5f25e22..f4333fbfb 100644 --- a/tools/fakeroot/Makefile +++ b/tools/fakeroot/Makefile @@ -19,7 +19,8 @@ include $(INCLUDE_DIR)/host-build.mk HOST_CONFIGURE_VARS += \ ac_cv_header_sys_capability_h=no \ - ac_cv_func_capset=no + ac_cv_func_capset=no \ + CPP="$(HOSTCC) -E" HOST_CONFIGURE_ARGS += \ --with-ipc=tcp From 2fcd8db6688adbdd3ac6d10286846817356dd335 Mon Sep 17 00:00:00 2001 From: "Sergey V. Lobanov" Date: Mon, 29 Nov 2021 19:07:34 +0300 Subject: [PATCH 27/32] tools/fakeroot: fix build on MacOS arm64 Added patch for MacOS without 32 bit inodes support (__DARWIN_ONLY_64_BIT_INO_T is true) This patch based on discussion https://github.com/archmac/bootstrap/issues/4 Signed-off-by: Sergey V. Lobanov --- .../patches/500-macos_arm64_compile_fix.patch | 86 +++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 tools/fakeroot/patches/500-macos_arm64_compile_fix.patch diff --git a/tools/fakeroot/patches/500-macos_arm64_compile_fix.patch b/tools/fakeroot/patches/500-macos_arm64_compile_fix.patch new file mode 100644 index 000000000..a3731b9e9 --- /dev/null +++ b/tools/fakeroot/patches/500-macos_arm64_compile_fix.patch @@ -0,0 +1,86 @@ +diff --git a/communicate.c b/communicate.c +index e2699a2..21e5366 100644 +--- a/communicate.c ++++ b/communicate.c +@@ -24,7 +24,12 @@ + In this file, we want 'struct stat' to have a 32-bit 'ino_t'. + We use 'struct stat64' when we need a 64-bit 'ino_t'. + */ +-#define _DARWIN_NO_64_BIT_INODE ++# include ++# if __DARWIN_ONLY_64_BIT_INO_T ++# define _DARWIN_USE_64_BIT_INODE ++# else ++# define _DARWIN_NO_64_BIT_INODE ++# endif + #endif + + #include "communicate.h" +diff --git a/communicate.h b/communicate.h +index 3f9ca39..a586108 100644 +--- a/communicate.h ++++ b/communicate.h +@@ -91,6 +91,10 @@ + # include + #endif + ++#if __DARWIN_ONLY_64_BIT_INO_T ++struct stat64 __DARWIN_STRUCT_STAT64; ++#endif ++ + #ifndef FAKEROOT_FAKENET + # define FAKEROOTKEY_ENV "FAKEROOTKEY" + #endif /* ! FAKEROOT_FAKENET */ +diff --git a/faked.c b/faked.c +index a970184..ea51a23 100644 +--- a/faked.c ++++ b/faked.c +@@ -84,7 +84,12 @@ + In this file, we want 'struct stat' to have a 32-bit 'ino_t'. + We use 'struct stat64' when we need a 64-bit 'ino_t'. + */ +-#define _DARWIN_NO_64_BIT_INODE ++# include ++# if __DARWIN_ONLY_64_BIT_INO_T ++# define _DARWIN_USE_64_BIT_INODE ++# else ++# define _DARWIN_NO_64_BIT_INODE ++# endif + #endif + + #include "config.h" +diff --git a/libfakeroot.c b/libfakeroot.c +index c967d5d..836337d 100644 +--- a/libfakeroot.c ++++ b/libfakeroot.c +@@ -38,7 +38,12 @@ + In this file, we want 'struct stat' to have a 32-bit 'ino_t'. + We use 'struct stat64' when we need a 64-bit 'ino_t'. + */ +-#define _DARWIN_NO_64_BIT_INODE ++# include ++# if __DARWIN_ONLY_64_BIT_INO_T ++# define _DARWIN_USE_64_BIT_INODE ++# else ++# define _DARWIN_NO_64_BIT_INODE ++# endif + + /* The helper _unix2003 version of this file calls a few functions in this file + that are marked with static_nonapple so that needs to become private instead +diff --git a/libfakeroot_unix2003.c b/libfakeroot_unix2003.c +index e1e19b6..f32bfec 100644 +--- a/libfakeroot_unix2003.c ++++ b/libfakeroot_unix2003.c +@@ -18,7 +18,11 @@ + In this file, we want 'struct stat' to have a 32-bit 'ino_t'. + We use 'struct stat64' when we need a 64-bit 'ino_t'. + */ +-#define _DARWIN_NO_64_BIT_INODE ++# if __DARWIN_ONLY_64_BIT_INO_T ++# define _DARWIN_USE_64_BIT_INODE ++# else ++# define _DARWIN_NO_64_BIT_INODE ++# endif + + /* + This file is for 32-bit symbols which have the "$UNIX2003" version, i.e. From 737959d3b7f798e6c97dc5fa97c07a622a690ed1 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 27 Jan 2022 13:20:15 +0100 Subject: [PATCH 28/32] tools/fakeroot: fix unresolved symbols on arm64 macOS The $INODE64 symbol variants are not present, since the base system always uses 64-bit file offsets Signed-off-by: Felix Fietkau --- .../patches/500-macos_arm64_compile_fix.patch | 53 +++++++++++++++---- 1 file changed, 43 insertions(+), 10 deletions(-) diff --git a/tools/fakeroot/patches/500-macos_arm64_compile_fix.patch b/tools/fakeroot/patches/500-macos_arm64_compile_fix.patch index a3731b9e9..271dceef9 100644 --- a/tools/fakeroot/patches/500-macos_arm64_compile_fix.patch +++ b/tools/fakeroot/patches/500-macos_arm64_compile_fix.patch @@ -1,5 +1,3 @@ -diff --git a/communicate.c b/communicate.c -index e2699a2..21e5366 100644 --- a/communicate.c +++ b/communicate.c @@ -24,7 +24,12 @@ @@ -16,8 +14,6 @@ index e2699a2..21e5366 100644 #endif #include "communicate.h" -diff --git a/communicate.h b/communicate.h -index 3f9ca39..a586108 100644 --- a/communicate.h +++ b/communicate.h @@ -91,6 +91,10 @@ @@ -31,8 +27,6 @@ index 3f9ca39..a586108 100644 #ifndef FAKEROOT_FAKENET # define FAKEROOTKEY_ENV "FAKEROOTKEY" #endif /* ! FAKEROOT_FAKENET */ -diff --git a/faked.c b/faked.c -index a970184..ea51a23 100644 --- a/faked.c +++ b/faked.c @@ -84,7 +84,12 @@ @@ -49,8 +43,6 @@ index a970184..ea51a23 100644 #endif #include "config.h" -diff --git a/libfakeroot.c b/libfakeroot.c -index c967d5d..836337d 100644 --- a/libfakeroot.c +++ b/libfakeroot.c @@ -38,7 +38,12 @@ @@ -67,8 +59,6 @@ index c967d5d..836337d 100644 /* The helper _unix2003 version of this file calls a few functions in this file that are marked with static_nonapple so that needs to become private instead -diff --git a/libfakeroot_unix2003.c b/libfakeroot_unix2003.c -index e1e19b6..f32bfec 100644 --- a/libfakeroot_unix2003.c +++ b/libfakeroot_unix2003.c @@ -18,7 +18,11 @@ @@ -84,3 +74,46 @@ index e1e19b6..f32bfec 100644 /* This file is for 32-bit symbols which have the "$UNIX2003" version, i.e. +--- a/libfakeroot_inode64.c ++++ b/libfakeroot_inode64.c +@@ -25,7 +25,7 @@ + #include "config.h" + #include "communicate.h" + +-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 ++#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 && !__DARWIN_ONLY_64_BIT_INO_T + + #include + #include +--- a/wrapfunc.inp ++++ b/wrapfunc.inp +@@ -48,9 +48,11 @@ getattrlist$UNIX2003;int;(const char *pa + #endif + #endif + #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 ++#if !__DARWIN_ONLY_64_BIT_INO_T + lstat$INODE64;int;(const char *file_name, struct stat *buf);(file_name, buf) + stat$INODE64;int;(const char *file_name, struct stat *buf);(file_name, buf) + fstat$INODE64;int;(int fd, struct stat *buf);(fd, buf) ++#endif + posix_spawn;int;(pid_t * __restrict pid, const char * __restrict path, const posix_spawn_file_actions_t *file_actions, const posix_spawnattr_t * __restrict attrp, char *const argv[ __restrict], char *const envp[ __restrict]);(pid, path, file_actions, attrp, argv, envp) + posix_spawnp;int;(pid_t * __restrict pid, const char * __restrict path, const posix_spawn_file_actions_t *file_actions, const posix_spawnattr_t * __restrict attrp, char *const argv[ __restrict], char *const envp[ __restrict]);(pid, path, file_actions, attrp, argv, envp) + #endif +@@ -232,7 +234,7 @@ facl;int;(int fd, int cmd, int cnt, void + #ifdef HAVE_FTS_READ + fts_read;FTSENT *;(FTS *ftsp);(ftsp) + #ifdef __APPLE__ +-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 ++#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 && !__DARWIN_ONLY_64_BIT_INO_T + fts_read$INODE64;FTSENT *;(FTS *ftsp);(ftsp) + #endif + #endif /* ifdef __APPLE__ */ +@@ -240,7 +242,7 @@ fts_read$INODE64;FTSENT *;(FTS *ftsp);(f + #ifdef HAVE_FTS_CHILDREN + fts_children;FTSENT *;(FTS *ftsp, int options);(ftsp, options) + #ifdef __APPLE__ +-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 ++#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 && !__DARWIN_ONLY_64_BIT_INO_T + fts_children$INODE64;FTSENT *;(FTS *ftsp, int options);(ftsp, options) + #endif + #endif /* ifdef __APPLE__ */ From f854419656d41cb73cc81ce45b8ca3c081dce685 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 24 Feb 2022 20:50:36 -0800 Subject: [PATCH 29/32] tools/fakeroot: update to 1.27 Remove macOS stuff. Upstream has fixed it in the same way. Add SOL_TCP define. Taken from elsewhere in the code. Refreshed patches. Signed-off-by: Rosen Penev --- tools/fakeroot/Makefile | 4 +- .../patches/100-macos_compile_fix.patch | 11 -- .../patches/400-alpine-libc.musl-fix.patch | 4 +- .../patches/500-macos_arm64_compile_fix.patch | 119 ------------------ tools/fakeroot/patches/600-macOS.patch | 13 ++ 5 files changed, 17 insertions(+), 134 deletions(-) delete mode 100644 tools/fakeroot/patches/100-macos_compile_fix.patch delete mode 100644 tools/fakeroot/patches/500-macos_arm64_compile_fix.patch create mode 100644 tools/fakeroot/patches/600-macOS.patch diff --git a/tools/fakeroot/Makefile b/tools/fakeroot/Makefile index f4333fbfb..adae33209 100644 --- a/tools/fakeroot/Makefile +++ b/tools/fakeroot/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fakeroot -PKG_VERSION:=1.26 +PKG_VERSION:=1.27 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz PKG_SOURCE_URL:=@DEBIAN/pool/main/f/fakeroot -PKG_HASH:=480a578ffdc5592e73df4c086950d321b4adc78dbdaec56c82e4fe1fb68de8e9 +PKG_HASH:=3c45eb2d1802a2762069e2e9d21bdd6fb533592bc0cda74c9aff066ab01caddc PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=COPYING PKG_FIXUP:=autoreconf diff --git a/tools/fakeroot/patches/100-macos_compile_fix.patch b/tools/fakeroot/patches/100-macos_compile_fix.patch deleted file mode 100644 index 64c0b472c..000000000 --- a/tools/fakeroot/patches/100-macos_compile_fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/libfakeroot_inode64.c -+++ b/libfakeroot_inode64.c -@@ -36,6 +36,8 @@ - #include - #endif /* HAVE_FTS_H */ - -+void load_library_symbols(void); -+ - #include "wrapped.h" - #include "wraptmpf.h" - #include "wrapdef.h" diff --git a/tools/fakeroot/patches/400-alpine-libc.musl-fix.patch b/tools/fakeroot/patches/400-alpine-libc.musl-fix.patch index c37282af5..730732db2 100644 --- a/tools/fakeroot/patches/400-alpine-libc.musl-fix.patch +++ b/tools/fakeroot/patches/400-alpine-libc.musl-fix.patch @@ -6,7 +6,7 @@ Error relocating openwrt/staging_dir/host/lib/libfakeroot.so: SEND_GET_XATTR: sy --- a/libfakeroot.c +++ b/libfakeroot.c -@@ -81,12 +81,14 @@ +@@ -86,12 +86,14 @@ #define SEND_STAT64(a,b,c) send_stat64(a,b,c) #define SEND_GET_STAT(a,b) send_get_stat(a,b) #define SEND_GET_STAT64(a,b) send_get_stat64(a,b) @@ -21,7 +21,7 @@ Error relocating openwrt/staging_dir/host/lib/libfakeroot.so: SEND_GET_XATTR: sy #define SEND_GET_XATTR64(a,b,c) send_get_xattr64(a,b) #endif -@@ -131,8 +133,9 @@ +@@ -136,8 +138,9 @@ /* 10.10 uses id_t in getpriority/setpriority calls, so pretend id_t is used everywhere, just happens to be int on some OSes */ diff --git a/tools/fakeroot/patches/500-macos_arm64_compile_fix.patch b/tools/fakeroot/patches/500-macos_arm64_compile_fix.patch deleted file mode 100644 index 271dceef9..000000000 --- a/tools/fakeroot/patches/500-macos_arm64_compile_fix.patch +++ /dev/null @@ -1,119 +0,0 @@ ---- a/communicate.c -+++ b/communicate.c -@@ -24,7 +24,12 @@ - In this file, we want 'struct stat' to have a 32-bit 'ino_t'. - We use 'struct stat64' when we need a 64-bit 'ino_t'. - */ --#define _DARWIN_NO_64_BIT_INODE -+# include -+# if __DARWIN_ONLY_64_BIT_INO_T -+# define _DARWIN_USE_64_BIT_INODE -+# else -+# define _DARWIN_NO_64_BIT_INODE -+# endif - #endif - - #include "communicate.h" ---- a/communicate.h -+++ b/communicate.h -@@ -91,6 +91,10 @@ - # include - #endif - -+#if __DARWIN_ONLY_64_BIT_INO_T -+struct stat64 __DARWIN_STRUCT_STAT64; -+#endif -+ - #ifndef FAKEROOT_FAKENET - # define FAKEROOTKEY_ENV "FAKEROOTKEY" - #endif /* ! FAKEROOT_FAKENET */ ---- a/faked.c -+++ b/faked.c -@@ -84,7 +84,12 @@ - In this file, we want 'struct stat' to have a 32-bit 'ino_t'. - We use 'struct stat64' when we need a 64-bit 'ino_t'. - */ --#define _DARWIN_NO_64_BIT_INODE -+# include -+# if __DARWIN_ONLY_64_BIT_INO_T -+# define _DARWIN_USE_64_BIT_INODE -+# else -+# define _DARWIN_NO_64_BIT_INODE -+# endif - #endif - - #include "config.h" ---- a/libfakeroot.c -+++ b/libfakeroot.c -@@ -38,7 +38,12 @@ - In this file, we want 'struct stat' to have a 32-bit 'ino_t'. - We use 'struct stat64' when we need a 64-bit 'ino_t'. - */ --#define _DARWIN_NO_64_BIT_INODE -+# include -+# if __DARWIN_ONLY_64_BIT_INO_T -+# define _DARWIN_USE_64_BIT_INODE -+# else -+# define _DARWIN_NO_64_BIT_INODE -+# endif - - /* The helper _unix2003 version of this file calls a few functions in this file - that are marked with static_nonapple so that needs to become private instead ---- a/libfakeroot_unix2003.c -+++ b/libfakeroot_unix2003.c -@@ -18,7 +18,11 @@ - In this file, we want 'struct stat' to have a 32-bit 'ino_t'. - We use 'struct stat64' when we need a 64-bit 'ino_t'. - */ --#define _DARWIN_NO_64_BIT_INODE -+# if __DARWIN_ONLY_64_BIT_INO_T -+# define _DARWIN_USE_64_BIT_INODE -+# else -+# define _DARWIN_NO_64_BIT_INODE -+# endif - - /* - This file is for 32-bit symbols which have the "$UNIX2003" version, i.e. ---- a/libfakeroot_inode64.c -+++ b/libfakeroot_inode64.c -@@ -25,7 +25,7 @@ - #include "config.h" - #include "communicate.h" - --#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 -+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 && !__DARWIN_ONLY_64_BIT_INO_T - - #include - #include ---- a/wrapfunc.inp -+++ b/wrapfunc.inp -@@ -48,9 +48,11 @@ getattrlist$UNIX2003;int;(const char *pa - #endif - #endif - #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 -+#if !__DARWIN_ONLY_64_BIT_INO_T - lstat$INODE64;int;(const char *file_name, struct stat *buf);(file_name, buf) - stat$INODE64;int;(const char *file_name, struct stat *buf);(file_name, buf) - fstat$INODE64;int;(int fd, struct stat *buf);(fd, buf) -+#endif - posix_spawn;int;(pid_t * __restrict pid, const char * __restrict path, const posix_spawn_file_actions_t *file_actions, const posix_spawnattr_t * __restrict attrp, char *const argv[ __restrict], char *const envp[ __restrict]);(pid, path, file_actions, attrp, argv, envp) - posix_spawnp;int;(pid_t * __restrict pid, const char * __restrict path, const posix_spawn_file_actions_t *file_actions, const posix_spawnattr_t * __restrict attrp, char *const argv[ __restrict], char *const envp[ __restrict]);(pid, path, file_actions, attrp, argv, envp) - #endif -@@ -232,7 +234,7 @@ facl;int;(int fd, int cmd, int cnt, void - #ifdef HAVE_FTS_READ - fts_read;FTSENT *;(FTS *ftsp);(ftsp) - #ifdef __APPLE__ --#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 -+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 && !__DARWIN_ONLY_64_BIT_INO_T - fts_read$INODE64;FTSENT *;(FTS *ftsp);(ftsp) - #endif - #endif /* ifdef __APPLE__ */ -@@ -240,7 +242,7 @@ fts_read$INODE64;FTSENT *;(FTS *ftsp);(f - #ifdef HAVE_FTS_CHILDREN - fts_children;FTSENT *;(FTS *ftsp, int options);(ftsp, options) - #ifdef __APPLE__ --#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 -+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 && !__DARWIN_ONLY_64_BIT_INO_T - fts_children$INODE64;FTSENT *;(FTS *ftsp, int options);(ftsp, options) - #endif - #endif /* ifdef __APPLE__ */ diff --git a/tools/fakeroot/patches/600-macOS.patch b/tools/fakeroot/patches/600-macOS.patch new file mode 100644 index 000000000..59e668eb9 --- /dev/null +++ b/tools/fakeroot/patches/600-macOS.patch @@ -0,0 +1,13 @@ +--- a/communicate.c ++++ b/communicate.c +@@ -441,6 +441,10 @@ void semaphore_down(){ + + #else /* FAKEROOT_FAKENET */ + ++#ifndef SOL_TCP ++# define SOL_TCP 6 /* this should probably be done with getprotoent */ ++#endif ++ + static struct sockaddr *get_addr(void) + { + static struct sockaddr_in addr = { 0, 0, { 0 } }; From 05e206921ed69c6fbba65a76c66af9869605d2d9 Mon Sep 17 00:00:00 2001 From: SiYao Mo <1388852+msylgj@users.noreply.github.com> Date: Thu, 3 Mar 2022 15:31:03 +0000 Subject: [PATCH 30/32] rockchip: missing config to use r8168 --- package/lean/r8168/Makefile | 1 + target/linux/rockchip/image/armv8.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/lean/r8168/Makefile b/package/lean/r8168/Makefile index fd5977a5b..1ad5bbc01 100644 --- a/package/lean/r8168/Makefile +++ b/package/lean/r8168/Makefile @@ -26,6 +26,7 @@ define KernelPackage/r8168 TITLE:=Driver for Realtek r8168 chipsets SUBMENU:=Network Devices VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) + DEPENDS:= FILES:= $(PKG_BUILD_DIR)/src/r8168.ko AUTOLOAD:=$(call AutoProbe,r8168) CONFLICTS:=kmod-r8169 diff --git a/target/linux/rockchip/image/armv8.mk b/target/linux/rockchip/image/armv8.mk index c3b7e0e3b..aaaf55ce6 100644 --- a/target/linux/rockchip/image/armv8.mk +++ b/target/linux/rockchip/image/armv8.mk @@ -57,7 +57,7 @@ define Device/friendlyarm_nanopi-r4s SOC := rk3399 UBOOT_DEVICE_NAME := nanopi-r4s-rk3399 IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r4s | pine64-bin | gzip | append-metadata - DEVICE_PACKAGES := kmod-r8169 -urngd + DEVICE_PACKAGES := kmod-r8168 -urngd endef TARGET_DEVICES += friendlyarm_nanopi-r4s From 7a988e46cf2e96a52d22ad941846ecc101833660 Mon Sep 17 00:00:00 2001 From: google-you-ok? <84753324+LPDDR6-10000MHz@users.noreply.github.com> Date: Fri, 4 Mar 2022 00:06:46 +0800 Subject: [PATCH 31/32] =?UTF-8?q?rockchip=EF=BC=9Afix=20doornet=20device?= =?UTF-8?q?=20parsing=20error=20resulting=20in=20missing=20compilation=20(?= =?UTF-8?q?#8994)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update armv8.mk * rockchip:fix device tree custom parsing error * rockchip:fix device tree custom parsing error * rockchip:add doornet1-add-rk3328-dmc-relate-node * rockchip:fix device tree custom parsing error * rockchip:refresh add device dtb configuration * Add files via upload * rockchip:add 1.5 second delay mode for ethernet * rockchip:add 1.5 second delay mode for ethernet * Update 205-rockchip-rk3399-Add-support-for-EmbedFire-DoorNet2.patch * Update 205-rockchip-rk3399-Add-support-for-EmbedFire-DoorNet2.patch * Update armv8.mk * Delete 808-arm64-dts-doornet1-add-rk3328-dmc-relate-node.patch * Update armv8.mk --- target/linux/rockchip/image/armv8.mk | 6 +- ...8-Add-support-for-EmbedFire-DoorNet1.patch | 83 +++++---- ...9-Add-support-for-EmbedFire-DoorNet2.patch | 30 +++- ...-doornet1-add-rk3328-dmc-relate-node.patch | 124 +++++++++++++ ...8-Add-support-for-EmbedFire-DoorNet1.patch | 166 +++++++++++++----- ...9-Add-support-for-EmbedFire-DoorNet2.patch | 30 +++- ...-support-for-FriendlyARM-NanoPi-Neo3.patch | 6 +- ...8-Add-support-for-EmbedFire-DoorNet1.patch | 59 ++++--- 8 files changed, 391 insertions(+), 113 deletions(-) create mode 100644 target/linux/rockchip/patches-5.10/809-arm64-dts-doornet1-add-rk3328-dmc-relate-node.patch diff --git a/target/linux/rockchip/image/armv8.mk b/target/linux/rockchip/image/armv8.mk index aaaf55ce6..0634e29b9 100644 --- a/target/linux/rockchip/image/armv8.mk +++ b/target/linux/rockchip/image/armv8.mk @@ -10,7 +10,7 @@ define Device/embedfire_doornet1 IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r2s | pine64-bin | gzip | append-metadata DEVICE_PACKAGES := kmod-usb-net-rtl8152 kmod-rtl8821cu endef -#TARGET_DEVICES += embedfire_doornet1 +TARGET_DEVICES += embedfire_doornet1 define Device/embedfire_doornet2 DEVICE_VENDOR := EmbedFire @@ -18,9 +18,9 @@ define Device/embedfire_doornet2 SOC := rk3399 UBOOT_DEVICE_NAME := doornet2-rk3399 IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r4s | pine64-bin | gzip | append-metadata - DEVICE_PACKAGES := kmod-r8168 kmod-rtl8821cu -urngd + DEVICE_PACKAGES := kmod-r8169 kmod-rtl8821cu -urngd endef -#TARGET_DEVICES += embedfire_doornet2 +TARGET_DEVICES += embedfire_doornet2 define Device/friendlyarm_nanopi-neo3 DEVICE_VENDOR := FriendlyARM diff --git a/target/linux/rockchip/patches-5.10/203-rockchip-rk3328-Add-support-for-EmbedFire-DoorNet1.patch b/target/linux/rockchip/patches-5.10/203-rockchip-rk3328-Add-support-for-EmbedFire-DoorNet1.patch index 63c3c82f0..efd3cd233 100644 --- a/target/linux/rockchip/patches-5.10/203-rockchip-rk3328-Add-support-for-EmbedFire-DoorNet1.patch +++ b/target/linux/rockchip/patches-5.10/203-rockchip-rk3328-Add-support-for-EmbedFire-DoorNet1.patch @@ -1,9 +1,19 @@ +--- a/arch/arm64/boot/dts/rockchip/Makefile ++++ b/arch/arm64/boot/dts/rockchip/Makefile +@@ -5,6 +5,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-ro + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3318-a95x-z2.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-odroid-go2.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-a1.dtb ++dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-doornet1.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2s.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-orangepi-r1-plus.dtb --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-doornet1.dts -@@ -0,0 +1,412 @@ +@@ -0,0 +1,419 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* -+ * Copyright (c) 2020 David Bauer ++ * Copyright (c) 2021 EmbedFire + */ + +/dts-v1/; @@ -21,6 +31,8 @@ + led-failsafe = &sys_led; + led-running = &sys_led; + led-upgrade = &sys_led; ++ // mmc1 = &sdmmc; ++ // mmc0 = &emmc; + }; + + chosen { @@ -78,6 +90,11 @@ + gpios = <&gpio2 RK_PC2 GPIO_ACTIVE_HIGH>; + label = "doornet1:green:wan"; + }; ++ ++ wifi_enable: wifi_enable { ++ gpios = <&gpio2 RK_PC5 GPIO_ACTIVE_HIGH>; ++ label = "wifi-enable"; ++ }; + }; + + vcc_io_sdio: sdmmcio-regulator { @@ -93,8 +110,8 @@ + regulator-settling-time-us = <5000>; + regulator-type = "voltage"; + startup-delay-us = <2000>; -+ states = <1800000 0x1>, -+ <3300000 0x0>; ++ states = <1800000 0x1 ++ 3300000 0x0>; + vin-supply = <&vcc_io_33>; + }; + @@ -140,34 +157,16 @@ + assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>; + assigned-clock-parents = <&gmac_clk>, <&gmac_clk>; + clock_in_out = "input"; -+ phy-handle = <&rtl8211f>; + phy-mode = "rgmii"; + phy-supply = <&vcc_io_33>; + pinctrl-0 = <&rgmiim1_pins>; + pinctrl-names = "default"; -+ snps,aal; -+ snps,rxpbl = <0x4>; -+ snps,txpbl = <0x4>; -+ tx_delay = <0x24>; -+ rx_delay = <0x58>; ++ snps,reset-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>; ++ snps,reset-delays-us = <0 1000000 50000>; ++ snps,reset-active-low; ++ tx_delay = <0x18>; ++ rx_delay = <0x24>; + status = "okay"; -+ -+ mdio { -+ compatible = "snps,dwmac-mdio"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ rtl8211f: ethernet-phy@1 { -+ compatible = "ethernet-phy-id001c.c916", -+ "ethernet-phy-ieee802.3-c22"; -+ reg = <1>; -+ pinctrl-0 = <ð_phy_reset_pin>; -+ pinctrl-names = "default"; -+ reset-assert-us = <10000>; -+ reset-deassert-us = <50000>; -+ reset-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>; -+ }; -+ }; +}; + +&i2c1 { @@ -329,6 +328,10 @@ + wan_led_pin: wan-led-pin { + rockchip,pins = <2 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>; + }; ++ ++ wifi_pin: wifi_pin{ ++ rockchip,pins = <2 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>; ++ }; + }; + + pmic { @@ -363,6 +366,20 @@ + status = "okay"; +}; + ++&emmc { ++ bus-width = <8>; ++ cap-mmc-highspeed; ++ max-frequency = <150000000>; ++ mmc-ddr-1_8v; ++ mmc-hs200-1_8v; ++ non-removable; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>; ++ vmmc-supply = <&vcc_io_33>; ++ vqmmc-supply = <&vcc18_emmc>; ++ status = "okay"; ++}; ++ +&tsadc { + rockchip,hw-tshut-mode = <0>; + rockchip,hw-tshut-polarity = <0>; @@ -413,13 +430,5 @@ + realtek,led-data = <0x87>; + }; +}; ---- a/arch/arm64/boot/dts/rockchip/Makefile -+++ b/arch/arm64/boot/dts/rockchip/Makefile -@@ -5,6 +5,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-ro - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3318-a95x-z2.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-odroid-go2.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-a1.dtb -+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-doornet1.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2s.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-orangepi-r1-plus.dtb +-- +2.25.1 diff --git a/target/linux/rockchip/patches-5.10/205-rockchip-rk3399-Add-support-for-EmbedFire-DoorNet2.patch b/target/linux/rockchip/patches-5.10/205-rockchip-rk3399-Add-support-for-EmbedFire-DoorNet2.patch index 02e5c74e1..65a38702c 100644 --- a/target/linux/rockchip/patches-5.10/205-rockchip-rk3399-Add-support-for-EmbedFire-DoorNet2.patch +++ b/target/linux/rockchip/patches-5.10/205-rockchip-rk3399-Add-support-for-EmbedFire-DoorNet2.patch @@ -274,8 +274,8 @@ + snps,reset-gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>; + snps,reset-active-low; + snps,reset-delays-us = <0 100000 50000>; -+ tx_delay = <0x13>; -+ rx_delay = <0x0e>; ++ tx_delay = <0x28>; ++ rx_delay = <0x11>; + status = "okay"; +}; + @@ -766,3 +766,29 @@ + status = "okay"; +}; + +--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c ++++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c +@@ -363,6 +363,11 @@ int stmmac_mdio_register(struct net_device *ndev) + goto bus_register_fail; + } + ++ stmmac_mdio_write(new_bus,0,31,2627); ++ stmmac_mdio_write(new_bus,0,25,0x1801); ++ stmmac_mdio_write(new_bus,0,31,0); ++ stmmac_mdio_write(new_bus,0,0,0x8000); ++ + if (priv->plat->phy_node || mdio_node) + goto bus_register_done; + + +--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c ++++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +@@ -2191,6 +2191,8 @@ static int stmmac_init_dma_engine(struct stmmac_priv *priv) + if (priv->extend_desc && (priv->mode == STMMAC_RING_MODE)) + atds = 1; + ++ msleep(1500); ++ + ret = stmmac_reset(priv, priv->ioaddr); + if (ret) { + dev_err(priv->device, "Failed to reset the dma\n"); diff --git a/target/linux/rockchip/patches-5.10/809-arm64-dts-doornet1-add-rk3328-dmc-relate-node.patch b/target/linux/rockchip/patches-5.10/809-arm64-dts-doornet1-add-rk3328-dmc-relate-node.patch new file mode 100644 index 000000000..54cd42051 --- /dev/null +++ b/target/linux/rockchip/patches-5.10/809-arm64-dts-doornet1-add-rk3328-dmc-relate-node.patch @@ -0,0 +1,124 @@ +From 2184ab853067b484ba5677e35f1a6955a5c023a1 Mon Sep 17 00:00:00 2001 +From: wowowow +Date: Wed, 20 Oct 2021 13:46:46 +0800 +Subject: [PATCH] arm64-dts-doornet1-add-rk3328-dmc-relate-node + +--- + .../boot/dts/rockchip/rk3328-doornet1.dts | 73 +++++++++++++++++++ + 1 file changed, 73 insertions(+) + +diff --git a/arch/arm64/boot/dts/rockchip/rk3328-doornet1.dts b/arch/arm64/boot/dts/rockchip/rk3328-doornet1.dts +index 8333351..d984163 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3328-doornet1.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3328-doornet1.dts +@@ -7,6 +7,7 @@ + + #include + #include ++#include "rk3328-dram-nanopi2-timing.dtsi" + #include "rk3328.dtsi" + + / { +@@ -56,6 +57,72 @@ + enable-active-high; + }; + ++ dmc: dmc { ++ compatible = "rockchip,rk3328-dmc"; ++ devfreq-events = <&dfi>; ++ center-supply = <&vdd_log>; ++ clocks = <&cru SCLK_DDRCLK>; ++ clock-names = "dmc_clk"; ++ operating-points-v2 = <&dmc_opp_table>; ++ ddr_timing = <&ddr_timing>; ++ upthreshold = <40>; ++ downdifferential = <20>; ++ auto-min-freq = <786000>; ++ auto-freq-en = <1>; ++ #cooling-cells = <2>; ++ status = "okay"; ++ ++ ddr_power_model: ddr_power_model { ++ compatible = "ddr_power_model"; ++ dynamic-power-coefficient = <120>; ++ static-power-coefficient = <200>; ++ ts = <32000 4700 (-80) 2>; ++ thermal-zone = "soc-thermal"; ++ }; ++ }; ++ ++ dmc_opp_table: dmc-opp-table { ++ compatible = "operating-points-v2"; ++ ++ rockchip,leakage-voltage-sel = < ++ 1 10 0 ++ 11 254 1 ++ >; ++ nvmem-cells = <&logic_leakage>; ++ nvmem-cell-names = "ddr_leakage"; ++ ++ opp-786000000 { ++ opp-hz = /bits/ 64 <786000000>; ++ opp-microvolt = <1075000>; ++ opp-microvolt-L0 = <1075000>; ++ opp-microvolt-L1 = <1050000>; ++ }; ++ opp-798000000 { ++ opp-hz = /bits/ 64 <798000000>; ++ opp-microvolt = <1075000>; ++ opp-microvolt-L0 = <1075000>; ++ opp-microvolt-L1 = <1050000>; ++ }; ++ opp-840000000 { ++ opp-hz = /bits/ 64 <840000000>; ++ opp-microvolt = <1075000>; ++ opp-microvolt-L0 = <1075000>; ++ opp-microvolt-L1 = <1050000>; ++ }; ++ opp-924000000 { ++ opp-hz = /bits/ 64 <924000000>; ++ opp-microvolt = <1100000>; ++ opp-microvolt-L0 = <1100000>; ++ opp-microvolt-L1 = <1075000>; ++ }; ++ opp-1056000000 { ++ opp-hz = /bits/ 64 <1056000000>; ++ opp-microvolt = <1175000>; ++ opp-microvolt-L0 = <1175000>; ++ opp-microvolt-L1 = <1150000>; ++ }; ++ }; ++ + leds { + compatible = "gpio-leds"; + pinctrl-0 = <&lan_led_pin>, <&sys_led_pin>, <&wan_led_pin>; +@@ -138,6 +205,10 @@ + cpu-supply = <&vdd_arm>; + }; + ++&dfi { ++ status = "okay"; ++}; ++ + &gmac2io { + assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>; + assigned-clock-parents = <&gmac_clk>, <&gmac_clk>; +@@ -201,6 +272,7 @@ + regulator-name = "vdd_log"; + regulator-always-on; + regulator-boot-on; ++ regulator-init-microvolt = <1075000>; + regulator-min-microvolt = <712500>; + regulator-max-microvolt = <1450000>; + regulator-ramp-delay = <12500>; +@@ -215,6 +287,7 @@ + regulator-name = "vdd_arm"; + regulator-always-on; + regulator-boot-on; ++ regulator-init-microvolt = <1225000>; + regulator-min-microvolt = <712500>; + regulator-max-microvolt = <1450000>; + regulator-ramp-delay = <12500>; +-- +2.25.1 + diff --git a/target/linux/rockchip/patches-5.15/203-rockchip-rk3328-Add-support-for-EmbedFire-DoorNet1.patch b/target/linux/rockchip/patches-5.15/203-rockchip-rk3328-Add-support-for-EmbedFire-DoorNet1.patch index aa675117f..2eef66d9f 100644 --- a/target/linux/rockchip/patches-5.15/203-rockchip-rk3328-Add-support-for-EmbedFire-DoorNet1.patch +++ b/target/linux/rockchip/patches-5.15/203-rockchip-rk3328-Add-support-for-EmbedFire-DoorNet1.patch @@ -1,15 +1,26 @@ +---- a/arch/arm64/boot/dts/rockchip/Makefile ++++ b/arch/arm64/boot/dts/rockchip/Makefile +@@ -8,6 +8,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-ro + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3318-a95x-z2.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-odroid-go2.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-a1.dtb ++dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-doornet1.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2s.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-orangepi-r1-plus.dtb --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-doornet1.dts -@@ -0,0 +1,412 @@ +@@ -0,0 +1,495 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* -+ * Copyright (c) 2020 David Bauer ++ * Copyright (c) 2021 EmbedFire + */ + +/dts-v1/; + +#include +#include ++#include "rk3328-dram-nanopi2-timing.dtsi" +#include "rk3328.dtsi" + +/ { @@ -21,6 +32,8 @@ + led-failsafe = &sys_led; + led-running = &sys_led; + led-upgrade = &sys_led; ++ // mmc1 = &sdmmc; ++ // mmc0 = &emmc; + }; + + chosen { @@ -59,6 +72,72 @@ + enable-active-high; + }; + ++ dmc: dmc { ++ compatible = "rockchip,rk3328-dmc"; ++ devfreq-events = <&dfi>; ++ center-supply = <&vdd_log>; ++ clocks = <&cru SCLK_DDRCLK>; ++ clock-names = "dmc_clk"; ++ operating-points-v2 = <&dmc_opp_table>; ++ ddr_timing = <&ddr_timing>; ++ upthreshold = <40>; ++ downdifferential = <20>; ++ auto-min-freq = <786000>; ++ auto-freq-en = <1>; ++ #cooling-cells = <2>; ++ status = "okay"; ++ ++ ddr_power_model: ddr_power_model { ++ compatible = "ddr_power_model"; ++ dynamic-power-coefficient = <120>; ++ static-power-coefficient = <200>; ++ ts = <32000 4700 (-80) 2>; ++ thermal-zone = "soc-thermal"; ++ }; ++ }; ++ ++ dmc_opp_table: dmc-opp-table { ++ compatible = "operating-points-v2"; ++ ++ rockchip,leakage-voltage-sel = < ++ 1 10 0 ++ 11 254 1 ++ >; ++ nvmem-cells = <&logic_leakage>; ++ nvmem-cell-names = "ddr_leakage"; ++ ++ opp-786000000 { ++ opp-hz = /bits/ 64 <786000000>; ++ opp-microvolt = <1075000>; ++ opp-microvolt-L0 = <1075000>; ++ opp-microvolt-L1 = <1050000>; ++ }; ++ opp-798000000 { ++ opp-hz = /bits/ 64 <798000000>; ++ opp-microvolt = <1075000>; ++ opp-microvolt-L0 = <1075000>; ++ opp-microvolt-L1 = <1050000>; ++ }; ++ opp-840000000 { ++ opp-hz = /bits/ 64 <840000000>; ++ opp-microvolt = <1075000>; ++ opp-microvolt-L0 = <1075000>; ++ opp-microvolt-L1 = <1050000>; ++ }; ++ opp-924000000 { ++ opp-hz = /bits/ 64 <924000000>; ++ opp-microvolt = <1100000>; ++ opp-microvolt-L0 = <1100000>; ++ opp-microvolt-L1 = <1075000>; ++ }; ++ opp-1056000000 { ++ opp-hz = /bits/ 64 <1056000000>; ++ opp-microvolt = <1175000>; ++ opp-microvolt-L0 = <1175000>; ++ opp-microvolt-L1 = <1150000>; ++ }; ++ }; ++ + leds { + compatible = "gpio-leds"; + pinctrl-0 = <&lan_led_pin>, <&sys_led_pin>, <&wan_led_pin>; @@ -78,6 +157,11 @@ + gpios = <&gpio2 RK_PC2 GPIO_ACTIVE_HIGH>; + label = "doornet1:green:wan"; + }; ++ ++ wifi_enable: wifi_enable { ++ gpios = <&gpio2 RK_PC5 GPIO_ACTIVE_HIGH>; ++ label = "wifi-enable"; ++ }; + }; + + vcc_io_sdio: sdmmcio-regulator { @@ -93,8 +177,8 @@ + regulator-settling-time-us = <5000>; + regulator-type = "voltage"; + startup-delay-us = <2000>; -+ states = <1800000 0x1>, -+ <3300000 0x0>; ++ states = <1800000 0x1 ++ 3300000 0x0>; + vin-supply = <&vcc_io_33>; + }; + @@ -136,38 +220,24 @@ + cpu-supply = <&vdd_arm>; +}; + ++&dfi { ++ status = "okay"; ++}; ++ +&gmac2io { + assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>; + assigned-clock-parents = <&gmac_clk>, <&gmac_clk>; + clock_in_out = "input"; -+ phy-handle = <&rtl8211f>; + phy-mode = "rgmii"; + phy-supply = <&vcc_io_33>; + pinctrl-0 = <&rgmiim1_pins>; + pinctrl-names = "default"; -+ snps,aal; -+ snps,rxpbl = <0x4>; -+ snps,txpbl = <0x4>; -+ tx_delay = <0x24>; -+ rx_delay = <0x58>; ++ snps,reset-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>; ++ snps,reset-delays-us = <0 1000000 50000>; ++ snps,reset-active-low; ++ tx_delay = <0x18>; ++ rx_delay = <0x24>; + status = "okay"; -+ -+ mdio { -+ compatible = "snps,dwmac-mdio"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ rtl8211f: ethernet-phy@1 { -+ compatible = "ethernet-phy-id001c.c916", -+ "ethernet-phy-ieee802.3-c22"; -+ reg = <1>; -+ pinctrl-0 = <ð_phy_reset_pin>; -+ pinctrl-names = "default"; -+ reset-assert-us = <10000>; -+ reset-deassert-us = <50000>; -+ reset-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>; -+ }; -+ }; +}; + +&i2c1 { @@ -199,6 +269,7 @@ + regulator-name = "vdd_log"; + regulator-always-on; + regulator-boot-on; ++ regulator-init-microvolt = <1075000>; + regulator-min-microvolt = <712500>; + regulator-max-microvolt = <1450000>; + regulator-ramp-delay = <12500>; @@ -213,6 +284,7 @@ + regulator-name = "vdd_arm"; + regulator-always-on; + regulator-boot-on; ++ regulator-init-microvolt = <1225000>; + regulator-min-microvolt = <712500>; + regulator-max-microvolt = <1450000>; + regulator-ramp-delay = <12500>; @@ -329,6 +401,10 @@ + wan_led_pin: wan-led-pin { + rockchip,pins = <2 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>; + }; ++ ++ wifi_pin: wifi_pin{ ++ rockchip,pins = <2 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>; ++ }; + }; + + pmic { @@ -363,6 +439,20 @@ + status = "okay"; +}; + ++&emmc { ++ bus-width = <8>; ++ cap-mmc-highspeed; ++ max-frequency = <150000000>; ++ mmc-ddr-1_8v; ++ mmc-hs200-1_8v; ++ non-removable; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>; ++ vmmc-supply = <&vcc_io_33>; ++ vqmmc-supply = <&vcc18_emmc>; ++ status = "okay"; ++}; ++ +&tsadc { + rockchip,hw-tshut-mode = <0>; + rockchip,hw-tshut-polarity = <0>; @@ -402,24 +492,20 @@ + status = "okay"; +}; + -+&usbdrd_dwc3 { ++&usbdrd3 { + dr_mode = "host"; + status = "okay"; ++ #address-cells = <1>; ++ #size-cells = <0>; + -+ usb-eth@2 { -+ compatible = "realtek,rtl8153"; ++ /* Second port is for USB 3.0 */ ++ rtl8153: device@2 { ++ compatible = "usbbda,8153"; + reg = <2>; + + realtek,led-data = <0x87>; + }; +}; ---- a/arch/arm64/boot/dts/rockchip/Makefile -+++ b/arch/arm64/boot/dts/rockchip/Makefile -@@ -8,6 +8,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-ro - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3318-a95x-z2.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-odroid-go2.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-a1.dtb -+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-doornet1.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2s.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-orangepi-r1-plus.dtb +\ No newline at end of file +-- +2.25.1 diff --git a/target/linux/rockchip/patches-5.15/205-rockchip-rk3399-Add-support-for-EmbedFire-DoorNet2.patch b/target/linux/rockchip/patches-5.15/205-rockchip-rk3399-Add-support-for-EmbedFire-DoorNet2.patch index 6f9a77f7b..3e614844e 100644 --- a/target/linux/rockchip/patches-5.15/205-rockchip-rk3399-Add-support-for-EmbedFire-DoorNet2.patch +++ b/target/linux/rockchip/patches-5.15/205-rockchip-rk3399-Add-support-for-EmbedFire-DoorNet2.patch @@ -274,8 +274,8 @@ + snps,reset-gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>; + snps,reset-active-low; + snps,reset-delays-us = <0 100000 50000>; -+ tx_delay = <0x13>; -+ rx_delay = <0x0e>; ++ tx_delay = <0x28>; ++ rx_delay = <0x11>; + status = "okay"; +}; + @@ -766,3 +766,29 @@ + status = "okay"; +}; + +--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c ++++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c +@@ -363,6 +363,11 @@ int stmmac_mdio_register(struct net_device *ndev) + goto bus_register_fail; + } + ++ stmmac_mdio_write(new_bus,0,31,2627); ++ stmmac_mdio_write(new_bus,0,25,0x1801); ++ stmmac_mdio_write(new_bus,0,31,0); ++ stmmac_mdio_write(new_bus,0,0,0x8000); ++ + if (priv->plat->phy_node || mdio_node) + goto bus_register_done; + + +--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c ++++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +@@ -2191,6 +2191,8 @@ static int stmmac_init_dma_engine(struct stmmac_priv *priv) + if (priv->extend_desc && (priv->mode == STMMAC_RING_MODE)) + atds = 1; + ++ msleep(1500); ++ + ret = stmmac_reset(priv, priv->ioaddr); + if (ret) { + dev_err(priv->device, "Failed to reset the dma\n"); diff --git a/target/linux/rockchip/patches-5.15/207-rockchip-rk3328-add-support-for-FriendlyARM-NanoPi-Neo3.patch b/target/linux/rockchip/patches-5.15/207-rockchip-rk3328-add-support-for-FriendlyARM-NanoPi-Neo3.patch index c7ef38c27..cad477a0d 100644 --- a/target/linux/rockchip/patches-5.15/207-rockchip-rk3328-add-support-for-FriendlyARM-NanoPi-Neo3.patch +++ b/target/linux/rockchip/patches-5.15/207-rockchip-rk3328-add-support-for-FriendlyARM-NanoPi-Neo3.patch @@ -35,11 +35,9 @@ to status_led in accordance with the board schematics. --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile -@@ -8,8 +8,8 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-ro - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3318-a95x-z2.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-odroid-go2.dtb +@@ -10,6 +10,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-odroid-go2.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-a1.dtb --dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-doornet1.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-doornet1.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-neo3.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2c.dtb diff --git a/target/linux/rockchip/patches-5.4/203-rockchip-rk3328-Add-support-for-EmbedFire-DoorNet1.patch b/target/linux/rockchip/patches-5.4/203-rockchip-rk3328-Add-support-for-EmbedFire-DoorNet1.patch index 2a848f2e4..2446d8c49 100644 --- a/target/linux/rockchip/patches-5.4/203-rockchip-rk3328-Add-support-for-EmbedFire-DoorNet1.patch +++ b/target/linux/rockchip/patches-5.4/203-rockchip-rk3328-Add-support-for-EmbedFire-DoorNet1.patch @@ -9,10 +9,10 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-orangepi-r1-plus.dtb --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-doornet1.dts -@@ -0,0 +1,412 @@ +@@ -0,0 +1,419 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* -+ * Copyright (c) 2020 David Bauer ++ * Copyright (c) 2021 EmbedFire + */ + +/dts-v1/; @@ -30,6 +30,8 @@ + led-failsafe = &sys_led; + led-running = &sys_led; + led-upgrade = &sys_led; ++ // mmc1 = &sdmmc; ++ // mmc0 = &emmc; + }; + + chosen { @@ -87,6 +89,11 @@ + gpios = <&gpio2 RK_PC2 GPIO_ACTIVE_HIGH>; + label = "doornet1:green:wan"; + }; ++ ++ wifi_enable: wifi_enable { ++ gpios = <&gpio2 RK_PC5 GPIO_ACTIVE_HIGH>; ++ label = "wifi-enable"; ++ }; + }; + + vcc_io_sdio: sdmmcio-regulator { @@ -149,34 +156,16 @@ + assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>; + assigned-clock-parents = <&gmac_clk>, <&gmac_clk>; + clock_in_out = "input"; -+ phy-handle = <&rtl8211f>; + phy-mode = "rgmii"; + phy-supply = <&vcc_io_33>; + pinctrl-0 = <&rgmiim1_pins>; + pinctrl-names = "default"; -+ snps,aal; -+ snps,rxpbl = <0x4>; -+ snps,txpbl = <0x4>; -+ tx_delay = <0x24>; -+ rx_delay = <0x58>; ++ snps,reset-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>; ++ snps,reset-delays-us = <0 1000000 50000>; ++ snps,reset-active-low; ++ tx_delay = <0xf>; ++ rx_delay = <0x68>; + status = "okay"; -+ -+ mdio { -+ compatible = "snps,dwmac-mdio"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ rtl8211f: ethernet-phy@1 { -+ compatible = "ethernet-phy-id001c.c916", -+ "ethernet-phy-ieee802.3-c22"; -+ reg = <1>; -+ pinctrl-0 = <ð_phy_reset_pin>; -+ pinctrl-names = "default"; -+ reset-assert-us = <10000>; -+ reset-deassert-us = <50000>; -+ reset-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>; -+ }; -+ }; +}; + +&i2c1 { @@ -338,6 +327,10 @@ + wan_led_pin: wan-led-pin { + rockchip,pins = <2 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>; + }; ++ ++ wifi_pin: wifi_pin{ ++ rockchip,pins = <2 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>; ++ }; + }; + + pmic { @@ -372,6 +365,20 @@ + status = "okay"; +}; + ++&emmc { ++ bus-width = <8>; ++ cap-mmc-highspeed; ++ max-frequency = <150000000>; ++ mmc-ddr-1_8v; ++ mmc-hs200-1_8v; ++ non-removable; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>; ++ vmmc-supply = <&vcc_io_33>; ++ vqmmc-supply = <&vcc18_emmc>; ++ status = "okay"; ++}; ++ +&tsadc { + rockchip,hw-tshut-mode = <0>; + rockchip,hw-tshut-polarity = <0>; @@ -422,3 +429,5 @@ + realtek,led-data = <0x87>; + }; +}; +-- +2.25.1 From 0f1905de355cfa46afb311feb466b859b7f7d1f5 Mon Sep 17 00:00:00 2001 From: Rui Salvaterra Date: Wed, 2 Mar 2022 13:11:44 +0000 Subject: [PATCH 32/32] kernel: bump 5.10 to 5.10.103 Patches automatically rebased. Signed-off-by: Rui Salvaterra --- include/kernel-5.10 | 4 ++-- .../linux/ath79/patches-5.10/910-unaligned_access_hacks.patch | 4 ++-- ...xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch | 4 ++-- .../950-0246-sc16is7xx-Fix-for-hardware-flow-control.patch | 4 ++-- ...netfilter-nftables-update-table-flags-from-the-commi.patch | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/kernel-5.10 b/include/kernel-5.10 index 0522a1432..5eededd53 100644 --- a/include/kernel-5.10 +++ b/include/kernel-5.10 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.10 = .102 -LINUX_KERNEL_HASH-5.10.102 = e6414895b1c2e406a41a8744160e2b4ef2095e6cebe5363be460d1b198f0e379 +LINUX_VERSION-5.10 = .103 +LINUX_KERNEL_HASH-5.10.103 = 4fb8ad55e6430342e4fbc94d54e594e9be8eb6a8bea1d71eccf835948d08580a diff --git a/target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch index c65361fa0..5738a2a8a 100644 --- a/target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch +++ b/target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch @@ -292,7 +292,7 @@ #endif /* _LINUX_TYPES_H */ --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c -@@ -1467,8 +1467,8 @@ struct sk_buff *inet_gro_receive(struct +@@ -1470,8 +1470,8 @@ struct sk_buff *inet_gro_receive(struct if (unlikely(ip_fast_csum((u8 *)iph, 5))) goto out_unlock; @@ -534,7 +534,7 @@ goto next_ht; --- a/net/ipv6/ip6_offload.c +++ b/net/ipv6/ip6_offload.c -@@ -238,7 +238,7 @@ INDIRECT_CALLABLE_SCOPE struct sk_buff * +@@ -240,7 +240,7 @@ INDIRECT_CALLABLE_SCOPE struct sk_buff * continue; iph2 = (struct ipv6hdr *)(p->data + off); diff --git a/target/linux/bcm27xx/patches-5.10/950-0139-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch b/target/linux/bcm27xx/patches-5.10/950-0139-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch index 6cc748211..4052d2f24 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0139-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0139-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch @@ -15,7 +15,7 @@ Signed-off-by: Jonathan Bell --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -1467,6 +1467,103 @@ command_cleanup: +@@ -1474,6 +1474,103 @@ command_cleanup: } /* @@ -119,7 +119,7 @@ Signed-off-by: Jonathan Bell * non-error returns are a promise to giveback() the urb later * we drop ownership so next owner (or urb unlink) can get it */ -@@ -5370,6 +5467,7 @@ static const struct hc_driver xhci_hc_dr +@@ -5380,6 +5477,7 @@ static const struct hc_driver xhci_hc_dr .endpoint_reset = xhci_endpoint_reset, .check_bandwidth = xhci_check_bandwidth, .reset_bandwidth = xhci_reset_bandwidth, diff --git a/target/linux/bcm27xx/patches-5.10/950-0246-sc16is7xx-Fix-for-hardware-flow-control.patch b/target/linux/bcm27xx/patches-5.10/950-0246-sc16is7xx-Fix-for-hardware-flow-control.patch index aeabd9725..bfc748bd7 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0246-sc16is7xx-Fix-for-hardware-flow-control.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0246-sc16is7xx-Fix-for-hardware-flow-control.patch @@ -38,7 +38,7 @@ Signed-off-by: Phil Elwell regcache_cache_bypass(s->regmap, false); /* Put LCR back to the normal mode */ -@@ -839,7 +840,7 @@ static unsigned int sc16is7xx_get_mctrl( +@@ -842,7 +843,7 @@ static unsigned int sc16is7xx_get_mctrl( /* DCD and DSR are not wired and CTS/RTS is handled automatically * so just indicate DSR and CAR asserted */ @@ -47,7 +47,7 @@ Signed-off-by: Phil Elwell } static void sc16is7xx_set_mctrl(struct uart_port *port, unsigned int mctrl) -@@ -926,14 +927,19 @@ static void sc16is7xx_set_termios(struct +@@ -929,14 +930,19 @@ static void sc16is7xx_set_termios(struct regcache_cache_bypass(s->regmap, true); sc16is7xx_port_write(port, SC16IS7XX_XON1_REG, termios->c_cc[VSTART]); sc16is7xx_port_write(port, SC16IS7XX_XOFF1_REG, termios->c_cc[VSTOP]); diff --git a/target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch b/target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch index 56f68feac..fa6e0c417 100644 --- a/target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch +++ b/target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch @@ -70,7 +70,7 @@ Signed-off-by: Pablo Neira Ayuso nft_trans_table_update(trans) = true; list_add_tail(&trans->list, &ctx->net->nft.commit_list); return 0; -@@ -7903,11 +7907,10 @@ static int nf_tables_commit(struct net * +@@ -7908,11 +7912,10 @@ static int nf_tables_commit(struct net * switch (trans->msg_type) { case NFT_MSG_NEWTABLE: if (nft_trans_table_update(trans)) { @@ -86,7 +86,7 @@ Signed-off-by: Pablo Neira Ayuso } else { nft_clear(net, trans->ctx.table); } -@@ -8120,11 +8123,9 @@ static int __nf_tables_abort(struct net +@@ -8125,11 +8128,9 @@ static int __nf_tables_abort(struct net switch (trans->msg_type) { case NFT_MSG_NEWTABLE: if (nft_trans_table_update(trans)) {