From nobody Sun May 10 21:18:29 2026 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 71966C433EF for ; Fri, 22 Apr 2022 22:55:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234093AbiDVW6K (ORCPT ); Fri, 22 Apr 2022 18:58:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51884 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234204AbiDVW5l (ORCPT ); Fri, 22 Apr 2022 18:57:41 -0400 Received: from mail-oi1-x231.google.com (mail-oi1-x231.google.com [IPv6:2607:f8b0:4864:20::231]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 98A96343E6B for ; Fri, 22 Apr 2022 15:21:52 -0700 (PDT) Received: by mail-oi1-x231.google.com with SMTP id 12so10542156oix.12 for ; Fri, 22 Apr 2022 15:21:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XENFSBCAxirOMSvN5P45H1Vvs6fWH0AA/S+LYBu5Oow=; b=bACNTkVaiUGXihYZDcQV9PLoJAjDwUaKU0nJbvLHLSp9EtlSmlIOcdlRlODArPFKE4 6dTDsPDnHZ3Ufdg74nOFzASENI2z+QVfy254paHTUJrIPVmKsvFSqeOKwY3mrfJU6gil 5iDO9pn3xe/hy9WtI0nfvFh/jt00HXQggQPPtjtj5VQ6uU3DUdi4CqCyIeCP1DcXQm3i jHsmBr79i5kdSdgf72LxJpOiQv9Mo7/2UIXm3oHMpNwpTXjwNPP0y07l6kIceye/fjnI 8c41lBph9vfCBfv+YSMIpJWeDHUtdXAbQep3lfDzHtN+Y6dIwg69llcmwsNiQpcq8gec f58g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XENFSBCAxirOMSvN5P45H1Vvs6fWH0AA/S+LYBu5Oow=; b=jIsjfPoNcvEhuO5SAzpL4t26v77TDNXSxvlrh85M49oXVY7ZiSxHmNYckVrdDFDEwr 7DzSJq9nJj2lvPTlDy6E001rlsEnK81X/qZKgUTRUU2n5rvVwil15aDgW1jcfayiQpCC L13ooZ/qYsCucEpsTMHfmKFPz71TW4Qu+hE0iyx5Q7A+HrQwUJFWgX0mEBjXtADDLa8u a1bIzQa4RPs7+xaL3oAPg7Nmgw/gYv/bmCrVkdnwI1kh3miZbiw1PCGIQX8Xl92g25LL G1klhPgh7tzat2wwmWa2i//rfl89QHxJyRDzi+OwRTmDDZ46bwAy24yFpQGdRi34C+jI 9cGw== X-Gm-Message-State: AOAM533ygtdcOiijDTnIUyKi8TghrsAMj6PpEWfIja9AD4ACsUQhhX1y 1LE0tcinA0c0LbAv6puO67C52w== X-Google-Smtp-Source: ABdhPJxUu+TIzAagwVAFL737HsQohEi6OYw8fsVfAEoixHQTgXTXln0yE3HNaoph719hM+yRvhkKkw== X-Received: by 2002:a05:6808:124b:b0:2da:38f0:945f with SMTP id o11-20020a056808124b00b002da38f0945fmr7623223oiv.171.1650666111443; Fri, 22 Apr 2022 15:21:51 -0700 (PDT) Received: from ripper.. ([2600:1700:a0:3dc8:205:1bff:fec0:b9b3]) by smtp.gmail.com with ESMTPSA id js4-20020a056870bac400b000e687cdf5adsm1049224oab.55.2022.04.22.15.21.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Apr 2022 15:21:50 -0700 (PDT) From: Bjorn Andersson To: Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Andy Shevchenko , Daniel Scally , Heikki Krogerus , Sakari Ailus , "Rafael J. Wysocki" , Hans de Goede Cc: linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org Subject: [PATCH v5 1/7] device property: Add helper to match multiple connections Date: Fri, 22 Apr 2022 15:23:45 -0700 Message-Id: <20220422222351.1297276-2-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220422222351.1297276-1-bjorn.andersson@linaro.org> References: <20220422222351.1297276-1-bjorn.andersson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In some cases multiple connections with the same connection id needs to be resolved from a fwnode graph. One such example is when separate hardware is used for performing muxing and/or orientation switching of the SuperSpeed and SBU lines in a USB Type-C connector. In this case the connector needs to belong to a graph with multiple matching remote endpoints, and the Type-C controller needs to be able to resolve them both. Add a new API that allows this kind of lookup. Signed-off-by: Bjorn Andersson Acked-by: Rafael J. Wysocki Reviewed-by: Andy Shevchenko Reviewed-by: Sakari Ailus --- Changes since v4: - Added "Add" to patch subject - Added "(Optional)" kernel-doc of fwnode_connection_find_matches() drivers/base/property.c | 109 +++++++++++++++++++++++++++++++++++++++ include/linux/property.h | 5 ++ 2 files changed, 114 insertions(+) diff --git a/drivers/base/property.c b/drivers/base/property.c index 36401cfe432c..babab8cec7a0 100644 --- a/drivers/base/property.c +++ b/drivers/base/property.c @@ -1201,6 +1201,40 @@ fwnode_graph_devcon_match(struct fwnode_handle *fwno= de, const char *con_id, return NULL; } =20 +static unsigned int fwnode_graph_devcon_matches(struct fwnode_handle *fwno= de, + const char *con_id, void *data, + devcon_match_fn_t match, + void **matches, + unsigned int matches_len) +{ + struct fwnode_handle *node; + struct fwnode_handle *ep; + unsigned int count =3D 0; + void *ret; + + fwnode_graph_for_each_endpoint(fwnode, ep) { + if (matches && count >=3D matches_len) { + fwnode_handle_put(ep); + break; + } + + node =3D fwnode_graph_get_remote_port_parent(ep); + if (!fwnode_device_is_available(node)) { + fwnode_handle_put(node); + continue; + } + + ret =3D match(node, con_id, data); + fwnode_handle_put(node); + if (ret) { + if (matches) + matches[count] =3D ret; + count++; + } + } + return count; +} + static void * fwnode_devcon_match(struct fwnode_handle *fwnode, const char *con_id, void *data, devcon_match_fn_t match) @@ -1223,6 +1257,37 @@ fwnode_devcon_match(struct fwnode_handle *fwnode, co= nst char *con_id, return NULL; } =20 +static unsigned int fwnode_devcon_matches(struct fwnode_handle *fwnode, + const char *con_id, void *data, + devcon_match_fn_t match, + void **matches, + unsigned int matches_len) +{ + struct fwnode_handle *node; + unsigned int count =3D 0; + unsigned int i; + void *ret; + + for (i =3D 0; ; i++) { + if (matches && count >=3D matches_len) + break; + + node =3D fwnode_find_reference(fwnode, con_id, i); + if (IS_ERR(node)) + break; + + ret =3D match(node, NULL, data); + fwnode_handle_put(node); + if (ret) { + if (matches) + matches[count] =3D ret; + count++; + } + } + + return count; +} + /** * fwnode_connection_find_match - Find connection from a device node * @fwnode: Device node with the connection @@ -1250,3 +1315,47 @@ void *fwnode_connection_find_match(struct fwnode_han= dle *fwnode, return fwnode_devcon_match(fwnode, con_id, data, match); } EXPORT_SYMBOL_GPL(fwnode_connection_find_match); + +/** + * fwnode_connection_find_matches - Find connections from a device node + * @fwnode: Device node with the connection + * @con_id: Identifier for the connection + * @data: Data for the match function + * @match: Function to check and convert the connection description + * @matches: (Optional) array of pointers to fill with matches + * @matches_len: Length of @matches + * + * Find up to @matches_len connections with unique identifier @con_id betw= een + * @fwnode and other device nodes. @match will be used to convert the + * connection description to data the caller is expecting to be returned + * through the @matches array. + * If @matches is NULL @matches_len is ignored and the total number of res= olved + * matches is returned. + * + * Return: Number of matches resolved, or negative errno. + */ +int fwnode_connection_find_matches(struct fwnode_handle *fwnode, + const char *con_id, void *data, + devcon_match_fn_t match, + void **matches, unsigned int matches_len) +{ + unsigned int count_graph; + unsigned int count_ref; + + if (!fwnode || !match) + return -EINVAL; + + count_graph =3D fwnode_graph_devcon_matches(fwnode, con_id, data, match, + matches, matches_len); + + if (matches) { + matches +=3D count_graph; + matches_len -=3D count_graph; + } + + count_ref =3D fwnode_devcon_matches(fwnode, con_id, data, match, + matches, matches_len); + + return count_graph + count_ref; +} +EXPORT_SYMBOL_GPL(fwnode_connection_find_matches); diff --git a/include/linux/property.h b/include/linux/property.h index fc24d45632eb..a5b429d623f6 100644 --- a/include/linux/property.h +++ b/include/linux/property.h @@ -451,6 +451,11 @@ static inline void *device_connection_find_match(struc= t device *dev, return fwnode_connection_find_match(dev_fwnode(dev), con_id, data, match); } =20 +int fwnode_connection_find_matches(struct fwnode_handle *fwnode, + const char *con_id, void *data, + devcon_match_fn_t match, + void **matches, unsigned int matches_len); + /* -----------------------------------------------------------------------= --- */ /* Software fwnode support - when HW description is incomplete or missing = */ =20 --=20 2.35.1 From nobody Sun May 10 21:18:29 2026 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 190E9C4332F for ; Fri, 22 Apr 2022 22:55:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233951AbiDVW55 (ORCPT ); Fri, 22 Apr 2022 18:57:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234212AbiDVW5m (ORCPT ); Fri, 22 Apr 2022 18:57:42 -0400 Received: from mail-oa1-x32.google.com (mail-oa1-x32.google.com [IPv6:2001:4860:4864:20::32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8058734515E for ; Fri, 22 Apr 2022 15:21:53 -0700 (PDT) Received: by mail-oa1-x32.google.com with SMTP id 586e51a60fabf-e5e433d66dso10069900fac.5 for ; Fri, 22 Apr 2022 15:21:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5WJANqKYC0uOwc9pHxoXMF3q63zMtKx1xf7OKCPf+Fc=; b=uthw0bR1T+hvsbqlpfq3kVyFnz9kfquznheJF2Eheau3SbrFUFBM7k946RQICA84iL +xpnkZGMw1h4UFs7xnhomn2V/SPwp8JDVJd0W8G6QjwWpDTomn60Qthg9pD41nGlmEbA q1irLx6H2YqzHFC1iZsDi7wc9GA+p1B9vYBJ7iAQ04qQdGWVvh+016mXSXPiQbrxOUo/ 74H6WCKYAs7uWiCAQrBON9ZjJxP/zpH7kljtCxymFwaVZhi3IN81Fx0hcijrD0akLZN1 rPM53YiQ7OsGxA/XkBFssJI+Ni33ftKFLAH+KoOGkYH5po//lrEASLlirdXtRDjqaZ1u G3cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5WJANqKYC0uOwc9pHxoXMF3q63zMtKx1xf7OKCPf+Fc=; b=h2iqh4Ht9MGoEWaJGtBl0Ev3NymVtk/vSQ6yFBK6csiKnfRqlA4Ox55mQDQNobna00 BFoe34tbat3Y9Y32PxKKpfWDaeslYBzwpB/jBiBgqKNOa2wWJSTL3J1C4tBUieG9v8h/ EgTNCmAqUqkCOQf/1HUolXk7lR/G0k7lpPGbQiDlQNWNEKj7QCaVGYHdEIekQ/pJYThK vjjCIP2ltU7SDTZ/5NSQplCQ1E77KfABpR6HkDUxo5sBf1wAMzhwvMC22SzVl1U60o3x iEkXFkrm8q80k/IsjMYzaE1m3Irtw0128WtKGZTi6jnx3FJbzcQ9xcO4VsGeNk4eKFqV TWcg== X-Gm-Message-State: AOAM531I3dYuebh9RD5x7btrC78jbu4L93WCQwjwLbnfo0u/NvoDZYiP 3ccSW4nKcC8VNMhtYF/emVpovg== X-Google-Smtp-Source: ABdhPJwSUqlaOIAUy4BPNAE9huiM3YDyDvJ842NV6mi/ujWxNBcGD09OfXFrcIPMy0Dxb7jgYWU22A== X-Received: by 2002:a05:6870:e244:b0:e9:150b:5d21 with SMTP id d4-20020a056870e24400b000e9150b5d21mr318161oac.234.1650666112565; Fri, 22 Apr 2022 15:21:52 -0700 (PDT) Received: from ripper.. ([2600:1700:a0:3dc8:205:1bff:fec0:b9b3]) by smtp.gmail.com with ESMTPSA id js4-20020a056870bac400b000e687cdf5adsm1049224oab.55.2022.04.22.15.21.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Apr 2022 15:21:52 -0700 (PDT) From: Bjorn Andersson To: Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Andy Shevchenko , Daniel Scally , Heikki Krogerus , Sakari Ailus , "Rafael J. Wysocki" , Hans de Goede Cc: linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org Subject: [PATCH v5 2/7] device property: Use multi-connection matchers for single case Date: Fri, 22 Apr 2022 15:23:46 -0700 Message-Id: <20220422222351.1297276-3-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220422222351.1297276-1-bjorn.andersson@linaro.org> References: <20220422222351.1297276-1-bjorn.andersson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The newly introduced helpers for searching for matches in the case of multiple connections can be resused by the single-connection case, so do this to save some duplication. Reviewed-by: Andy Shevchenko Signed-off-by: Bjorn Andersson Reviewed-by: Sakari Ailus --- Changes since v4: - None drivers/base/property.c | 55 ++++------------------------------------- 1 file changed, 5 insertions(+), 50 deletions(-) diff --git a/drivers/base/property.c b/drivers/base/property.c index babab8cec7a0..337c95fea217 100644 --- a/drivers/base/property.c +++ b/drivers/base/property.c @@ -1176,31 +1176,6 @@ const void *device_get_match_data(struct device *dev) } EXPORT_SYMBOL_GPL(device_get_match_data); =20 -static void * -fwnode_graph_devcon_match(struct fwnode_handle *fwnode, const char *con_id, - void *data, devcon_match_fn_t match) -{ - struct fwnode_handle *node; - struct fwnode_handle *ep; - void *ret; - - fwnode_graph_for_each_endpoint(fwnode, ep) { - node =3D fwnode_graph_get_remote_port_parent(ep); - if (!fwnode_device_is_available(node)) { - fwnode_handle_put(node); - continue; - } - - ret =3D match(node, con_id, data); - fwnode_handle_put(node); - if (ret) { - fwnode_handle_put(ep); - return ret; - } - } - return NULL; -} - static unsigned int fwnode_graph_devcon_matches(struct fwnode_handle *fwno= de, const char *con_id, void *data, devcon_match_fn_t match, @@ -1235,28 +1210,6 @@ static unsigned int fwnode_graph_devcon_matches(stru= ct fwnode_handle *fwnode, return count; } =20 -static void * -fwnode_devcon_match(struct fwnode_handle *fwnode, const char *con_id, - void *data, devcon_match_fn_t match) -{ - struct fwnode_handle *node; - void *ret; - int i; - - for (i =3D 0; ; i++) { - node =3D fwnode_find_reference(fwnode, con_id, i); - if (IS_ERR(node)) - break; - - ret =3D match(node, NULL, data); - fwnode_handle_put(node); - if (ret) - return ret; - } - - return NULL; -} - static unsigned int fwnode_devcon_matches(struct fwnode_handle *fwnode, const char *con_id, void *data, devcon_match_fn_t match, @@ -1303,16 +1256,18 @@ void *fwnode_connection_find_match(struct fwnode_ha= ndle *fwnode, const char *con_id, void *data, devcon_match_fn_t match) { + unsigned int count; void *ret; =20 if (!fwnode || !match) return NULL; =20 - ret =3D fwnode_graph_devcon_match(fwnode, con_id, data, match); - if (ret) + count =3D fwnode_graph_devcon_matches(fwnode, con_id, data, match, &ret, = 1); + if (count) return ret; =20 - return fwnode_devcon_match(fwnode, con_id, data, match); + count =3D fwnode_devcon_matches(fwnode, con_id, data, match, &ret, 1); + return count ? ret : NULL; } EXPORT_SYMBOL_GPL(fwnode_connection_find_match); =20 --=20 2.35.1 From nobody Sun May 10 21:18:29 2026 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 0B0A3C433EF for ; Fri, 22 Apr 2022 22:55:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234043AbiDVW6B (ORCPT ); Fri, 22 Apr 2022 18:58:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51344 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234225AbiDVW5m (ORCPT ); Fri, 22 Apr 2022 18:57:42 -0400 Received: from mail-oi1-x235.google.com (mail-oi1-x235.google.com [IPv6:2607:f8b0:4864:20::235]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 89C73374D64 for ; Fri, 22 Apr 2022 15:21:54 -0700 (PDT) Received: by mail-oi1-x235.google.com with SMTP id v65so5859178oig.10 for ; Fri, 22 Apr 2022 15:21:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AvSAQb1M8ai7iREtClhTlQbpfuCOvIwvoizOPDtnCrk=; b=Pc1e+PMZm5IuYicnb0WwTJ3NxS7TWcDp5tMa6jMLdMKAY3An0CjGAK0elizA3QrGdx qzxqjjVPtpGIT6IPsJIq1xPrBEMGIwCLBxMej9K4Y+EHPh8ksv960DhiDp443oAUcbFZ Jhsny1PFJ8tHy9iAkzQntJe638zmBWWED/CGHiAsKTL/om+PCaUq7KuJMxwxuIDtdN+z b24DjqO1UN/wg00srUSnjInLBJasjhNV6itXuEF4Xm2wa8jd5dq6Aeb5ibdQYQLy6MJu UaPkjfulA0/O5DsIxHPt15xV9ek4CamZlac5+XwtbU0OWOkFk0ROC2t/7ED58vXNdNM2 saOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AvSAQb1M8ai7iREtClhTlQbpfuCOvIwvoizOPDtnCrk=; b=H3j2iTKzOHm6RXJVMle5M1sOKgxkmgu7G+7gnOHBzKvGOa7xebYeYTkpze5FSwZUhW mLOoIEr/WrPa0Ro8hepkwa5XfMtyrs5V0DjsXAC+tcT0/XoF4788r0MVVzcdRmAInKgy xbcpYGsDis16snhD7GldEUjyEcTyA+nbQ2kkSXsS+4/xU0qzx3q1HbLJbJRBFG2rf36S cLG5TSP769rS3ZLl7CtrlVcrDhYMOqzJlPk9iVEPsqI5gJFME67PDgPl1rFrGwUxQYqs EgVmZ+N5rdnsCPlcwZr9qEOgqHh1AkwFUYAtON4TVH9gYNE14WQbgwgHOzi5KYqQkgqK qGhA== X-Gm-Message-State: AOAM531JvoH8e3hO9XhU6umzGSvVPtStsK8F1yHlnohVB3uJakunP/8l 35wRas1Nx31LEbFHiRavNHihlg== X-Google-Smtp-Source: ABdhPJxPQFhhi1f//zKscwPmmuTNsN+HkKo9ZZPLpV1bgBPsKMaslivRlGVFdAXX/APr6Tx55vb/oQ== X-Received: by 2002:a05:6808:3b8:b0:322:a783:8fc8 with SMTP id n24-20020a05680803b800b00322a7838fc8mr7584151oie.189.1650666113629; Fri, 22 Apr 2022 15:21:53 -0700 (PDT) Received: from ripper.. ([2600:1700:a0:3dc8:205:1bff:fec0:b9b3]) by smtp.gmail.com with ESMTPSA id js4-20020a056870bac400b000e687cdf5adsm1049224oab.55.2022.04.22.15.21.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Apr 2022 15:21:53 -0700 (PDT) From: Bjorn Andersson To: Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Andy Shevchenko , Daniel Scally , Heikki Krogerus , Sakari Ailus , "Rafael J. Wysocki" , Hans de Goede Cc: linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org Subject: [PATCH v5 3/7] usb: typec: mux: Check dev_set_name() return value Date: Fri, 22 Apr 2022 15:23:47 -0700 Message-Id: <20220422222351.1297276-4-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220422222351.1297276-1-bjorn.andersson@linaro.org> References: <20220422222351.1297276-1-bjorn.andersson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" It's possible that dev_set_name() returns -ENOMEM, catch and handle this. Fixes: 3370db35193b ("usb: typec: Registering real device entries for the m= uxes") Reported-by: Andy Shevchenko Acked-by: Heikki Krogerus Signed-off-by: Bjorn Andersson Reviewed-by: Andy Shevchenko Reviewed-by: Sakari Ailus --- Changes since v4: - Added Fixes tag drivers/usb/typec/mux.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/usb/typec/mux.c b/drivers/usb/typec/mux.c index c8340de0ed49..d2aaf294b649 100644 --- a/drivers/usb/typec/mux.c +++ b/drivers/usb/typec/mux.c @@ -131,8 +131,11 @@ typec_switch_register(struct device *parent, sw->dev.class =3D &typec_mux_class; sw->dev.type =3D &typec_switch_dev_type; sw->dev.driver_data =3D desc->drvdata; - dev_set_name(&sw->dev, "%s-switch", - desc->name ? desc->name : dev_name(parent)); + ret =3D dev_set_name(&sw->dev, "%s-switch", desc->name ? desc->name : dev= _name(parent)); + if (ret) { + put_device(&sw->dev); + return ERR_PTR(ret); + } =20 ret =3D device_add(&sw->dev); if (ret) { @@ -338,8 +341,11 @@ typec_mux_register(struct device *parent, const struct= typec_mux_desc *desc) mux->dev.class =3D &typec_mux_class; mux->dev.type =3D &typec_mux_dev_type; mux->dev.driver_data =3D desc->drvdata; - dev_set_name(&mux->dev, "%s-mux", - desc->name ? desc->name : dev_name(parent)); + ret =3D dev_set_name(&mux->dev, "%s-mux", desc->name ? desc->name : dev_n= ame(parent)); + if (ret) { + put_device(&mux->dev); + return ERR_PTR(ret); + } =20 ret =3D device_add(&mux->dev); if (ret) { --=20 2.35.1 From nobody Sun May 10 21:18:29 2026 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 8F8A4C433F5 for ; Fri, 22 Apr 2022 22:54:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234030AbiDVW5H (ORCPT ); Fri, 22 Apr 2022 18:57:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51296 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233780AbiDVW46 (ORCPT ); Fri, 22 Apr 2022 18:56:58 -0400 Received: from mail-oi1-x234.google.com (mail-oi1-x234.google.com [IPv6:2607:f8b0:4864:20::234]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BA207374D66 for ; Fri, 22 Apr 2022 15:21:55 -0700 (PDT) Received: by mail-oi1-x234.google.com with SMTP id w194so10543860oiw.11 for ; Fri, 22 Apr 2022 15:21:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HT3yGBceGT/sqgPDZBaPYs4FOk+bbKU0vW9rubyf3jM=; b=GxxXJCYRjD63APwYPdnI3SLrXjmSAeY5euoQBZbgIBSICO9OHAWTVzyupI7CGRb5la rCTPShwM4fQvRe/8HsmWepJYkBauciXZ7Uk16JcIXO+Bo4/aPwofQ/zZaWv3+CPbz5lR iWM/JlzFFd/a/CLEs4nxBH2xS/fN4XNn0YUFlOmuaJuAy1iO2nxXeSRGqOR78d+e/45J 7d6RHBv3iukCauo/zdU579ZZp1Fq8f3Yxi58rIkug3NhzHJcNYIYIw1PNjHHgNa2Xee2 FmeJC25qDWeSbAe9Y6UnxR6c2fIkd3vm0nIOYd4r+mxQSO1xsw/JxfNUqontBn5gnyNp hfag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HT3yGBceGT/sqgPDZBaPYs4FOk+bbKU0vW9rubyf3jM=; b=aF9cg9aBCZ+Ss47F1/WIgf1uOEaXsBQE7VhBXpQSgi6tAAvniUNz4fbpb9PiJbL8H4 HK8bJTThqOxsjIBK8h5QQhXaKRtJkUFZ+c4H5GlalUzJEZsBiUpmU2x03Tzl8ByNs18r qCHtGz8e7YEqlPjsLVUdD22vxWOZY/szjCGUxs/fGGqS/+KmIT/Ty/Hfn7N75i+f45Ho 2nps4EltYFQlP4Xy5KgApKczFXiMKjBc4ZbhsDiZ+c3v9+EsS1M9qm4n3isYnhXQd4HL bZuHB9D4tX9PTswXn4Iyz0yTwHMBFPyA0Z8I//XkKUDqWuxoZ6wFfpVFcEeqYXxwyJSO f7lQ== X-Gm-Message-State: AOAM531oi5zMLvS0IyOnqvOxgn94R24Ly9dfaZC1+drHDA0DW2prNVq5 QidhAMjnKsYx+uDjVDRcpvrKbg== X-Google-Smtp-Source: ABdhPJxi3DSVySwb1PLIk4Pc6nuEZhZ/mgXPYs71rR61NDvvUy6QkTJob5J2FU0yTKx18z2RGmHgwg== X-Received: by 2002:aca:3854:0:b0:325:137:453 with SMTP id f81-20020aca3854000000b0032501370453mr529612oia.178.1650666114726; Fri, 22 Apr 2022 15:21:54 -0700 (PDT) Received: from ripper.. ([2600:1700:a0:3dc8:205:1bff:fec0:b9b3]) by smtp.gmail.com with ESMTPSA id js4-20020a056870bac400b000e687cdf5adsm1049224oab.55.2022.04.22.15.21.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Apr 2022 15:21:54 -0700 (PDT) From: Bjorn Andersson To: Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Andy Shevchenko , Daniel Scally , Heikki Krogerus , Sakari Ailus , "Rafael J. Wysocki" , Hans de Goede Cc: linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org Subject: [PATCH v5 4/7] usb: typec: mux: Introduce indirection Date: Fri, 22 Apr 2022 15:23:48 -0700 Message-Id: <20220422222351.1297276-5-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220422222351.1297276-1-bjorn.andersson@linaro.org> References: <20220422222351.1297276-1-bjorn.andersson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Rather than directly exposing the implementation's representation of the typec muxes to the controller/clients, introduce an indirection object. This enables the introduction of turning this relationship into a one-to-many in the following patch. Acked-by: Heikki Krogerus Signed-off-by: Bjorn Andersson Reviewed-by: Sakari Ailus --- Changes since v4: - None drivers/usb/typec/bus.c | 2 +- drivers/usb/typec/mux.c | 193 ++++++++++++++++---------- drivers/usb/typec/mux.h | 12 +- drivers/usb/typec/mux/intel_pmc_mux.c | 8 +- drivers/usb/typec/mux/pi3usb30532.c | 8 +- include/linux/usb/typec_mux.h | 22 +-- 6 files changed, 148 insertions(+), 97 deletions(-) diff --git a/drivers/usb/typec/bus.c b/drivers/usb/typec/bus.c index 78e0e78954f2..26ea2fdec17d 100644 --- a/drivers/usb/typec/bus.c +++ b/drivers/usb/typec/bus.c @@ -24,7 +24,7 @@ typec_altmode_set_mux(struct altmode *alt, unsigned long = conf, void *data) state.mode =3D conf; state.data =3D data; =20 - return alt->mux->set(alt->mux, &state); + return typec_mux_set(alt->mux, &state); } =20 static int typec_altmode_set_state(struct typec_altmode *adev, diff --git a/drivers/usb/typec/mux.c b/drivers/usb/typec/mux.c index d2aaf294b649..bb6c095b4af9 100644 --- a/drivers/usb/typec/mux.c +++ b/drivers/usb/typec/mux.c @@ -17,9 +17,13 @@ #include "class.h" #include "mux.h" =20 +struct typec_switch { + struct typec_switch_dev *sw_dev; +}; + static int switch_fwnode_match(struct device *dev, const void *fwnode) { - if (!is_typec_switch(dev)) + if (!is_typec_switch_dev(dev)) return 0; =20 return dev_fwnode(dev) =3D=3D fwnode; @@ -49,7 +53,7 @@ static void *typec_switch_match(struct fwnode_handle *fwn= ode, const char *id, dev =3D class_find_device(&typec_mux_class, NULL, fwnode, switch_fwnode_match); =20 - return dev ? to_typec_switch(dev) : ERR_PTR(-EPROBE_DEFER); + return dev ? to_typec_switch_dev(dev) : ERR_PTR(-EPROBE_DEFER); } =20 /** @@ -63,12 +67,23 @@ static void *typec_switch_match(struct fwnode_handle *f= wnode, const char *id, */ struct typec_switch *fwnode_typec_switch_get(struct fwnode_handle *fwnode) { + struct typec_switch_dev *sw_dev; struct typec_switch *sw; =20 - sw =3D fwnode_connection_find_match(fwnode, "orientation-switch", NULL, - typec_switch_match); - if (!IS_ERR_OR_NULL(sw)) - WARN_ON(!try_module_get(sw->dev.parent->driver->owner)); + sw =3D kzalloc(sizeof(*sw), GFP_KERNEL); + if (!sw) + return ERR_PTR(-ENOMEM); + + sw_dev =3D fwnode_connection_find_match(fwnode, "orientation-switch", NUL= L, + typec_switch_match); + if (IS_ERR_OR_NULL(sw_dev)) { + kfree(sw); + return ERR_CAST(sw_dev); + } + + WARN_ON(!try_module_get(sw_dev->dev.parent->driver->owner)); + + sw->sw_dev =3D sw_dev; =20 return sw; } @@ -82,16 +97,22 @@ EXPORT_SYMBOL_GPL(fwnode_typec_switch_get); */ void typec_switch_put(struct typec_switch *sw) { - if (!IS_ERR_OR_NULL(sw)) { - module_put(sw->dev.parent->driver->owner); - put_device(&sw->dev); - } + struct typec_switch_dev *sw_dev; + + if (IS_ERR_OR_NULL(sw)) + return; + + sw_dev =3D sw->sw_dev; + + module_put(sw_dev->dev.parent->driver->owner); + put_device(&sw_dev->dev); + kfree(sw); } EXPORT_SYMBOL_GPL(typec_switch_put); =20 static void typec_switch_release(struct device *dev) { - kfree(to_typec_switch(dev)); + kfree(to_typec_switch_dev(dev)); } =20 const struct device_type typec_switch_dev_type =3D { @@ -109,85 +130,93 @@ const struct device_type typec_switch_dev_type =3D { * connector to the USB controllers. USB Type-C plugs can be inserted * right-side-up or upside-down. */ -struct typec_switch * +struct typec_switch_dev * typec_switch_register(struct device *parent, const struct typec_switch_desc *desc) { - struct typec_switch *sw; + struct typec_switch_dev *sw_dev; int ret; =20 if (!desc || !desc->set) return ERR_PTR(-EINVAL); =20 - sw =3D kzalloc(sizeof(*sw), GFP_KERNEL); - if (!sw) + sw_dev =3D kzalloc(sizeof(*sw_dev), GFP_KERNEL); + if (!sw_dev) return ERR_PTR(-ENOMEM); =20 - sw->set =3D desc->set; + sw_dev->set =3D desc->set; =20 - device_initialize(&sw->dev); - sw->dev.parent =3D parent; - sw->dev.fwnode =3D desc->fwnode; - sw->dev.class =3D &typec_mux_class; - sw->dev.type =3D &typec_switch_dev_type; - sw->dev.driver_data =3D desc->drvdata; - ret =3D dev_set_name(&sw->dev, "%s-switch", desc->name ? desc->name : dev= _name(parent)); + device_initialize(&sw_dev->dev); + sw_dev->dev.parent =3D parent; + sw_dev->dev.fwnode =3D desc->fwnode; + sw_dev->dev.class =3D &typec_mux_class; + sw_dev->dev.type =3D &typec_switch_dev_type; + sw_dev->dev.driver_data =3D desc->drvdata; + ret =3D dev_set_name(&sw_dev->dev, "%s-switch", desc->name ? desc->name := dev_name(parent)); if (ret) { - put_device(&sw->dev); + put_device(&sw_dev->dev); return ERR_PTR(ret); } =20 - ret =3D device_add(&sw->dev); + ret =3D device_add(&sw_dev->dev); if (ret) { dev_err(parent, "failed to register switch (%d)\n", ret); - put_device(&sw->dev); + put_device(&sw_dev->dev); return ERR_PTR(ret); } =20 - return sw; + return sw_dev; } EXPORT_SYMBOL_GPL(typec_switch_register); =20 int typec_switch_set(struct typec_switch *sw, enum typec_orientation orientation) { + struct typec_switch_dev *sw_dev; + if (IS_ERR_OR_NULL(sw)) return 0; =20 - return sw->set(sw, orientation); + sw_dev =3D sw->sw_dev; + + return sw_dev->set(sw_dev, orientation); } EXPORT_SYMBOL_GPL(typec_switch_set); =20 /** * typec_switch_unregister - Unregister USB Type-C orientation switch - * @sw: USB Type-C orientation switch + * @sw_dev: USB Type-C orientation switch * * Unregister switch that was registered with typec_switch_register(). */ -void typec_switch_unregister(struct typec_switch *sw) +void typec_switch_unregister(struct typec_switch_dev *sw_dev) { - if (!IS_ERR_OR_NULL(sw)) - device_unregister(&sw->dev); + if (!IS_ERR_OR_NULL(sw_dev)) + device_unregister(&sw_dev->dev); } EXPORT_SYMBOL_GPL(typec_switch_unregister); =20 -void typec_switch_set_drvdata(struct typec_switch *sw, void *data) +void typec_switch_set_drvdata(struct typec_switch_dev *sw_dev, void *data) { - dev_set_drvdata(&sw->dev, data); + dev_set_drvdata(&sw_dev->dev, data); } EXPORT_SYMBOL_GPL(typec_switch_set_drvdata); =20 -void *typec_switch_get_drvdata(struct typec_switch *sw) +void *typec_switch_get_drvdata(struct typec_switch_dev *sw_dev) { - return dev_get_drvdata(&sw->dev); + return dev_get_drvdata(&sw_dev->dev); } EXPORT_SYMBOL_GPL(typec_switch_get_drvdata); =20 /* -----------------------------------------------------------------------= -- */ =20 +struct typec_mux { + struct typec_mux_dev *mux_dev; +}; + static int mux_fwnode_match(struct device *dev, const void *fwnode) { - if (!is_typec_mux(dev)) + if (!is_typec_mux_dev(dev)) return 0; =20 return dev_fwnode(dev) =3D=3D fwnode; @@ -249,7 +278,7 @@ static void *typec_mux_match(struct fwnode_handle *fwno= de, const char *id, dev =3D class_find_device(&typec_mux_class, NULL, fwnode, mux_fwnode_match); =20 - return dev ? to_typec_mux(dev) : ERR_PTR(-EPROBE_DEFER); + return dev ? to_typec_mux_dev(dev) : ERR_PTR(-EPROBE_DEFER); } =20 /** @@ -265,12 +294,23 @@ static void *typec_mux_match(struct fwnode_handle *fw= node, const char *id, struct typec_mux *fwnode_typec_mux_get(struct fwnode_handle *fwnode, const struct typec_altmode_desc *desc) { + struct typec_mux_dev *mux_dev; struct typec_mux *mux; =20 - mux =3D fwnode_connection_find_match(fwnode, "mode-switch", (void *)desc, - typec_mux_match); - if (!IS_ERR_OR_NULL(mux)) - WARN_ON(!try_module_get(mux->dev.parent->driver->owner)); + mux =3D kzalloc(sizeof(*mux), GFP_KERNEL); + if (!mux) + return ERR_PTR(-ENOMEM); + + mux_dev =3D fwnode_connection_find_match(fwnode, "mode-switch", (void *)d= esc, + typec_mux_match); + if (IS_ERR_OR_NULL(mux_dev)) { + kfree(mux); + return ERR_CAST(mux_dev); + } + + WARN_ON(!try_module_get(mux_dev->dev.parent->driver->owner)); + + mux->mux_dev =3D mux_dev; =20 return mux; } @@ -284,25 +324,34 @@ EXPORT_SYMBOL_GPL(fwnode_typec_mux_get); */ void typec_mux_put(struct typec_mux *mux) { - if (!IS_ERR_OR_NULL(mux)) { - module_put(mux->dev.parent->driver->owner); - put_device(&mux->dev); - } + struct typec_mux_dev *mux_dev; + + if (IS_ERR_OR_NULL(mux)) + return; + + mux_dev =3D mux->mux_dev; + module_put(mux_dev->dev.parent->driver->owner); + put_device(&mux_dev->dev); + kfree(mux); } EXPORT_SYMBOL_GPL(typec_mux_put); =20 int typec_mux_set(struct typec_mux *mux, struct typec_mux_state *state) { + struct typec_mux_dev *mux_dev; + if (IS_ERR_OR_NULL(mux)) return 0; =20 - return mux->set(mux, state); + mux_dev =3D mux->mux_dev; + + return mux_dev->set(mux_dev, state); } EXPORT_SYMBOL_GPL(typec_mux_set); =20 static void typec_mux_release(struct device *dev) { - kfree(to_typec_mux(dev)); + kfree(to_typec_mux_dev(dev)); } =20 const struct device_type typec_mux_dev_type =3D { @@ -320,66 +369,66 @@ const struct device_type typec_mux_dev_type =3D { * the pins on the connector need to be reconfigured. This function regist= ers * multiplexer switches routing the pins on the connector. */ -struct typec_mux * +struct typec_mux_dev * typec_mux_register(struct device *parent, const struct typec_mux_desc *des= c) { - struct typec_mux *mux; + struct typec_mux_dev *mux_dev; int ret; =20 if (!desc || !desc->set) return ERR_PTR(-EINVAL); =20 - mux =3D kzalloc(sizeof(*mux), GFP_KERNEL); - if (!mux) + mux_dev =3D kzalloc(sizeof(*mux_dev), GFP_KERNEL); + if (!mux_dev) return ERR_PTR(-ENOMEM); =20 - mux->set =3D desc->set; + mux_dev->set =3D desc->set; =20 - device_initialize(&mux->dev); - mux->dev.parent =3D parent; - mux->dev.fwnode =3D desc->fwnode; - mux->dev.class =3D &typec_mux_class; - mux->dev.type =3D &typec_mux_dev_type; - mux->dev.driver_data =3D desc->drvdata; - ret =3D dev_set_name(&mux->dev, "%s-mux", desc->name ? desc->name : dev_n= ame(parent)); + device_initialize(&mux_dev->dev); + mux_dev->dev.parent =3D parent; + mux_dev->dev.fwnode =3D desc->fwnode; + mux_dev->dev.class =3D &typec_mux_class; + mux_dev->dev.type =3D &typec_mux_dev_type; + mux_dev->dev.driver_data =3D desc->drvdata; + ret =3D dev_set_name(&mux_dev->dev, "%s-mux", desc->name ? desc->name : d= ev_name(parent)); if (ret) { - put_device(&mux->dev); + put_device(&mux_dev->dev); return ERR_PTR(ret); } =20 - ret =3D device_add(&mux->dev); + ret =3D device_add(&mux_dev->dev); if (ret) { dev_err(parent, "failed to register mux (%d)\n", ret); - put_device(&mux->dev); + put_device(&mux_dev->dev); return ERR_PTR(ret); } =20 - return mux; + return mux_dev; } EXPORT_SYMBOL_GPL(typec_mux_register); =20 /** * typec_mux_unregister - Unregister Multiplexer Switch - * @mux: USB Type-C Connector Multiplexer/DeMultiplexer + * @mux_dev: USB Type-C Connector Multiplexer/DeMultiplexer * * Unregister mux that was registered with typec_mux_register(). */ -void typec_mux_unregister(struct typec_mux *mux) +void typec_mux_unregister(struct typec_mux_dev *mux_dev) { - if (!IS_ERR_OR_NULL(mux)) - device_unregister(&mux->dev); + if (!IS_ERR_OR_NULL(mux_dev)) + device_unregister(&mux_dev->dev); } EXPORT_SYMBOL_GPL(typec_mux_unregister); =20 -void typec_mux_set_drvdata(struct typec_mux *mux, void *data) +void typec_mux_set_drvdata(struct typec_mux_dev *mux_dev, void *data) { - dev_set_drvdata(&mux->dev, data); + dev_set_drvdata(&mux_dev->dev, data); } EXPORT_SYMBOL_GPL(typec_mux_set_drvdata); =20 -void *typec_mux_get_drvdata(struct typec_mux *mux) +void *typec_mux_get_drvdata(struct typec_mux_dev *mux_dev) { - return dev_get_drvdata(&mux->dev); + return dev_get_drvdata(&mux_dev->dev); } EXPORT_SYMBOL_GPL(typec_mux_get_drvdata); =20 diff --git a/drivers/usb/typec/mux.h b/drivers/usb/typec/mux.h index b1d6e837cb74..58f0f28b6dc8 100644 --- a/drivers/usb/typec/mux.h +++ b/drivers/usb/typec/mux.h @@ -5,23 +5,23 @@ =20 #include =20 -struct typec_switch { +struct typec_switch_dev { struct device dev; typec_switch_set_fn_t set; }; =20 -struct typec_mux { +struct typec_mux_dev { struct device dev; typec_mux_set_fn_t set; }; =20 -#define to_typec_switch(_dev_) container_of(_dev_, struct typec_switch, de= v) -#define to_typec_mux(_dev_) container_of(_dev_, struct typec_mux, dev) +#define to_typec_switch_dev(_dev_) container_of(_dev_, struct typec_switch= _dev, dev) +#define to_typec_mux_dev(_dev_) container_of(_dev_, struct typec_mux_dev, = dev) =20 extern const struct device_type typec_switch_dev_type; extern const struct device_type typec_mux_dev_type; =20 -#define is_typec_switch(dev) ((dev)->type =3D=3D &typec_switch_dev_type) -#define is_typec_mux(dev) ((dev)->type =3D=3D &typec_mux_dev_type) +#define is_typec_switch_dev(dev) ((dev)->type =3D=3D &typec_switch_dev_typ= e) +#define is_typec_mux_dev(dev) ((dev)->type =3D=3D &typec_mux_dev_type) =20 #endif /* __USB_TYPEC_MUX__ */ diff --git a/drivers/usb/typec/mux/intel_pmc_mux.c b/drivers/usb/typec/mux/= intel_pmc_mux.c index 2cdd22130834..51d8f3b88128 100644 --- a/drivers/usb/typec/mux/intel_pmc_mux.c +++ b/drivers/usb/typec/mux/intel_pmc_mux.c @@ -121,8 +121,8 @@ struct pmc_usb_port { int num; u32 iom_status; struct pmc_usb *pmc; - struct typec_mux *typec_mux; - struct typec_switch *typec_sw; + struct typec_mux_dev *typec_mux; + struct typec_switch_dev *typec_sw; struct usb_role_switch *usb_sw; =20 enum typec_orientation orientation; @@ -416,7 +416,7 @@ static int pmc_usb_connect(struct pmc_usb_port *port, e= num usb_role role) } =20 static int -pmc_usb_mux_set(struct typec_mux *mux, struct typec_mux_state *state) +pmc_usb_mux_set(struct typec_mux_dev *mux, struct typec_mux_state *state) { struct pmc_usb_port *port =3D typec_mux_get_drvdata(mux); =20 @@ -452,7 +452,7 @@ pmc_usb_mux_set(struct typec_mux *mux, struct typec_mux= _state *state) return -EOPNOTSUPP; } =20 -static int pmc_usb_set_orientation(struct typec_switch *sw, +static int pmc_usb_set_orientation(struct typec_switch_dev *sw, enum typec_orientation orientation) { struct pmc_usb_port *port =3D typec_switch_get_drvdata(sw); diff --git a/drivers/usb/typec/mux/pi3usb30532.c b/drivers/usb/typec/mux/pi= 3usb30532.c index 7afe275b17d0..6ce9f282594e 100644 --- a/drivers/usb/typec/mux/pi3usb30532.c +++ b/drivers/usb/typec/mux/pi3usb30532.c @@ -23,8 +23,8 @@ struct pi3usb30532 { struct i2c_client *client; struct mutex lock; /* protects the cached conf register */ - struct typec_switch *sw; - struct typec_mux *mux; + struct typec_switch_dev *sw; + struct typec_mux_dev *mux; u8 conf; }; =20 @@ -45,7 +45,7 @@ static int pi3usb30532_set_conf(struct pi3usb30532 *pi, u= 8 new_conf) return 0; } =20 -static int pi3usb30532_sw_set(struct typec_switch *sw, +static int pi3usb30532_sw_set(struct typec_switch_dev *sw, enum typec_orientation orientation) { struct pi3usb30532 *pi =3D typec_switch_get_drvdata(sw); @@ -74,7 +74,7 @@ static int pi3usb30532_sw_set(struct typec_switch *sw, } =20 static int -pi3usb30532_mux_set(struct typec_mux *mux, struct typec_mux_state *state) +pi3usb30532_mux_set(struct typec_mux_dev *mux, struct typec_mux_state *sta= te) { struct pi3usb30532 *pi =3D typec_mux_get_drvdata(mux); u8 new_conf; diff --git a/include/linux/usb/typec_mux.h b/include/linux/usb/typec_mux.h index a9d9957933dc..ee57781dcf28 100644 --- a/include/linux/usb/typec_mux.h +++ b/include/linux/usb/typec_mux.h @@ -8,11 +8,13 @@ =20 struct device; struct typec_mux; +struct typec_mux_dev; struct typec_switch; +struct typec_switch_dev; struct typec_altmode; struct fwnode_handle; =20 -typedef int (*typec_switch_set_fn_t)(struct typec_switch *sw, +typedef int (*typec_switch_set_fn_t)(struct typec_switch_dev *sw, enum typec_orientation orientation); =20 struct typec_switch_desc { @@ -32,13 +34,13 @@ static inline struct typec_switch *typec_switch_get(str= uct device *dev) return fwnode_typec_switch_get(dev_fwnode(dev)); } =20 -struct typec_switch * +struct typec_switch_dev * typec_switch_register(struct device *parent, const struct typec_switch_desc *desc); -void typec_switch_unregister(struct typec_switch *sw); +void typec_switch_unregister(struct typec_switch_dev *sw); =20 -void typec_switch_set_drvdata(struct typec_switch *sw, void *data); -void *typec_switch_get_drvdata(struct typec_switch *sw); +void typec_switch_set_drvdata(struct typec_switch_dev *sw, void *data); +void *typec_switch_get_drvdata(struct typec_switch_dev *sw); =20 struct typec_mux_state { struct typec_altmode *alt; @@ -46,7 +48,7 @@ struct typec_mux_state { void *data; }; =20 -typedef int (*typec_mux_set_fn_t)(struct typec_mux *mux, +typedef int (*typec_mux_set_fn_t)(struct typec_mux_dev *mux, struct typec_mux_state *state); =20 struct typec_mux_desc { @@ -67,11 +69,11 @@ typec_mux_get(struct device *dev, const struct typec_al= tmode_desc *desc) return fwnode_typec_mux_get(dev_fwnode(dev), desc); } =20 -struct typec_mux * +struct typec_mux_dev * typec_mux_register(struct device *parent, const struct typec_mux_desc *des= c); -void typec_mux_unregister(struct typec_mux *mux); +void typec_mux_unregister(struct typec_mux_dev *mux); =20 -void typec_mux_set_drvdata(struct typec_mux *mux, void *data); -void *typec_mux_get_drvdata(struct typec_mux *mux); +void typec_mux_set_drvdata(struct typec_mux_dev *mux, void *data); +void *typec_mux_get_drvdata(struct typec_mux_dev *mux); =20 #endif /* __USB_TYPEC_MUX */ --=20 2.35.1 From nobody Sun May 10 21:18:29 2026 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 44166C433F5 for ; Fri, 22 Apr 2022 22:55:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233834AbiDVW6c (ORCPT ); Fri, 22 Apr 2022 18:58:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234229AbiDVW5m (ORCPT ); Fri, 22 Apr 2022 18:57:42 -0400 Received: from mail-oa1-x30.google.com (mail-oa1-x30.google.com [IPv6:2001:4860:4864:20::30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C820E1AFF41 for ; Fri, 22 Apr 2022 15:21:56 -0700 (PDT) Received: by mail-oa1-x30.google.com with SMTP id 586e51a60fabf-e2442907a1so10057385fac.8 for ; Fri, 22 Apr 2022 15:21:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MZN6Zt3nDrquMGvxHt/QElrh6H38NKlikXj3lsOy1lI=; b=dSoGWyLvstbL4O3lghCrhJfbLZQ9PPNdEpiAqQBZaeCuTDnM3EHyVR4hCZlbt6YUG0 7COIeBGGRULeoKoqIdyJdVyoQ2dNh0KYpCJgcxfQ+Hgoh9r5dKnHY9t+8aKkXTRKjqhg WHzuwIDLzMZ0WFe/lfX5M/v/eaq9SVAAOLUFcESQmQX/QqJ/s+m/iKuOObFmbhTgbACE Hb8r52nPhXwgwhp06wfhayF5zq4pssB0xgvgPwe1YCtqIzT+pJb9b/Nj91Jjk3DImzVR PYyWwTf5fze35nZ0hO0B88nNWNnC867JHDGKpHdSDPRsYhYt6Cad0VK7Pcg9l15IA39x LdtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MZN6Zt3nDrquMGvxHt/QElrh6H38NKlikXj3lsOy1lI=; b=kcbhS2t3n+m8yqiatZdV9qiMQa9JHTxfKZlGyyq2xFZFn5Bam49CXVSAbfVNW4kERv 2jGxNgjQLQ+FdPxqbNzzMSXnkEHmOqjI+W2NquYwr1OgHE+WZC+TUShdGypw8bC60dQy avhfUxBy4f5M3MvRveZAIaxQpaAYCgOwCf3uzc4n5KNRk5BXAqCDmIyB/5TSRZuXKXZb /DwIDMHAzxXlC9g6CUXMx7RE+8dtXJA5OBtin0bPGXMn4Yvc8Yn8VCC9iaZ42Wau88qh ERCl8oODrm/3QI+rgBd3LXD6x+WXVIfLBEBXYb81JkR6/2NF4/Wre2WedYalgBwq0ra5 yhMQ== X-Gm-Message-State: AOAM530mXiHQkSVbZfrmfBUuUslIvBXa4wowtOunV+Whumk1Hq5mRI9b xMrDey96rB48NKRxK/L8lyCGlw== X-Google-Smtp-Source: ABdhPJxx8HVT12hM8dHtgpR8ya/52JDTLcKh4apdtUfXZReIakG45ZoMf581rVq74RFPawXvKQvkhg== X-Received: by 2002:a05:6870:9a21:b0:e5:c836:9456 with SMTP id fo33-20020a0568709a2100b000e5c8369456mr2956229oab.282.1650666115987; Fri, 22 Apr 2022 15:21:55 -0700 (PDT) Received: from ripper.. ([2600:1700:a0:3dc8:205:1bff:fec0:b9b3]) by smtp.gmail.com with ESMTPSA id js4-20020a056870bac400b000e687cdf5adsm1049224oab.55.2022.04.22.15.21.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Apr 2022 15:21:55 -0700 (PDT) From: Bjorn Andersson To: Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Andy Shevchenko , Daniel Scally , Heikki Krogerus , Sakari Ailus , "Rafael J. Wysocki" , Hans de Goede Cc: linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org Subject: [PATCH v5 5/7] usb: typec: mux: Allow multiple mux_devs per mux Date: Fri, 22 Apr 2022 15:23:49 -0700 Message-Id: <20220422222351.1297276-6-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220422222351.1297276-1-bjorn.andersson@linaro.org> References: <20220422222351.1297276-1-bjorn.andersson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In the Qualcomm platforms the USB/DP PHY handles muxing and orientation switching of the SuperSpeed lines, but the SBU lines needs to be connected and switched by external (to the SoC) hardware. It's therefor necessary to be able to have the TypeC controller operate multiple TypeC muxes and switches. Use the newly introduced indirection object to handle this, to avoid having to taint the TypeC controllers with knowledge about the downstream hardware configuration. The max number of devs per indirection is set to 3, which account for being able to mux/switch the USB HS, SS and SBU lines, as per defined defined in the usb-c-connector binding. This number could be grown if need arrises at a later point in time. Acked-by: Heikki Krogerus Signed-off-by: Bjorn Andersson Reviewed-by: Sakari Ailus --- Changes since v4: - None drivers/usb/typec/mux.c | 128 ++++++++++++++++++++++++++++++++-------- 1 file changed, 102 insertions(+), 26 deletions(-) diff --git a/drivers/usb/typec/mux.c b/drivers/usb/typec/mux.c index bb6c095b4af9..fd55c2c516a5 100644 --- a/drivers/usb/typec/mux.c +++ b/drivers/usb/typec/mux.c @@ -17,8 +17,11 @@ #include "class.h" #include "mux.h" =20 +#define TYPEC_MUX_MAX_DEVS 3 + struct typec_switch { - struct typec_switch_dev *sw_dev; + struct typec_switch_dev *sw_devs[TYPEC_MUX_MAX_DEVS]; + unsigned int num_sw_devs; }; =20 static int switch_fwnode_match(struct device *dev, const void *fwnode) @@ -67,25 +70,50 @@ static void *typec_switch_match(struct fwnode_handle *f= wnode, const char *id, */ struct typec_switch *fwnode_typec_switch_get(struct fwnode_handle *fwnode) { - struct typec_switch_dev *sw_dev; + struct typec_switch_dev *sw_devs[TYPEC_MUX_MAX_DEVS]; struct typec_switch *sw; + int count; + int err; + int i; =20 sw =3D kzalloc(sizeof(*sw), GFP_KERNEL); if (!sw) return ERR_PTR(-ENOMEM); =20 - sw_dev =3D fwnode_connection_find_match(fwnode, "orientation-switch", NUL= L, - typec_switch_match); - if (IS_ERR_OR_NULL(sw_dev)) { + count =3D fwnode_connection_find_matches(fwnode, "orientation-switch", NU= LL, + typec_switch_match, + (void **)sw_devs, + ARRAY_SIZE(sw_devs)); + if (count <=3D 0) { kfree(sw); - return ERR_CAST(sw_dev); + return NULL; } =20 - WARN_ON(!try_module_get(sw_dev->dev.parent->driver->owner)); + for (i =3D 0; i < count; i++) { + if (IS_ERR(sw_devs[i])) { + err =3D PTR_ERR(sw_devs[i]); + goto put_sw_devs; + } + } =20 - sw->sw_dev =3D sw_dev; + for (i =3D 0; i < count; i++) { + WARN_ON(!try_module_get(sw_devs[i]->dev.parent->driver->owner)); + sw->sw_devs[i] =3D sw_devs[i]; + } + + sw->num_sw_devs =3D count; =20 return sw; + +put_sw_devs: + for (i =3D 0; i < count; i++) { + if (!IS_ERR(sw_devs[i])) + put_device(&sw_devs[i]->dev); + } + + kfree(sw); + + return ERR_PTR(err); } EXPORT_SYMBOL_GPL(fwnode_typec_switch_get); =20 @@ -98,14 +126,17 @@ EXPORT_SYMBOL_GPL(fwnode_typec_switch_get); void typec_switch_put(struct typec_switch *sw) { struct typec_switch_dev *sw_dev; + unsigned int i; =20 if (IS_ERR_OR_NULL(sw)) return; =20 - sw_dev =3D sw->sw_dev; + for (i =3D 0; i < sw->num_sw_devs; i++) { + sw_dev =3D sw->sw_devs[i]; =20 - module_put(sw_dev->dev.parent->driver->owner); - put_device(&sw_dev->dev); + module_put(sw_dev->dev.parent->driver->owner); + put_device(&sw_dev->dev); + } kfree(sw); } EXPORT_SYMBOL_GPL(typec_switch_put); @@ -173,13 +204,21 @@ int typec_switch_set(struct typec_switch *sw, enum typec_orientation orientation) { struct typec_switch_dev *sw_dev; + unsigned int i; + int ret; =20 if (IS_ERR_OR_NULL(sw)) return 0; =20 - sw_dev =3D sw->sw_dev; + for (i =3D 0; i < sw->num_sw_devs; i++) { + sw_dev =3D sw->sw_devs[i]; + + ret =3D sw_dev->set(sw_dev, orientation); + if (ret) + return ret; + } =20 - return sw_dev->set(sw_dev, orientation); + return 0; } EXPORT_SYMBOL_GPL(typec_switch_set); =20 @@ -211,7 +250,8 @@ EXPORT_SYMBOL_GPL(typec_switch_get_drvdata); /* -----------------------------------------------------------------------= -- */ =20 struct typec_mux { - struct typec_mux_dev *mux_dev; + struct typec_mux_dev *mux_devs[TYPEC_MUX_MAX_DEVS]; + unsigned int num_mux_devs; }; =20 static int mux_fwnode_match(struct device *dev, const void *fwnode) @@ -294,25 +334,50 @@ static void *typec_mux_match(struct fwnode_handle *fw= node, const char *id, struct typec_mux *fwnode_typec_mux_get(struct fwnode_handle *fwnode, const struct typec_altmode_desc *desc) { - struct typec_mux_dev *mux_dev; + struct typec_mux_dev *mux_devs[TYPEC_MUX_MAX_DEVS]; struct typec_mux *mux; + int count; + int err; + int i; =20 mux =3D kzalloc(sizeof(*mux), GFP_KERNEL); if (!mux) return ERR_PTR(-ENOMEM); =20 - mux_dev =3D fwnode_connection_find_match(fwnode, "mode-switch", (void *)d= esc, - typec_mux_match); - if (IS_ERR_OR_NULL(mux_dev)) { + count =3D fwnode_connection_find_matches(fwnode, "mode-switch", + (void *)desc, typec_mux_match, + (void **)mux_devs, + ARRAY_SIZE(mux_devs)); + if (count <=3D 0) { kfree(mux); - return ERR_CAST(mux_dev); + return NULL; } =20 - WARN_ON(!try_module_get(mux_dev->dev.parent->driver->owner)); + for (i =3D 0; i < count; i++) { + if (IS_ERR(mux_devs[i])) { + err =3D PTR_ERR(mux_devs[i]); + goto put_mux_devs; + } + } + + for (i =3D 0; i < count; i++) { + WARN_ON(!try_module_get(mux_devs[i]->dev.parent->driver->owner)); + mux->mux_devs[i] =3D mux_devs[i]; + } =20 - mux->mux_dev =3D mux_dev; + mux->num_mux_devs =3D count; =20 return mux; + +put_mux_devs: + for (i =3D 0; i < count; i++) { + if (!IS_ERR(mux_devs[i])) + put_device(&mux_devs[i]->dev); + } + + kfree(mux); + + return ERR_PTR(err); } EXPORT_SYMBOL_GPL(fwnode_typec_mux_get); =20 @@ -325,13 +390,16 @@ EXPORT_SYMBOL_GPL(fwnode_typec_mux_get); void typec_mux_put(struct typec_mux *mux) { struct typec_mux_dev *mux_dev; + unsigned int i; =20 if (IS_ERR_OR_NULL(mux)) return; =20 - mux_dev =3D mux->mux_dev; - module_put(mux_dev->dev.parent->driver->owner); - put_device(&mux_dev->dev); + for (i =3D 0; i < mux->num_mux_devs; i++) { + mux_dev =3D mux->mux_devs[i]; + module_put(mux_dev->dev.parent->driver->owner); + put_device(&mux_dev->dev); + } kfree(mux); } EXPORT_SYMBOL_GPL(typec_mux_put); @@ -339,13 +407,21 @@ EXPORT_SYMBOL_GPL(typec_mux_put); int typec_mux_set(struct typec_mux *mux, struct typec_mux_state *state) { struct typec_mux_dev *mux_dev; + unsigned int i; + int ret; =20 if (IS_ERR_OR_NULL(mux)) return 0; =20 - mux_dev =3D mux->mux_dev; + for (i =3D 0; i < mux->num_mux_devs; i++) { + mux_dev =3D mux->mux_devs[i]; + + ret =3D mux_dev->set(mux_dev, state); + if (ret) + return ret; + } =20 - return mux_dev->set(mux_dev, state); + return 0; } EXPORT_SYMBOL_GPL(typec_mux_set); =20 --=20 2.35.1 From nobody Sun May 10 21:18:29 2026 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 6E9E3C433EF for ; Fri, 22 Apr 2022 22:55:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234101AbiDVW6P (ORCPT ); Fri, 22 Apr 2022 18:58:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51294 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234196AbiDVW5l (ORCPT ); Fri, 22 Apr 2022 18:57:41 -0400 Received: from mail-oa1-x29.google.com (mail-oa1-x29.google.com [IPv6:2001:4860:4864:20::29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB496375E7A for ; Fri, 22 Apr 2022 15:21:57 -0700 (PDT) Received: by mail-oa1-x29.google.com with SMTP id 586e51a60fabf-deb9295679so10065163fac.6 for ; Fri, 22 Apr 2022 15:21:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zbrQJFqn/WJzFyNhh4+ufy40OrWo2hrMWxpSlAkPQWY=; b=sRUYTmbk06KsFnSSqgjMEjZLe/nW8hlf6MtX6VtMuQT4zBTl86+ruLHJuAEZv6OBMU vkdLDekFqfBxRCgm0nuOub8bHmQvKhek5rp802gDBOYLPdMnFlPJ5zuLJAwGmfjU88qp s5W/kH8rNbT7RwW9fTZHNZiYKdA7mLEkQ914U0CFsCBV699zopXiCUM20cNbg4g2q/ju kHcPxtahw+cJVwYWcI3VFzXPQ9upUcUhqhvl7OTeZZA8kaSmHFcCFSlZYJ3qajDVDV+K 07iqwrDFjYwgoYpDUByoBX9a9aiOYadiN7GSfIOw69U8VKSE4Z4qdYO1OY06yD/PFgle iMsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zbrQJFqn/WJzFyNhh4+ufy40OrWo2hrMWxpSlAkPQWY=; b=lKTMyAbN5t63wCAsVCX+UaChbRwYdS5Y8G+k9hbXZDqBjG+3iK7OmSlT1ImQkYMxu7 rZMS6DcVOH/Nbhtqf+tl2m8AKlQHLj6EByUv/oYmRjRpwj5SIbDzQd+MZ4aBNea/VBPg JUkJ+nPhwi8Owrdm5e9Ljmd4WPySnni7LINMnF9QxX6yCgDt7uEvcfkSzg0M4kV/kDXR HUjiSvz9RpgVcN9jc655QhY/Epea9gearglncR51NdbJGBQ+bm1521G+sKFJlqgAXZTw 275F7B3IcLF4EVwZdp9nIj9DZDuplmlpb6ol9mBiB+10aq9OkfZiP283aFAHdp0UjMuQ 6Y1g== X-Gm-Message-State: AOAM532V48epz8i4/NUTlhE56KdzzO3kt2MX4tMGxIqZKtD+d+5OVByO FDJW81ogAP9H311+VqXSXdn3/w== X-Google-Smtp-Source: ABdhPJwNrtkIBqCrhCqv28M2QWXDvRl/sQAPj3p6KYeo/awaC3wDWg5F9wMuMSThxywFlqVOUFlklg== X-Received: by 2002:a05:6870:d0ce:b0:de:79e2:7ec7 with SMTP id k14-20020a056870d0ce00b000de79e27ec7mr2814583oaa.245.1650666117162; Fri, 22 Apr 2022 15:21:57 -0700 (PDT) Received: from ripper.. ([2600:1700:a0:3dc8:205:1bff:fec0:b9b3]) by smtp.gmail.com with ESMTPSA id js4-20020a056870bac400b000e687cdf5adsm1049224oab.55.2022.04.22.15.21.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Apr 2022 15:21:56 -0700 (PDT) From: Bjorn Andersson To: Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Andy Shevchenko , Daniel Scally , Heikki Krogerus , Sakari Ailus , "Rafael J. Wysocki" , Hans de Goede Cc: linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, Rob Herring Subject: [PATCH v5 6/7] dt-bindings: usb: Add binding for fcs,fsa4480 Date: Fri, 22 Apr 2022 15:23:50 -0700 Message-Id: <20220422222351.1297276-7-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220422222351.1297276-1-bjorn.andersson@linaro.org> References: <20220422222351.1297276-1-bjorn.andersson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The Fairchild/ON Semiconductor FSA4480 Analog Audio switch is used in USB Type-C configurations for muxing analog audio onto the USB connector, and as such used to control the SBU signals for altmodes such as DisplayPort. Add a binding for this hardware block. Reviewed-by: Rob Herring Signed-off-by: Bjorn Andersson Reviewed-by: Sakari Ailus --- Changes since v4: - None .../devicetree/bindings/usb/fcs,fsa4480.yaml | 72 +++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 Documentation/devicetree/bindings/usb/fcs,fsa4480.yaml diff --git a/Documentation/devicetree/bindings/usb/fcs,fsa4480.yaml b/Docum= entation/devicetree/bindings/usb/fcs,fsa4480.yaml new file mode 100644 index 000000000000..9473f26b0621 --- /dev/null +++ b/Documentation/devicetree/bindings/usb/fcs,fsa4480.yaml @@ -0,0 +1,72 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: "http://devicetree.org/schemas/usb/fcs,fsa4480.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: ON Semiconductor Analog Audio Switch + +maintainers: + - Bjorn Andersson + +properties: + compatible: + enum: + - fcs,fsa4480 + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + vcc-supply: + description: power supply (2.7V-5.5V) + + mode-switch: + description: Flag the port as possible handle of altmode switching + type: boolean + + orientation-switch: + description: Flag the port as possible handler of orientation switching + type: boolean + + port: + $ref: /schemas/graph.yaml#/properties/port + description: + A port node to link the FSA4480 to a TypeC controller for the purpos= e of + handling altmode muxing and orientation switching. + +required: + - compatible + - reg + - port + +additionalProperties: false + +examples: + - | + #include + i2c13 { + #address-cells =3D <1>; + #size-cells =3D <0>; + + fsa4480@42 { + compatible =3D "fcs,fsa4480"; + reg =3D <0x42>; + + interrupts-extended =3D <&tlmm 2 IRQ_TYPE_LEVEL_LOW>; + + vcc-supply =3D <&vreg_bob>; + + mode-switch; + orientation-switch; + + port { + fsa4480_ept: endpoint { + remote-endpoint =3D <&typec_controller>; + }; + }; + }; + }; +... --=20 2.35.1 From nobody Sun May 10 21:18:29 2026 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 1A0A9C433EF for ; Fri, 22 Apr 2022 22:54:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233735AbiDVW5S (ORCPT ); Fri, 22 Apr 2022 18:57:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233901AbiDVW47 (ORCPT ); Fri, 22 Apr 2022 18:56:59 -0400 Received: from mail-oa1-x30.google.com (mail-oa1-x30.google.com [IPv6:2001:4860:4864:20::30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 66CAB3766AE for ; Fri, 22 Apr 2022 15:21:59 -0700 (PDT) Received: by mail-oa1-x30.google.com with SMTP id 586e51a60fabf-d39f741ba0so10034602fac.13 for ; Fri, 22 Apr 2022 15:21:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YfdyUeRBKR7/kufYH33kid5tsUaSAg2QglexM2TYAZE=; b=S25cr15PWqZVQoaeR93yTdLNOyjL74an2NA5fiXvUN03SfqBvkwUc6/NJ90wfypL6n 7qnczyOLRDGNi6Qy28R0x8oTvofoG9WX/Fc27z5mU0aF1mw0AB7pFoU6mLVNG/5JGeVW OLj2uQPq8NFb6be6O4z0NPT1JhEAWH2HfCh9e/NBdrzGjq9oKTg4VDm9F+Li5xCUfOEv ULg+g6VaAjSjYqTqGODCKxJAIEtj6flZaplXDSM8WtFAFZrHaSEgt4p3gmRhd1MC8wvr e+lRijbqUCY2tzpQHXe+yGcltJKrP9sBBoqrHPWSs+mansOmL6v0I1MDmZKJBUHp0BuZ +hDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YfdyUeRBKR7/kufYH33kid5tsUaSAg2QglexM2TYAZE=; b=zDUsV6bMf9DquRqpjazpdLeoulT/nqPZHgfFo+HCDHd6vuJrsWvMXFHpE2IT0wqsqr u+Wc8TEivR0wl7qU9mtTTDmQ9JWWtMvWkpsJEmEXC/W6qbjJpFiipbEDFTdsgGrJ0di1 fUicNO9/VrEoTJjEWOIj7dKkerWDjmeNtKtm6F45BAfZDDaCMnhGdxfXB2PE6tn9cOG/ ksugH9qsvmy+8+O+HLFcZg9BtGkkgOt4+C+KATW6UB54Y5JF11M3kuhTS3DUVdpINBmj a+GKgrDky9dcB6yN6k6W1V1tMZo4KoRI8+neZkE15TALdu9nTuHrGYHXpgvOS31RIdEA aRCQ== X-Gm-Message-State: AOAM533ymR6Ttafgf2DgrVHocKZ2YzMw9mrdH312/Gx+LFFoMaarRyQ7 bwMlv+i2gPwxptLO1MKtb2sGJw== X-Google-Smtp-Source: ABdhPJxzLx2x/E6WOR5Si0YdPNktJBV8OkVVmeAAG7G+uedRUBkDjgfJ8N9psrJxZUh6jlA7ixI/8g== X-Received: by 2002:a05:6870:5802:b0:de:ce5e:33ea with SMTP id r2-20020a056870580200b000dece5e33eamr2967613oap.57.1650666118478; Fri, 22 Apr 2022 15:21:58 -0700 (PDT) Received: from ripper.. ([2600:1700:a0:3dc8:205:1bff:fec0:b9b3]) by smtp.gmail.com with ESMTPSA id js4-20020a056870bac400b000e687cdf5adsm1049224oab.55.2022.04.22.15.21.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Apr 2022 15:21:57 -0700 (PDT) From: Bjorn Andersson To: Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Andy Shevchenko , Daniel Scally , Heikki Krogerus , Sakari Ailus , "Rafael J. Wysocki" , Hans de Goede Cc: linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org Subject: [PATCH v5 7/7] usb: typec: mux: Add On Semi fsa4480 driver Date: Fri, 22 Apr 2022 15:23:51 -0700 Message-Id: <20220422222351.1297276-8-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220422222351.1297276-1-bjorn.andersson@linaro.org> References: <20220422222351.1297276-1-bjorn.andersson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The ON Semiconductor FSA4480 is a USB Type-C port multimedia switch with support for analog audio headsets. It allows sharing a common USB Type-C port to pass USB2.0 signal, analog audio, sideband use wires and analog microphone signal. Due to lacking upstream audio support for testing, the audio muxing is left untouched, but implementation of muxing the SBU lines is provided as a pair of Type-C mux and switch devices. This provides the necessary support for enabling the DisplayPort altmode on devices with this circuit. Signed-off-by: Bjorn Andersson Reviewed-by: Heikki Krogerus Reviewed-by: Sakari Ailus --- Changes since v4: - Disable locking of the regmap - Use dev_fwnode() instead of explicit dereference drivers/usb/typec/mux/Kconfig | 10 ++ drivers/usb/typec/mux/Makefile | 1 + drivers/usb/typec/mux/fsa4480.c | 218 ++++++++++++++++++++++++++++++++ 3 files changed, 229 insertions(+) create mode 100644 drivers/usb/typec/mux/fsa4480.c diff --git a/drivers/usb/typec/mux/Kconfig b/drivers/usb/typec/mux/Kconfig index edead555835e..5eb2c17d72c1 100644 --- a/drivers/usb/typec/mux/Kconfig +++ b/drivers/usb/typec/mux/Kconfig @@ -2,6 +2,16 @@ =20 menu "USB Type-C Multiplexer/DeMultiplexer Switch support" =20 +config TYPEC_MUX_FSA4480 + tristate "ON Semi FSA4480 Analog Audio Switch driver" + depends on I2C + select REGMAP_I2C + help + Driver for the ON Semiconductor FSA4480 Analog Audio Switch, which + provides support for muxing analog audio and sideband signals on a + common USB Type-C connector. + If compiled as a module, the module will be named fsa4480. + config TYPEC_MUX_PI3USB30532 tristate "Pericom PI3USB30532 Type-C cross switch driver" depends on I2C diff --git a/drivers/usb/typec/mux/Makefile b/drivers/usb/typec/mux/Makefile index 280a6f553115..e52a56c16bfb 100644 --- a/drivers/usb/typec/mux/Makefile +++ b/drivers/usb/typec/mux/Makefile @@ -1,4 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 =20 +obj-$(CONFIG_TYPEC_MUX_FSA4480) +=3D fsa4480.o obj-$(CONFIG_TYPEC_MUX_PI3USB30532) +=3D pi3usb30532.o obj-$(CONFIG_TYPEC_MUX_INTEL_PMC) +=3D intel_pmc_mux.o diff --git a/drivers/usb/typec/mux/fsa4480.c b/drivers/usb/typec/mux/fsa448= 0.c new file mode 100644 index 000000000000..6184f5367190 --- /dev/null +++ b/drivers/usb/typec/mux/fsa4480.c @@ -0,0 +1,218 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2021-2022 Linaro Ltd. + * Copyright (C) 2018-2020 The Linux Foundation + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#define FSA4480_SWITCH_ENABLE 0x04 +#define FSA4480_SWITCH_SELECT 0x05 +#define FSA4480_SWITCH_STATUS1 0x07 +#define FSA4480_SLOW_L 0x08 +#define FSA4480_SLOW_R 0x09 +#define FSA4480_SLOW_MIC 0x0a +#define FSA4480_SLOW_SENSE 0x0b +#define FSA4480_SLOW_GND 0x0c +#define FSA4480_DELAY_L_R 0x0d +#define FSA4480_DELAY_L_MIC 0x0e +#define FSA4480_DELAY_L_SENSE 0x0f +#define FSA4480_DELAY_L_AGND 0x10 +#define FSA4480_RESET 0x1e +#define FSA4480_MAX_REGISTER 0x1f + +#define FSA4480_ENABLE_DEVICE BIT(7) +#define FSA4480_ENABLE_SBU GENMASK(6, 5) +#define FSA4480_ENABLE_USB GENMASK(4, 3) + +#define FSA4480_SEL_SBU_REVERSE GENMASK(6, 5) +#define FSA4480_SEL_USB GENMASK(4, 3) + +struct fsa4480 { + struct i2c_client *client; + + /* used to serialize concurrent change requests */ + struct mutex lock; + + struct typec_switch_dev *sw; + struct typec_mux_dev *mux; + + struct regmap *regmap; + + u8 cur_enable; + u8 cur_select; +}; + +static const struct regmap_config fsa4480_regmap_config =3D { + .reg_bits =3D 8, + .val_bits =3D 8, + .max_register =3D FSA4480_MAX_REGISTER, + /* Accesses only done under fsa4480->lock */ + .disable_locking =3D true, +}; + +static int fsa4480_switch_set(struct typec_switch_dev *sw, + enum typec_orientation orientation) +{ + struct fsa4480 *fsa =3D typec_switch_get_drvdata(sw); + u8 new_sel; + + mutex_lock(&fsa->lock); + new_sel =3D FSA4480_SEL_USB; + if (orientation =3D=3D TYPEC_ORIENTATION_REVERSE) + new_sel |=3D FSA4480_SEL_SBU_REVERSE; + + if (new_sel =3D=3D fsa->cur_select) + goto out_unlock; + + if (fsa->cur_enable & FSA4480_ENABLE_SBU) { + /* Disable SBU output while re-configuring the switch */ + regmap_write(fsa->regmap, FSA4480_SWITCH_ENABLE, + fsa->cur_enable & ~FSA4480_ENABLE_SBU); + + /* 35us to allow the SBU switch to turn off */ + usleep_range(35, 1000); + } + + regmap_write(fsa->regmap, FSA4480_SWITCH_SELECT, new_sel); + fsa->cur_select =3D new_sel; + + if (fsa->cur_enable & FSA4480_ENABLE_SBU) { + regmap_write(fsa->regmap, FSA4480_SWITCH_ENABLE, fsa->cur_enable); + + /* 15us to allow the SBU switch to turn on again */ + usleep_range(15, 1000); + } + +out_unlock: + mutex_unlock(&fsa->lock); + + return 0; +} + +static int fsa4480_mux_set(struct typec_mux_dev *mux, struct typec_mux_sta= te *state) +{ + struct fsa4480 *fsa =3D typec_mux_get_drvdata(mux); + u8 new_enable; + + mutex_lock(&fsa->lock); + + new_enable =3D FSA4480_ENABLE_DEVICE | FSA4480_ENABLE_USB; + if (state->mode >=3D TYPEC_DP_STATE_A) + new_enable |=3D FSA4480_ENABLE_SBU; + + if (new_enable =3D=3D fsa->cur_enable) + goto out_unlock; + + regmap_write(fsa->regmap, FSA4480_SWITCH_ENABLE, new_enable); + fsa->cur_enable =3D new_enable; + + if (new_enable & FSA4480_ENABLE_SBU) { + /* 15us to allow the SBU switch to turn off */ + usleep_range(15, 1000); + } + +out_unlock: + mutex_unlock(&fsa->lock); + + return 0; +} + +static int fsa4480_probe(struct i2c_client *client) +{ + struct device *dev =3D &client->dev; + struct typec_switch_desc sw_desc =3D { }; + struct typec_mux_desc mux_desc =3D { }; + struct fsa4480 *fsa; + + fsa =3D devm_kzalloc(dev, sizeof(*fsa), GFP_KERNEL); + if (!fsa) + return -ENOMEM; + + fsa->client =3D client; + mutex_init(&fsa->lock); + + fsa->regmap =3D devm_regmap_init_i2c(client, &fsa4480_regmap_config); + if (IS_ERR(fsa->regmap)) + return dev_err_probe(dev, PTR_ERR(fsa->regmap), "failed to initialize re= gmap\n"); + + fsa->cur_enable =3D FSA4480_ENABLE_DEVICE | FSA4480_ENABLE_USB; + fsa->cur_select =3D FSA4480_SEL_USB; + + /* set default settings */ + regmap_write(fsa->regmap, FSA4480_SLOW_L, 0x00); + regmap_write(fsa->regmap, FSA4480_SLOW_R, 0x00); + regmap_write(fsa->regmap, FSA4480_SLOW_MIC, 0x00); + regmap_write(fsa->regmap, FSA4480_SLOW_SENSE, 0x00); + regmap_write(fsa->regmap, FSA4480_SLOW_GND, 0x00); + regmap_write(fsa->regmap, FSA4480_DELAY_L_R, 0x00); + regmap_write(fsa->regmap, FSA4480_DELAY_L_MIC, 0x00); + regmap_write(fsa->regmap, FSA4480_DELAY_L_SENSE, 0x00); + regmap_write(fsa->regmap, FSA4480_DELAY_L_AGND, 0x09); + regmap_write(fsa->regmap, FSA4480_SWITCH_SELECT, fsa->cur_select); + regmap_write(fsa->regmap, FSA4480_SWITCH_ENABLE, fsa->cur_enable); + + sw_desc.drvdata =3D fsa; + sw_desc.fwnode =3D dev_fwnode(dev); + sw_desc.set =3D fsa4480_switch_set; + + fsa->sw =3D typec_switch_register(dev, &sw_desc); + if (IS_ERR(fsa->sw)) + return dev_err_probe(dev, PTR_ERR(fsa->sw), "failed to register typec sw= itch\n"); + + mux_desc.drvdata =3D fsa; + mux_desc.fwnode =3D dev_fwnode(dev); + mux_desc.set =3D fsa4480_mux_set; + + fsa->mux =3D typec_mux_register(dev, &mux_desc); + if (IS_ERR(fsa->mux)) { + typec_switch_unregister(fsa->sw); + return dev_err_probe(dev, PTR_ERR(fsa->mux), "failed to register typec m= ux\n"); + } + + i2c_set_clientdata(client, fsa); + return 0; +} + +static int fsa4480_remove(struct i2c_client *client) +{ + struct fsa4480 *fsa =3D i2c_get_clientdata(client); + + typec_mux_unregister(fsa->mux); + typec_switch_unregister(fsa->sw); + + return 0; +} + +static const struct i2c_device_id fsa4480_table[] =3D { + { "fsa4480" }, + { } +}; +MODULE_DEVICE_TABLE(i2c, fsa4480_table); + +static const struct of_device_id fsa4480_of_table[] =3D { + { .compatible =3D "fcs,fsa4480" }, + { } +}; +MODULE_DEVICE_TABLE(of, fsa4480_of_table); + +static struct i2c_driver fsa4480_driver =3D { + .driver =3D { + .name =3D "fsa4480", + .of_match_table =3D fsa4480_of_table, + }, + .probe_new =3D fsa4480_probe, + .remove =3D fsa4480_remove, + .id_table =3D fsa4480_table, +}; +module_i2c_driver(fsa4480_driver); + +MODULE_DESCRIPTION("ON Semiconductor FSA4480 driver"); +MODULE_LICENSE("GPL v2"); --=20 2.35.1