Patch "Revert "ARM: dts: bcm283x: increase dwc2's RX FIFO size"" has been added to the 5.13-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    Revert "ARM: dts: bcm283x: increase dwc2's RX FIFO size"

to the 5.13-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     revert-arm-dts-bcm283x-increase-dwc2-s-rx-fifo-size.patch
and it can be found in the queue-5.13 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 87473d0d2326fcc9c00f8ab91258ba39c0826ca2
Author: Stefan Wahren <stefan.wahren@xxxxxxxx>
Date:   Sat May 29 15:02:51 2021 +0200

    Revert "ARM: dts: bcm283x: increase dwc2's RX FIFO size"
    
    [ Upstream commit 77daceabedb42482bb6200fa26047c5591716e45 ]
    
    This reverts commit 278407a53c3b33fb820332c4d39eb39316c3879a.
    
    The original change breaks USB config on Raspberry Pi Zero and Pi 4 B,
    because it exceeds the total fifo size of 4080. A naive attempt to reduce
    g-tx-fifo-size doesn't help on Raspberry Pi Zero. So better go back.
    
    Fixes: 278407a53c3b ("ARM: dts: bcm283x: increase dwc2's RX FIFO size")
    Signed-off-by: Stefan Wahren <stefan.wahren@xxxxxxxx>
    Cc: Pavel Hofman <pavel.hofman@xxxxxxxxxxx>
    Link: https://lore.kernel.org/r/1622293371-5997-1-git-send-email-stefan.wahren@xxxxxxxx
    Signed-off-by: Nicolas Saenz Julienne <nsaenz@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/arch/arm/boot/dts/bcm283x-rpi-usb-otg.dtsi b/arch/arm/boot/dts/bcm283x-rpi-usb-otg.dtsi
index 20322de2f8bf..e2fd9610e125 100644
--- a/arch/arm/boot/dts/bcm283x-rpi-usb-otg.dtsi
+++ b/arch/arm/boot/dts/bcm283x-rpi-usb-otg.dtsi
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 &usb {
 	dr_mode = "otg";
-	g-rx-fifo-size = <558>;
+	g-rx-fifo-size = <256>;
 	g-np-tx-fifo-size = <32>;
 	/*
 	 * According to dwc2 the sum of all device EP
diff --git a/arch/arm/boot/dts/bcm283x-rpi-usb-peripheral.dtsi b/arch/arm/boot/dts/bcm283x-rpi-usb-peripheral.dtsi
index 1409d1b559c1..0ff0e9e25327 100644
--- a/arch/arm/boot/dts/bcm283x-rpi-usb-peripheral.dtsi
+++ b/arch/arm/boot/dts/bcm283x-rpi-usb-peripheral.dtsi
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 &usb {
 	dr_mode = "peripheral";
-	g-rx-fifo-size = <558>;
+	g-rx-fifo-size = <256>;
 	g-np-tx-fifo-size = <32>;
 	g-tx-fifo-size = <256 256 512 512 512 768 768>;
 };