usb: typec: fusb302: Resolve fixed role power configuration
Subsystems (2)
cover usb: typec: fusb302: Resolve fixed role power configuration
This small patch set updates the fusb302 driver to correctly report CC line status during attach, when the device is configured as source only or sink only (non-DRP), so that TCPM state machine correctly proceeds with contract establishment. In addition, a trivial typo with regards to the OFF toggling state for the device is corrected.
Changes are based on usb-testing (ae8a2ca8a221)
Adam Thomson (2):
usb: typec: fusb302: Correct spelling mistake for toggling state
usb: typec: fusb302: Resolve fixed power role contract setup
drivers/usb/typec/tcpm/fusb302.c | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-)
Signature · 1 line
1.9.1
PATCH 1/2 usb: typec: fusb302: Correct spelling mistake for toggling state
There's a typo in the enum name of the 'OFF' state for toggling (TOGGLINE instead of TOGGLING). This commit resolves that trivial spelling inconsistency.
--- drivers/usb/typec/tcpm/fusb302.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/usb/typec/tcpm/fusb302.c +6 -6
@@ -42,7 +42,7 @@#define T_BC_LVL_DEBOUNCE_DELAY_MS 30enum toggling_mode { -TOGGLINE_MODE_OFF , +TOGGLING_MODE_OFF ,TOGGLING_MODE_DRP ,TOGGLING_MODE_SNK ,TOGGLING_MODE_SRC ,
@@ -594,7 +594,7 @@ static int fusb302_set_toggling(struct fusb302_chip *chip, chip->intr_comp_chng = false;/* configure toggling mode: none/snk/src/drp */ switch (mode) { -case TOGGLINE_MODE_OFF : +case TOGGLING_MODE_OFF : ret =fusb302_i2c_mask_write (chip,FUSB_REG_CONTROL2 ,FUSB_REG_CONTROL2_MODE_MASK ,FUSB_REG_CONTROL2_MODE_NONE );
@@ -626,7 +626,7 @@ static int fusb302_set_toggling(struct fusb302_chip *chip,break ; } -if (mode ==TOGGLINE_MODE_OFF ) { +if (mode ==TOGGLING_MODE_OFF ) {/* mask TOGDONE interrupt */ ret =fusb302_i2c_set_bits (chip,FUSB_REG_MASKA ,FUSB_REG_MASKA_TOGDONE );
@@ -702,7 +702,7 @@ static int tcpm_set_cc(struct tcpc_dev *dev, enum typec_cc_status cc) ret = -EINVAL ; goto done; } - ret =fusb302_set_toggling (chip,TOGGLINE_MODE_OFF ); + ret =fusb302_set_toggling (chip,TOGGLING_MODE_OFF );if (ret <0 ) {fusb302_log (chip,"cannot stop toggling, ret=%d" , ret); goto done;
@@ -1292,7 +1292,7 @@ static int fusb302_handle_togdone_snk(struct fusb302_chip *chip,tcpm_cc_change (chip->tcpm_port); }/* turn off toggling */ - ret =fusb302_set_toggling (chip,TOGGLINE_MODE_OFF ); + ret =fusb302_set_toggling (chip,TOGGLING_MODE_OFF );if (ret <0 ) {fusb302_log (chip,"cannot set toggling mode off, ret=%d" , ret);
@@ -1388,7 +1388,7 @@ static int fusb302_handle_togdone_src(struct fusb302_chip *chip,tcpm_cc_change (chip->tcpm_port); }/* turn off toggling */ - ret =fusb302_set_toggling (chip,TOGGLINE_MODE_OFF ); + ret =fusb302_set_toggling (chip,TOGGLING_MODE_OFF );if (ret <0 ) {fusb302_log (chip,"cannot set toggling mode off, ret=%d" , ret);
Re: [PATCH 1/2] usb: typec: fusb302: Correct spelling mistake for toggling state
Quoted 5 lines · Adam Thomson
There's a typo in the enum name of the 'OFF' state for toggling (TOGGLINE instead of TOGGLING). This commit resolves that trivial spelling inconsistency.
Signed-off-by Adam Thomson <[email protected]>
Quoted 65 lines
--- drivers/usb/typec/tcpm/fusb302.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)drivers/usb/typec/tcpm/fusb302.c +6
-6@@ -42,7 +42,7 @@#define T_BC_LVL_DEBOUNCE_DELAY_MS 30enum toggling_mode { -TOGGLINE_MODE_OFF , +TOGGLING_MODE_OFF ,TOGGLING_MODE_DRP ,TOGGLING_MODE_SNK ,TOGGLING_MODE_SRC ,@@ -594,7 +594,7 @@ static int fusb302_set_toggling(struct fusb302_chip *chip, chip->intr_comp_chng = false;/* configure toggling mode: none/snk/src/drp */ switch (mode) { -case TOGGLINE_MODE_OFF : +case TOGGLING_MODE_OFF : ret =fusb302_i2c_mask_write (chip,FUSB_REG_CONTROL2 ,FUSB_REG_CONTROL2_MODE_MASK ,FUSB_REG_CONTROL2_MODE_NONE );@@ -626,7 +626,7 @@ static int fusb302_set_toggling(struct fusb302_chip *chip,break ; } -if (mode ==TOGGLINE_MODE_OFF ) { +if (mode ==TOGGLING_MODE_OFF ) {/* mask TOGDONE interrupt */ ret =fusb302_i2c_set_bits (chip,FUSB_REG_MASKA ,FUSB_REG_MASKA_TOGDONE );@@ -702,7 +702,7 @@ static int tcpm_set_cc(struct tcpc_dev *dev, enum typec_cc_status cc) ret = -EINVAL ; goto done; } - ret =fusb302_set_toggling (chip,TOGGLINE_MODE_OFF ); + ret =fusb302_set_toggling (chip,TOGGLING_MODE_OFF );if (ret <0 ) {fusb302_log (chip,"cannot stop toggling, ret=%d" , ret); goto done;@@ -1292,7 +1292,7 @@ static int fusb302_handle_togdone_snk(struct fusb302_chip *chip,tcpm_cc_change (chip->tcpm_port); }/* turn off toggling */ - ret =fusb302_set_toggling (chip,TOGGLINE_MODE_OFF ); + ret =fusb302_set_toggling (chip,TOGGLING_MODE_OFF );if (ret <0 ) {fusb302_log (chip,"cannot set toggling mode off, ret=%d" , ret);@@ -1388,7 +1388,7 @@ static int fusb302_handle_togdone_src(struct fusb302_chip *chip,tcpm_cc_change (chip->tcpm_port); }/* turn off toggling */ - ret =fusb302_set_toggling (chip,TOGGLINE_MODE_OFF ); + ret =fusb302_set_toggling (chip,TOGGLING_MODE_OFF );if (ret <0 ) {fusb302_log (chip,"cannot set toggling mode off, ret=%d" , ret);Signature · 1 line
1.9.1
Re: [PATCH 1/2] usb: typec: fusb302: Correct spelling mistake for toggling state
In reply to Adam ThomsonQuoted 5 lines · Adam Thomson
There's a typo in the enum name of the 'OFF' state for toggling (TOGGLINE instead of TOGGLING). This commit resolves that trivial spelling inconsistency.
Signed-off-by Adam Thomson <[email protected]>
Quoted 64 lines
--- drivers/usb/typec/tcpm/fusb302.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)drivers/usb/typec/tcpm/fusb302.c +6
-6@@ -42,7 +42,7 @@#define T_BC_LVL_DEBOUNCE_DELAY_MS 30enum toggling_mode { -TOGGLINE_MODE_OFF , +TOGGLING_MODE_OFF ,TOGGLING_MODE_DRP ,TOGGLING_MODE_SNK ,TOGGLING_MODE_SRC ,@@ -594,7 +594,7 @@ static int fusb302_set_toggling(struct fusb302_chip *chip, chip->intr_comp_chng = false;/* configure toggling mode: none/snk/src/drp */ switch (mode) { -case TOGGLINE_MODE_OFF : +case TOGGLING_MODE_OFF : ret =fusb302_i2c_mask_write (chip,FUSB_REG_CONTROL2 ,FUSB_REG_CONTROL2_MODE_MASK ,FUSB_REG_CONTROL2_MODE_NONE );@@ -626,7 +626,7 @@ static int fusb302_set_toggling(struct fusb302_chip *chip,break ; } -if (mode ==TOGGLINE_MODE_OFF ) { +if (mode ==TOGGLING_MODE_OFF ) {/* mask TOGDONE interrupt */ ret =fusb302_i2c_set_bits (chip,FUSB_REG_MASKA ,FUSB_REG_MASKA_TOGDONE );@@ -702,7 +702,7 @@ static int tcpm_set_cc(struct tcpc_dev *dev, enum typec_cc_status cc) ret = -EINVAL ; goto done; } - ret =fusb302_set_toggling (chip,TOGGLINE_MODE_OFF ); + ret =fusb302_set_toggling (chip,TOGGLING_MODE_OFF );if (ret <0 ) {fusb302_log (chip,"cannot stop toggling, ret=%d" , ret); goto done;@@ -1292,7 +1292,7 @@ static int fusb302_handle_togdone_snk(struct fusb302_chip *chip,tcpm_cc_change (chip->tcpm_port); }/* turn off toggling */ - ret =fusb302_set_toggling (chip,TOGGLINE_MODE_OFF ); + ret =fusb302_set_toggling (chip,TOGGLING_MODE_OFF );if (ret <0 ) {fusb302_log (chip,"cannot set toggling mode off, ret=%d" , ret);@@ -1388,7 +1388,7 @@ static int fusb302_handle_togdone_src(struct fusb302_chip *chip,tcpm_cc_change (chip->tcpm_port); }/* turn off toggling */ - ret =fusb302_set_toggling (chip,TOGGLINE_MODE_OFF ); + ret =fusb302_set_toggling (chip,TOGGLING_MODE_OFF );if (ret <0 ) {fusb302_log (chip,"cannot set toggling mode off, ret=%d" , ret);Signature · 1 line
1.9.1
PATCH 2/2 usb: typec: fusb302: Resolve fixed power role contract setup
In reply to Adam ThomsonWhen the controller is configured for a fixed power role (Source only or Sink only), attach does not proceed within the TCPM state machine as there is no CC event generated by this driver to update the CC line status.
To rectify this, when CC is configured as Source or Sink we now make use of the hardware's automatic fixed Source or Sink toggling mechanism, which detects attaches in the same way as for DRP toggling. In this way the result of toggling is handled in the same way by the 'fusb302_handle_togdone()' function, and CC events are generated as expected for TCPM allowing a contract to be established.
--- drivers/usb/typec/tcpm/fusb302.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
drivers/usb/typec/tcpm/fusb302.c +24 -0
@@ -679,6 +679,7 @@ static int tcpm_set_cc(struct tcpc_dev *dev, enum typec_cc_status cc)int ret =0 ;bool pull_up, pull_down;u8 rd_mda; +enum toggling_mode mode;mutex_lock (&chip->lock);switch (cc) {
@@ -764,6 +765,29 @@ static int tcpm_set_cc(struct tcpc_dev *dev, enum typec_cc_status cc) chip->intr_comp_chng = false; }fusb302_log (chip,"cc := %s" , typec_cc_status_name[cc]); + +/* Enable detection for fixed SNK or SRC only roles */ +switch (cc) { +case TYPEC_CC_RD : + mode =TOGGLING_MODE_SNK ; +break ; +case TYPEC_CC_RP_DEF : +case TYPEC_CC_RP_1_5 : +case TYPEC_CC_RP_3_0 : + mode =TOGGLING_MODE_SRC ; +break ; +default : + mode =TOGGLING_MODE_OFF ; +break ; + } + +if (mode !=TOGGLING_MODE_OFF ) { + ret =fusb302_set_toggling (chip, mode); +if (ret <0 ) +fusb302_log (chip, +"cannot set fixed role toggling mode, ret=%d" , + ret); + } done:mutex_unlock (&chip->lock);
Re: [PATCH 2/2] usb: typec: fusb302: Resolve fixed power role contract setup
Quoted 13 lines · Adam Thomson
When the controller is configured for a fixed power role (Source only or Sink only), attach does not proceed within the TCPM state machine as there is no CC event generated by this driver to update the CC line status.
To rectify this, when CC is configured as Source or Sink we now make use of the hardware's automatic fixed Source or Sink toggling mechanism, which detects attaches in the same way as for DRP toggling. In this way the result of toggling is handled in the same way by the '
fusb302_handle_togdone()' function, and CC events are generated as expected for TCPM allowing a contract to be established.
Quoted 1 line
Signed-off-by Adam Thomson <[email protected]>
Quoted 49 lines
--- drivers/usb/typec/tcpm/fusb302.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)drivers/usb/typec/tcpm/fusb302.c +24
-0@@ -679,6 +679,7 @@ static int tcpm_set_cc(struct tcpc_dev *dev, enum typec_cc_status cc)int ret =0 ;bool pull_up, pull_down;u8 rd_mda; +enum toggling_mode mode;mutex_lock (&chip->lock);switch (cc) {@@ -764,6 +765,29 @@ static int tcpm_set_cc(struct tcpc_dev *dev, enum typec_cc_status cc) chip->intr_comp_chng = false; }fusb302_log (chip,"cc := %s" , typec_cc_status_name[cc]); + +/* Enable detection for fixed SNK or SRC only roles */ +switch (cc) { +case TYPEC_CC_RD : + mode =TOGGLING_MODE_SNK ; +break ; +case TYPEC_CC_RP_DEF : +case TYPEC_CC_RP_1_5 : +case TYPEC_CC_RP_3_0 : + mode =TOGGLING_MODE_SRC ; +break ; +default : + mode =TOGGLING_MODE_OFF ; +break ; + } + +if (mode !=TOGGLING_MODE_OFF ) { + ret =fusb302_set_toggling (chip, mode); +if (ret <0 ) +fusb302_log (chip, +"cannot set fixed role toggling mode, ret=%d" , + ret); + } done:mutex_unlock (&chip->lock);Signature · 1 line
1.9.1
Re: [PATCH 2/2] usb: typec: fusb302: Resolve fixed power role contract setup
In reply to Adam ThomsonQuoted 13 lines · Adam Thomson
When the controller is configured for a fixed power role (Source only or Sink only), attach does not proceed within the TCPM state machine as there is no CC event generated by this driver to update the CC line status.
To rectify this, when CC is configured as Source or Sink we now make use of the hardware's automatic fixed Source or Sink toggling mechanism, which detects attaches in the same way as for DRP toggling. In this way the result of toggling is handled in the same way by the '
fusb302_handle_togdone()' function, and CC events are generated as expected for TCPM allowing a contract to be established.
Quoted 1 line
Signed-off-by Adam Thomson <[email protected]>
Quoted 48 lines
--- drivers/usb/typec/tcpm/fusb302.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)drivers/usb/typec/tcpm/fusb302.c +24
-0@@ -679,6 +679,7 @@ static int tcpm_set_cc(struct tcpc_dev *dev, enum typec_cc_status cc)int ret =0 ;bool pull_up, pull_down;u8 rd_mda; +enum toggling_mode mode;mutex_lock (&chip->lock);switch (cc) {@@ -764,6 +765,29 @@ static int tcpm_set_cc(struct tcpc_dev *dev, enum typec_cc_status cc) chip->intr_comp_chng = false; }fusb302_log (chip,"cc := %s" , typec_cc_status_name[cc]); + +/* Enable detection for fixed SNK or SRC only roles */ +switch (cc) { +case TYPEC_CC_RD : + mode =TOGGLING_MODE_SNK ; +break ; +case TYPEC_CC_RP_DEF : +case TYPEC_CC_RP_1_5 : +case TYPEC_CC_RP_3_0 : + mode =TOGGLING_MODE_SRC ; +break ; +default : + mode =TOGGLING_MODE_OFF ; +break ; + } + +if (mode !=TOGGLING_MODE_OFF ) { + ret =fusb302_set_toggling (chip, mode); +if (ret <0 ) +fusb302_log (chip, +"cannot set fixed role toggling mode, ret=%d" , + ret); + } done:mutex_unlock (&chip->lock);Signature · 1 line
1.9.1