From mboxrd@z Thu Jan 1 00:00:00 1970 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 6D5AAC3DA78 for ; Sat, 14 Jan 2023 09:33:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229991AbjANJdC (ORCPT ); Sat, 14 Jan 2023 04:33:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56952 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229954AbjANJcz (ORCPT ); Sat, 14 Jan 2023 04:32:55 -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 83711659E for ; Sat, 14 Jan 2023 01:32:53 -0800 (PST) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-4ce566db73eso183129077b3.11 for ; Sat, 14 Jan 2023 01:32:53 -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=Wht8S1tiS6ErGYffBA+FLaploIN0PjL9TJxJ3obSUDA=; b=Z/8q2PzUfv9PKvdmJmcLjsg8n4iQHcKVOk6G3Ddl89b5u0C4uEcKPoZcQtFWPfIIdH u5f03xp2lY+Ip0mFFmXlfTc7Pif5hbcQWn1tvvYh7/igqsDYUCzKNjZ2TvDAOMLAsltd gEfqkT0lfSqWCP8708YA4KW+IBKJ3JAYA2P31Rxe4YWrKCUfnInlq0d8+K4fsRQ6/3RX +xNL97CW2qJ14y5NlrQu4NzSREdRjnPv4Bjlot9tDaUcdGLMPL2HmSnG365NBr+SjQHR Dv6JCWljLibe2siOw3gktwitNWQ6Ju/T6wuyc3eOJIiL+8Gj1vrbnMdo2qTuDc7Acadq bCQA== 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=Wht8S1tiS6ErGYffBA+FLaploIN0PjL9TJxJ3obSUDA=; b=Vco3+A04jmTdWgvYxR6SCs0AlK+OvjdfMm3R7lnjDg2hSIsWcb00QD897Mbwb6C8RB rMZKgMhU9zEnbIKVtOpfqLhICEdU7mXZqA8bgoi56eotXMsaObQ0eEmE0hvncjVGZ85u rPX75GUkfHQwRGE/jXe+Im4WycqnIfJs/whhZySEu0zpsy7HVxaO8AxgIChPpXFKG5Me ZcwVWpyIiryMGP2jz4hygs7b4htWF3+2qaq7y7QFMQs3mmTMVzPLGIPOSk2/SDHJa2hB 0aPpt9G6HTwumPNYZeAt2LPac2fzIzy/Tto1Stpr3BGnE5OXLV2Xi3rJMbSY9jv5DdfA KRfQ== X-Gm-Message-State: AFqh2krn/KguanCh21CTDxZ5+cLmaG2+gLvel2FEEhiXO8aSuVD0+g8X d34diU9R3eCaavv5ni+wsxpFSrJwv18= X-Google-Smtp-Source: AMrXdXud5Kn1RPDHqUVfpTCBsiHRp5IAJ9CSXYbBJpFFGWdo3yLQ7LRVDOxEWdttcxSWMB919olo/ZRWyhg= X-Received: from badhri.mtv.corp.google.com ([2620:15c:211:201:d726:232e:7cc0:6434]) (user=badhri job=sendgmr) by 2002:a05:690c:857:b0:38b:17c4:4297 with SMTP id bz23-20020a05690c085700b0038b17c44297mr3608057ywb.446.1673688772790; Sat, 14 Jan 2023 01:32:52 -0800 (PST) Date: Sat, 14 Jan 2023 01:32:45 -0800 In-Reply-To: <20230114093246.1933321-1-badhri@google.com> Mime-Version: 1.0 References: <20230114093246.1933321-1-badhri@google.com> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Message-ID: <20230114093246.1933321-2-badhri@google.com> Subject: [PATCH v13 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 Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This change adds callback to evaluate presence of contaminant in the TCPCI layer. Signed-off-by: Badhri Jagan Sridharan --- Changes since v12: * None Changes since v11: * None Changes since v10: * None Changes since v9: * Check for presence of low level check_contaminant before installing tcpc.check_contaminant. Changes since v7: * None. Skipped versions by mistake. Changes since v6: * Removed is_potential_contaminant callback 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 | 11 +++++++++++ include/linux/usb/tcpci.h | 7 +++++++ 2 files changed, 18 insertions(+) diff --git a/drivers/usb/typec/tcpm/tcpci.c b/drivers/usb/typec/tcpm/tcpci.c index fe781a38dc82..699539e1be06 100644 --- a/drivers/usb/typec/tcpm/tcpci.c +++ b/drivers/usb/typec/tcpm/tcpci.c @@ -403,6 +403,14 @@ static void tcpci_frs_sourcing_vbus(struct tcpc_dev *dev) tcpci->data->frs_sourcing_vbus(tcpci, tcpci->data); } +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); @@ -778,6 +786,9 @@ struct tcpci *tcpci_register_port(struct device *dev, struct tcpci_data *data) tcpci->tcpc.frs_sourcing_vbus = tcpci_frs_sourcing_vbus; tcpci->tcpc.set_partner_usb_comm_capable = tcpci_set_partner_usb_comm_capable; + if (tcpci->data->check_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; tcpci->tcpc.set_auto_vbus_discharge_threshold = diff --git a/include/linux/usb/tcpci.h b/include/linux/usb/tcpci.h index 17657451c762..85e95a3251d3 100644 --- a/include/linux/usb/tcpci.h +++ b/include/linux/usb/tcpci.h @@ -188,6 +188,12 @@ 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. */ struct tcpci_data { struct regmap *regmap; @@ -204,6 +210,7 @@ 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); }; struct tcpci *tcpci_register_port(struct device *dev, struct tcpci_data *data); -- 2.39.0.314.g84b9a713c41-goog