2020-05-18 12:17:55

by Sanket Parmar

Subject: [PATCH] phy: cadence: sierra: Fix for USB3 U1/U2 state

Updated values of USB3 related Sierra PHY registers.
This change fixes USB3 device disconnect issue observed
while enternig U1/U2 state.

Signed-off-by: Sanket Parmar <[email protected]>
---
drivers/phy/cadence/phy-cadence-sierra.c | 27 ++++++++++++++-------------
1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/drivers/phy/cadence/phy-cadence-sierra.c b/drivers/phy/cadence/phy-cadence-sierra.c
index a5c08e5..faed652 100644
--- a/drivers/phy/cadence/phy-cadence-sierra.c
+++ b/drivers/phy/cadence/phy-cadence-sierra.c
@@ -685,10 +685,10 @@ static struct cdns_reg_pairs cdns_usb_cmn_regs_ext_ssc[] = {
static struct cdns_reg_pairs cdns_usb_ln_regs_ext_ssc[] = {
{0xFE0A, SIERRA_DET_STANDEC_A_PREG},
{0x000F, SIERRA_DET_STANDEC_B_PREG},
- {0x00A5, SIERRA_DET_STANDEC_C_PREG},
+ {0x55A5, SIERRA_DET_STANDEC_C_PREG},
{0x69ad, SIERRA_DET_STANDEC_D_PREG},
{0x0241, SIERRA_DET_STANDEC_E_PREG},
- {0x0010, SIERRA_PSM_LANECAL_DLY_A1_RESETS_PREG},
+ {0x0110, SIERRA_PSM_LANECAL_DLY_A1_RESETS_PREG},
{0x0014, SIERRA_PSM_A0IN_TMR_PREG},
{0xCF00, SIERRA_PSM_DIAG_PREG},
{0x001F, SIERRA_PSC_TX_A0_PREG},
@@ -696,7 +696,7 @@ static struct cdns_reg_pairs cdns_usb_ln_regs_ext_ssc[] = {
{0x0003, SIERRA_PSC_TX_A2_PREG},
{0x0003, SIERRA_PSC_TX_A3_PREG},
{0x0FFF, SIERRA_PSC_RX_A0_PREG},
- {0x0619, SIERRA_PSC_RX_A1_PREG},
+ {0x0003, SIERRA_PSC_RX_A1_PREG},
{0x0003, SIERRA_PSC_RX_A2_PREG},
{0x0001, SIERRA_PSC_RX_A3_PREG},
{0x0001, SIERRA_PLLCTRL_SUBRATE_PREG},
@@ -705,19 +705,19 @@ static struct cdns_reg_pairs cdns_usb_ln_regs_ext_ssc[] = {
{0x00CA, SIERRA_CLKPATH_BIASTRIM_PREG},
{0x2512, SIERRA_DFE_BIASTRIM_PREG},
{0x0000, SIERRA_DRVCTRL_ATTEN_PREG},
- {0x873E, SIERRA_CLKPATHCTRL_TMR_PREG},
- {0x03CF, SIERRA_RX_CREQ_FLTR_A_MODE1_PREG},
- {0x01CE, SIERRA_RX_CREQ_FLTR_A_MODE0_PREG},
+ {0x823E, SIERRA_CLKPATHCTRL_TMR_PREG},
+ {0x078F, SIERRA_RX_CREQ_FLTR_A_MODE1_PREG},
+ {0x078F, SIERRA_RX_CREQ_FLTR_A_MODE0_PREG},
{0x7B3C, SIERRA_CREQ_CCLKDET_MODE01_PREG},
- {0x033F, SIERRA_RX_CTLE_MAINTENANCE_PREG},
+ {0x023C, SIERRA_RX_CTLE_MAINTENANCE_PREG},
{0x3232, SIERRA_CREQ_FSMCLK_SEL_PREG},
{0x0000, SIERRA_CREQ_EQ_CTRL_PREG},
- {0x8000, SIERRA_CREQ_SPARE_PREG},
+ {0x0000, SIERRA_CREQ_SPARE_PREG},
{0xCC44, SIERRA_CREQ_EQ_OPEN_EYE_THRESH_PREG},
- {0x8453, SIERRA_CTLELUT_CTRL_PREG},
- {0x4110, SIERRA_DFE_ECMP_RATESEL_PREG},
- {0x4110, SIERRA_DFE_SMP_RATESEL_PREG},
- {0x0002, SIERRA_DEQ_PHALIGN_CTRL},
+ {0x8452, SIERRA_CTLELUT_CTRL_PREG},
+ {0x4121, SIERRA_DFE_ECMP_RATESEL_PREG},
+ {0x4121, SIERRA_DFE_SMP_RATESEL_PREG},
+ {0x0003, SIERRA_DEQ_PHALIGN_CTRL},
{0x3200, SIERRA_DEQ_CONCUR_CTRL1_PREG},
{0x5064, SIERRA_DEQ_CONCUR_CTRL2_PREG},
{0x0030, SIERRA_DEQ_EPIPWR_CTRL2_PREG},
@@ -725,7 +725,7 @@ static struct cdns_reg_pairs cdns_usb_ln_regs_ext_ssc[] = {
{0x5A5A, SIERRA_DEQ_ERRCMP_CTRL_PREG},
{0x02F5, SIERRA_DEQ_OFFSET_CTRL_PREG},
{0x02F5, SIERRA_DEQ_GAIN_CTRL_PREG},
- {0x9A8A, SIERRA_DEQ_VGATUNE_CTRL_PREG},
+ {0x9999, SIERRA_DEQ_VGATUNE_CTRL_PREG},
{0x0014, SIERRA_DEQ_GLUT0},
{0x0014, SIERRA_DEQ_GLUT1},
{0x0014, SIERRA_DEQ_GLUT2},
@@ -772,6 +772,7 @@ static struct cdns_reg_pairs cdns_usb_ln_regs_ext_ssc[] = {
{0x000F, SIERRA_LFPSFILT_NS_PREG},
{0x0009, SIERRA_LFPSFILT_RD_PREG},
{0x0001, SIERRA_LFPSFILT_MP_PREG},
+ {0x6013, SIERRA_SIGDET_SUPPORT_PREG},
{0x8013, SIERRA_SDFILT_H2L_A_PREG},
{0x8009, SIERRA_SDFILT_L2H_PREG},
{0x0024, SIERRA_RXBUFFER_CTLECTRL_PREG},
--
2.4.5

2020-05-18 12:32:11

by Roger Quadros

Subject: Re: [PATCH] phy: cadence: sierra: Fix for USB3 U1/U2 state

On 18/05/2020 15:14, Sanket Parmar wrote:
> Updated values of USB3 related Sierra PHY registers.
> This change fixes USB3 device disconnect issue observed
> while enternig U1/U2 state.
>
> Signed-off-by: Sanket Parmar <[email protected]>

Reviewed-by: Roger Quadros <[email protected]>

> ---
> drivers/phy/cadence/phy-cadence-sierra.c | 27 ++++++++++++++-------------
> 1 file changed, 14 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/phy/cadence/phy-cadence-sierra.c b/drivers/phy/cadence/phy-cadence-sierra.c
> index a5c08e5..faed652 100644
> --- a/drivers/phy/cadence/phy-cadence-sierra.c
> +++ b/drivers/phy/cadence/phy-cadence-sierra.c
> @@ -685,10 +685,10 @@ static struct cdns_reg_pairs cdns_usb_cmn_regs_ext_ssc[] = {
> static struct cdns_reg_pairs cdns_usb_ln_regs_ext_ssc[] = {
> {0xFE0A, SIERRA_DET_STANDEC_A_PREG},
> {0x000F, SIERRA_DET_STANDEC_B_PREG},
> - {0x00A5, SIERRA_DET_STANDEC_C_PREG},
> + {0x55A5, SIERRA_DET_STANDEC_C_PREG},
> {0x69ad, SIERRA_DET_STANDEC_D_PREG},
> {0x0241, SIERRA_DET_STANDEC_E_PREG},
> - {0x0010, SIERRA_PSM_LANECAL_DLY_A1_RESETS_PREG},
> + {0x0110, SIERRA_PSM_LANECAL_DLY_A1_RESETS_PREG},
> {0x0014, SIERRA_PSM_A0IN_TMR_PREG},
> {0xCF00, SIERRA_PSM_DIAG_PREG},
> {0x001F, SIERRA_PSC_TX_A0_PREG},
> @@ -696,7 +696,7 @@ static struct cdns_reg_pairs cdns_usb_ln_regs_ext_ssc[] = {
> {0x0003, SIERRA_PSC_TX_A2_PREG},
> {0x0003, SIERRA_PSC_TX_A3_PREG},
> {0x0FFF, SIERRA_PSC_RX_A0_PREG},
> - {0x0619, SIERRA_PSC_RX_A1_PREG},
> + {0x0003, SIERRA_PSC_RX_A1_PREG},
> {0x0003, SIERRA_PSC_RX_A2_PREG},
> {0x0001, SIERRA_PSC_RX_A3_PREG},
> {0x0001, SIERRA_PLLCTRL_SUBRATE_PREG},
> @@ -705,19 +705,19 @@ static struct cdns_reg_pairs cdns_usb_ln_regs_ext_ssc[] = {
> {0x00CA, SIERRA_CLKPATH_BIASTRIM_PREG},
> {0x2512, SIERRA_DFE_BIASTRIM_PREG},
> {0x0000, SIERRA_DRVCTRL_ATTEN_PREG},
> - {0x873E, SIERRA_CLKPATHCTRL_TMR_PREG},
> - {0x03CF, SIERRA_RX_CREQ_FLTR_A_MODE1_PREG},
> - {0x01CE, SIERRA_RX_CREQ_FLTR_A_MODE0_PREG},
> + {0x823E, SIERRA_CLKPATHCTRL_TMR_PREG},
> + {0x078F, SIERRA_RX_CREQ_FLTR_A_MODE1_PREG},
> + {0x078F, SIERRA_RX_CREQ_FLTR_A_MODE0_PREG},
> {0x7B3C, SIERRA_CREQ_CCLKDET_MODE01_PREG},
> - {0x033F, SIERRA_RX_CTLE_MAINTENANCE_PREG},
> + {0x023C, SIERRA_RX_CTLE_MAINTENANCE_PREG},
> {0x3232, SIERRA_CREQ_FSMCLK_SEL_PREG},
> {0x0000, SIERRA_CREQ_EQ_CTRL_PREG},
> - {0x8000, SIERRA_CREQ_SPARE_PREG},
> + {0x0000, SIERRA_CREQ_SPARE_PREG},
> {0xCC44, SIERRA_CREQ_EQ_OPEN_EYE_THRESH_PREG},
> - {0x8453, SIERRA_CTLELUT_CTRL_PREG},
> - {0x4110, SIERRA_DFE_ECMP_RATESEL_PREG},
> - {0x4110, SIERRA_DFE_SMP_RATESEL_PREG},
> - {0x0002, SIERRA_DEQ_PHALIGN_CTRL},
> + {0x8452, SIERRA_CTLELUT_CTRL_PREG},
> + {0x4121, SIERRA_DFE_ECMP_RATESEL_PREG},
> + {0x4121, SIERRA_DFE_SMP_RATESEL_PREG},
> + {0x0003, SIERRA_DEQ_PHALIGN_CTRL},
> {0x3200, SIERRA_DEQ_CONCUR_CTRL1_PREG},
> {0x5064, SIERRA_DEQ_CONCUR_CTRL2_PREG},
> {0x0030, SIERRA_DEQ_EPIPWR_CTRL2_PREG},
> @@ -725,7 +725,7 @@ static struct cdns_reg_pairs cdns_usb_ln_regs_ext_ssc[] = {
> {0x5A5A, SIERRA_DEQ_ERRCMP_CTRL_PREG},
> {0x02F5, SIERRA_DEQ_OFFSET_CTRL_PREG},
> {0x02F5, SIERRA_DEQ_GAIN_CTRL_PREG},
> - {0x9A8A, SIERRA_DEQ_VGATUNE_CTRL_PREG},
> + {0x9999, SIERRA_DEQ_VGATUNE_CTRL_PREG},
> {0x0014, SIERRA_DEQ_GLUT0},
> {0x0014, SIERRA_DEQ_GLUT1},
> {0x0014, SIERRA_DEQ_GLUT2},
> @@ -772,6 +772,7 @@ static struct cdns_reg_pairs cdns_usb_ln_regs_ext_ssc[] = {
> {0x000F, SIERRA_LFPSFILT_NS_PREG},
> {0x0009, SIERRA_LFPSFILT_RD_PREG},
> {0x0001, SIERRA_LFPSFILT_MP_PREG},
> + {0x6013, SIERRA_SIGDET_SUPPORT_PREG},
> {0x8013, SIERRA_SDFILT_H2L_A_PREG},
> {0x8009, SIERRA_SDFILT_L2H_PREG},
> {0x0024, SIERRA_RXBUFFER_CTLECTRL_PREG},
>

--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

2020-05-18 13:57:18

by Kishon Vijay Abraham I

Subject: Re: [PATCH] phy: cadence: sierra: Fix for USB3 U1/U2 state

On 5/18/2020 5:59 PM, Roger Quadros wrote:
>
>
> On 18/05/2020 15:14, Sanket Parmar wrote:
>> Updated values of USB3 related Sierra PHY registers.
>> This change fixes USB3 device disconnect issue observed
>> while enternig U1/U2 state.
>>
>> Signed-off-by: Sanket Parmar <[email protected]>
>
> Reviewed-by: Roger Quadros <[email protected]>

merged, thanks!

-Kishon
>
>> ---
>>   drivers/phy/cadence/phy-cadence-sierra.c | 27 ++++++++++++++-------------
>>   1 file changed, 14 insertions(+), 13 deletions(-)
>>
>> diff --git a/drivers/phy/cadence/phy-cadence-sierra.c
>> b/drivers/phy/cadence/phy-cadence-sierra.c
>> index a5c08e5..faed652 100644
>> --- a/drivers/phy/cadence/phy-cadence-sierra.c
>> +++ b/drivers/phy/cadence/phy-cadence-sierra.c
>> @@ -685,10 +685,10 @@ static struct cdns_reg_pairs
>> cdns_usb_cmn_regs_ext_ssc[] = {
>>   static struct cdns_reg_pairs cdns_usb_ln_regs_ext_ssc[] = {
>>       {0xFE0A, SIERRA_DET_STANDEC_A_PREG},
>>       {0x000F, SIERRA_DET_STANDEC_B_PREG},
>> -    {0x00A5, SIERRA_DET_STANDEC_C_PREG},
>> +    {0x55A5, SIERRA_DET_STANDEC_C_PREG},
>>       {0x69ad, SIERRA_DET_STANDEC_D_PREG},
>>       {0x0241, SIERRA_DET_STANDEC_E_PREG},
>> -    {0x0010, SIERRA_PSM_LANECAL_DLY_A1_RESETS_PREG},
>> +    {0x0110, SIERRA_PSM_LANECAL_DLY_A1_RESETS_PREG},
>>       {0x0014, SIERRA_PSM_A0IN_TMR_PREG},
>>       {0xCF00, SIERRA_PSM_DIAG_PREG},
>>       {0x001F, SIERRA_PSC_TX_A0_PREG},
>> @@ -696,7 +696,7 @@ static struct cdns_reg_pairs cdns_usb_ln_regs_ext_ssc[] = {
>>       {0x0003, SIERRA_PSC_TX_A2_PREG},
>>       {0x0003, SIERRA_PSC_TX_A3_PREG},
>>       {0x0FFF, SIERRA_PSC_RX_A0_PREG},
>> -    {0x0619, SIERRA_PSC_RX_A1_PREG},
>> +    {0x0003, SIERRA_PSC_RX_A1_PREG},
>>       {0x0003, SIERRA_PSC_RX_A2_PREG},
>>       {0x0001, SIERRA_PSC_RX_A3_PREG},
>>       {0x0001, SIERRA_PLLCTRL_SUBRATE_PREG},
>> @@ -705,19 +705,19 @@ static struct cdns_reg_pairs cdns_usb_ln_regs_ext_ssc[]
>> = {
>>       {0x00CA, SIERRA_CLKPATH_BIASTRIM_PREG},
>>       {0x2512, SIERRA_DFE_BIASTRIM_PREG},
>>       {0x0000, SIERRA_DRVCTRL_ATTEN_PREG},
>> -    {0x873E, SIERRA_CLKPATHCTRL_TMR_PREG},
>> -    {0x03CF, SIERRA_RX_CREQ_FLTR_A_MODE1_PREG},
>> -    {0x01CE, SIERRA_RX_CREQ_FLTR_A_MODE0_PREG},
>> +    {0x823E, SIERRA_CLKPATHCTRL_TMR_PREG},
>> +    {0x078F, SIERRA_RX_CREQ_FLTR_A_MODE1_PREG},
>> +    {0x078F, SIERRA_RX_CREQ_FLTR_A_MODE0_PREG},
>>       {0x7B3C, SIERRA_CREQ_CCLKDET_MODE01_PREG},
>> -    {0x033F, SIERRA_RX_CTLE_MAINTENANCE_PREG},
>> +    {0x023C, SIERRA_RX_CTLE_MAINTENANCE_PREG},
>>       {0x3232, SIERRA_CREQ_FSMCLK_SEL_PREG},
>>       {0x0000, SIERRA_CREQ_EQ_CTRL_PREG},
>> -    {0x8000, SIERRA_CREQ_SPARE_PREG},
>> +    {0x0000, SIERRA_CREQ_SPARE_PREG},
>>       {0xCC44, SIERRA_CREQ_EQ_OPEN_EYE_THRESH_PREG},
>> -    {0x8453, SIERRA_CTLELUT_CTRL_PREG},
>> -    {0x4110, SIERRA_DFE_ECMP_RATESEL_PREG},
>> -    {0x4110, SIERRA_DFE_SMP_RATESEL_PREG},
>> -    {0x0002, SIERRA_DEQ_PHALIGN_CTRL},
>> +    {0x8452, SIERRA_CTLELUT_CTRL_PREG},
>> +    {0x4121, SIERRA_DFE_ECMP_RATESEL_PREG},
>> +    {0x4121, SIERRA_DFE_SMP_RATESEL_PREG},
>> +    {0x0003, SIERRA_DEQ_PHALIGN_CTRL},
>>       {0x3200, SIERRA_DEQ_CONCUR_CTRL1_PREG},
>>       {0x5064, SIERRA_DEQ_CONCUR_CTRL2_PREG},
>>       {0x0030, SIERRA_DEQ_EPIPWR_CTRL2_PREG},
>> @@ -725,7 +725,7 @@ static struct cdns_reg_pairs cdns_usb_ln_regs_ext_ssc[] = {
>>       {0x5A5A, SIERRA_DEQ_ERRCMP_CTRL_PREG},
>>       {0x02F5, SIERRA_DEQ_OFFSET_CTRL_PREG},
>>       {0x02F5, SIERRA_DEQ_GAIN_CTRL_PREG},
>> -    {0x9A8A, SIERRA_DEQ_VGATUNE_CTRL_PREG},
>> +    {0x9999, SIERRA_DEQ_VGATUNE_CTRL_PREG},
>>       {0x0014, SIERRA_DEQ_GLUT0},
>>       {0x0014, SIERRA_DEQ_GLUT1},
>>       {0x0014, SIERRA_DEQ_GLUT2},
>> @@ -772,6 +772,7 @@ static struct cdns_reg_pairs cdns_usb_ln_regs_ext_ssc[] = {
>>       {0x000F, SIERRA_LFPSFILT_NS_PREG},
>>       {0x0009, SIERRA_LFPSFILT_RD_PREG},
>>       {0x0001, SIERRA_LFPSFILT_MP_PREG},
>> +    {0x6013, SIERRA_SIGDET_SUPPORT_PREG},
>>       {0x8013, SIERRA_SDFILT_H2L_A_PREG},
>>       {0x8009, SIERRA_SDFILT_L2H_PREG},
>>       {0x0024, SIERRA_RXBUFFER_CTLECTRL_PREG},
>>
>