From patchwork Fri Apr 22 22:23:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 12824293 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 D0D02C4332F for ; Fri, 22 Apr 2022 22:55:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234186AbiDVW6Z (ORCPT ); Fri, 22 Apr 2022 18:58:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51260 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234185AbiDVW5k (ORCPT ); Fri, 22 Apr 2022 18:57:40 -0400 Received: from mail-oi1-x236.google.com (mail-oi1-x236.google.com [IPv6:2607:f8b0:4864:20::236]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 984D4343E61 for ; Fri, 22 Apr 2022 15:21:52 -0700 (PDT) Received: by mail-oi1-x236.google.com with SMTP id b188so10535853oia.13 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=OCTBWkKiomymYi2DBxK0Jcyy+pY9iFSpAXMEy8nLbj0Oyg6JtFCtTPjYCkZ+6KU5Bd HpHLZTDmRbYoEKsVDTzZyy+MgsCsz606wdlj4oBVzQTyhF/PXSXFCE/bCzwNRAlNKtOw Fc+oLlIoowjZYyQE5lHZktJNiFcmm4Wo2c4HGirfy7zdDmPVOvR0tdgB7ebPi/wpi6/5 VrvAC53Tdg+5bSLstOpXuodvSgID54uDPSOviPkxKLGwHM0KSpuMOJ7HZf9SViN2UvHV 7adFzDUyh/LJKTv9BidYRgD9KnwtAaG3HjqkgKZRGH5Ry4nckd/FW9NBacsUGdWs34h+ 693Q== X-Gm-Message-State: AOAM530V0GIccurc5ZYvqwtFyjJN1R+MINaF4O8oywczIyfifIGHzdOX L5uxV3s0QJDu1DDEOenPthqHfQ== 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 Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org 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 Reviewed-by: Andy Shevchenko Acked-by: Rafael J. Wysocki --- 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 *fwnode, const char *con_id, return NULL; } +static unsigned int fwnode_graph_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; + struct fwnode_handle *ep; + unsigned int count = 0; + void *ret; + + fwnode_graph_for_each_endpoint(fwnode, ep) { + if (matches && count >= matches_len) { + fwnode_handle_put(ep); + break; + } + + node = fwnode_graph_get_remote_port_parent(ep); + if (!fwnode_device_is_available(node)) { + fwnode_handle_put(node); + continue; + } + + ret = match(node, con_id, data); + fwnode_handle_put(node); + if (ret) { + if (matches) + matches[count] = 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, const char *con_id, return NULL; } +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 = 0; + unsigned int i; + void *ret; + + for (i = 0; ; i++) { + if (matches && count >= matches_len) + break; + + node = fwnode_find_reference(fwnode, con_id, i); + if (IS_ERR(node)) + break; + + ret = match(node, NULL, data); + fwnode_handle_put(node); + if (ret) { + if (matches) + matches[count] = 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_handle *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 between + * @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 resolved + * 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 = fwnode_graph_devcon_matches(fwnode, con_id, data, match, + matches, matches_len); + + if (matches) { + matches += count_graph; + matches_len -= count_graph; + } + + count_ref = 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(struct device *dev, return fwnode_connection_find_match(dev_fwnode(dev), con_id, data, match); } +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 */