[PATCH 1/2] arm64: dts: stratix10: Support Ethernet Jumbo frame

[PATCH 1/2] arm64: dts: stratix10: Support Ethernet Jumbo frame

[Dinh Nguyen]

From: Thor Thayer <thor.thayer@linux.intel.com>

commit a27460c9768ee19949c5b91f3d959ccd88c2a64a upstream

Properly specify the RX and TX FIFO size which is important
for Jumbo frames.
Update the max-frame-size to support Jumbo frames.

Signed-off-by: Thor Thayer <thor.thayer@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
 arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi      | 6 ++++++
 arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
index d033da401c26..8a2641c742ae 100644
--- a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
+++ b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
@@ -137,6 +137,8 @@
 			reset-names = "stmmaceth", "stmmaceth-ocp";
 			clocks = <&clkmgr STRATIX10_EMAC0_CLK>;
 			clock-names = "stmmaceth";
+			tx-fifo-depth = <16384>;
+			rx-fifo-depth = <16384>;
 			status = "disabled";
 		};
 
@@ -150,6 +152,8 @@
 			reset-names = "stmmaceth", "stmmaceth-ocp";
 			clocks = <&clkmgr STRATIX10_EMAC1_CLK>;
 			clock-names = "stmmaceth";
+			tx-fifo-depth = <16384>;
+			rx-fifo-depth = <16384>;
 			status = "disabled";
 		};
 
@@ -163,6 +167,8 @@
 			reset-names = "stmmaceth", "stmmaceth-ocp";
 			clocks = <&clkmgr STRATIX10_EMAC2_CLK>;
 			clock-names = "stmmaceth";
+			tx-fifo-depth = <16384>;
+			rx-fifo-depth = <16384>;
 			status = "disabled";
 		};
 
diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts b/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts
index 6edc4fa9fd42..7c661753bfaf 100644
--- a/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts
+++ b/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts
@@ -76,7 +76,7 @@
 	phy-mode = "rgmii";
 	phy-handle = <&phy0>;
 
-	max-frame-size = <3800>;
+	max-frame-size = <9000>;
 
 	mdio0 {
 		#address-cells = <1>;
-- 
2.17.1

[PATCH 2/2] arm64: dts: stratix10: fix multicast filtering

[Dinh Nguyen]

From: Aaro Koskinen <aaro.koskinen@nokia.com>

commit fd5ba6ee3187617287fb9cb187e3d6b3631210a3 upstream

On Stratix 10, the EMAC has 256 hash buckets for multicast filtering. This
needs to be specified in DTS, otherwise the stmmac driver defaults to 64
buckets and initializes the filter incorrectly. As a result, e.g. valid
IPv6 multicast traffic ends up being dropped.

Fixes: 78cd6a9d8e15 ("arm64: dts: Add base stratix 10 dtsi")
Cc: stable@vger.kernel.org
Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
Signed-off-by: Dinh Nguyen <dinguyen@kernel.org>
---
 arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
index 8a2641c742ae..f89e6c86e4d7 100644
--- a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
+++ b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
@@ -139,6 +139,7 @@
 			clock-names = "stmmaceth";
 			tx-fifo-depth = <16384>;
 			rx-fifo-depth = <16384>;
+			snps,multicast-filter-bins = <256>;
 			status = "disabled";
 		};
 
@@ -154,6 +155,7 @@
 			clock-names = "stmmaceth";
 			tx-fifo-depth = <16384>;
 			rx-fifo-depth = <16384>;
+			snps,multicast-filter-bins = <256>;
 			status = "disabled";
 		};
 
@@ -169,6 +171,7 @@
 			clock-names = "stmmaceth";
 			tx-fifo-depth = <16384>;
 			rx-fifo-depth = <16384>;
+			snps,multicast-filter-bins = <256>;
 			status = "disabled";
 		};
 
-- 
2.17.1

Re: [PATCH 1/2] arm64: dts: stratix10: Support Ethernet Jumbo frame

[Greg KH]

On Mon, Nov 12, 2018 at 02:50:21PM -0600, Dinh Nguyen wrote:
> From: Thor Thayer <thor.thayer@linux.intel.com>
> 
> commit a27460c9768ee19949c5b91f3d959ccd88c2a64a upstream
> 
> Properly specify the RX and TX FIFO size which is important
> for Jumbo frames.
> Update the max-frame-size to support Jumbo frames.
> 
> Signed-off-by: Thor Thayer <thor.thayer@linux.intel.com>
> Signed-off-by: David S. Miller <davem@davemloft.net>
> ---
>  arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi      | 6 ++++++
>  arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts | 2 +-
>  2 files changed, 7 insertions(+), 1 deletion(-)

Any hint as to what stable tree(s) you want these applied to?

thanks,

greg k-h

Re: [PATCH 1/2] arm64: dts: stratix10: Support Ethernet Jumbo frame

[Dinh Nguyen]

On 11/12/18 3:14 PM, Greg KH wrote:
> On Mon, Nov 12, 2018 at 02:50:21PM -0600, Dinh Nguyen wrote:
>> From: Thor Thayer <thor.thayer@linux.intel.com>
>>
>> commit a27460c9768ee19949c5b91f3d959ccd88c2a64a upstream
>>
>> Properly specify the RX and TX FIFO size which is important
>> for Jumbo frames.
>> Update the max-frame-size to support Jumbo frames.
>>
>> Signed-off-by: Thor Thayer <thor.thayer@linux.intel.com>
>> Signed-off-by: David S. Miller <davem@davemloft.net>
>> ---
>>  arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi      | 6 ++++++
>>  arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts | 2 +-
>>  2 files changed, 7 insertions(+), 1 deletion(-)
> 
> Any hint as to what stable tree(s) you want these applied to?
> 

Oh sorry about that! Please apply these to 4.18-stable and 4.19-stable.

Thanks,
Dinh

Re: [PATCH 1/2] arm64: dts: stratix10: Support Ethernet Jumbo frame

[Sasha Levin]

On Mon, Nov 12, 2018 at 03:27:00PM -0600, Dinh Nguyen wrote:
>
>
>On 11/12/18 3:14 PM, Greg KH wrote:
>> On Mon, Nov 12, 2018 at 02:50:21PM -0600, Dinh Nguyen wrote:
>>> From: Thor Thayer <thor.thayer@linux.intel.com>
>>>
>>> commit a27460c9768ee19949c5b91f3d959ccd88c2a64a upstream
>>>
>>> Properly specify the RX and TX FIFO size which is important
>>> for Jumbo frames.
>>> Update the max-frame-size to support Jumbo frames.
>>>
>>> Signed-off-by: Thor Thayer <thor.thayer@linux.intel.com>
>>> Signed-off-by: David S. Miller <davem@davemloft.net>
>>> ---
>>>  arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi      | 6 ++++++
>>>  arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts | 2 +-
>>>  2 files changed, 7 insertions(+), 1 deletion(-)
>>
>> Any hint as to what stable tree(s) you want these applied to?
>>
>
>Oh sorry about that! Please apply these to 4.18-stable and 4.19-stable.

Queued for 4.18 and 4.19, thank you.

--
Thanks,
Sasha