2022-05-10 13:15:41

by ChiYuan Huang

Subject: [PATCH v2] usb: typec: tcpci_mt6360: Update for BMC PHY setting

From: ChiYuan Huang <[email protected]>

Update MT6360 BMC PHY Tx/Rx setting for the compatibility.

Macpaul reported this CtoDP cable attention message cannot be received from
MT6360 TCPC. But actually, attention message really sent from UFP_D
device.

After RD's comment, there may be BMC PHY Tx/Rx setting causes this issue.

Below's the detailed TCPM log and DP attention message didn't received from 6360
TCPCI.
[ 1206.367775] Identity: 0000:0000.0000
[ 1206.416570] Alternate mode 0: SVID 0xff01, VDO 1: 0x00000405
[ 1206.447378] AMS DFP_TO_UFP_ENTER_MODE start
[ 1206.447383] PD TX, header: 0x1d6f
[ 1206.449393] PD TX complete, status: 0
[ 1206.454110] PD RX, header: 0x184f [1]
[ 1206.456867] Rx VDM cmd 0xff018144 type 1 cmd 4 len 1
[ 1206.456872] AMS DFP_TO_UFP_ENTER_MODE finished
[ 1206.456873] cc:=4
[ 1206.473100] AMS STRUCTURED_VDMS start
[ 1206.473103] PD TX, header: 0x2f6f
[ 1206.475397] PD TX complete, status: 0
[ 1206.480442] PD RX, header: 0x2a4f [1]
[ 1206.483145] Rx VDM cmd 0xff018150 type 1 cmd 16 len 2
[ 1206.483150] AMS STRUCTURED_VDMS finished
[ 1206.483151] cc:=4
[ 1206.505643] AMS STRUCTURED_VDMS start
[ 1206.505646] PD TX, header: 0x216f
[ 1206.507933] PD TX complete, status: 0
[ 1206.512664] PD RX, header: 0x1c4f [1]
[ 1206.515456] Rx VDM cmd 0xff018151 type 1 cmd 17 len 1
[ 1206.515460] AMS STRUCTURED_VDMS finished
[ 1206.515461] cc:=4

Fixes: e1aefcdd394fd ("usb typec: mt6360: Add support for mt6360 Type-C driver")
Reported-by: Macpaul Lin <[email protected]>
Signed-off-by: ChiYuan Huang <[email protected]>
Signed-off-by: Fabien Parent <[email protected]>
Cc: stable <[email protected]>
---
drivers/usb/typec/tcpm/tcpci_mt6360.c | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)

diff --git a/drivers/usb/typec/tcpm/tcpci_mt6360.c b/drivers/usb/typec/tcpm/tcpci_mt6360.c
index f1bd9e0..8a952ea 100644
--- a/drivers/usb/typec/tcpm/tcpci_mt6360.c
+++ b/drivers/usb/typec/tcpm/tcpci_mt6360.c
@@ -15,6 +15,9 @@

#include "tcpci.h"

+#define MT6360_REG_PHYCTRL1 0x80
+#define MT6360_REG_PHYCTRL3 0x82
+#define MT6360_REG_PHYCTRL7 0x86
#define MT6360_REG_VCONNCTRL1 0x8C
#define MT6360_REG_MODECTRL2 0x8F
#define MT6360_REG_SWRESET 0xA0
@@ -22,6 +25,8 @@
#define MT6360_REG_DRPCTRL1 0xA2
#define MT6360_REG_DRPCTRL2 0xA3
#define MT6360_REG_I2CTORST 0xBF
+#define MT6360_REG_PHYCTRL11 0xCA
+#define MT6360_REG_RXCTRL1 0xCE
#define MT6360_REG_RXCTRL2 0xCF
#define MT6360_REG_CTDCTRL2 0xEC

@@ -106,6 +111,27 @@ static int mt6360_tcpc_init(struct tcpci *tcpci, struct tcpci_data *tdata)
if (ret)
return ret;

+ /* BMC PHY */
+ ret = mt6360_tcpc_write16(regmap, MT6360_REG_PHYCTRL1, 0x3A70);
+ if (ret)
+ return ret;
+
+ ret = regmap_write(regmap, MT6360_REG_PHYCTRL3, 0x82);
+ if (ret)
+ return ret;
+
+ ret = regmap_write(regmap, MT6360_REG_PHYCTRL7, 0x36);
+ if (ret)
+ return ret;
+
+ ret = mt6360_tcpc_write16(regmap, MT6360_REG_PHYCTRL11, 0x3C60);
+ if (ret)
+ return ret;
+
+ ret = regmap_write(regmap, MT6360_REG_RXCTRL1, 0xE8);
+ if (ret)
+ return ret;
+
/* Set shipping mode off, AUTOIDLE on */
return regmap_write(regmap, MT6360_REG_MODECTRL2, 0x7A);
}
--
2.7.4

2022-05-10 16:35:24

by Guenter Roeck

Subject: Re: [PATCH v2] usb: typec: tcpci_mt6360: Update for BMC PHY setting

On 5/9/22 22:13, cy_huang wrote:
> From: ChiYuan Huang <[email protected]>
>
> Update MT6360 BMC PHY Tx/Rx setting for the compatibility.
>
> Macpaul reported this CtoDP cable attention message cannot be received from
> MT6360 TCPC. But actually, attention message really sent from UFP_D
> device.
>
> After RD's comment, there may be BMC PHY Tx/Rx setting causes this issue.
>
> Below's the detailed TCPM log and DP attention message didn't received from 6360
> TCPCI.
> [ 1206.367775] Identity: 0000:0000.0000
> [ 1206.416570] Alternate mode 0: SVID 0xff01, VDO 1: 0x00000405
> [ 1206.447378] AMS DFP_TO_UFP_ENTER_MODE start
> [ 1206.447383] PD TX, header: 0x1d6f
> [ 1206.449393] PD TX complete, status: 0
> [ 1206.454110] PD RX, header: 0x184f [1]
> [ 1206.456867] Rx VDM cmd 0xff018144 type 1 cmd 4 len 1
> [ 1206.456872] AMS DFP_TO_UFP_ENTER_MODE finished
> [ 1206.456873] cc:=4
> [ 1206.473100] AMS STRUCTURED_VDMS start
> [ 1206.473103] PD TX, header: 0x2f6f
> [ 1206.475397] PD TX complete, status: 0
> [ 1206.480442] PD RX, header: 0x2a4f [1]
> [ 1206.483145] Rx VDM cmd 0xff018150 type 1 cmd 16 len 2
> [ 1206.483150] AMS STRUCTURED_VDMS finished
> [ 1206.483151] cc:=4
> [ 1206.505643] AMS STRUCTURED_VDMS start
> [ 1206.505646] PD TX, header: 0x216f
> [ 1206.507933] PD TX complete, status: 0
> [ 1206.512664] PD RX, header: 0x1c4f [1]
> [ 1206.515456] Rx VDM cmd 0xff018151 type 1 cmd 17 len 1
> [ 1206.515460] AMS STRUCTURED_VDMS finished
> [ 1206.515461] cc:=4
>
> Fixes: e1aefcdd394fd ("usb typec: mt6360: Add support for mt6360 Type-C driver")
> Reported-by: Macpaul Lin <[email protected]>
> Signed-off-by: ChiYuan Huang <[email protected]>
> Signed-off-by: Fabien Parent <[email protected]>
> Cc: stable <[email protected]>

Reviewed-by: Guenter Roeck <[email protected]>

> ---
> drivers/usb/typec/tcpm/tcpci_mt6360.c | 26 ++++++++++++++++++++++++++
> 1 file changed, 26 insertions(+)
>
> diff --git a/drivers/usb/typec/tcpm/tcpci_mt6360.c b/drivers/usb/typec/tcpm/tcpci_mt6360.c
> index f1bd9e0..8a952ea 100644
> --- a/drivers/usb/typec/tcpm/tcpci_mt6360.c
> +++ b/drivers/usb/typec/tcpm/tcpci_mt6360.c
> @@ -15,6 +15,9 @@
>
> #include "tcpci.h"
>
> +#define MT6360_REG_PHYCTRL1 0x80
> +#define MT6360_REG_PHYCTRL3 0x82
> +#define MT6360_REG_PHYCTRL7 0x86
> #define MT6360_REG_VCONNCTRL1 0x8C
> #define MT6360_REG_MODECTRL2 0x8F
> #define MT6360_REG_SWRESET 0xA0
> @@ -22,6 +25,8 @@
> #define MT6360_REG_DRPCTRL1 0xA2
> #define MT6360_REG_DRPCTRL2 0xA3
> #define MT6360_REG_I2CTORST 0xBF
> +#define MT6360_REG_PHYCTRL11 0xCA
> +#define MT6360_REG_RXCTRL1 0xCE
> #define MT6360_REG_RXCTRL2 0xCF
> #define MT6360_REG_CTDCTRL2 0xEC
>
> @@ -106,6 +111,27 @@ static int mt6360_tcpc_init(struct tcpci *tcpci, struct tcpci_data *tdata)
> if (ret)
> return ret;
>
> + /* BMC PHY */
> + ret = mt6360_tcpc_write16(regmap, MT6360_REG_PHYCTRL1, 0x3A70);
> + if (ret)
> + return ret;
> +
> + ret = regmap_write(regmap, MT6360_REG_PHYCTRL3, 0x82);
> + if (ret)
> + return ret;
> +
> + ret = regmap_write(regmap, MT6360_REG_PHYCTRL7, 0x36);
> + if (ret)
> + return ret;
> +
> + ret = mt6360_tcpc_write16(regmap, MT6360_REG_PHYCTRL11, 0x3C60);
> + if (ret)
> + return ret;
> +
> + ret = regmap_write(regmap, MT6360_REG_RXCTRL1, 0xE8);
> + if (ret)
> + return ret;
> +
> /* Set shipping mode off, AUTOIDLE on */
> return regmap_write(regmap, MT6360_REG_MODECTRL2, 0x7A);
> }

2022-05-11 09:36:00

by Heikki Krogerus

Subject: Re: [PATCH v2] usb: typec: tcpci_mt6360: Update for BMC PHY setting

On Tue, May 10, 2022 at 01:13:00PM +0800, cy_huang wrote:
> From: ChiYuan Huang <[email protected]>
>
> Update MT6360 BMC PHY Tx/Rx setting for the compatibility.
>
> Macpaul reported this CtoDP cable attention message cannot be received from
> MT6360 TCPC. But actually, attention message really sent from UFP_D
> device.
>
> After RD's comment, there may be BMC PHY Tx/Rx setting causes this issue.
>
> Below's the detailed TCPM log and DP attention message didn't received from 6360
> TCPCI.
> [ 1206.367775] Identity: 0000:0000.0000
> [ 1206.416570] Alternate mode 0: SVID 0xff01, VDO 1: 0x00000405
> [ 1206.447378] AMS DFP_TO_UFP_ENTER_MODE start
> [ 1206.447383] PD TX, header: 0x1d6f
> [ 1206.449393] PD TX complete, status: 0
> [ 1206.454110] PD RX, header: 0x184f [1]
> [ 1206.456867] Rx VDM cmd 0xff018144 type 1 cmd 4 len 1
> [ 1206.456872] AMS DFP_TO_UFP_ENTER_MODE finished
> [ 1206.456873] cc:=4
> [ 1206.473100] AMS STRUCTURED_VDMS start
> [ 1206.473103] PD TX, header: 0x2f6f
> [ 1206.475397] PD TX complete, status: 0
> [ 1206.480442] PD RX, header: 0x2a4f [1]
> [ 1206.483145] Rx VDM cmd 0xff018150 type 1 cmd 16 len 2
> [ 1206.483150] AMS STRUCTURED_VDMS finished
> [ 1206.483151] cc:=4
> [ 1206.505643] AMS STRUCTURED_VDMS start
> [ 1206.505646] PD TX, header: 0x216f
> [ 1206.507933] PD TX complete, status: 0
> [ 1206.512664] PD RX, header: 0x1c4f [1]
> [ 1206.515456] Rx VDM cmd 0xff018151 type 1 cmd 17 len 1
> [ 1206.515460] AMS STRUCTURED_VDMS finished
> [ 1206.515461] cc:=4
>
> Fixes: e1aefcdd394fd ("usb typec: mt6360: Add support for mt6360 Type-C driver")
> Reported-by: Macpaul Lin <[email protected]>
> Signed-off-by: ChiYuan Huang <[email protected]>
> Signed-off-by: Fabien Parent <[email protected]>
> Cc: stable <[email protected]>

Acked-by: Heikki Krogerus <[email protected]>

> ---
> drivers/usb/typec/tcpm/tcpci_mt6360.c | 26 ++++++++++++++++++++++++++
> 1 file changed, 26 insertions(+)
>
> diff --git a/drivers/usb/typec/tcpm/tcpci_mt6360.c b/drivers/usb/typec/tcpm/tcpci_mt6360.c
> index f1bd9e0..8a952ea 100644
> --- a/drivers/usb/typec/tcpm/tcpci_mt6360.c
> +++ b/drivers/usb/typec/tcpm/tcpci_mt6360.c
> @@ -15,6 +15,9 @@
>
> #include "tcpci.h"
>
> +#define MT6360_REG_PHYCTRL1 0x80
> +#define MT6360_REG_PHYCTRL3 0x82
> +#define MT6360_REG_PHYCTRL7 0x86
> #define MT6360_REG_VCONNCTRL1 0x8C
> #define MT6360_REG_MODECTRL2 0x8F
> #define MT6360_REG_SWRESET 0xA0
> @@ -22,6 +25,8 @@
> #define MT6360_REG_DRPCTRL1 0xA2
> #define MT6360_REG_DRPCTRL2 0xA3
> #define MT6360_REG_I2CTORST 0xBF
> +#define MT6360_REG_PHYCTRL11 0xCA
> +#define MT6360_REG_RXCTRL1 0xCE
> #define MT6360_REG_RXCTRL2 0xCF
> #define MT6360_REG_CTDCTRL2 0xEC
>
> @@ -106,6 +111,27 @@ static int mt6360_tcpc_init(struct tcpci *tcpci, struct tcpci_data *tdata)
> if (ret)
> return ret;
>
> + /* BMC PHY */
> + ret = mt6360_tcpc_write16(regmap, MT6360_REG_PHYCTRL1, 0x3A70);
> + if (ret)
> + return ret;
> +
> + ret = regmap_write(regmap, MT6360_REG_PHYCTRL3, 0x82);
> + if (ret)
> + return ret;
> +
> + ret = regmap_write(regmap, MT6360_REG_PHYCTRL7, 0x36);
> + if (ret)
> + return ret;
> +
> + ret = mt6360_tcpc_write16(regmap, MT6360_REG_PHYCTRL11, 0x3C60);
> + if (ret)
> + return ret;
> +
> + ret = regmap_write(regmap, MT6360_REG_RXCTRL1, 0xE8);
> + if (ret)
> + return ret;
> +
> /* Set shipping mode off, AUTOIDLE on */
> return regmap_write(regmap, MT6360_REG_MODECTRL2, 0x7A);
> }
> --
> 2.7.4

--
heikki