usb: typec: tcpm: Create legacy PDOs for PD2 connection
Subsystems (3)
PATCH 1/1 usb: typec: tcpm: Create legacy PDOs for PD2 connection
If the port partner is PD2, the PDOs of the local port should follow the format defined in PD2 Spec. Dynamically modify the pre-defined PD3 PDOs and transform them into PD2 format before sending them to the PD2 port partner.
--- drivers/usb/typec/tcpm/tcpm.c | 62 +++++++++++++++++++++++++++++------ include/linux/usb/pd.h | 1 + 2 files changed, 53 insertions(+), 10 deletions(-)
drivers/usb/typec/tcpm/tcpm.c +52 -10
@@ -911,13 +911,47 @@ static int tcpm_set_pwr_role(struct tcpm_port *port, enum typec_role role)return 0 ; } +/* +* Transform the PDO to be compliant to PD rev2.0. +* Return 0 if the PDO type is not defined in PD rev2.0. +* Otherwise, return the converted PDO. +*/ +static u32 tcpm_forge_legacy_pdo (struct tcpm_port *port,u32 pdo,enum typec_role role) +{ +switch (pdo_type (pdo)) { +case PDO_TYPE_FIXED : +if (role ==TYPEC_SINK ) +return pdo & ~PDO_FIXED_FRS_CURR_MASK ; +else +return pdo & ~PDO_FIXED_UNCHUNK_EXT ; +case PDO_TYPE_VAR : +case PDO_TYPE_BATT : +return pdo; +case PDO_TYPE_APDO : +default : +return 0 ; + } +} +static int tcpm_pd_send_source_caps (struct tcpm_port *port) {struct pd_message msg; -int i; +u32 pdo; +unsigned int i, nr_pdo =0 ;memset (&msg,0 ,sizeof (msg)); -if (!port->nr_src_pdo) { + +for (i =0 ; i < port->nr_src_pdo; i++) { +if (port->negotiated_rev >=PD_REV30 ) { + msg.payload[nr_pdo++] =cpu_to_le32 (port->src_pdo[i]); + }else { + pdo =tcpm_forge_legacy_pdo (port, port->src_pdo[i],TYPEC_SOURCE ); +if (pdo) + msg.payload[nr_pdo++] =cpu_to_le32 (pdo); + } + } + +if (!nr_pdo) {/* No source capabilities defined, sink only */ msg.header = PD_HEADER_LE(PD_CTRL_REJECT, port->pwr_role,
@@ -930,10 +964,8 @@ static int tcpm_pd_send_source_caps(struct tcpm_port *port) port->data_role, port->negotiated_rev, port->message_id, - port->nr_src_pdo); + nr_pdo); } -for (i =0 ; i < port->nr_src_pdo; i++) - msg.payload[i] =cpu_to_le32 (port->src_pdo[i]);return tcpm_pd_transmit (port,TCPC_TX_SOP , &msg); }
@@ -941,10 +973,22 @@ static int tcpm_pd_send_source_caps(struct tcpm_port *port)static int tcpm_pd_send_sink_caps (struct tcpm_port *port) {struct pd_message msg; -int i; +u32 pdo; +unsigned int i, nr_pdo =0 ;memset (&msg,0 ,sizeof (msg)); -if (!port->nr_snk_pdo) { + +for (i =0 ; i < port->nr_snk_pdo; i++) { +if (port->negotiated_rev >=PD_REV30 ) { + msg.payload[nr_pdo++] =cpu_to_le32 (port->snk_pdo[i]); + }else { + pdo =tcpm_forge_legacy_pdo (port, port->snk_pdo[i],TYPEC_SINK ); +if (pdo) + msg.payload[nr_pdo++] =cpu_to_le32 (pdo); + } + } + +if (!nr_pdo) {/* No sink capabilities defined, source only */ msg.header = PD_HEADER_LE(PD_CTRL_REJECT, port->pwr_role,
@@ -957,10 +1001,8 @@ static int tcpm_pd_send_sink_caps(struct tcpm_port *port) port->data_role, port->negotiated_rev, port->message_id, - port->nr_snk_pdo); + nr_pdo); } -for (i =0 ; i < port->nr_snk_pdo; i++) - msg.payload[i] =cpu_to_le32 (port->snk_pdo[i]);return tcpm_pd_transmit (port,TCPC_TX_SOP , &msg); }
include/linux/usb/pd.h +1 -0
@@ -225,6 +225,7 @@ enum pd_pdo_type {#define PDO_FIXED_EXTPOWER BIT(27)/* Externally powered */ #define PDO_FIXED_USB_COMM BIT(26)/* USB communications capable */ #define PDO_FIXED_DATA_SWAP BIT(25)/* Data role swap supported */ +#define PDO_FIXED_UNCHUNK_EXT BIT(24)/* Unchunked Extended Message supported (Source) */ #define PDO_FIXED_FRS_CURR_MASK (BIT(24) | BIT(23))/* FR_Swap Current (Sink) */ #define PDO_FIXED_FRS_CURR_SHIFT 23#define PDO_FIXED_VOLT_SHIFT 10/* 50mV units */
Signature · 1 line
2.30.0.284.gd98b1dd5eaa7-goog
Heikki Krogerus
maintainerHi Kyle,
Quoted 4 lines · Kyle Tso
If the port partner is PD2, the PDOs of the local port should follow the format defined in PD2 Spec. Dynamically modify the pre-defined PD3 PDOs and transform them into PD2 format before sending them to the PD2 port partner.
I guess it's not possible for the system to supply separate static PDOs for each PD revision?
Quoted 32 lines
Signed-off-by Kyle Tso <[email protected]>--- drivers/usb/typec/tcpm/tcpm.c | 62 +++++++++++++++++++++++++++++------ include/linux/usb/pd.h | 1 + 2 files changed, 53 insertions(+), 10 deletions(-)drivers/usb/typec/tcpm/tcpm.c +18
-0@@ -911,13 +911,47 @@ static int tcpm_set_pwr_role(struct tcpm_port *port, enum typec_role role)return 0 ; } +/* +* Transform the PDO to be compliant to PD rev2.0. +* Return 0 if the PDO type is not defined in PD rev2.0. +* Otherwise, return the converted PDO. +*/ +static u32 tcpm_forge_legacy_pdo (struct tcpm_port *port,u32 pdo,enum typec_role role) +{ +switch (pdo_type (pdo)) { +case PDO_TYPE_FIXED : +if (role ==TYPEC_SINK ) +return pdo & ~PDO_FIXED_FRS_CURR_MASK ; +else +return pdo & ~PDO_FIXED_UNCHUNK_EXT ; +case PDO_TYPE_VAR : +case PDO_TYPE_BATT : +return pdo; +case PDO_TYPE_APDO : +default :
drivers/usb/typec/tcpm/tcpm.c static int tcpm_set_pwr_role(struct tcpm_port *port, enum typec_role role) · line 940
Quoted 10 lines
drivers/usb/typec/tcpm/tcpm.c +6
-1+return 0 ; + } +} +static int tcpm_pd_send_source_caps (struct tcpm_port *port) {struct pd_message msg; -int i; +u32 pdo; +unsigned int i, nr_pdo =0 ;
Side note. I think this driver uses the "reverse christmas tree" style with the variables.
drivers/usb/typec/tcpm/tcpm.c static int tcpm_set_pwr_role(struct tcpm_port *port, enum typec_role role) · line 952
Quoted 12 lines
drivers/usb/typec/tcpm/tcpm.c +10
-1memset (&msg,0 ,sizeof (msg)); -if (!port->nr_src_pdo) { + +for (i =0 ; i < port->nr_src_pdo; i++) { +if (port->negotiated_rev >=PD_REV30 ) { + msg.payload[nr_pdo++] =cpu_to_le32 (port->src_pdo[i]); + }else { + pdo =tcpm_forge_legacy_pdo (port, port->src_pdo[i],TYPEC_SOURCE ); +if (pdo) + msg.payload[nr_pdo++] =cpu_to_le32 (pdo); + } + }
Why not just generate the PD_REV20 PDOs during probe time and then just use the ones that fit the negotiated_rev here?
Quoted 27 lines
drivers/usb/typec/tcpm/tcpm.c +5
-5+ +if (!nr_pdo) {/* No source capabilities defined, sink only */ msg.header = PD_HEADER_LE(PD_CTRL_REJECT, port->pwr_role,@@ -930,10 +964,8 @@ static int tcpm_pd_send_source_caps(struct tcpm_port *port) port->data_role, port->negotiated_rev, port->message_id, - port->nr_src_pdo); + nr_pdo); } -for (i =0 ; i < port->nr_src_pdo; i++) - msg.payload[i] =cpu_to_le32 (port->src_pdo[i]);return tcpm_pd_transmit (port,TCPC_TX_SOP , &msg); }@@ -941,10 +973,22 @@ static int tcpm_pd_send_source_caps(struct tcpm_port *port)static int tcpm_pd_send_sink_caps (struct tcpm_port *port) {struct pd_message msg; -int i; +u32 pdo; +unsigned int i, nr_pdo =0 ;memset (&msg,0 ,sizeof (msg)); -if (!port->nr_snk_pdo) {
drivers/usb/typec/tcpm/tcpm.c static int tcpm_pd_send_source_caps(struct tcpm_port *port) · line 989
Quoted 10 lines
drivers/usb/typec/tcpm/tcpm.c +10
-0+ +for (i =0 ; i < port->nr_snk_pdo; i++) { +if (port->negotiated_rev >=PD_REV30 ) { + msg.payload[nr_pdo++] =cpu_to_le32 (port->snk_pdo[i]); + }else { + pdo =tcpm_forge_legacy_pdo (port, port->snk_pdo[i],TYPEC_SINK ); +if (pdo) + msg.payload[nr_pdo++] =cpu_to_le32 (pdo); + } + }
ditto.
Quoted 21 lines
drivers/usb/typec/tcpm/tcpm.c +2
-3+if (!nr_pdo) {/* No sink capabilities defined, source only */ msg.header = PD_HEADER_LE(PD_CTRL_REJECT, port->pwr_role,@@ -957,10 +1001,8 @@ static int tcpm_pd_send_sink_caps(struct tcpm_port *port) port->data_role, port->negotiated_rev, port->message_id, - port->nr_snk_pdo); + nr_pdo); } -for (i =0 ; i < port->nr_snk_pdo; i++) - msg.payload[i] =cpu_to_le32 (port->snk_pdo[i]);return tcpm_pd_transmit (port,TCPC_TX_SOP , &msg); }include/linux/usb/pd.h +0
-0
include/linux/usb/pd.h enum pd_pdo_type { · line 231
Quoted 7 lines
include/linux/usb/pd.h +1
-0@@ -225,6 +225,7 @@ enum pd_pdo_type {#define PDO_FIXED_EXTPOWER BIT(27)/* Externally powered */ #define PDO_FIXED_USB_COMM BIT(26)/* USB communications capable */ #define PDO_FIXED_DATA_SWAP BIT(25)/* Data role swap supported */ +#define PDO_FIXED_UNCHUNK_EXT BIT(24)/* Unchunked Extended Message supported (Source) */ #define PDO_FIXED_FRS_CURR_MASK (BIT(24) | BIT(23))/* FR_Swap Current (Sink) */ #define PDO_FIXED_FRS_CURR_SHIFT 23#define PDO_FIXED_VOLT_SHIFT 10/* 50mV units */
thanks,
Signature · 1 line
heikki
Quoted 12 lines · Heikki Krogerus
Hi Kyle,
Quoted 4 lines · Kyle Tso
If the port partner is PD2, the PDOs of the local port should follow the format defined in PD2 Spec. Dynamically modify the pre-defined PD3 PDOs and transform them into PD2 format before sending them to the PD2 port partner.
I guess it's not possible for the system to supply separate static PDOs for each PD revision?
We can do that for sure. But a problem is that if there are more PD revisions in the future, we will need to add more PDO arrays. For backward compatibility, the new revision usually uses the previously-reserved bits for the new features.
From my perspective, the better way to achieve the backward compatibility is to just clear the bits if those are reserved in the previous revision.
I can submit another patch which adds another PDO array for PD2 if you think it is more appropriate.
Quoted 37 lines
Quoted 37 lines
Signed-off-by Kyle Tso <[email protected]>--- drivers/usb/typec/tcpm/tcpm.c | 62 +++++++++++++++++++++++++++++------ include/linux/usb/pd.h | 1 + 2 files changed, 53 insertions(+), 10 deletions(-)drivers/usb/typec/tcpm/tcpm.c +22
-0@@ -911,13 +911,47 @@ static int tcpm_set_pwr_role(struct tcpm_port *port, enum typec_role role)return 0 ; } +/* +* Transform the PDO to be compliant to PD rev2.0. +* Return 0 if the PDO type is not defined in PD rev2.0. +* Otherwise, return the converted PDO. +*/ +static u32 tcpm_forge_legacy_pdo (struct tcpm_port *port,u32 pdo,enum typec_role role) +{ +switch (pdo_type (pdo)) { +case PDO_TYPE_FIXED : +if (role ==TYPEC_SINK ) +return pdo & ~PDO_FIXED_FRS_CURR_MASK ; +else +return pdo & ~PDO_FIXED_UNCHUNK_EXT ; +case PDO_TYPE_VAR : +case PDO_TYPE_BATT : +return pdo; +case PDO_TYPE_APDO : +default : +return 0 ; + } +} +static int tcpm_pd_send_source_caps (struct tcpm_port *port)
Quoted 8 lines
drivers/usb/typec/tcpm/tcpm.c static int tcpm_set_pwr_role(struct tcpm_port *port, enum typec_role role) · line 940
Quoted 5 lines
drivers/usb/typec/tcpm/tcpm.c +2
-1{struct pd_message msg; -int i; +u32 pdo; +unsigned int i, nr_pdo =0 ;Side note. I think this driver uses the "reverse christmas tree" style with the variables.
I will change the order (if there is a next version)
thanks,
Kyle
Hi,
Quoted 14 lines · Kyle Tso
Quoted 12 lines · Heikki Krogerus
Hi Kyle,
Quoted 4 lines · Kyle Tso
If the port partner is PD2, the PDOs of the local port should follow the format defined in PD2 Spec. Dynamically modify the pre-defined PD3 PDOs and transform them into PD2 format before sending them to the PD2 port partner.
I guess it's not possible for the system to supply separate static PDOs for each PD revision?
Quoted 7 lines
We can do that for sure. But a problem is that if there are more PD revisions in the future, we will need to add more PDO arrays. For backward compatibility, the new revision usually uses the previously-reserved bits for the new features.
Quoted 1 line
From my perspective, the better way to achieve the backward
compatibility is to just clear the bits if those are reserved in the previous revision.
I was trying to think of something better for this, but I got nothing. I'm not completely comfortable with this, but never mind. Let's just go with this.
Quoted 2 lines
I can submit another patch which adds another PDO array for PD2 if you think it is more appropriate.
Not necessary.
Quoted 50 lines
Quoted 37 lines
Quoted 37 lines
Signed-off-by Kyle Tso <[email protected]>--- drivers/usb/typec/tcpm/tcpm.c | 62 +++++++++++++++++++++++++++++------ include/linux/usb/pd.h | 1 + 2 files changed, 53 insertions(+), 10 deletions(-)drivers/usb/typec/tcpm/tcpm.c +22
-0@@ -911,13 +911,47 @@ static int tcpm_set_pwr_role(struct tcpm_port *port, enum typec_role role)return 0 ; } +/* +* Transform the PDO to be compliant to PD rev2.0. +* Return 0 if the PDO type is not defined in PD rev2.0. +* Otherwise, return the converted PDO. +*/ +static u32 tcpm_forge_legacy_pdo (struct tcpm_port *port,u32 pdo,enum typec_role role) +{ +switch (pdo_type (pdo)) { +case PDO_TYPE_FIXED : +if (role ==TYPEC_SINK ) +return pdo & ~PDO_FIXED_FRS_CURR_MASK ; +else +return pdo & ~PDO_FIXED_UNCHUNK_EXT ; +case PDO_TYPE_VAR : +case PDO_TYPE_BATT : +return pdo; +case PDO_TYPE_APDO : +default : +return 0 ; + } +} +static int tcpm_pd_send_source_caps (struct tcpm_port *port)Quoted 8 lines
drivers/usb/typec/tcpm/tcpm.c static int tcpm_set_pwr_role(struct tcpm_port *port, enum typec_role role) · line 940
Quoted 5 lines
drivers/usb/typec/tcpm/tcpm.c +2
-1{struct pd_message msg; -int i; +u32 pdo; +unsigned int i, nr_pdo =0 ;Side note. I think this driver uses the "reverse christmas tree" style with the variables.
I will change the order (if there is a next version)
thanks,
Kyle
Signature · 1 line
heikki
Quoted 6 lines · Kyle Tso
If the port partner is PD2, the PDOs of the local port should follow the format defined in PD2 Spec. Dynamically modify the pre-defined PD3 PDOs and transform them into PD2 format before sending them to the PD2 port partner.
Signed-off-by Kyle Tso <[email protected]>
I don't like this too much, but I don't have a better idea. Thus,
Guenter
Quoted 121 lines
--- drivers/usb/typec/tcpm/tcpm.c | 62 +++++++++++++++++++++++++++++------ include/linux/usb/pd.h | 1 + 2 files changed, 53 insertions(+), 10 deletions(-)drivers/usb/typec/tcpm/tcpm.c +52
-10@@ -911,13 +911,47 @@ static int tcpm_set_pwr_role(struct tcpm_port *port, enum typec_role role)return 0 ; } +/* +* Transform the PDO to be compliant to PD rev2.0. +* Return 0 if the PDO type is not defined in PD rev2.0. +* Otherwise, return the converted PDO. +*/ +static u32 tcpm_forge_legacy_pdo (struct tcpm_port *port,u32 pdo,enum typec_role role) +{ +switch (pdo_type (pdo)) { +case PDO_TYPE_FIXED : +if (role ==TYPEC_SINK ) +return pdo & ~PDO_FIXED_FRS_CURR_MASK ; +else +return pdo & ~PDO_FIXED_UNCHUNK_EXT ; +case PDO_TYPE_VAR : +case PDO_TYPE_BATT : +return pdo; +case PDO_TYPE_APDO : +default : +return 0 ; + } +} +static int tcpm_pd_send_source_caps (struct tcpm_port *port) {struct pd_message msg; -int i; +u32 pdo; +unsigned int i, nr_pdo =0 ;memset (&msg,0 ,sizeof (msg)); -if (!port->nr_src_pdo) { + +for (i =0 ; i < port->nr_src_pdo; i++) { +if (port->negotiated_rev >=PD_REV30 ) { + msg.payload[nr_pdo++] =cpu_to_le32 (port->src_pdo[i]); + }else { + pdo =tcpm_forge_legacy_pdo (port, port->src_pdo[i],TYPEC_SOURCE ); +if (pdo) + msg.payload[nr_pdo++] =cpu_to_le32 (pdo); + } + } + +if (!nr_pdo) {/* No source capabilities defined, sink only */ msg.header = PD_HEADER_LE(PD_CTRL_REJECT, port->pwr_role,@@ -930,10 +964,8 @@ static int tcpm_pd_send_source_caps(struct tcpm_port *port) port->data_role, port->negotiated_rev, port->message_id, - port->nr_src_pdo); + nr_pdo); } -for (i =0 ; i < port->nr_src_pdo; i++) - msg.payload[i] =cpu_to_le32 (port->src_pdo[i]);return tcpm_pd_transmit (port,TCPC_TX_SOP , &msg); }@@ -941,10 +973,22 @@ static int tcpm_pd_send_source_caps(struct tcpm_port *port)static int tcpm_pd_send_sink_caps (struct tcpm_port *port) {struct pd_message msg; -int i; +u32 pdo; +unsigned int i, nr_pdo =0 ;memset (&msg,0 ,sizeof (msg)); -if (!port->nr_snk_pdo) { + +for (i =0 ; i < port->nr_snk_pdo; i++) { +if (port->negotiated_rev >=PD_REV30 ) { + msg.payload[nr_pdo++] =cpu_to_le32 (port->snk_pdo[i]); + }else { + pdo =tcpm_forge_legacy_pdo (port, port->snk_pdo[i],TYPEC_SINK ); +if (pdo) + msg.payload[nr_pdo++] =cpu_to_le32 (pdo); + } + } + +if (!nr_pdo) {/* No sink capabilities defined, source only */ msg.header = PD_HEADER_LE(PD_CTRL_REJECT, port->pwr_role,@@ -957,10 +1001,8 @@ static int tcpm_pd_send_sink_caps(struct tcpm_port *port) port->data_role, port->negotiated_rev, port->message_id, - port->nr_snk_pdo); + nr_pdo); } -for (i =0 ; i < port->nr_snk_pdo; i++) - msg.payload[i] =cpu_to_le32 (port->snk_pdo[i]);return tcpm_pd_transmit (port,TCPC_TX_SOP , &msg); }include/linux/usb/pd.h +1
-0@@ -225,6 +225,7 @@ enum pd_pdo_type {#define PDO_FIXED_EXTPOWER BIT(27)/* Externally powered */ #define PDO_FIXED_USB_COMM BIT(26)/* USB communications capable */ #define PDO_FIXED_DATA_SWAP BIT(25)/* Data role swap supported */ +#define PDO_FIXED_UNCHUNK_EXT BIT(24)/* Unchunked Extended Message supported (Source) */ #define PDO_FIXED_FRS_CURR_MASK (BIT(24) | BIT(23))/* FR_Swap Current (Sink) */ #define PDO_FIXED_FRS_CURR_SHIFT 23#define PDO_FIXED_VOLT_SHIFT 10/* 50mV units */