Skip to contentSkip to conversation

Patch "usb: host: xhci-plat: Make enum xhci_plat_type start at a non zero value" has been added to the 4.5-stable tree

PATCH [email protected] 1 participant 1 message Apr 27, 2016

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

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

usb: host: xhci-plat: Make enum xhci_plat_type start at a non zero value

to the 4.5-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:
usb-host-xhci-plat-make-enum-xhci_plat_type-start-at-a-non-zero-value.patch
and it can be found in the queue-4.5 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From f9a85f6e61c695daeb427dfc6c1d5a279654207b Mon Sep 17 00:00:00 2001

From: Peter Griffin <[email protected]>
Date: Wed, 13 Apr 2016 19:58:44 +0300
Subject: usb: host: xhci-plat: Make enum xhci_plat_type start at a non zero value

From: Peter Griffin <[email protected]>

commit f9a85f6e61c695daeb427dfc6c1d5a279654207b upstream.

Otherwise generic-xhci and xhci-platform which have no data get wrongly detected as XHCI_PLAT_TYPE_MARVELL_ARMADA by xhci_plat_type_is().

This fixes a regression in v4.5 for STiH407 family SoC's which use the synopsis dwc3 IP, whereby the disable_clk error path gets taken due to wrongly being detected as XHCI_PLAT_TYPE_MARVELL_ARMADA and the hcd never gets added.

I suspect this will also fix other dwc3 DT platforms such as Exynos, although I've only tested on STih410 SoC.

Fixes 4efb2f694114 ("usb: host: xhci-plat: add struct xhci_plat_priv")
---
 drivers/usb/host/xhci-plat.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/xhci-plat.h +1 -1
@@ -14,7 +14,7 @@
 #include "xhci.h"	/* for hcd_to_xhci() */
 
 enum xhci_plat_type {
-	XHCI_PLAT_TYPE_MARVELL_ARMADA,
+	XHCI_PLAT_TYPE_MARVELL_ARMADA = 1,
 	XHCI_PLAT_TYPE_RENESAS_RCAR_GEN2,
 	XHCI_PLAT_TYPE_RENESAS_RCAR_GEN3,
 };

Patches currently in stable-queue which might be from [email protected] are

queue-4.5/usb-host-xhci-plat-make-enum-xhci_plat_type-start-at-a-non-zero-value.patch