FAILED: patch "[PATCH] usb: typec: maxim_contaminant: re-enable cc toggle if cc is" failed to apply to 6.6-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x a381c6d6f646226924809d0ad01a9465786da463
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2025082346-facedown-granddad-9758@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From a381c6d6f646226924809d0ad01a9465786da463 Mon Sep 17 00:00:00 2001
From: Amit Sunil Dhamne <[email protected]>
Date: Fri, 15 Aug 2025 11:31:52 -0700
Subject: [PATCH] usb: typec: maxim_contaminant: re-enable cc toggle if cc is
open and port is clean
Presently in max_contaminant_is_contaminant() if there's no contaminant detected previously, CC is open & stopped toggling and no contaminant is currently present, TCPC.RC would be programmed to do DRP toggling. However, it didn't actively look for a connection. This would lead to Type-C not detect *any* new connections. Hence, in the above situation, re-enable toggling & program TCPC to look for a new connection.
Also, return early if TCPC was looking for connection as this indicates TCPC has neither detected a potential connection nor a change in contaminant state.
In addition, once dry detection is complete (port is dry), restart toggling.
drivers/usb/typec/tcpm/maxim_contaminant.c +53 -0
@@ -329,6 +329,39 @@ static int max_contaminant_enable_dry_detection(struct max_tcpci_chip *chip)return 0 ; } +static int max_contaminant_enable_toggling (struct max_tcpci_chip *chip) +{ +struct regmap *regmap = chip->data.regmap; +int ret; + +/* Disable dry detection if enabled. */ + ret =regmap_update_bits (regmap,TCPC_VENDOR_CC_CTRL2 ,CCLPMODESEL , +FIELD_PREP (CCLPMODESEL , +LOW_POWER_MODE_DISABLE )); +if (ret) +return ret; + + ret =regmap_update_bits (regmap,TCPC_VENDOR_CC_CTRL1 ,CCCONNDRY ,0 ); +if (ret) +return ret; + + ret =max_tcpci_write8 (chip,TCPC_ROLE_CTRL ,TCPC_ROLE_CTRL_DRP | +FIELD_PREP (TCPC_ROLE_CTRL_CC1 , +TCPC_ROLE_CTRL_CC_RD ) | +FIELD_PREP (TCPC_ROLE_CTRL_CC2 , +TCPC_ROLE_CTRL_CC_RD )); +if (ret) +return ret; + + ret =regmap_update_bits (regmap,TCPC_TCPC_CTRL , +TCPC_TCPC_CTRL_EN_LK4CONN_ALRT , +TCPC_TCPC_CTRL_EN_LK4CONN_ALRT ); +if (ret) +return ret; + +return max_tcpci_write8 (chip,TCPC_COMMAND ,TCPC_CMD_LOOK4CONNECTION ); +} +bool max_contaminant_is_contaminant (struct max_tcpci_chip *chip,bool disconnect_while_debounce,bool *cc_handled) {
@@ -345,6 +378,12 @@ bool max_contaminant_is_contaminant(struct max_tcpci_chip *chip, bool disconnectif (ret <0 )return false; +if (cc_status &TCPC_CC_STATUS_TOGGLING ) { +if (chip->contaminant_state ==DETECTED ) +return true; +return false; + } +if (chip->contaminant_state ==NOT_DETECTED || chip->contaminant_state ==SINK ) {if (!disconnect_while_debounce)msleep (100 );
@@ -377,6 +416,12 @@ bool max_contaminant_is_contaminant(struct max_tcpci_chip *chip, bool disconnectmax_contaminant_enable_dry_detection (chip);return true; } + + ret =max_contaminant_enable_toggling (chip); +if (ret) +dev_err (chip->dev, +"Failed to enable toggling, ret=%d" , + ret); } }else if (chip->contaminant_state ==DETECTED ) {if (!(cc_status &TCPC_CC_STATUS_TOGGLING )) {
@@ -384,6 +429,14 @@ bool max_contaminant_is_contaminant(struct max_tcpci_chip *chip, bool disconnectif (chip->contaminant_state ==DETECTED ) {max_contaminant_enable_dry_detection (chip);return true; + }else { + ret =max_contaminant_enable_toggling (chip); +if (ret) { +dev_err (chip->dev, +"Failed to enable toggling, ret=%d" , + ret); +return true; + } } } }
Sasha Levin
maintainerPATCH 1/1 usb: typec: maxim_contaminant: re-enable cc toggle if cc is open and port is clean
From: Amit Sunil Dhamne <[email protected]>
[ Upstream commit a381c6d6f646226924809d0ad01a9465786da463 ]
Presently in max_contaminant_is_contaminant() if there's no contaminant detected previously, CC is open & stopped toggling and no contaminant is currently present, TCPC.RC would be programmed to do DRP toggling. However, it didn't actively look for a connection. This would lead to Type-C not detect *any* new connections. Hence, in the above situation, re-enable toggling & program TCPC to look for a new connection.
Also, return early if TCPC was looking for connection as this indicates TCPC has neither detected a potential connection nor a change in contaminant state.
In addition, once dry detection is complete (port is dry), restart toggling.
--- drivers/usb/typec/tcpm/maxim_contaminant.c | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+)
drivers/usb/typec/tcpm/maxim_contaminant.c +48 -0
@@ -322,6 +322,34 @@ static int max_contaminant_enable_dry_detection(struct max_tcpci_chip *chip)return 0 ; } +static int max_contaminant_enable_toggling (struct max_tcpci_chip *chip) +{ +struct regmap *regmap = chip->data.regmap; +int ret; + +/* Disable dry detection if enabled. */ + ret =regmap_update_bits (regmap,TCPC_VENDOR_CC_CTRL2 ,CCLPMODESEL_MASK , +ULTRA_LOW_POWER_MODE ); +if (ret) +return ret; + + ret =regmap_update_bits (regmap,TCPC_VENDOR_CC_CTRL1 ,CCCONNDRY ,0 ); +if (ret) +return ret; + + ret =max_tcpci_write8 (chip,TCPC_ROLE_CTRL ,TCPC_ROLE_CTRL_DRP |0xA ); +if (ret) +return ret; + + ret =regmap_update_bits (regmap,TCPC_TCPC_CTRL , +TCPC_TCPC_CTRL_EN_LK4CONN_ALRT , +TCPC_TCPC_CTRL_EN_LK4CONN_ALRT ); +if (ret) +return ret; + +return max_tcpci_write8 (chip,TCPC_COMMAND ,TCPC_CMD_LOOK4CONNECTION ); +} +bool max_contaminant_is_contaminant (struct max_tcpci_chip *chip,bool disconnect_while_debounce) {u8 cc_status, pwr_cntl;
@@ -335,6 +363,12 @@ bool max_contaminant_is_contaminant(struct max_tcpci_chip *chip, bool disconnectif (ret <0 )return false; +if (cc_status &TCPC_CC_STATUS_TOGGLING ) { +if (chip->contaminant_state ==DETECTED ) +return true; +return false; + } +if (chip->contaminant_state ==NOT_DETECTED || chip->contaminant_state ==SINK ) {if (!disconnect_while_debounce)msleep (100 );
@@ -367,6 +401,12 @@ bool max_contaminant_is_contaminant(struct max_tcpci_chip *chip, bool disconnectmax_contaminant_enable_dry_detection (chip);return true; } + + ret =max_contaminant_enable_toggling (chip); +if (ret) +dev_err (chip->dev, +"Failed to enable toggling, ret=%d" , + ret); }return false; }else if (chip->contaminant_state ==DETECTED ) {
@@ -375,6 +415,14 @@ bool max_contaminant_is_contaminant(struct max_tcpci_chip *chip, bool disconnectif (chip->contaminant_state ==DETECTED ) {max_contaminant_enable_dry_detection (chip);return true; + }else { + ret =max_contaminant_enable_toggling (chip); +if (ret) { +dev_err (chip->dev, +"Failed to enable toggling, ret=%d" , + ret); +return true; + } } } }
Signature · 1 line
2.50.1