armv8: Add workaround for USB erratum A-050106
PATCH RESEND v2 1/1 armv8: Add workaround for USB erratum A-050106
USB3.0 Receiver needs to enable fixed equalization for each of PHY instances in an SOC. This is similar to erratum A-009007, but this one is for LX2160A, and the register value is different.
---
Change in v2:
- Move function erratum_a050106() under the scope of CONFIG_FSL_LSCH3 to avoid compilation warning of 'defined but not used'.
arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 4 ++++ arch/arm/cpu/armv8/fsl-layerscape/soc.c | 13 ++++++++++++- arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h | 5 +++++ 3 files changed, 21 insertions(+), 1 deletion(-)
arch/arm/cpu/armv8/fsl-layerscape/Kconfig +4 -0
@@ -191,6 +191,7 @@ config ARCH_LX2160A select SYS_FSL_DDR_VER_50 select SYS_FSL_EC1 select SYS_FSL_EC2 + select SYS_FSL_ERRATUM_A050106 select SYS_FSL_HAS_RGMII select SYS_FSL_HAS_SEC select SYS_FSL_HAS_CCN508
@@ -335,6 +336,9 @@ config SYS_FSL_ERRATUM_A009008 config SYS_FSL_ERRATUM_A009798 bool "Workaround for USB PHY erratum A009798" +config SYS_FSL_ERRATUM_A050106 + bool "Workaround for USB PHY erratum A050106" + config SYS_FSL_ERRATUM_A010315 bool "Workaround for PCIe erratum A010315"
arch/arm/cpu/armv8/fsl-layerscape/soc.c +12 -1
@@ -139,7 +139,8 @@ static void erratum_a008997(void)out_be16 ((phy) +SCFG_USB_PHY_RX_OVRD_IN_HI ,USB_PHY_RX_EQ_VAL_3 ); \ out_be16((phy) + SCFG_USB_PHY_RX_OVRD_IN_HI, USB_PHY_RX_EQ_VAL_4) -#elif defined(CONFIG_ARCH_LS2080A ) || defined(CONFIG_ARCH_LS1088A ) +#elif defined(CONFIG_ARCH_LS2080A ) || defined(CONFIG_ARCH_LS1088A ) || \ + defined(CONFIG_ARCH_LX2160A )#define PROGRAM_USB_PHY_RX_OVRD_IN_HI (phy) \ out_le16((phy) + DCSR_USB_PHY_RX_OVRD_IN_HI, USB_PHY_RX_EQ_VAL_1); \
@@ -172,6 +173,15 @@ static void erratum_a009007(void) }#if defined(CONFIG_FSL_LSCH3 ) +static void erratum_a050106 (void ) +{ +#if defined(CONFIG_ARCH_LX2160A ) +void __iomem *dcsr = (void __iomem *)DCSR_BASE ; + +PROGRAM_USB_PHY_RX_OVRD_IN_HI (dcsr +DCSR_USB_PHY1 ); +PROGRAM_USB_PHY_RX_OVRD_IN_HI (dcsr +DCSR_USB_PHY2 ); +#endif +}/* * This erratum requires setting a value to eddrtqcr1 to * optimal the DDR performance.
@@ -323,6 +333,7 @@ void fsl_lsch3_early_init_f(void)erratum_a009798 ();erratum_a008997 ();erratum_a009007 (); +erratum_a050106 ();#ifdef CONFIG_CHAIN_OF_TRUST /* In case of Secure Boot, the IBR configures the SMMU * to allow only Secure transactions.
arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h +5 -0
@@ -209,8 +209,13 @@#define DCSR_USB_PHY_RX_OVRD_IN_HI 0x200C#define USB_PHY_RX_EQ_VAL_1 0x0000#define USB_PHY_RX_EQ_VAL_2 0x0080 +#if defined(CONFIG_ARCH_LS2080A ) || defined(CONFIG_ARCH_LS1088A )#define USB_PHY_RX_EQ_VAL_3 0x0380#define USB_PHY_RX_EQ_VAL_4 0x0b80 +#elif defined(CONFIG_ARCH_LX2160A ) +#define USB_PHY_RX_EQ_VAL_3 0x0080 +#define USB_PHY_RX_EQ_VAL_4 0x0880 +#endif #define TP_ITYP_AV 0x00000001/* Initiator available */ #define TP_ITYP_TYPE (x) (((x) & 0x6) >> 1)/* Initiator Type */
Signature · 1 line
2.7.4
PATCH RESEND v2 1/1 armv8: Add workaround for USB erratum A-050106
Dear Ran
Quoted 10 lines
-----Original Message-----
From: Ran Wang <[email protected]>
Sent: Monday, May 13, 2019 8:49 AM
To: Albert Aribaud <[email protected]>; Prabhakar Kushwaha <[email protected]>
Cc: York Sun <[email protected]>; u-boot at lists.denx.de; Ran Wang <[email protected]>
Subject: [RESEND][PATCH v2] armv8: Add workaround for USB erratum A- 050106
Quoted 6 lines
USB3.0 Receiver needs to enable fixed equalization for each of PHY instances in an SOC. This is similar to erratum A-009007, but this one is for LX2160A, and the register value is different.
Signed-off-by Ran Wang <[email protected]>---
This patch is for adding workaround for errata A-050106. But you are modifying erratum_a008997().
Please avid hidden changes in a patch.
I will suggest to generate 2 patches one for A-050106 and other for a008997
-pk
PATCH RESEND v2 1/1 armv8: Add workaround for USB erratum A-050106
Hi Prabhakar,
Quoted 3 lines · Prabhakar Kushwaha
Dear Ran
<snip>
Quoted 5 lines
Quoted 5 lines
USB3.0 Receiver needs to enable fixed equalization for each of PHY instances in an SOC. This is similar to erratum A-009007, but this one is for LX2160A, and the register value is different.
Quoted 8 lines
Quoted 2 lines
Signed-off-by Ran Wang <[email protected]>---
This patch is for adding workaround for errata A-050106. But you are modifying
erratum_a008997().Please avid hidden changes in a patch.
I will suggest to generate 2 patches one for A-050106 and other for a008997
Actually the information ' @@ -139,7 +139,8 @@ static void erratum_a008997(void) ' automatically generated by git is not quite right, the change I made is within macro PROGRAM_USB_PHY_RX_OVRD_IN_HI rather than function erratum_a008997(void) . You can look into the src file arch/arm/cpu/armv8/fsl-layerscape/soc.c for details :)
Regards,
Ran
PATCH RESEND v2 1/1 armv8: Add workaround for USB erratum A-050106
Dear Ran,
Quoted 31 lines
-----Original Message-----
From: Ran Wang
Sent: Thursday, May 23, 2019 9:16 AM
To: Prabhakar Kushwaha <[email protected]>
Cc: York Sun <[email protected]>; u-boot at lists.denx.de; Albert Aribaud <[email protected]>
Subject: RE: [RESEND][PATCH v2] armv8: Add workaround for USB erratum A- 050106Hi Prabhakar,
Quoted 3 lines · Prabhakar Kushwaha
Dear Ran
<snip>
Quoted 8 lines
Quoted 7 lines
USB3.0 Receiver needs to enable fixed equalization for each of PHY instances in an SOC. This is similar to erratum A-009007, but this one is for LX2160A, and the register value is different.
Signed-off-by Ran Wang <[email protected]>---
Quoted 6 lines
This patch is for adding workaround for errata A-050106. But you are modifying
erratum_a008997().Please avid hidden changes in a patch.
I will suggest to generate 2 patches one for A-050106 and other for a008997
Quoted 8 lines
Actually the information ' @@ -139,7 +139,8 @@ static void
erratum_a008997(void)'
automatically generated by git is not quite right, the change I made is within macroPROGRAM_USB_PHY_RX_OVRD_IN_HIrather than functionerratum_a008997(void).
You can look into the src filearch/arm/cpu/armv8/fsl-layerscape/soc.cfor details :)
@@ -139,7 +139,8 @@ static void erratum_a008997(void)
out_be16((phy) + SCFG_USB_PHY_RX_OVRD_IN_HI, USB_PHY_RX_EQ_VAL_3); \
out_be16((phy) + SCFG_USB_PHY_RX_OVRD_IN_HI, USB_PHY_RX_EQ_VAL_4)
-#elif defined(CONFIG_ARCH_LS2080A) || defined(CONFIG_ARCH_LS1088A) +#elif defined(CONFIG_ARCH_LS2080A) || defined(CONFIG_ARCH_LS1088A) || \
+ defined(CONFIG_ARCH_LX2160A)
As per my understanding this change is being done in erratum_a008997 Let me know, if am not seeing it correctly.
--pk
PATCH RESEND v2 1/1 armv8: Add workaround for USB erratum A-050106
Quoted 64 lines
-----Original Message-----
From: Prabhakar Kushwaha
Sent: Thursday, May 23, 2019 9:20 AM
To: Ran Wang <[email protected]>
Cc: York Sun <[email protected]>; u-boot at lists.denx.de; Albert Aribaud <[email protected]>
Subject: RE: [RESEND][PATCH v2] armv8: Add workaround for USB erratum A- 050106Dear Ran,
Quoted 40 lines
-----Original Message-----
From: Ran Wang
Sent: Thursday, May 23, 2019 9:16 AM
To: Prabhakar Kushwaha <[email protected]>
Cc: York Sun <[email protected]>; u-boot at lists.denx.de; Albert Aribaud <[email protected]>
Subject: RE: [RESEND][PATCH v2] armv8: Add workaround for USB erratum A-
050106Hi Prabhakar,
Quoted 3 lines · Prabhakar Kushwaha
Dear Ran
<snip>
Quoted 8 lines
Quoted 7 lines
USB3.0 Receiver needs to enable fixed equalization for each of PHY instances in an SOC. This is similar to erratum A-009007, but this one is for LX2160A, and the register value is different.
Signed-off-by Ran Wang <[email protected]>---
Quoted 6 lines
This patch is for adding workaround for errata A-050106. But you are modifying
erratum_a008997().Please avid hidden changes in a patch.
I will suggest to generate 2 patches one for A-050106 and other for a008997Actually the information ' @@ -139,7 +139,8 @@ static void
erratum_a008997(void)'
automatically generated by git is not quite right, the change I made is within macroPROGRAM_USB_PHY_RX_OVRD_IN_HIrather than functionerratum_a008997(void).
You can look into the src filearch/arm/cpu/armv8/fsl-layerscape/soc.cfor details :)arch/arm/cpu/armv8/fsl-layerscape/soc.c +2
-1@@ -139,7 +139,8 @@ static void erratum_a008997(void)out_be16 ((phy) +SCFG_USB_PHY_RX_OVRD_IN_HI ,USB_PHY_RX_EQ_VAL_3 ); \out_be16 ((phy) +SCFG_USB_PHY_RX_OVRD_IN_HI , USB_PHY_RX_EQ_VAL_4) -#elif defined(CONFIG_ARCH_LS2080A ) || defined(CONFIG_ARCH_LS1088A ) +#elif defined(CONFIG_ARCH_LS2080A ) || defined(CONFIG_ARCH_LS1088A ) || \ + defined(CONFIG_ARCH_LX2160A )
Quoted 3 lines
As per my understanding this change is being done in
erratum_a008997Let me know, if am not seeing it correctly.
Thanks for showing me.
You are right.. this change is in between static void erratum_a008997 and your new function 😊
--pk
PATCH RESEND v2 1/1 armv8: Add workaround for USB erratum A-050106
Hi Prabhakar,
Quoted 70 lines · Prabhakar Kushwaha
Quoted 60 lines
-----Original Message-----
From: Prabhakar Kushwaha
Sent: Thursday, May 23, 2019 9:20 AM
To: Ran Wang <[email protected]>
Cc: York Sun <[email protected]>; u-boot at lists.denx.de; Albert Aribaud <[email protected]>
Subject: RE: [RESEND][PATCH v2] armv8: Add workaround for USB erratum A-
050106Dear Ran,
Quoted 43 lines
-----Original Message-----
From: Ran Wang
Sent: Thursday, May 23, 2019 9:16 AM
To: Prabhakar Kushwaha <[email protected]>
Cc: York Sun <[email protected]>; u-boot at lists.denx.de; Albert Aribaud <[email protected]>
Subject: RE: [RESEND][PATCH v2] armv8: Add workaround for USB erratum
A-
050106Hi Prabhakar,
Quoted 3 lines · Prabhakar Kushwaha
Dear Ran
<snip>
Quoted 8 lines
Quoted 7 lines
USB3.0 Receiver needs to enable fixed equalization for each of PHY instances in an SOC. This is similar to erratum A-009007, but this one is for LX2160A, and the register value is different.
Signed-off-by Ran Wang <[email protected]>---
Quoted 7 lines
This patch is for adding workaround for errata A-050106. But you are modifying
erratum_a008997().Please avid hidden changes in a patch.
I will suggest to generate 2 patches one for A-050106 and other for
a008997Actually the information ' @@ -139,7 +139,8 @@ static void
erratum_a008997(void)'
automatically generated by git is not quite right, the change I made is within macroPROGRAM_USB_PHY_RX_OVRD_IN_HIrather than functionerratum_a008997(void).
You can look into the src filearch/arm/cpu/armv8/fsl-layerscape/soc.c
for details :)Review static void erratum_a008997(void) · line 144
Quoted 7 lines
(quoted diff) +1
-1@@ -139,7 +139,8 @@ static void erratum_a008997(void) out_be16((phy) + SCFG_USB_PHY_RX_OVRD_IN_HI, USB_PHY_RX_EQ_VAL_3); \ out_be16((phy) + SCFG_USB_PHY_RX_OVRD_IN_HI, USB_PHY_RX_EQ_VAL_4) -#elif defined(CONFIG_ARCH_LS2080A) || defined(CONFIG_ARCH_LS1088A) +#elif defined(CONFIG_ARCH_LS2080A) || defined(CONFIG_ARCH_LS1088A)|| \
Quoted 2 lines
arch/arm/cpu/armv8/fsl-layerscape/soc.c +1
-0+defined (CONFIG_ARCH_LX2160A )
Quoted 8 lines
Quoted 3 lines
As per my understanding this change is being done in
erratum_a008997Let me know, if am not seeing it correctly.Thanks for showing me.
You are right.. this change is in between static void
erratum_a008997and your new function 😊
Yes, looks like Git has defect on this. Thanks.
Regards,
Ran