FAILED: patch "[PATCH] drivers: usb: fsl: Workaround for USB erratum-A005275" failed to apply to 4.2-stable tree

PATCH [email protected] 2 participants 2 messages Sep 16, 2015 – Sep 24, 2015 1 message not in the archive

Subsystems (3)

Stable branch USB USB ehci driver

lore

Share & tools

lore

[email protected]

author maintainer

2015-09-16 20:00 UTC #0 lore raw

The patch below does not apply to the 4.2-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From f8786a91548df6930643a052e40e5c0b7a8403a5 Mon Sep 17 00:00:00 2001

From: Nikhil Badola <[email protected]>
Date: Thu, 6 Aug 2015 14:51:27 +0530
Subject: [PATCH] drivers: usb: fsl: Workaround for USB erratum-A005275

Incoming packets in high speed are randomly corrupted by h/w resulting in multiple errors. This workaround makes FS as default mode in all affected socs by disabling HS chirp signalling.This errata does not affect FS and LS mode.

Forces all HS devices to connect in FS mode for all socs affected by this erratum:
P3041 and P2041 rev 1.0 and 1.1
P5020 and P5010 rev 1.0 and 2.0
P5040, P1010 and T4240 rev 1.0

Signed-off-by Ramneek Mehresh <[email protected]>

Signed-off-by Nikhil Badola <[email protected]>

Cc stable <[email protected]>

Signed-off-by Greg Kroah-Hartman <[email protected]>

drivers/usb/host/ehci-fsl.c +4 -0

index 202dafb7d0cb..3b6eb219de1a 100644
@@ -278,6 +278,10 @@ static int ehci_fsl_usb_setup(struct ehci_hcd *ehci)
 		out_be32(non_ehci + FSL_SOC_USB_SNOOP2, 0x80000000 | SNOOP_SIZE_2GB);
 	}
 
+	/* Deal with USB erratum A-005275 */
+	if (pdata->has_fsl_erratum_a005275 == 1)
+		ehci->has_fsl_hs_errata = 1;
+
 	if ((pdata->operating_mode == FSL_USB2_DR_HOST) ||
 			(pdata->operating_mode == FSL_USB2_DR_OTG))
 		if (ehci_fsl_setup_phy(hcd, pdata->phy_mode, 0))

drivers/usb/host/ehci-hub.c +7 -0

index 22abb6830dfa..086a7115d263 100644
@@ -1221,6 +1221,13 @@ int ehci_hub_control(
 				 */
 				ehci->reset_done [wIndex] = jiffies
 						+ msecs_to_jiffies (50);
+
+				/*
+				 * Force full-speed connect for FSL high-speed
+				 * erratum; disable HS Chirp by setting PFSC bit
+				 */
+				if (ehci_has_fsl_hs_errata(ehci))
+					temp |= (1 << PORTSC_FSL_PFSC);
 			}
 			ehci_writel(ehci, temp, status_reg);
 			break;

drivers/usb/host/ehci.h +12 -0

index f700157cd084..46f62e41bcde 100644
@@ -215,6 +215,7 @@ struct ehci_hcd {			/* one per controller */
 	/* SILICON QUIRKS */
 	unsigned		no_selective_suspend:1;
 	unsigned		has_fsl_port_bug:1; /* FreeScale */
+	unsigned		has_fsl_hs_errata:1;	/* Freescale HS quirk */
 	unsigned		big_endian_mmio:1;
 	unsigned		big_endian_desc:1;
 	unsigned		big_endian_capbase:1;

@@ -686,6 +687,17 @@ ehci_port_speed(struct ehci_hcd *ehci, unsigned int portsc)
 #define	ehci_has_fsl_portno_bug(e)		(0)
 #endif
 
+#define PORTSC_FSL_PFSC	24	/* Port Force Full-Speed Connect */
+
+#if defined(CONFIG_PPC_85xx)
+/* Some Freescale processors have an erratum (USB A-005275) in which
+ * incoming packets get corrupted in HS mode
+ */
+#define ehci_has_fsl_hs_errata(e)	((e)->has_fsl_hs_errata)
+#else
+#define ehci_has_fsl_hs_errata(e)	(0)
+#endif
+
 /*
  * While most USB host controllers implement their registers in
  * little-endian format, a minority (celleb companion chip) implement

drivers/usb/host/fsl-mph-dr-of.c +4 -0

index 9f731413ab3e..534c4c5d278a 100644
@@ -221,6 +221,10 @@ static int fsl_usb2_mph_dr_of_probe(struct platform_device *ofdev)
 		pdata->has_fsl_erratum_a007792 = 1;
 	else
 		pdata->has_fsl_erratum_a007792 = 0;
+	if (of_get_property(np, "fsl,usb-erratum-a005275", NULL))
+		pdata->has_fsl_erratum_a005275 = 1;
+	else
+		pdata->has_fsl_erratum_a005275 = 0;
 
 	/*
 	 * Determine whether phy_clk_valid needs to be checked

include/linux/fsl_devices.h +1 -0

index cebdbbb4aa69..f2912914141a 100644
@@ -99,6 +99,7 @@ struct fsl_usb2_platform_data {
 	unsigned	suspended:1;
 	unsigned	already_suspended:1;
 	unsigned        has_fsl_erratum_a007792:1;
+	unsigned        has_fsl_erratum_a005275:1;
 	unsigned        check_phy_clk_valid:1;
 
 	/* register save area for suspend/resume */

A message that is not in the archive (sent off-list or not yet received): SN1PR0301MB16291C9F7D05B9BE3B78A8DEF35A0@SN1PR0301MB1629.namprd03.prod.outlook.com

RAJESH BHAGAT

2015-09-24 09:23 UTC #2 lore raw

Hi Greg-KH,

For the time being, there is no plan to do so i.e. adding to other stable or longterm tree. If needed, I will create a new thread for it.

BTW, Nikhil has left freescale.

Thanks,
Rajesh Bhagat

-----Original Message-----
From: Badola Nikhil-B46172
Sent: Thursday, September 17, 2015 12:05 PM
To: Bhagat Rajesh-B56421
Cc: Dash Sriram-B56067; Mehresh Ramneek-B31383
Subject: FW: FAILED: patch "[PATCH] drivers: usb: fsl: Workaround for USB erratum-A005275" failed to apply to 4.2-stable tree

-----Original Message-----
From: [email protected] [mailto:[email protected]]
Sent: Wednesday, September 16, 2015 11:49 PM
To: Badola Nikhil-B46172 <[email protected]>; [email protected]; Mehresh Ramneek-B31383 <[email protected]>; [email protected]
Cc: [email protected]
Subject: FAILED: patch "[PATCH] drivers: usb: fsl: Workaround for USB erratum-A005275" failed to apply to 4.2-stable tree