diff --git a/target/linux/ipq806x/patches-6.6/990-001-Add-required-entries-in-dts-files-for-NSS-support.patch b/target/linux/ipq806x/patches-6.6/990-001-Add-required-entries-in-dts-files-for-NSS-support.patch index 518e65c961..066c3f66c2 100644 --- a/target/linux/ipq806x/patches-6.6/990-001-Add-required-entries-in-dts-files-for-NSS-support.patch +++ b/target/linux/ipq806x/patches-6.6/990-001-Add-required-entries-in-dts-files-for-NSS-support.patch @@ -1,8 +1,6 @@ -diff --git a/arch/arm/boot/dts/qcom/qcom-ipq8064-ad7200-c2600.dtsi b/arch/arm/boot/dts/qcom/qcom-ipq8064-ad7200-c2600.dtsi -index 3a33472..48ba58f 100644 --- a/arch/arm/boot/dts/qcom/qcom-ipq8064-ad7200-c2600.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-ipq8064-ad7200-c2600.dtsi -@@ -371,6 +371,9 @@ phy4: ethernet-phy@4 { +@@ -371,6 +371,9 @@ &gmac1 { status = "okay"; @@ -12,7 +10,7 @@ index 3a33472..48ba58f 100644 phy-mode = "rgmii"; qcom,id = <1>; -@@ -388,6 +391,9 @@ fixed-link { +@@ -388,6 +391,9 @@ &gmac2 { status = "okay"; @@ -22,11 +20,9 @@ index 3a33472..48ba58f 100644 phy-mode = "sgmii"; qcom,id = <2>; -diff --git a/arch/arm/boot/dts/qcom/qcom-ipq8064-d7800.dts b/arch/arm/boot/dts/qcom/qcom-ipq8064-d7800.dts -index c147bbf..13191ee 100644 --- a/arch/arm/boot/dts/qcom/qcom-ipq8064-d7800.dts +++ b/arch/arm/boot/dts/qcom/qcom-ipq8064-d7800.dts -@@ -369,6 +369,9 @@ phy4: ethernet-phy@4 { +@@ -369,6 +369,9 @@ &gmac1 { status = "okay"; @@ -36,7 +32,7 @@ index c147bbf..13191ee 100644 phy-mode = "rgmii"; qcom,id = <1>; -@@ -386,6 +389,9 @@ fixed-link { +@@ -386,6 +389,9 @@ &gmac2 { status = "okay"; @@ -46,11 +42,9 @@ index c147bbf..13191ee 100644 phy-mode = "sgmii"; qcom,id = <2>; -diff --git a/arch/arm/boot/dts/qcom/qcom-ipq8064-ea7500-v1.dts b/arch/arm/boot/dts/qcom/qcom-ipq8064-ea7500-v1.dts -index 9502a2c..fbbe103 100644 --- a/arch/arm/boot/dts/qcom/qcom-ipq8064-ea7500-v1.dts +++ b/arch/arm/boot/dts/qcom/qcom-ipq8064-ea7500-v1.dts -@@ -92,3 +92,16 @@ partition@6080000 { +@@ -92,3 +92,16 @@ reg = <0x6080000 0x1f80000>; }; }; @@ -67,11 +61,9 @@ index 9502a2c..fbbe103 100644 + qcom,poll-required = <0>; + qcom,rgmii-delay = <0>; +}; -diff --git a/arch/arm/boot/dts/qcom/qcom-ipq8064-ea8500.dts b/arch/arm/boot/dts/qcom/qcom-ipq8064-ea8500.dts -index 0ba7bbe..1dd3894 100644 --- a/arch/arm/boot/dts/qcom/qcom-ipq8064-ea8500.dts +++ b/arch/arm/boot/dts/qcom/qcom-ipq8064-ea8500.dts -@@ -115,18 +115,3 @@ phy4: ethernet-phy@4 { +@@ -115,18 +115,3 @@ reg = <4>; }; }; @@ -90,11 +82,9 @@ index 0ba7bbe..1dd3894 100644 - qcom,rgmii_delay = <0>; - qcom,emulation = <0>; -}; -diff --git a/arch/arm/boot/dts/qcom/qcom-ipq8064-eax500.dtsi b/arch/arm/boot/dts/qcom/qcom-ipq8064-eax500.dtsi -index 910bd86..f199898 100644 --- a/arch/arm/boot/dts/qcom/qcom-ipq8064-eax500.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-ipq8064-eax500.dtsi -@@ -198,10 +198,17 @@ phy0: ethernet-phy@0 { +@@ -198,10 +198,17 @@ 0x00094 0x4e /* PORT6_STATUS */ >; }; @@ -112,7 +102,7 @@ index 910bd86..f199898 100644 phy-mode = "rgmii"; qcom,id = <1>; -@@ -217,6 +224,9 @@ fixed-link { +@@ -217,6 +224,9 @@ &gmac2 { status = "okay"; @@ -122,11 +112,9 @@ index 910bd86..f199898 100644 phy-mode = "sgmii"; qcom,id = <2>; -diff --git a/arch/arm/boot/dts/qcom/qcom-ipq8064-g10.dts b/arch/arm/boot/dts/qcom/qcom-ipq8064-g10.dts -index 0425459..677e9f0 100644 --- a/arch/arm/boot/dts/qcom/qcom-ipq8064-g10.dts +++ b/arch/arm/boot/dts/qcom/qcom-ipq8064-g10.dts -@@ -127,12 +127,24 @@ &adm_dma { +@@ -127,12 +127,24 @@ &gmac1 { status = "okay"; @@ -155,7 +143,7 @@ index 0425459..677e9f0 100644 fixed-link { speed = <1000>; -@@ -142,9 +154,22 @@ fixed-link { +@@ -142,9 +154,22 @@ &gmac2 { status = "okay"; @@ -179,7 +167,7 @@ index 0425459..677e9f0 100644 fixed-link { speed = <1000>; -@@ -159,6 +184,9 @@ &gsbi4_serial { +@@ -159,6 +184,9 @@ &mdio0 { status = "okay"; @@ -189,7 +177,7 @@ index 0425459..677e9f0 100644 pinctrl-0 = <&mdio0_pins>; pinctrl-names = "default"; -@@ -179,6 +207,9 @@ ethernet-phy@0 { +@@ -179,6 +207,9 @@ &nand { status = "okay"; @@ -199,8 +187,6 @@ index 0425459..677e9f0 100644 nand@0 { reg = <0>; -diff --git a/arch/arm/boot/dts/qcom/qcom-ipq8064-onhub.dtsi b/arch/arm/boot/dts/qcom/qcom-ipq8064-onhub.dtsi -index 5cbbcc3..2871710 100644 --- a/arch/arm/boot/dts/qcom/qcom-ipq8064-onhub.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-ipq8064-onhub.dtsi @@ -10,8 +10,6 @@ @@ -212,7 +198,7 @@ index 5cbbcc3..2871710 100644 mdio-gpio0 = &mdio; serial0 = &gsbi4_serial; }; -@@ -294,8 +292,22 @@ &adm_dma { +@@ -294,8 +292,22 @@ &gmac0 { status = "okay"; @@ -237,7 +223,7 @@ index 5cbbcc3..2871710 100644 pinctrl-0 = <&rgmii0_pins>; pinctrl-names = "default"; -@@ -308,8 +320,22 @@ fixed-link { +@@ -308,8 +320,22 @@ &gmac2 { status = "okay"; @@ -262,7 +248,7 @@ index 5cbbcc3..2871710 100644 fixed-link { speed = <1000>; -@@ -410,8 +436,6 @@ pcie@0 { +@@ -410,8 +436,6 @@ ath10k@0,0 { reg = <0 0 0 0 0>; device_type = "pci"; @@ -271,7 +257,7 @@ index 5cbbcc3..2871710 100644 }; }; }; -@@ -430,8 +454,6 @@ pcie@0 { +@@ -430,8 +454,6 @@ ath10k@0,0 { reg = <0 0 0 0 0>; device_type = "pci"; @@ -280,11 +266,9 @@ index 5cbbcc3..2871710 100644 }; }; }; -diff --git a/arch/arm/boot/dts/qcom/qcom-ipq8064-r7500.dts b/arch/arm/boot/dts/qcom/qcom-ipq8064-r7500.dts -index 995ea3a..1dab7c4 100644 --- a/arch/arm/boot/dts/qcom/qcom-ipq8064-r7500.dts +++ b/arch/arm/boot/dts/qcom/qcom-ipq8064-r7500.dts -@@ -294,6 +294,9 @@ phy4: ethernet-phy@4 { +@@ -294,6 +294,9 @@ &gmac1 { status = "okay"; @@ -294,7 +278,7 @@ index 995ea3a..1dab7c4 100644 phy-mode = "rgmii"; qcom,id = <1>; -@@ -311,6 +314,9 @@ fixed-link { +@@ -311,6 +314,9 @@ &gmac2 { status = "okay"; @@ -304,11 +288,9 @@ index 995ea3a..1dab7c4 100644 phy-mode = "sgmii"; qcom,id = <2>; -diff --git a/arch/arm/boot/dts/qcom/qcom-ipq8064-r7500v2.dts b/arch/arm/boot/dts/qcom/qcom-ipq8064-r7500v2.dts -index 2812f7e..fd22c33 100644 --- a/arch/arm/boot/dts/qcom/qcom-ipq8064-r7500v2.dts +++ b/arch/arm/boot/dts/qcom/qcom-ipq8064-r7500v2.dts -@@ -365,6 +365,9 @@ phy4: ethernet-phy@4 { +@@ -365,6 +365,9 @@ &gmac1 { status = "okay"; @@ -318,7 +300,7 @@ index 2812f7e..fd22c33 100644 phy-mode = "rgmii"; qcom,id = <1>; -@@ -382,6 +385,9 @@ fixed-link { +@@ -382,6 +385,9 @@ &gmac2 { status = "okay"; @@ -328,11 +310,9 @@ index 2812f7e..fd22c33 100644 phy-mode = "sgmii"; qcom,id = <2>; -diff --git a/arch/arm/boot/dts/qcom/qcom-ipq8064-v2.0.dtsi b/arch/arm/boot/dts/qcom/qcom-ipq8064-v2.0.dtsi -index 2f117d5..26a2750 100644 --- a/arch/arm/boot/dts/qcom/qcom-ipq8064-v2.0.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-ipq8064-v2.0.dtsi -@@ -22,6 +22,15 @@ rsvd@41200000 { +@@ -22,6 +22,15 @@ reg = <0x41200000 0x300000>; no-map; }; @@ -348,11 +328,9 @@ index 2f117d5..26a2750 100644 }; }; -diff --git a/arch/arm/boot/dts/qcom/qcom-ipq8064-wg2600hp.dts b/arch/arm/boot/dts/qcom/qcom-ipq8064-wg2600hp.dts -index 6f8eb26..e889572 100644 --- a/arch/arm/boot/dts/qcom/qcom-ipq8064-wg2600hp.dts +++ b/arch/arm/boot/dts/qcom/qcom-ipq8064-wg2600hp.dts -@@ -164,9 +164,25 @@ ethernet-phy@4 { +@@ -164,9 +164,25 @@ &gmac1 { status = "okay"; @@ -378,7 +356,7 @@ index 6f8eb26..e889572 100644 pinctrl-0 = <&rgmii2_pins>; pinctrl-names = "default"; -@@ -182,9 +198,25 @@ fixed-link { +@@ -182,9 +198,25 @@ &gmac2 { status = "okay"; @@ -404,11 +382,9 @@ index 6f8eb26..e889572 100644 nvmem-cells = <&macaddr_PRODUCTDATA_0>; nvmem-cell-names = "mac-address"; -diff --git a/arch/arm/boot/dts/qcom/qcom-ipq8064.dtsi b/arch/arm/boot/dts/qcom/qcom-ipq8064.dtsi -index e10c34c..6342d32 100644 --- a/arch/arm/boot/dts/qcom/qcom-ipq8064.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-ipq8064.dtsi -@@ -670,6 +670,20 @@ tsens: thermal-sensor { +@@ -670,6 +670,20 @@ }; }; @@ -429,7 +405,7 @@ index e10c34c..6342d32 100644 sfpb_mutex: hwlock@1200600 { compatible = "qcom,sfpb-mutex"; reg = <0x01200600 0x100>; -@@ -856,6 +870,132 @@ ss_phy_1: phy@110f8830 { +@@ -856,6 +870,132 @@ status = "disabled"; }; @@ -562,7 +538,7 @@ index e10c34c..6342d32 100644 sdcc3bam: dma-controller@12182000 { compatible = "qcom,bam-v1.3.0"; reg = <0x12182000 0x8000>; -@@ -1462,6 +1602,12 @@ mdio0: mdio@37000000 { +@@ -1462,6 +1602,12 @@ status = "disabled"; }; @@ -575,7 +551,7 @@ index e10c34c..6342d32 100644 gmac0: ethernet@37000000 { device_type = "network"; compatible = "qcom,ipq806x-gmac", "snps,dwmac"; -@@ -1559,3 +1705,48 @@ gmac3: ethernet@37600000 { +@@ -1559,3 +1705,48 @@ }; }; }; @@ -624,11 +600,9 @@ index e10c34c..6342d32 100644 + qcom,socver = <0>; + mdiobus = <&mdio0>; + }; -diff --git a/arch/arm/boot/dts/qcom/qcom-ipq8065-nbg6817.dts b/arch/arm/boot/dts/qcom/qcom-ipq8065-nbg6817.dts -index 5b916ee..2a94919 100644 --- a/arch/arm/boot/dts/qcom/qcom-ipq8065-nbg6817.dts +++ b/arch/arm/boot/dts/qcom/qcom-ipq8065-nbg6817.dts -@@ -286,13 +286,23 @@ phy4: ethernet-phy@4 { +@@ -286,13 +286,23 @@ &gmac1 { status = "okay"; @@ -652,7 +626,7 @@ index 5b916ee..2a94919 100644 qcom,irq = <255>; mdiobus = <&mdio0>; -@@ -307,13 +317,23 @@ fixed-link { +@@ -307,13 +317,23 @@ &gmac2 { status = "okay"; @@ -676,11 +650,9 @@ index 5b916ee..2a94919 100644 qcom,irq = <258>; mdiobus = <&mdio0>; -diff --git a/arch/arm/boot/dts/qcom/qcom-ipq8065-nighthawk.dtsi b/arch/arm/boot/dts/qcom/qcom-ipq8065-nighthawk.dtsi -index ebaeceb..84b1d3c 100644 --- a/arch/arm/boot/dts/qcom/qcom-ipq8065-nighthawk.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-ipq8065-nighthawk.dtsi -@@ -360,13 +360,23 @@ phy4: ethernet-phy@4 { +@@ -360,13 +360,23 @@ &gmac1 { status = "okay"; @@ -704,7 +676,7 @@ index ebaeceb..84b1d3c 100644 qcom,irq = <255>; mdiobus = <&mdio0>; -@@ -385,13 +395,23 @@ fixed-link { +@@ -385,13 +395,23 @@ &gmac2 { status = "okay"; @@ -728,11 +700,9 @@ index ebaeceb..84b1d3c 100644 qcom,irq = <258>; mdiobus = <&mdio0>; -diff --git a/arch/arm/boot/dts/qcom/qcom-ipq8065-rt4230w-rev6.dts b/arch/arm/boot/dts/qcom/qcom-ipq8065-rt4230w-rev6.dts -index 095d83a..6b02266 100644 --- a/arch/arm/boot/dts/qcom/qcom-ipq8065-rt4230w-rev6.dts +++ b/arch/arm/boot/dts/qcom/qcom-ipq8065-rt4230w-rev6.dts -@@ -316,10 +316,28 @@ phy0: ethernet-phy@0 { +@@ -316,10 +316,28 @@ 0x00054 0xc832c832 /* LED_CTRL_1 */ >; }; @@ -761,7 +731,7 @@ index 095d83a..6b02266 100644 phy-mode = "rgmii"; qcom,id = <0>; -@@ -337,6 +355,16 @@ fixed-link { +@@ -337,6 +355,16 @@ &gmac1 { status = "okay"; @@ -778,11 +748,9 @@ index 095d83a..6b02266 100644 phy-mode = "sgmii"; qcom,id = <1>; -diff --git a/arch/arm/boot/dts/qcom/qcom-ipq8065.dtsi b/arch/arm/boot/dts/qcom/qcom-ipq8065.dtsi -index 5db79dc..835c5a6 100644 --- a/arch/arm/boot/dts/qcom/qcom-ipq8065.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-ipq8065.dtsi -@@ -95,3 +95,15 @@ opp-1725000000 { +@@ -95,3 +95,15 @@ opp-level = <2>; }; }; diff --git a/target/linux/ipq806x/patches-6.6/990-055-qca-nss-drv-add-qdisc-support.patch b/target/linux/ipq806x/patches-6.6/990-055-qca-nss-drv-add-qdisc-support.patch index fd4a03e4eb..a1b98a3836 100644 --- a/target/linux/ipq806x/patches-6.6/990-055-qca-nss-drv-add-qdisc-support.patch +++ b/target/linux/ipq806x/patches-6.6/990-055-qca-nss-drv-add-qdisc-support.patch @@ -8,7 +8,7 @@ * @tc_at_ingress: used within tc_classify to distinguish in/egress * @redirected: packet was redirected by packet classifier * @from_ingress: packet was redirected from the ingress path -@@ -970,6 +971,12 @@ struct sk_buff { +@@ -970,6 +971,10 @@ struct sk_buff { __u8 offload_fwd_mark:1; __u8 offload_l3_fwd_mark:1; #endif diff --git a/target/linux/ipq806x/patches-6.6/990-058-net-add-fast-xmit-api.patch b/target/linux/ipq806x/patches-6.6/990-058-net-add-fast-xmit-api.patch index 4593c26593..c27a471940 100644 --- a/target/linux/ipq806x/patches-6.6/990-058-net-add-fast-xmit-api.patch +++ b/target/linux/ipq806x/patches-6.6/990-058-net-add-fast-xmit-api.patch @@ -15,7 +15,7 @@ Signed-off-by: Tallapragada Kalyan --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -992,6 +992,8 @@ struct sk_buff { +@@ -990,6 +990,8 @@ struct sk_buff { __u8 csum_not_inet:1; #endif __u8 fast_forwarded:1;