From nobody Sat Oct 4 14:12:47 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 54AF9946A; Fri, 15 Aug 2025 18:32:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755282736; cv=none; b=D2Y4+1X67QtSBICQbgoPsaU1p1q7qtHX8XFE27gQin7EM1gvGu2mkGQTubUDpx1GB4l9ov7IV9EEXyIi0nvFBJorjMbY6irFawFvbU4OSfwh/uCiquqhyXk4ciWKlLOrGYnx6SX5QNMvd/7TUPlefZAu6CycpB2WtCtqG866SuI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755282736; c=relaxed/simple; bh=k/hVQtPf/YplLXIDsqdhaq22mUPS3WD/l1OuxiARJfs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ZQ32JENA+Jt9gFGwUsoseSwLivbcIXeTXQrv4rn76YuYaTN24ItrJeaUoXQmmVfTQv57yye+mRwUYkASMMzYxqDy2uo9+MOT3mCVeiEnQBJyKy03HpMoi2yCUZ/i3imQyKPfuRKdVMSPrA88EhM2++6X5O/okwMw6CGeq9sFBjs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=llEhxguw; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="llEhxguw" Received: by smtp.kernel.org (Postfix) with ESMTPS id 3233BC4CEF6; Fri, 15 Aug 2025 18:32:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1755282736; bh=k/hVQtPf/YplLXIDsqdhaq22mUPS3WD/l1OuxiARJfs=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=llEhxguwOjaJnGKxqOz7buWLcmS2BPO/DgX2TWj/sN5uiA3n52m60vivhsOwXRCBW dFjhcwuhExDWY1ZkLrHE3DiGClLfjKvWOBizeGN4+D1gS6J4MBlyxBZGZddoNHkijW 9KqR2myRCd2iTIznblPxtrziJ4bPS3YSGHOUQOSYTOAA4KRYgxHs3l2C4g2l9UvEw1 cLZzQD1G98BrIM1GEyVQ9pd7kv+6tSxkjNlmJ92CJijCkKqng24C2Kt6BL10Q3peK9 8zRykc73gg+9PPeYHUnv1af4kHYXsIyWAlGpXV3mRDp2JZq3IONHQqluJbCK8PoviP WbtXhuHDfXCbQ== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 275E4CA0ED1; Fri, 15 Aug 2025 18:32:16 +0000 (UTC) From: Amit Sunil Dhamne via B4 Relay Date: Fri, 15 Aug 2025 11:31:52 -0700 Subject: [PATCH v2 2/2] usb: typec: maxim_contaminant: re-enable cc toggle if cc is open and port is clean Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250815-fix-upstream-contaminant-v2-2-6c8d6c3adafb@google.com> References: <20250815-fix-upstream-contaminant-v2-0-6c8d6c3adafb@google.com> In-Reply-To: <20250815-fix-upstream-contaminant-v2-0-6c8d6c3adafb@google.com> To: Heikki Krogerus , Greg Kroah-Hartman , Badhri Jagan Sridharan , Guenter Roeck Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, RD Babiera , Kyle Tso , =?utf-8?q?Andr=C3=A9_Draszik?= , Peter Griffin , Tudor Ambarus , Amit Sunil Dhamne X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1755282735; l=3851; i=amitsd@google.com; s=20241031; h=from:subject:message-id; bh=EWnT1ifJAgl1Osv4yGiXsCaYOzDaaQyWwT/7zjrH7aQ=; b=rvbTFbaa4EqrfOIvMfO9ErfjvRxt6r3Sdvwn+i6BHgY7mrPr8wRcqwe4dtWipx1UX8lSKPRhY oAlPewPQ5ChCkfnXYhJI4SjTta/ErnBkXDKnVYD43mj5OnenRIoxDNx X-Developer-Key: i=amitsd@google.com; a=ed25519; pk=wD+XZSST4dmnNZf62/lqJpLm7fiyT8iv462zmQ3H6bI= X-Endpoint-Received: by B4 Relay for amitsd@google.com/20241031 with auth_id=262 X-Original-From: Amit Sunil Dhamne Reply-To: amitsd@google.com From: Amit Sunil Dhamne 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. Fixes: 02b332a06397e ("usb: typec: maxim_contaminant: Implement check_conta= minant callback") Cc: stable@vger.kernel.org Signed-off-by: Amit Sunil Dhamne Reviewed-by: Badhri Jagan Sridharan Reviewed-by: Heikki Krogerus --- drivers/usb/typec/tcpm/maxim_contaminant.c | 53 ++++++++++++++++++++++++++= ++++ 1 file changed, 53 insertions(+) diff --git a/drivers/usb/typec/tcpm/maxim_contaminant.c b/drivers/usb/typec= /tcpm/maxim_contaminant.c index 818cfe226ac7716de2fcbce205c67ea16acba592..af8da6dc60ae0bc5900f6614514= d51f41eded8ab 100644 --- a/drivers/usb/typec/tcpm/maxim_contaminant.c +++ b/drivers/usb/typec/tcpm/maxim_contaminant.c @@ -329,6 +329,39 @@ static int max_contaminant_enable_dry_detection(struct= max_tcpci_chip *chip) return 0; } =20 +static int max_contaminant_enable_toggling(struct max_tcpci_chip *chip) +{ + struct regmap *regmap =3D chip->data.regmap; + int ret; + + /* Disable dry detection if enabled. */ + ret =3D regmap_update_bits(regmap, TCPC_VENDOR_CC_CTRL2, CCLPMODESEL, + FIELD_PREP(CCLPMODESEL, + LOW_POWER_MODE_DISABLE)); + if (ret) + return ret; + + ret =3D regmap_update_bits(regmap, TCPC_VENDOR_CC_CTRL1, CCCONNDRY, 0); + if (ret) + return ret; + + ret =3D 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 =3D 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 disc= onnect_while_debounce, bool *cc_handled) { @@ -345,6 +378,12 @@ bool max_contaminant_is_contaminant(struct max_tcpci_c= hip *chip, bool disconnect if (ret < 0) return false; =20 + if (cc_status & TCPC_CC_STATUS_TOGGLING) { + if (chip->contaminant_state =3D=3D DETECTED) + return true; + return false; + } + if (chip->contaminant_state =3D=3D NOT_DETECTED || chip->contaminant_stat= e =3D=3D SINK) { if (!disconnect_while_debounce) msleep(100); @@ -377,6 +416,12 @@ bool max_contaminant_is_contaminant(struct max_tcpci_c= hip *chip, bool disconnect max_contaminant_enable_dry_detection(chip); return true; } + + ret =3D max_contaminant_enable_toggling(chip); + if (ret) + dev_err(chip->dev, + "Failed to enable toggling, ret=3D%d", + ret); } } else if (chip->contaminant_state =3D=3D DETECTED) { if (!(cc_status & TCPC_CC_STATUS_TOGGLING)) { @@ -384,6 +429,14 @@ bool max_contaminant_is_contaminant(struct max_tcpci_c= hip *chip, bool disconnect if (chip->contaminant_state =3D=3D DETECTED) { max_contaminant_enable_dry_detection(chip); return true; + } else { + ret =3D max_contaminant_enable_toggling(chip); + if (ret) { + dev_err(chip->dev, + "Failed to enable toggling, ret=3D%d", + ret); + return true; + } } } } --=20 2.51.0.rc1.167.g924127e9c0-goog