ipq806x_nss: refresh patches once again
This commit is contained in:
@@ -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
|
--- a/arch/arm/boot/dts/qcom/qcom-ipq8064-ad7200-c2600.dtsi
|
||||||
+++ b/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 {
|
&gmac1 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
@@ -12,7 +10,7 @@ index 3a33472..48ba58f 100644
|
|||||||
phy-mode = "rgmii";
|
phy-mode = "rgmii";
|
||||||
qcom,id = <1>;
|
qcom,id = <1>;
|
||||||
|
|
||||||
@@ -388,6 +391,9 @@ fixed-link {
|
@@ -388,6 +391,9 @@
|
||||||
|
|
||||||
&gmac2 {
|
&gmac2 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
@@ -22,11 +20,9 @@ index 3a33472..48ba58f 100644
|
|||||||
phy-mode = "sgmii";
|
phy-mode = "sgmii";
|
||||||
qcom,id = <2>;
|
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
|
--- a/arch/arm/boot/dts/qcom/qcom-ipq8064-d7800.dts
|
||||||
+++ b/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 {
|
&gmac1 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
@@ -36,7 +32,7 @@ index c147bbf..13191ee 100644
|
|||||||
phy-mode = "rgmii";
|
phy-mode = "rgmii";
|
||||||
qcom,id = <1>;
|
qcom,id = <1>;
|
||||||
|
|
||||||
@@ -386,6 +389,9 @@ fixed-link {
|
@@ -386,6 +389,9 @@
|
||||||
|
|
||||||
&gmac2 {
|
&gmac2 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
@@ -46,11 +42,9 @@ index c147bbf..13191ee 100644
|
|||||||
phy-mode = "sgmii";
|
phy-mode = "sgmii";
|
||||||
qcom,id = <2>;
|
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
|
--- a/arch/arm/boot/dts/qcom/qcom-ipq8064-ea7500-v1.dts
|
||||||
+++ b/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>;
|
reg = <0x6080000 0x1f80000>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@@ -67,11 +61,9 @@ index 9502a2c..fbbe103 100644
|
|||||||
+ qcom,poll-required = <0>;
|
+ qcom,poll-required = <0>;
|
||||||
+ qcom,rgmii-delay = <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
|
--- a/arch/arm/boot/dts/qcom/qcom-ipq8064-ea8500.dts
|
||||||
+++ b/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>;
|
reg = <4>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@@ -90,11 +82,9 @@ index 0ba7bbe..1dd3894 100644
|
|||||||
- qcom,rgmii_delay = <0>;
|
- qcom,rgmii_delay = <0>;
|
||||||
- qcom,emulation = <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
|
--- a/arch/arm/boot/dts/qcom/qcom-ipq8064-eax500.dtsi
|
||||||
+++ b/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 */
|
0x00094 0x4e /* PORT6_STATUS */
|
||||||
>;
|
>;
|
||||||
};
|
};
|
||||||
@@ -112,7 +102,7 @@ index 910bd86..f199898 100644
|
|||||||
|
|
||||||
phy-mode = "rgmii";
|
phy-mode = "rgmii";
|
||||||
qcom,id = <1>;
|
qcom,id = <1>;
|
||||||
@@ -217,6 +224,9 @@ fixed-link {
|
@@ -217,6 +224,9 @@
|
||||||
|
|
||||||
&gmac2 {
|
&gmac2 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
@@ -122,11 +112,9 @@ index 910bd86..f199898 100644
|
|||||||
|
|
||||||
phy-mode = "sgmii";
|
phy-mode = "sgmii";
|
||||||
qcom,id = <2>;
|
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
|
--- a/arch/arm/boot/dts/qcom/qcom-ipq8064-g10.dts
|
||||||
+++ b/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 {
|
&gmac1 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
@@ -155,7 +143,7 @@ index 0425459..677e9f0 100644
|
|||||||
|
|
||||||
fixed-link {
|
fixed-link {
|
||||||
speed = <1000>;
|
speed = <1000>;
|
||||||
@@ -142,9 +154,22 @@ fixed-link {
|
@@ -142,9 +154,22 @@
|
||||||
|
|
||||||
&gmac2 {
|
&gmac2 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
@@ -179,7 +167,7 @@ index 0425459..677e9f0 100644
|
|||||||
|
|
||||||
fixed-link {
|
fixed-link {
|
||||||
speed = <1000>;
|
speed = <1000>;
|
||||||
@@ -159,6 +184,9 @@ &gsbi4_serial {
|
@@ -159,6 +184,9 @@
|
||||||
|
|
||||||
&mdio0 {
|
&mdio0 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
@@ -189,7 +177,7 @@ index 0425459..677e9f0 100644
|
|||||||
|
|
||||||
pinctrl-0 = <&mdio0_pins>;
|
pinctrl-0 = <&mdio0_pins>;
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
@@ -179,6 +207,9 @@ ethernet-phy@0 {
|
@@ -179,6 +207,9 @@
|
||||||
|
|
||||||
&nand {
|
&nand {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
@@ -199,8 +187,6 @@ index 0425459..677e9f0 100644
|
|||||||
|
|
||||||
nand@0 {
|
nand@0 {
|
||||||
reg = <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
|
--- a/arch/arm/boot/dts/qcom/qcom-ipq8064-onhub.dtsi
|
||||||
+++ b/arch/arm/boot/dts/qcom/qcom-ipq8064-onhub.dtsi
|
+++ b/arch/arm/boot/dts/qcom/qcom-ipq8064-onhub.dtsi
|
||||||
@@ -10,8 +10,6 @@
|
@@ -10,8 +10,6 @@
|
||||||
@@ -212,7 +198,7 @@ index 5cbbcc3..2871710 100644
|
|||||||
mdio-gpio0 = &mdio;
|
mdio-gpio0 = &mdio;
|
||||||
serial0 = &gsbi4_serial;
|
serial0 = &gsbi4_serial;
|
||||||
};
|
};
|
||||||
@@ -294,8 +292,22 @@ &adm_dma {
|
@@ -294,8 +292,22 @@
|
||||||
|
|
||||||
&gmac0 {
|
&gmac0 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
@@ -237,7 +223,7 @@ index 5cbbcc3..2871710 100644
|
|||||||
|
|
||||||
pinctrl-0 = <&rgmii0_pins>;
|
pinctrl-0 = <&rgmii0_pins>;
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
@@ -308,8 +320,22 @@ fixed-link {
|
@@ -308,8 +320,22 @@
|
||||||
|
|
||||||
&gmac2 {
|
&gmac2 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
@@ -262,7 +248,7 @@ index 5cbbcc3..2871710 100644
|
|||||||
|
|
||||||
fixed-link {
|
fixed-link {
|
||||||
speed = <1000>;
|
speed = <1000>;
|
||||||
@@ -410,8 +436,6 @@ pcie@0 {
|
@@ -410,8 +436,6 @@
|
||||||
ath10k@0,0 {
|
ath10k@0,0 {
|
||||||
reg = <0 0 0 0 0>;
|
reg = <0 0 0 0 0>;
|
||||||
device_type = "pci";
|
device_type = "pci";
|
||||||
@@ -271,7 +257,7 @@ index 5cbbcc3..2871710 100644
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@@ -430,8 +454,6 @@ pcie@0 {
|
@@ -430,8 +454,6 @@
|
||||||
ath10k@0,0 {
|
ath10k@0,0 {
|
||||||
reg = <0 0 0 0 0>;
|
reg = <0 0 0 0 0>;
|
||||||
device_type = "pci";
|
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
|
--- a/arch/arm/boot/dts/qcom/qcom-ipq8064-r7500.dts
|
||||||
+++ b/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 {
|
&gmac1 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
@@ -294,7 +278,7 @@ index 995ea3a..1dab7c4 100644
|
|||||||
phy-mode = "rgmii";
|
phy-mode = "rgmii";
|
||||||
qcom,id = <1>;
|
qcom,id = <1>;
|
||||||
|
|
||||||
@@ -311,6 +314,9 @@ fixed-link {
|
@@ -311,6 +314,9 @@
|
||||||
|
|
||||||
&gmac2 {
|
&gmac2 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
@@ -304,11 +288,9 @@ index 995ea3a..1dab7c4 100644
|
|||||||
phy-mode = "sgmii";
|
phy-mode = "sgmii";
|
||||||
qcom,id = <2>;
|
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
|
--- a/arch/arm/boot/dts/qcom/qcom-ipq8064-r7500v2.dts
|
||||||
+++ b/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 {
|
&gmac1 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
@@ -318,7 +300,7 @@ index 2812f7e..fd22c33 100644
|
|||||||
phy-mode = "rgmii";
|
phy-mode = "rgmii";
|
||||||
qcom,id = <1>;
|
qcom,id = <1>;
|
||||||
|
|
||||||
@@ -382,6 +385,9 @@ fixed-link {
|
@@ -382,6 +385,9 @@
|
||||||
|
|
||||||
&gmac2 {
|
&gmac2 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
@@ -328,11 +310,9 @@ index 2812f7e..fd22c33 100644
|
|||||||
phy-mode = "sgmii";
|
phy-mode = "sgmii";
|
||||||
qcom,id = <2>;
|
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
|
--- a/arch/arm/boot/dts/qcom/qcom-ipq8064-v2.0.dtsi
|
||||||
+++ b/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>;
|
reg = <0x41200000 0x300000>;
|
||||||
no-map;
|
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
|
--- a/arch/arm/boot/dts/qcom/qcom-ipq8064-wg2600hp.dts
|
||||||
+++ b/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 {
|
&gmac1 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
|
|
||||||
@@ -378,7 +356,7 @@ index 6f8eb26..e889572 100644
|
|||||||
pinctrl-0 = <&rgmii2_pins>;
|
pinctrl-0 = <&rgmii2_pins>;
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
|
|
||||||
@@ -182,9 +198,25 @@ fixed-link {
|
@@ -182,9 +198,25 @@
|
||||||
&gmac2 {
|
&gmac2 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
|
|
||||||
@@ -404,11 +382,9 @@ index 6f8eb26..e889572 100644
|
|||||||
nvmem-cells = <&macaddr_PRODUCTDATA_0>;
|
nvmem-cells = <&macaddr_PRODUCTDATA_0>;
|
||||||
nvmem-cell-names = "mac-address";
|
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
|
--- a/arch/arm/boot/dts/qcom/qcom-ipq8064.dtsi
|
||||||
+++ b/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 {
|
sfpb_mutex: hwlock@1200600 {
|
||||||
compatible = "qcom,sfpb-mutex";
|
compatible = "qcom,sfpb-mutex";
|
||||||
reg = <0x01200600 0x100>;
|
reg = <0x01200600 0x100>;
|
||||||
@@ -856,6 +870,132 @@ ss_phy_1: phy@110f8830 {
|
@@ -856,6 +870,132 @@
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -562,7 +538,7 @@ index e10c34c..6342d32 100644
|
|||||||
sdcc3bam: dma-controller@12182000 {
|
sdcc3bam: dma-controller@12182000 {
|
||||||
compatible = "qcom,bam-v1.3.0";
|
compatible = "qcom,bam-v1.3.0";
|
||||||
reg = <0x12182000 0x8000>;
|
reg = <0x12182000 0x8000>;
|
||||||
@@ -1462,6 +1602,12 @@ mdio0: mdio@37000000 {
|
@@ -1462,6 +1602,12 @@
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -575,7 +551,7 @@ index e10c34c..6342d32 100644
|
|||||||
gmac0: ethernet@37000000 {
|
gmac0: ethernet@37000000 {
|
||||||
device_type = "network";
|
device_type = "network";
|
||||||
compatible = "qcom,ipq806x-gmac", "snps,dwmac";
|
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>;
|
+ qcom,socver = <0>;
|
||||||
+ mdiobus = <&mdio0>;
|
+ 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
|
--- a/arch/arm/boot/dts/qcom/qcom-ipq8065-nbg6817.dts
|
||||||
+++ b/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 {
|
&gmac1 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
@@ -652,7 +626,7 @@ index 5b916ee..2a94919 100644
|
|||||||
qcom,irq = <255>;
|
qcom,irq = <255>;
|
||||||
mdiobus = <&mdio0>;
|
mdiobus = <&mdio0>;
|
||||||
|
|
||||||
@@ -307,13 +317,23 @@ fixed-link {
|
@@ -307,13 +317,23 @@
|
||||||
|
|
||||||
&gmac2 {
|
&gmac2 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
@@ -676,11 +650,9 @@ index 5b916ee..2a94919 100644
|
|||||||
qcom,irq = <258>;
|
qcom,irq = <258>;
|
||||||
mdiobus = <&mdio0>;
|
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
|
--- a/arch/arm/boot/dts/qcom/qcom-ipq8065-nighthawk.dtsi
|
||||||
+++ b/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 {
|
&gmac1 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
|
|
||||||
@@ -704,7 +676,7 @@ index ebaeceb..84b1d3c 100644
|
|||||||
qcom,irq = <255>;
|
qcom,irq = <255>;
|
||||||
mdiobus = <&mdio0>;
|
mdiobus = <&mdio0>;
|
||||||
|
|
||||||
@@ -385,13 +395,23 @@ fixed-link {
|
@@ -385,13 +395,23 @@
|
||||||
&gmac2 {
|
&gmac2 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
|
|
||||||
@@ -728,11 +700,9 @@ index ebaeceb..84b1d3c 100644
|
|||||||
qcom,irq = <258>;
|
qcom,irq = <258>;
|
||||||
mdiobus = <&mdio0>;
|
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
|
--- a/arch/arm/boot/dts/qcom/qcom-ipq8065-rt4230w-rev6.dts
|
||||||
+++ b/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 */
|
0x00054 0xc832c832 /* LED_CTRL_1 */
|
||||||
>;
|
>;
|
||||||
};
|
};
|
||||||
@@ -761,7 +731,7 @@ index 095d83a..6b02266 100644
|
|||||||
phy-mode = "rgmii";
|
phy-mode = "rgmii";
|
||||||
qcom,id = <0>;
|
qcom,id = <0>;
|
||||||
|
|
||||||
@@ -337,6 +355,16 @@ fixed-link {
|
@@ -337,6 +355,16 @@
|
||||||
|
|
||||||
&gmac1 {
|
&gmac1 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
@@ -778,11 +748,9 @@ index 095d83a..6b02266 100644
|
|||||||
phy-mode = "sgmii";
|
phy-mode = "sgmii";
|
||||||
qcom,id = <1>;
|
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
|
--- a/arch/arm/boot/dts/qcom/qcom-ipq8065.dtsi
|
||||||
+++ b/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>;
|
opp-level = <2>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ Signed-off-by: Murat Sezgin <msezgin@codeaurora.org>
|
|||||||
__u16 tc_index; /* traffic control index */
|
__u16 tc_index; /* traffic control index */
|
||||||
--- a/net/core/dev.c
|
--- a/net/core/dev.c
|
||||||
+++ b/net/core/dev.c
|
+++ b/net/core/dev.c
|
||||||
@@ -3594,8 +3594,13 @@ static int xmit_one(struct sk_buff *skb,
|
@@ -3625,8 +3625,13 @@ static int xmit_one(struct sk_buff *skb,
|
||||||
unsigned int len;
|
unsigned int len;
|
||||||
int rc;
|
int rc;
|
||||||
|
|
||||||
@@ -43,7 +43,7 @@ Signed-off-by: Murat Sezgin <msezgin@codeaurora.org>
|
|||||||
|
|
||||||
#ifdef CONFIG_ETHERNET_PACKET_MANGLE
|
#ifdef CONFIG_ETHERNET_PACKET_MANGLE
|
||||||
if (dev->eth_mangle_tx && !(skb = dev->eth_mangle_tx(dev, skb)))
|
if (dev->eth_mangle_tx && !(skb = dev->eth_mangle_tx(dev, skb)))
|
||||||
@@ -5365,6 +5370,9 @@ void netdev_rx_handler_unregister(struct
|
@@ -5396,6 +5401,9 @@ void netdev_rx_handler_unregister(struct
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister);
|
EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister);
|
||||||
|
|
||||||
@@ -53,7 +53,7 @@ Signed-off-by: Murat Sezgin <msezgin@codeaurora.org>
|
|||||||
/*
|
/*
|
||||||
* Limit the use of PFMEMALLOC reserves to those protocols that implement
|
* Limit the use of PFMEMALLOC reserves to those protocols that implement
|
||||||
* the special handling of PFMEMALLOC skbs.
|
* the special handling of PFMEMALLOC skbs.
|
||||||
@@ -5412,6 +5420,7 @@ static int __netif_receive_skb_core(stru
|
@@ -5443,6 +5451,7 @@ static int __netif_receive_skb_core(stru
|
||||||
bool deliver_exact = false;
|
bool deliver_exact = false;
|
||||||
int ret = NET_RX_DROP;
|
int ret = NET_RX_DROP;
|
||||||
__be16 type;
|
__be16 type;
|
||||||
@@ -61,7 +61,7 @@ Signed-off-by: Murat Sezgin <msezgin@codeaurora.org>
|
|||||||
|
|
||||||
net_timestamp_check(!READ_ONCE(netdev_tstamp_prequeue), skb);
|
net_timestamp_check(!READ_ONCE(netdev_tstamp_prequeue), skb);
|
||||||
|
|
||||||
@@ -5450,6 +5459,14 @@ another_round:
|
@@ -5481,6 +5490,14 @@ another_round:
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -30,7 +30,7 @@
|
|||||||
* therefore there is no reason for a NETDEV_RELEASE event.
|
* therefore there is no reason for a NETDEV_RELEASE event.
|
||||||
--- a/net/core/dev.c
|
--- a/net/core/dev.c
|
||||||
+++ b/net/core/dev.c
|
+++ b/net/core/dev.c
|
||||||
@@ -1699,6 +1699,8 @@ const char *netdev_cmd_to_name(enum netd
|
@@ -1730,6 +1730,8 @@ const char *netdev_cmd_to_name(enum netd
|
||||||
N(PRE_CHANGEADDR) N(OFFLOAD_XSTATS_ENABLE) N(OFFLOAD_XSTATS_DISABLE)
|
N(PRE_CHANGEADDR) N(OFFLOAD_XSTATS_ENABLE) N(OFFLOAD_XSTATS_DISABLE)
|
||||||
N(OFFLOAD_XSTATS_REPORT_USED) N(OFFLOAD_XSTATS_REPORT_DELTA)
|
N(OFFLOAD_XSTATS_REPORT_USED) N(OFFLOAD_XSTATS_REPORT_DELTA)
|
||||||
N(XDP_FEAT_CHANGE)
|
N(XDP_FEAT_CHANGE)
|
||||||
|
|||||||
@@ -104,7 +104,7 @@ Signed-off-by: Murat Sezgin <quic_msezgin@quicinc.com>
|
|||||||
const struct net_device_ops *netdev_ops;
|
const struct net_device_ops *netdev_ops;
|
||||||
const struct xdp_metadata_ops *xdp_metadata_ops;
|
const struct xdp_metadata_ops *xdp_metadata_ops;
|
||||||
int ifindex;
|
int ifindex;
|
||||||
@@ -5245,6 +5274,11 @@ static inline bool netif_is_failover_sla
|
@@ -5247,6 +5276,11 @@ static inline bool netif_is_failover_sla
|
||||||
return dev->priv_flags & IFF_FAILOVER_SLAVE;
|
return dev->priv_flags & IFF_FAILOVER_SLAVE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -90,7 +90,7 @@
|
|||||||
{
|
{
|
||||||
--- a/include/linux/netdevice.h
|
--- a/include/linux/netdevice.h
|
||||||
+++ b/include/linux/netdevice.h
|
+++ b/include/linux/netdevice.h
|
||||||
@@ -4730,6 +4730,15 @@ void dev_uc_flush(struct net_device *dev
|
@@ -4732,6 +4732,15 @@ void dev_uc_flush(struct net_device *dev
|
||||||
void dev_uc_init(struct net_device *dev);
|
void dev_uc_init(struct net_device *dev);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ Signed-off-by: Ratheesh Kannoth <quic_rkannoth@quicinc.com>
|
|||||||
|
|
||||||
--- a/net/core/dev.c
|
--- a/net/core/dev.c
|
||||||
+++ b/net/core/dev.c
|
+++ b/net/core/dev.c
|
||||||
@@ -5455,12 +5455,6 @@ another_round:
|
@@ -5486,12 +5486,6 @@ another_round:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -24,7 +24,7 @@ Signed-off-by: Ratheesh Kannoth <quic_rkannoth@quicinc.com>
|
|||||||
fast_recv = rcu_dereference(athrs_fast_nat_recv);
|
fast_recv = rcu_dereference(athrs_fast_nat_recv);
|
||||||
if (fast_recv) {
|
if (fast_recv) {
|
||||||
if (fast_recv(skb)) {
|
if (fast_recv(skb)) {
|
||||||
@@ -5469,6 +5463,12 @@ another_round:
|
@@ -5500,6 +5494,12 @@ another_round:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ Signed-off-by: Tallapragada Kalyan <quic_ktallapr@quicinc.com>
|
|||||||
#if defined(CONFIG_NET_SCHED) || defined(CONFIG_NET_XGRESS)
|
#if defined(CONFIG_NET_SCHED) || defined(CONFIG_NET_XGRESS)
|
||||||
--- a/net/core/dev.c
|
--- a/net/core/dev.c
|
||||||
+++ b/net/core/dev.c
|
+++ b/net/core/dev.c
|
||||||
@@ -4305,6 +4305,144 @@ struct netdev_queue *netdev_core_pick_tx
|
@@ -4336,6 +4336,144 @@ struct netdev_queue *netdev_core_pick_tx
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ Signed-off-by: Tushar Ganatra <quic_tganatra@quicinc.com>
|
|||||||
|
|
||||||
--- a/net/core/dev.c
|
--- a/net/core/dev.c
|
||||||
+++ b/net/core/dev.c
|
+++ b/net/core/dev.c
|
||||||
@@ -4474,6 +4474,11 @@ int __dev_queue_xmit(struct sk_buff *skb
|
@@ -4505,6 +4505,11 @@ int __dev_queue_xmit(struct sk_buff *skb
|
||||||
skb_reset_mac_header(skb);
|
skb_reset_mac_header(skb);
|
||||||
skb_assert_len(skb);
|
skb_assert_len(skb);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user