From: Heikki Krogerus <heikki.krogerus@linux.intel.com>
To: amitsd@google.com
Cc: "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Badhri Jagan Sridharan" <badhri@google.com>,
"Guenter Roeck" <linux@roeck-us.net>,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
stable@vger.kernel.org, "RD Babiera" <rdbabiera@google.com>,
"Kyle Tso" <kyletso@google.com>,
"André Draszik" <andre.draszik@linaro.org>,
"Peter Griffin" <peter.griffin@linaro.org>,
"Tudor Ambarus" <tudor.ambarus@linaro.org>
Subject: Re: [PATCH v2 1/2] usb: typec: maxim_contaminant: disable low power mode when reading comparator values
Date: Thu, 21 Aug 2025 10:11:04 +0300 [thread overview]
Message-ID: <aKbGiLh2FrCM4dLk@kuha.fi.intel.com> (raw)
In-Reply-To: <20250815-fix-upstream-contaminant-v2-1-6c8d6c3adafb@google.com>
On Fri, Aug 15, 2025 at 11:31:51AM -0700, Amit Sunil Dhamne via B4 Relay wrote:
> From: Amit Sunil Dhamne <amitsd@google.com>
>
> Low power mode is enabled when reading CC resistance as part of
> `max_contaminant_read_resistance_kohm()` and left in that state.
> However, it's supposed to work with 1uA current source. To read CC
> comparator values current source is changed to 80uA. This causes a storm
> of CC interrupts as it (falsely) detects a potential contaminant. To
> prevent this, disable low power mode current sourcing before reading
> comparator values.
>
> Fixes: 02b332a06397 ("usb: typec: maxim_contaminant: Implement check_contaminant callback")
> Cc: stable@vger.kernel.org
> Signed-off-by: Amit Sunil Dhamne <amitsd@google.com>
> Reviewed-by: Badhri Jagan Sridharan <badhri@google.com>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> ---
> drivers/usb/typec/tcpm/maxim_contaminant.c | 5 +++++
> drivers/usb/typec/tcpm/tcpci_maxim.h | 1 +
> 2 files changed, 6 insertions(+)
>
> diff --git a/drivers/usb/typec/tcpm/maxim_contaminant.c b/drivers/usb/typec/tcpm/maxim_contaminant.c
> index 0cdda06592fd3cc34e2179ccd49ef677f8ec9792..818cfe226ac7716de2fcbce205c67ea16acba592 100644
> --- a/drivers/usb/typec/tcpm/maxim_contaminant.c
> +++ b/drivers/usb/typec/tcpm/maxim_contaminant.c
> @@ -188,6 +188,11 @@ static int max_contaminant_read_comparators(struct max_tcpci_chip *chip, u8 *ven
> if (ret < 0)
> return ret;
>
> + /* Disable low power mode */
> + ret = regmap_update_bits(regmap, TCPC_VENDOR_CC_CTRL2, CCLPMODESEL,
> + FIELD_PREP(CCLPMODESEL,
> + LOW_POWER_MODE_DISABLE));
> +
> /* Sleep to allow comparators settle */
> usleep_range(5000, 6000);
> ret = regmap_update_bits(regmap, TCPC_TCPC_CTRL, TCPC_TCPC_CTRL_ORIENTATION, PLUG_ORNT_CC1);
> diff --git a/drivers/usb/typec/tcpm/tcpci_maxim.h b/drivers/usb/typec/tcpm/tcpci_maxim.h
> index 76270d5c283880dc49b13cabe7d682f2c2bf15fe..b33540a42a953dc6d8197790ee4af3b6f52791ce 100644
> --- a/drivers/usb/typec/tcpm/tcpci_maxim.h
> +++ b/drivers/usb/typec/tcpm/tcpci_maxim.h
> @@ -21,6 +21,7 @@
> #define CCOVPDIS BIT(6)
> #define SBURPCTRL BIT(5)
> #define CCLPMODESEL GENMASK(4, 3)
> +#define LOW_POWER_MODE_DISABLE 0
> #define ULTRA_LOW_POWER_MODE 1
> #define CCRPCTRL GENMASK(2, 0)
> #define UA_1_SRC 1
>
> --
> 2.51.0.rc1.167.g924127e9c0-goog
>
--
heikki
next prev parent reply other threads:[~2025-08-21 7:11 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-15 18:31 [PATCH v2 0/2] Fixes for maxim tcpc contaminant detection logic Amit Sunil Dhamne via B4 Relay
2025-08-15 18:31 ` [PATCH v2 1/2] usb: typec: maxim_contaminant: disable low power mode when reading comparator values Amit Sunil Dhamne via B4 Relay
2025-08-21 7:11 ` Heikki Krogerus [this message]
2025-08-15 18:31 ` [PATCH v2 2/2] usb: typec: maxim_contaminant: re-enable cc toggle if cc is open and port is clean Amit Sunil Dhamne via B4 Relay
2025-08-21 7:12 ` Heikki Krogerus
2025-08-21 7:15 ` Heikki Krogerus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=aKbGiLh2FrCM4dLk@kuha.fi.intel.com \
--to=heikki.krogerus@linux.intel.com \
--cc=amitsd@google.com \
--cc=andre.draszik@linaro.org \
--cc=badhri@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=kyletso@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=peter.griffin@linaro.org \
--cc=rdbabiera@google.com \
--cc=stable@vger.kernel.org \
--cc=tudor.ambarus@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox