From patchwork Thu Dec 8 15:04:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Badhri Jagan Sridharan X-Patchwork-Id: 632178 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5815CC63703 for ; Thu, 8 Dec 2022 15:05:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229561AbiLHPFE (ORCPT ); Thu, 8 Dec 2022 10:05:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50968 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230051AbiLHPFD (ORCPT ); Thu, 8 Dec 2022 10:05:03 -0500 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EADFF57B54 for ; Thu, 8 Dec 2022 07:05:01 -0800 (PST) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-3dfb9d11141so16577737b3.3 for ; Thu, 08 Dec 2022 07:05:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=rgcJmSY/a3u3/TKPh3sf1WEcjrc/opZ8FA/EjT+FEzA=; b=bee95gXMVlaSHPjGxdRRdoBEJRlUc8HO478qdX3Gn4pp+oowyEHZEnY0J4HmU1GQf/ aQZBj7AWnUP+ZSjNS5P8r9Pa29jbaulYyjK+ysoJ2si33cyYcAl3kLJO38egOGc7GZz5 oyU5YoQFiFzyI6ZE4329Z5OLUiU/3c1kBViNxN5rsXpIFQLvu6bT7MEFcTs9dy4Le+Dj /q9X4JbbaqohoQHBH9G1tqLpebk1ir8zQP049JUF3j1QYquhIH6GNwrKDrkIpSF77Sjh Ux5F3lC56u4vjrhs9RHD5oFhwSsLlSdzwhYf3ZiB925oxIOKBiingqQNbDVaQz0AHQTD /80Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=rgcJmSY/a3u3/TKPh3sf1WEcjrc/opZ8FA/EjT+FEzA=; b=17bVjbki7GXnmADyshSvXct9KVeGmrSNGQMVoXL03C3LYTdORpur67q9FAWmHa2Vhu i59ubHGxfJC7MlHnMqElkqaMwjJo+aoMwNVg59ylaVpAHVwx/tB7rhQyeInk/U+3wfTV 4QFBagf3T7MyacF6p6KzNLiRWjs4YvJXwZpbzBfbrgUdhCpiNGUWuvP1nkAD3NYh8ATd 7yHtr3rxt8kEDNRxV2OqeCDYRsX99u5blpGlsVojbbJP/Vl9hfK92qrRMYwcfCmlDHJP e8pEvKZ6zMfXr/kHo6MtyEBU/HO0+hc752gnBph/VXdT6Z9QdMbEohtZieWdiXx0Th3J INIg== X-Gm-Message-State: ANoB5pmYR0dTt5FldVqJOPIs1Z6g9DJAx7ePnfImcze5v3uJkQyWDMFQ jDFKSWH4u+9e60Et554zCyit2yum5nc= X-Google-Smtp-Source: AA0mqf6ZCZHTKOBGc7FXx532jY1CZ58ivW4l9hvUCyogvYH0kcq/BIxRsRtxStu/At01eE0UX8jd/oBiCzI= X-Received: from badhri.mtv.corp.google.com ([2620:15c:211:201:592e:36a9:5604:2233]) (user=badhri job=sendgmr) by 2002:a81:4b05:0:b0:38d:e8f4:c8ba with SMTP id y5-20020a814b05000000b0038de8f4c8bamr23301840ywa.159.1670511901241; Thu, 08 Dec 2022 07:05:01 -0800 (PST) Date: Thu, 8 Dec 2022 07:04:55 -0800 In-Reply-To: <20221208150456.473056-1-badhri@google.com> Mime-Version: 1.0 References: <20221208150456.473056-1-badhri@google.com> X-Mailer: git-send-email 2.39.0.rc0.267.gcb52ba06e7-goog Message-ID: <20221208150456.473056-2-badhri@google.com> Subject: [PATCH v6 2/3] usb: typec: tcpci: Add callback for evaluating contaminant presence From: Badhri Jagan Sridharan To: Guenter Roeck , Heikki Krogerus , Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Kyle Tso , Badhri Jagan Sridharan Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org This change adds callback to evaluate presence of contaminant in the TCPCI layer. Signed-off-by: Badhri Jagan Sridharan --- Changes since v5: * None Changes since v4: * None Changes since v3: * None Changes since v2: * Added tcpci_is_potential_contaminant to offload * disconnect_while_debounce logic --- drivers/usb/typec/tcpm/tcpci.c | 20 ++++++++++++++++++++ include/linux/usb/tcpci.h | 13 +++++++++++++ 2 files changed, 33 insertions(+) diff --git a/drivers/usb/typec/tcpm/tcpci.c b/drivers/usb/typec/tcpm/tcpci.c index fe781a38dc82..2aadf785970f 100644 --- a/drivers/usb/typec/tcpm/tcpci.c +++ b/drivers/usb/typec/tcpm/tcpci.c @@ -403,6 +403,24 @@ static void tcpci_frs_sourcing_vbus(struct tcpc_dev *dev) tcpci->data->frs_sourcing_vbus(tcpci, tcpci->data); } +static bool tcpci_is_potential_contaminant(struct tcpc_dev *dev, enum tcpm_state current_state) +{ + struct tcpci *tcpci = tcpc_to_tcpci(dev); + + if (tcpci->data->is_potential_contaminant) + return tcpci->data->is_potential_contaminant(tcpci, tcpci->data, current_state); + + return false; +} + +static void tcpci_check_contaminant(struct tcpc_dev *dev) +{ + struct tcpci *tcpci = tcpc_to_tcpci(dev); + + if (tcpci->data->check_contaminant) + tcpci->data->check_contaminant(tcpci, tcpci->data); +} + static int tcpci_set_bist_data(struct tcpc_dev *tcpc, bool enable) { struct tcpci *tcpci = tcpc_to_tcpci(tcpc); @@ -777,6 +795,8 @@ struct tcpci *tcpci_register_port(struct device *dev, struct tcpci_data *data) tcpci->tcpc.enable_frs = tcpci_enable_frs; tcpci->tcpc.frs_sourcing_vbus = tcpci_frs_sourcing_vbus; tcpci->tcpc.set_partner_usb_comm_capable = tcpci_set_partner_usb_comm_capable; + tcpci->tcpc.is_potential_contaminant = tcpci_is_potential_contaminant; + tcpci->tcpc.check_contaminant = tcpci_check_contaminant; if (tcpci->data->auto_discharge_disconnect) { tcpci->tcpc.enable_auto_vbus_discharge = tcpci_enable_auto_vbus_discharge; diff --git a/include/linux/usb/tcpci.h b/include/linux/usb/tcpci.h index 17657451c762..548e85fdc7fa 100644 --- a/include/linux/usb/tcpci.h +++ b/include/linux/usb/tcpci.h @@ -188,6 +188,16 @@ struct tcpci; * Optional; The USB Communications Capable bit indicates if port * partner is capable of communication over the USB data lines * (e.g. D+/- or SS Tx/Rx). Called to notify the status of the bit. + * @check_contaminant: + * Optional; The callback is invoked when chiplevel drivers indicated + * that the USB port needs to be checked for contaminant presence. + * Chip level drivers are expected to check for contaminant and call + * tcpm_clean_port when the port is clean to put the port back into + * toggling state. + * @is_potential_contaminant: + * Optional; TCPM invokes the callback for every TCPM state machine + * transition. Chiplevel drivers can monitor the state machine + * transitions to flag for potential contaminant presence. */ struct tcpci_data { struct regmap *regmap; @@ -204,6 +214,9 @@ struct tcpci_data { void (*frs_sourcing_vbus)(struct tcpci *tcpci, struct tcpci_data *data); void (*set_partner_usb_comm_capable)(struct tcpci *tcpci, struct tcpci_data *data, bool capable); + void (*check_contaminant)(struct tcpci *tcpci, struct tcpci_data *data); + bool (*is_potential_contaminant)(struct tcpci *tcpci, struct tcpci_data *data, + enum tcpm_state current_state); }; struct tcpci *tcpci_register_port(struct device *dev, struct tcpci_data *data);