From: Fabio Estevam fabio.estevam@nxp.com
This reverts commit df06ca1f565077596512fa2ab91df502e48e4f00.
This commit causes reboot to fail on imx6 wandboard, so let's revert it.
Cc: stable@vger.kernel.org #4.17 Reported-by: Rasmus Villemoes rasmus.villemoes@prevas.dk Signed-off-by: Fabio Estevam fabio.estevam@nxp.com --- arch/arm/configs/imx_v6_v7_defconfig | 2 -- 1 file changed, 2 deletions(-)
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 19c924d..3a30843 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig @@ -294,7 +294,6 @@ CONFIG_USB_STORAGE=y CONFIG_USB_CHIPIDEA=y CONFIG_USB_CHIPIDEA_UDC=y CONFIG_USB_CHIPIDEA_HOST=y -CONFIG_USB_CHIPIDEA_ULPI=y CONFIG_USB_SERIAL=m CONFIG_USB_SERIAL_GENERIC=y CONFIG_USB_SERIAL_FTDI_SIO=m @@ -331,7 +330,6 @@ CONFIG_USB_GADGETFS=m CONFIG_USB_FUNCTIONFS=m CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=m -CONFIG_USB_ULPI_BUS=y CONFIG_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y
On Mon, Sep 03, 2018 at 10:39:04AM -0300, Fabio Estevam wrote:
From: Fabio Estevam fabio.estevam@nxp.com
This reverts commit df06ca1f565077596512fa2ab91df502e48e4f00.
This commit causes reboot to fail on imx6 wandboard, so let's revert it.
Cc: stable@vger.kernel.org #4.17 Reported-by: Rasmus Villemoes rasmus.villemoes@prevas.dk Signed-off-by: Fabio Estevam fabio.estevam@nxp.com
Why is this a stable-tree-only patch? What is wrong with those trees that having this in Linus's tree (and 4.18) is ok, but stable trees are not ok?
I don't like being out-of-sync at all, and need a very good reason why.
thanks,
greg k-h
On 2018-09-07 13:14, Greg KH wrote:
On Mon, Sep 03, 2018 at 10:39:04AM -0300, Fabio Estevam wrote:
From: Fabio Estevam fabio.estevam@nxp.com
This reverts commit df06ca1f565077596512fa2ab91df502e48e4f00.
This commit causes reboot to fail on imx6 wandboard, so let's revert it.
Cc: stable@vger.kernel.org #4.17 Reported-by: Rasmus Villemoes rasmus.villemoes@prevas.dk Signed-off-by: Fabio Estevam fabio.estevam@nxp.com
Why is this a stable-tree-only patch? What is wrong with those trees that having this in Linus's tree (and 4.18) is ok, but stable trees are not ok?
So, I'm only going to talk about 4.14.y, because that's where we are, and where I saw the breakage.
Please see lkml.kernel.org/r/d8dd8d02-b8ed-91fd-bcc0-87dedc5998ae@prevas.dk. To recap, mainline was also broken between 157bcc0609 (introduced in 4.18-rc4) and a930d8bd94d (in 4.18-rc7).
Another option is to also add a930d8bd94d to 4.14.y. I think it cherry-picks cleanly. I haven't tested precisely that, but as I wrote above I have tested with the "business part" of a930d8bd94d applied. Unfortunately I'm busy with other boards and tasks currently, so can't offer more than this.
Rasmus
Hi Greg,
On Fri, Sep 7, 2018 at 8:14 AM, Greg KH gregkh@linuxfoundation.org wrote:
On Mon, Sep 03, 2018 at 10:39:04AM -0300, Fabio Estevam wrote:
From: Fabio Estevam fabio.estevam@nxp.com
This reverts commit df06ca1f565077596512fa2ab91df502e48e4f00. 03e6275ae381 ("usb: chipidea: Fix ULPI on imx51") This commit causes reboot to fail on imx6 wandboard, so let's revert it.
Cc: stable@vger.kernel.org #4.17 Reported-by: Rasmus Villemoes rasmus.villemoes@prevas.dk Signed-off-by: Fabio Estevam fabio.estevam@nxp.com
Why is this a stable-tree-only patch? What is wrong with those trees that having this in Linus's tree (and 4.18) is ok, but stable trees are not ok?
In Linus' tree we have a930d8bd94d8 ("usb: chipidea: Always build ULPI code "), which removes CONFIG_USB_CHIPIDEA_ULPI and CONFIG_USB_ULPI_BUS.
Since it fixes 03e6275ae381 ("usb: chipidea: Fix ULPI on imx51") then we would also need to have this one in the stable tree.
And its equivalent fix for imx53: be9cae2479f4 ("usb: chipidea: imx: Fix ULPI on imx53")
So in order to fix the reboot regression in stable as reported by Rasmus I see two options:
1. Backport these three commits to stable:
a930d8bd94d8 ("usb: chipidea: Always build ULPI code ") 03e6275ae381 ("usb: chipidea: Fix ULPI on imx51") be9cae2479f4 ("usb: chipidea: imx: Fix ULPI on imx53")
2. Just revert the defconfig change as originally proposed.
If everyone agrees that option 1 is preferred I can prepare these patches for 4.4/4.9/4.14/4.17.
Please let me know if option 1 is the way to go.
Thanks
linux-stable-mirror@lists.linaro.org
-
Fabio Estevam -
Greg KH -
Rasmus Villemoes