Skip to contentSkip to conversation

usb: typec: tcpci: Prevent Sink disconnection before vPpsShutdown in SPR PPS

PATCH In review Kyle Tso 4 participants 5 messages Jan 14, 2025 – Jan 17, 2025

Subsystems (4)
lore
Share & tools
lore

Kyle Tso

author
#0 lore raw

PATCH 1/1 usb: typec: tcpci: Prevent Sink disconnection before vPpsShutdown in SPR PPS

The Source can drop its output voltage to the minimum of the requested PPS APDO voltage range when it is in Current Limit Mode. If this voltage falls within the range of vPpsShutdown, the Source initiates a Hard Reset and discharges Vbus. However, currently the Sink may disconnect before the voltage reaches vPpsShutdown, leading to unexpected behavior.

Prevent premature disconnection by setting the Sink's disconnect threshold to the minimum vPpsShutdown value. Additionally, consider the voltage drop due to IR drop when calculating the appropriate threshold. This ensures a robust and reliable interaction between the Source and Sink during SPR PPS Current Limit Mode operation.

Fixes 4288debeaa4e ("usb: typec: tcpci: Fix up sink disconnect thresholds for PD")
---
 drivers/usb/typec/tcpm/tcpci.c | 13 +++++++++----
 drivers/usb/typec/tcpm/tcpm.c  |  8 +++++---
 include/linux/usb/tcpm.h       |  3 ++-
 3 files changed, 16 insertions(+), 8 deletions(-)
drivers/usb/typec/tcpm/tcpci.c +9 -4
index 48762508cc86..19ab6647af70 100644
@@ -27,6 +27,7 @@
 #define	VPPS_NEW_MIN_PERCENT			95
 #define	VPPS_VALID_MIN_MV			100
 #define	VSINKDISCONNECT_PD_MIN_PERCENT		90
+#define	VPPS_SHUTDOWN_MIN_PERCENT		85
 
 struct tcpci {
 	struct device *dev;
@@ -366,7 +367,8 @@ static int tcpci_enable_auto_vbus_discharge(struct tcpc_dev *dev, bool enable)
 }
 
 static int tcpci_set_auto_vbus_discharge_threshold(struct tcpc_dev *dev, enum typec_pwr_opmode mode,
-						   bool pps_active, u32 requested_vbus_voltage_mv)
+						   bool pps_active, u32 requested_vbus_voltage_mv,
+						   u32 apdo_min_voltage_mv)
 {
 	struct tcpci *tcpci = tcpc_to_tcpci(dev);
 	unsigned int pwr_ctrl, threshold = 0;
@@ -388,9 +390,12 @@ static int tcpci_set_auto_vbus_discharge_threshold(struct tcpc_dev *dev, enum ty
 		threshold = AUTO_DISCHARGE_DEFAULT_THRESHOLD_MV;
 	} else if (mode == TYPEC_PWR_MODE_PD) {
 		if (pps_active)
-			threshold = ((VPPS_NEW_MIN_PERCENT * requested_vbus_voltage_mv / 100) -
-				     VSINKPD_MIN_IR_DROP_MV - VPPS_VALID_MIN_MV) *
-				     VSINKDISCONNECT_PD_MIN_PERCENT / 100;
+			/*
+			 * To prevent disconnect when the source is in Current Limit Mode.
+			 * Set the threshold to the lowest possible voltage vPpsShutdown (min)
+			 */
+			threshold = VPPS_SHUTDOWN_MIN_PERCENT * apdo_min_voltage_mv / 100 -
+				    VSINKPD_MIN_IR_DROP_MV;
 		else
 			threshold = ((VSRC_NEW_MIN_PERCENT * requested_vbus_voltage_mv / 100) -
 				     VSINKPD_MIN_IR_DROP_MV - VSRC_VALID_MIN_MV) *
drivers/usb/typec/tcpm/tcpm.c +5 -3
index 460dbde9fe22..e4b85a09c3ae 100644
@@ -2973,10 +2973,12 @@ static int tcpm_set_auto_vbus_discharge_threshold(struct tcpm_port *port,
 		return 0;
 
 	ret = port->tcpc->set_auto_vbus_discharge_threshold(port->tcpc, mode, pps_active,
-							    requested_vbus_voltage);
+							    requested_vbus_voltage,
+							    port->pps_data.min_volt);
 	tcpm_log_force(port,
-		       "set_auto_vbus_discharge_threshold mode:%d pps_active:%c vbus:%u ret:%d",
-		       mode, pps_active ? 'y' : 'n', requested_vbus_voltage, ret);
+		       "set_auto_vbus_discharge_threshold mode:%d pps_active:%c vbus:%u pps_apdo_min_volt:%u ret:%d",
+		       mode, pps_active ? 'y' : 'n', requested_vbus_voltage,
+		       port->pps_data.min_volt, ret);
 
 	return ret;
 }
include/linux/usb/tcpm.h +2 -1
index 061da9546a81..b22e659f81ba 100644
@@ -163,7 +163,8 @@ struct tcpc_dev {
 	void (*frs_sourcing_vbus)(struct tcpc_dev *dev);
 	int (*enable_auto_vbus_discharge)(struct tcpc_dev *dev, bool enable);
 	int (*set_auto_vbus_discharge_threshold)(struct tcpc_dev *dev, enum typec_pwr_opmode mode,
-						 bool pps_active, u32 requested_vbus_voltage);
+						 bool pps_active, u32 requested_vbus_voltage,
+						 u32 pps_apdo_min_voltage);
 	bool (*is_vbus_vsafe0v)(struct tcpc_dev *dev);
 	void (*set_partner_usb_comm_capable)(struct tcpc_dev *dev, bool enable);
 	void (*check_contaminant)(struct tcpc_dev *dev);
Signature · 1 line
2.47.1.688.g23fc6f90ad-goog
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 13 lines · Kyle Tso

The Source can drop its output voltage to the minimum of the requested PPS APDO voltage range when it is in Current Limit Mode. If this voltage falls within the range of vPpsShutdown, the Source initiates a Hard Reset and discharges Vbus. However, currently the Sink may disconnect before the voltage reaches vPpsShutdown, leading to unexpected behavior.

Prevent premature disconnection by setting the Sink's disconnect threshold to the minimum vPpsShutdown value. Additionally, consider the voltage drop due to IR drop when calculating the appropriate threshold. This ensures a robust and reliable interaction between the Source and Sink during SPR PPS Current Limit Mode operation.

Quoted 3 lines
Fixes 4288debeaa4e ("usb: typec: tcpci: Fix up sink disconnect thresholds for PD")
Quoted 81 lines
---
 drivers/usb/typec/tcpm/tcpci.c | 13 +++++++++----
 drivers/usb/typec/tcpm/tcpm.c  |  8 +++++---
 include/linux/usb/tcpm.h       |  3 ++-
 3 files changed, 16 insertions(+), 8 deletions(-)
drivers/usb/typec/tcpm/tcpci.c +9 -4
index 48762508cc86..19ab6647af70 100644
@@ -27,6 +27,7 @@
 #define        VPPS_NEW_MIN_PERCENT                    95
 #define        VPPS_VALID_MIN_MV                       100
 #define        VSINKDISCONNECT_PD_MIN_PERCENT          90
+#define        VPPS_SHUTDOWN_MIN_PERCENT               85
 
 struct tcpci {
        struct device *dev;
@@ -366,7 +367,8 @@ static int tcpci_enable_auto_vbus_discharge(struct tcpc_dev *dev, bool enable)
 }
 
 static int tcpci_set_auto_vbus_discharge_threshold(struct tcpc_dev *dev, enum typec_pwr_opmode mode,
-                                                  bool pps_active, u32 requested_vbus_voltage_mv)
+                                                  bool pps_active, u32 requested_vbus_voltage_mv,
+                                                  u32 apdo_min_voltage_mv)
 {
        struct tcpci *tcpci = tcpc_to_tcpci(dev);
        unsigned int pwr_ctrl, threshold = 0;
@@ -388,9 +390,12 @@ static int tcpci_set_auto_vbus_discharge_threshold(struct tcpc_dev *dev, enum ty
                threshold = AUTO_DISCHARGE_DEFAULT_THRESHOLD_MV;
        } else if (mode == TYPEC_PWR_MODE_PD) {
                if (pps_active)
-                       threshold = ((VPPS_NEW_MIN_PERCENT * requested_vbus_voltage_mv / 100) -
-                                    VSINKPD_MIN_IR_DROP_MV - VPPS_VALID_MIN_MV) *
-                                    VSINKDISCONNECT_PD_MIN_PERCENT / 100;
+                       /*
+                        * To prevent disconnect when the source is in Current Limit Mode.
+                        * Set the threshold to the lowest possible voltage vPpsShutdown (min)
+                        */
+                       threshold = VPPS_SHUTDOWN_MIN_PERCENT * apdo_min_voltage_mv / 100 -
+                                   VSINKPD_MIN_IR_DROP_MV;
                else
                        threshold = ((VSRC_NEW_MIN_PERCENT * requested_vbus_voltage_mv / 100) -
                                     VSINKPD_MIN_IR_DROP_MV - VSRC_VALID_MIN_MV) *
drivers/usb/typec/tcpm/tcpm.c +5 -3
index 460dbde9fe22..e4b85a09c3ae 100644
@@ -2973,10 +2973,12 @@ static int tcpm_set_auto_vbus_discharge_threshold(struct tcpm_port *port,
                return 0;
 
        ret = port->tcpc->set_auto_vbus_discharge_threshold(port->tcpc, mode, pps_active,
-                                                           requested_vbus_voltage);
+                                                           requested_vbus_voltage,
+                                                           port->pps_data.min_volt);
        tcpm_log_force(port,
-                      "set_auto_vbus_discharge_threshold mode:%d pps_active:%c vbus:%u ret:%d",
-                      mode, pps_active ? 'y' : 'n', requested_vbus_voltage, ret);
+                      "set_auto_vbus_discharge_threshold mode:%d pps_active:%c vbus:%u pps_apdo_min_volt:%u ret:%d",
+                      mode, pps_active ? 'y' : 'n', requested_vbus_voltage,
+                      port->pps_data.min_volt, ret);
 
        return ret;
 }
include/linux/usb/tcpm.h +2 -2
index 061da9546a81..b22e659f81ba 100644
@@ -163,7 +163,8 @@ struct tcpc_dev {
        void (*frs_sourcing_vbus)(struct tcpc_dev *dev);
        int (*enable_auto_vbus_discharge)(struct tcpc_dev *dev, bool enable);
        int (*set_auto_vbus_discharge_threshold)(struct tcpc_dev *dev, enum typec_pwr_opmode mode,
-                                                bool pps_active, u32 requested_vbus_voltage);
+                                                bool pps_active, u32 requested_vbus_voltage,
+                                                u32 pps_apdo_min_voltage);
        bool (*is_vbus_vsafe0v)(struct tcpc_dev *dev);
        void (*set_partner_usb_comm_capable)(struct tcpc_dev *dev, bool enable);
        void (*check_contaminant)(struct tcpc_dev *dev);
--

2.47.1.688.g23fc6f90ad-goog

maintainer Reviewed-by on v1 1/1
#2 lore raw
In reply to Kyle Tso
Quoted 12 lines · Kyle Tso

The Source can drop its output voltage to the minimum of the requested PPS APDO voltage range when it is in Current Limit Mode. If this voltage falls within the range of vPpsShutdown, the Source initiates a Hard Reset and discharges Vbus. However, currently the Sink may disconnect before the voltage reaches vPpsShutdown, leading to unexpected behavior.

Prevent premature disconnection by setting the Sink's disconnect threshold to the minimum vPpsShutdown value. Additionally, consider the voltage drop due to IR drop when calculating the appropriate threshold. This ensures a robust and reliable interaction between the Source and Sink during SPR PPS Current Limit Mode operation.

Quoted 3 lines
Fixes 4288debeaa4e ("usb: typec: tcpci: Fix up sink disconnect thresholds for PD")

You've resend this, right? So is this v2 (or v1)?

Quoted 80 lines
---
 drivers/usb/typec/tcpm/tcpci.c | 13 +++++++++----
 drivers/usb/typec/tcpm/tcpm.c  |  8 +++++---
 include/linux/usb/tcpm.h       |  3 ++-
 3 files changed, 16 insertions(+), 8 deletions(-)
drivers/usb/typec/tcpm/tcpci.c +9 -4
index 48762508cc86..19ab6647af70 100644
@@ -27,6 +27,7 @@
 #define	VPPS_NEW_MIN_PERCENT			95
 #define	VPPS_VALID_MIN_MV			100
 #define	VSINKDISCONNECT_PD_MIN_PERCENT		90
+#define	VPPS_SHUTDOWN_MIN_PERCENT		85
 
 struct tcpci {
 	struct device *dev;
@@ -366,7 +367,8 @@ static int tcpci_enable_auto_vbus_discharge(struct tcpc_dev *dev, bool enable)
 }
 
 static int tcpci_set_auto_vbus_discharge_threshold(struct tcpc_dev *dev, enum typec_pwr_opmode mode,
-						   bool pps_active, u32 requested_vbus_voltage_mv)
+						   bool pps_active, u32 requested_vbus_voltage_mv,
+						   u32 apdo_min_voltage_mv)
 {
 	struct tcpci *tcpci = tcpc_to_tcpci(dev);
 	unsigned int pwr_ctrl, threshold = 0;
@@ -388,9 +390,12 @@ static int tcpci_set_auto_vbus_discharge_threshold(struct tcpc_dev *dev, enum ty
 		threshold = AUTO_DISCHARGE_DEFAULT_THRESHOLD_MV;
 	} else if (mode == TYPEC_PWR_MODE_PD) {
 		if (pps_active)
-			threshold = ((VPPS_NEW_MIN_PERCENT * requested_vbus_voltage_mv / 100) -
-				     VSINKPD_MIN_IR_DROP_MV - VPPS_VALID_MIN_MV) *
-				     VSINKDISCONNECT_PD_MIN_PERCENT / 100;
+			/*
+			 * To prevent disconnect when the source is in Current Limit Mode.
+			 * Set the threshold to the lowest possible voltage vPpsShutdown (min)
+			 */
+			threshold = VPPS_SHUTDOWN_MIN_PERCENT * apdo_min_voltage_mv / 100 -
+				    VSINKPD_MIN_IR_DROP_MV;
 		else
 			threshold = ((VSRC_NEW_MIN_PERCENT * requested_vbus_voltage_mv / 100) -
 				     VSINKPD_MIN_IR_DROP_MV - VSRC_VALID_MIN_MV) *
drivers/usb/typec/tcpm/tcpm.c +5 -3
index 460dbde9fe22..e4b85a09c3ae 100644
@@ -2973,10 +2973,12 @@ static int tcpm_set_auto_vbus_discharge_threshold(struct tcpm_port *port,
 		return 0;
 
 	ret = port->tcpc->set_auto_vbus_discharge_threshold(port->tcpc, mode, pps_active,
-							    requested_vbus_voltage);
+							    requested_vbus_voltage,
+							    port->pps_data.min_volt);
 	tcpm_log_force(port,
-		       "set_auto_vbus_discharge_threshold mode:%d pps_active:%c vbus:%u ret:%d",
-		       mode, pps_active ? 'y' : 'n', requested_vbus_voltage, ret);
+		       "set_auto_vbus_discharge_threshold mode:%d pps_active:%c vbus:%u pps_apdo_min_volt:%u ret:%d",
+		       mode, pps_active ? 'y' : 'n', requested_vbus_voltage,
+		       port->pps_data.min_volt, ret);
 
 	return ret;
 }
include/linux/usb/tcpm.h +2 -1
index 061da9546a81..b22e659f81ba 100644
@@ -163,7 +163,8 @@ struct tcpc_dev {
 	void (*frs_sourcing_vbus)(struct tcpc_dev *dev);
 	int (*enable_auto_vbus_discharge)(struct tcpc_dev *dev, bool enable);
 	int (*set_auto_vbus_discharge_threshold)(struct tcpc_dev *dev, enum typec_pwr_opmode mode,
-						 bool pps_active, u32 requested_vbus_voltage);
+						 bool pps_active, u32 requested_vbus_voltage,
+						 u32 pps_apdo_min_voltage);
 	bool (*is_vbus_vsafe0v)(struct tcpc_dev *dev);
 	void (*set_partner_usb_comm_capable)(struct tcpc_dev *dev, bool enable);
 	void (*check_contaminant)(struct tcpc_dev *dev);
Signature · 1 line
2.47.1.688.g23fc6f90ad-goog
Signature · 1 line
heikki
author
#3 lore raw
Quoted 14 lines · Heikki Krogerus
Quoted 12 lines · Kyle Tso

The Source can drop its output voltage to the minimum of the requested PPS APDO voltage range when it is in Current Limit Mode. If this voltage falls within the range of vPpsShutdown, the Source initiates a Hard Reset and discharges Vbus. However, currently the Sink may disconnect before the voltage reaches vPpsShutdown, leading to unexpected behavior.

Prevent premature disconnection by setting the Sink's disconnect threshold to the minimum vPpsShutdown value. Additionally, consider the voltage drop due to IR drop when calculating the appropriate threshold. This ensures a robust and reliable interaction between the Source and Sink during SPR PPS Current Limit Mode operation.

Quoted 8 lines
Quoted 3 lines
Fixes 4288debeaa4e ("usb: typec: tcpci: Fix up sink disconnect thresholds for PD")

You've resend this, right? So is this v2 (or v1)?

Hello Heikki,

Thank you for the review.

Apologies for the resend. This is indeed the v1 patch. The previous email was accidentally sent with an incomplete recipient list.

Thanks,
Kyle

Quoted 83 lines
Quoted 79 lines
---
 drivers/usb/typec/tcpm/tcpci.c | 13 +++++++++----
 drivers/usb/typec/tcpm/tcpm.c  |  8 +++++---
 include/linux/usb/tcpm.h       |  3 ++-
 3 files changed, 16 insertions(+), 8 deletions(-)
drivers/usb/typec/tcpm/tcpci.c +9 -4
index 48762508cc86..19ab6647af70 100644
@@ -27,6 +27,7 @@
 #define      VPPS_NEW_MIN_PERCENT                    95
 #define      VPPS_VALID_MIN_MV                       100
 #define      VSINKDISCONNECT_PD_MIN_PERCENT          90
+#define      VPPS_SHUTDOWN_MIN_PERCENT               85
 
 struct tcpci {
      struct device *dev;
@@ -366,7 +367,8 @@ static int tcpci_enable_auto_vbus_discharge(struct tcpc_dev *dev, bool enable)
 }
 
 static int tcpci_set_auto_vbus_discharge_threshold(struct tcpc_dev *dev, enum typec_pwr_opmode mode,
-                                                bool pps_active, u32 requested_vbus_voltage_mv)
+                                                bool pps_active, u32 requested_vbus_voltage_mv,
+                                                u32 apdo_min_voltage_mv)
 {
      struct tcpci *tcpci = tcpc_to_tcpci(dev);
      unsigned int pwr_ctrl, threshold = 0;
@@ -388,9 +390,12 @@ static int tcpci_set_auto_vbus_discharge_threshold(struct tcpc_dev *dev, enum ty
              threshold = AUTO_DISCHARGE_DEFAULT_THRESHOLD_MV;
      } else if (mode == TYPEC_PWR_MODE_PD) {
              if (pps_active)
-                     threshold = ((VPPS_NEW_MIN_PERCENT * requested_vbus_voltage_mv / 100) -
-                                  VSINKPD_MIN_IR_DROP_MV - VPPS_VALID_MIN_MV) *
-                                  VSINKDISCONNECT_PD_MIN_PERCENT / 100;
+                     /*
+                      * To prevent disconnect when the source is in Current Limit Mode.
+                      * Set the threshold to the lowest possible voltage vPpsShutdown (min)
+                      */
+                     threshold = VPPS_SHUTDOWN_MIN_PERCENT * apdo_min_voltage_mv / 100 -
+                                 VSINKPD_MIN_IR_DROP_MV;
              else
                      threshold = ((VSRC_NEW_MIN_PERCENT * requested_vbus_voltage_mv / 100) -
                                   VSINKPD_MIN_IR_DROP_MV - VSRC_VALID_MIN_MV) *
drivers/usb/typec/tcpm/tcpm.c +5 -3
index 460dbde9fe22..e4b85a09c3ae 100644
@@ -2973,10 +2973,12 @@ static int tcpm_set_auto_vbus_discharge_threshold(struct tcpm_port *port,
              return 0;
 
      ret = port->tcpc->set_auto_vbus_discharge_threshold(port->tcpc, mode, pps_active,
-                                                         requested_vbus_voltage);
+                                                         requested_vbus_voltage,
+                                                         port->pps_data.min_volt);
      tcpm_log_force(port,
-                    "set_auto_vbus_discharge_threshold mode:%d pps_active:%c vbus:%u ret:%d",
-                    mode, pps_active ? 'y' : 'n', requested_vbus_voltage, ret);
+                    "set_auto_vbus_discharge_threshold mode:%d pps_active:%c vbus:%u pps_apdo_min_volt:%u ret:%d",
+                    mode, pps_active ? 'y' : 'n', requested_vbus_voltage,
+                    port->pps_data.min_volt, ret);
 
      return ret;
 }
include/linux/usb/tcpm.h +2 -2
index 061da9546a81..b22e659f81ba 100644
@@ -163,7 +163,8 @@ struct tcpc_dev {
      void (*frs_sourcing_vbus)(struct tcpc_dev *dev);
      int (*enable_auto_vbus_discharge)(struct tcpc_dev *dev, bool enable);
      int (*set_auto_vbus_discharge_threshold)(struct tcpc_dev *dev, enum typec_pwr_opmode mode,
-                                              bool pps_active, u32 requested_vbus_voltage);
+                                              bool pps_active, u32 requested_vbus_voltage,
+                                              u32 pps_apdo_min_voltage);
      bool (*is_vbus_vsafe0v)(struct tcpc_dev *dev);
      void (*set_partner_usb_comm_capable)(struct tcpc_dev *dev, bool enable);
      void (*check_contaminant)(struct tcpc_dev *dev);
--
Quoted 1 line

2.47.1.688.g23fc6f90ad-goog

--
heikki

maintainer
#4 lore raw
Quoted 25 lines · Kyle Tso
Quoted 14 lines · Heikki Krogerus
Quoted 12 lines · Kyle Tso

The Source can drop its output voltage to the minimum of the requested PPS APDO voltage range when it is in Current Limit Mode. If this voltage falls within the range of vPpsShutdown, the Source initiates a Hard Reset and discharges Vbus. However, currently the Sink may disconnect before the voltage reaches vPpsShutdown, leading to unexpected behavior.

Prevent premature disconnection by setting the Sink's disconnect threshold to the minimum vPpsShutdown value. Additionally, consider the voltage drop due to IR drop when calculating the appropriate threshold. This ensures a robust and reliable interaction between the Source and Sink during SPR PPS Current Limit Mode operation.

Quoted 8 lines
Quoted 3 lines
Fixes 4288debeaa4e ("usb: typec: tcpci: Fix up sink disconnect thresholds for PD")

You've resend this, right? So is this v2 (or v1)?

Quoted 6 lines

Hello Heikki,

Thank you for the review.

Apologies for the resend. This is indeed the v1 patch. The previous email was accidentally sent with an incomplete recipient list.

Our tools play havoc when we have duplicates like this, always increment the version number when resending as obviously you did the resend for some reason. Also, it let's us know which ones to review, what would you do if you saw both of these in your inbox?

I'll try to fix this up by hand this time..

thanks,

greg k-h