From patchwork Thu Sep 3 13:31:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Georgi Djakov X-Patchwork-Id: 249014 Delivered-To: patch@linaro.org Received: by 2002:a92:5b9c:0:0:0:0:0 with SMTP id c28csp489592ilg; Thu, 3 Sep 2020 06:59:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyaKUaoJ8LcmqAlAI7mAB038+ak4YgTO8uk7twSN890qvl9YD1PQ9Ec6UwT9TAlaGBSva/o X-Received: by 2002:a17:906:5e59:: with SMTP id b25mr2407155eju.414.1599141546227; Thu, 03 Sep 2020 06:59:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599141546; cv=none; d=google.com; s=arc-20160816; b=FLqhGEPCGDac+rgBtM1ZAFQ5u/GTgvFWSNY9pcfAQhaSWNb4vE3d/fIVKh+Y/PHYqZ odJ2vvJqJL/04hRXrFDjcfUkOnfCyti5KVzcjRDa3DMT9bN4w6eeExbaUX/exWYYrx02 +FmRutn6uTUJR34JWlBcLtvRvlUTbSZKq/F2NbrHlQ5BNmt8b8skVJFeQzlWGzrHSz/7 3MjI+CmKTIOY8r+P+wAhkrWNgt9/Gz1vtYfUFRlDO3SE7dfe9B6gB5mSVF8YdlWpZrTh +eZ5qT9n0D4cPTy2IsMr/EvnO/RI0vQn3S95y/1VaBvlQ1ziahZB7+JIH6uc10VKfcr2 Iczg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=89sbNvX6ByvD6Ay+Fn+uPrui3FWgVd/+bGNAilB1it4=; b=vvjnTVV/EAHHATNPmGQoJeUI+soKfgSD0SoRWn+q8E9bRd6Wmmpk3mJgMIerZ/8hIj Lro6Ccd9Pmb3HfwFVOgmFsALWDDASSLPwFplQVT2a0AjFRxQ3b96pGOKe7Owit0iOxsg 63//GTrlK4UTUfyfbTvAYBuMGGIdVivinqpd6xg3CT/l/SLraLGrkaEoYVYxyNXTLgO7 fjmoapDAZnMgLGz0HBPfVVIh8+ZByv6gxSpaSmIbFIQoqJpqLoNJC3z2Z97N1zhfW3IV SrRplHKxWn8VTGDrrOppKql9JhE5G7xMtdCVe77AFiVuItu55fiK+bEaiD7T5j3rYeWa 4WSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lJyZRId8; spf=pass (google.com: domain of linux-pm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b2si1881646ejk.222.2020.09.03.06.59.05; Thu, 03 Sep 2020 06:59:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-pm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lJyZRId8; spf=pass (google.com: domain of linux-pm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729033AbgICN66 (ORCPT + 10 others); Thu, 3 Sep 2020 09:58:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59194 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728998AbgICN5y (ORCPT ); Thu, 3 Sep 2020 09:57:54 -0400 Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 02514C0619E7 for ; Thu, 3 Sep 2020 06:31:39 -0700 (PDT) Received: by mail-wm1-x341.google.com with SMTP id w2so2924251wmi.1 for ; Thu, 03 Sep 2020 06:31:39 -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=89sbNvX6ByvD6Ay+Fn+uPrui3FWgVd/+bGNAilB1it4=; b=lJyZRId8ESKK6KkiXPxRWmfFHTNRw2ZnCPgVk03k7H66kDAafI3H5NU6WUPG0qZpst UTtIyUNJI0w15ad0L3gxxAQwtsvw+irnMVJUsJCx5UVAT2u9Cqxs1hBq8J+1YMEOF+XG BjjiwRaBCvk/EDZbpXVUGIC6Ks5ZVlHJWB1qKdxdD8fBUinnymUliE4JbZHmtEmkCPOp a2k5qp/xwDEhxnKHT8h4H44LsHTHBmXp6AxAbvixk4kGFV+3edJDJcx0Jp+RULLMb4mc MTTxgYXY4ae6HbLWSfhiuOk43aXJxQkyanTUTR3p/2UJsYX55R0Il5uSr6qkQNSDU8C6 0efQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=89sbNvX6ByvD6Ay+Fn+uPrui3FWgVd/+bGNAilB1it4=; b=uQmMpte8UCXQgaV97PJ4tDqAETtMadrGQPD3fkTQdLi5gT4gxSS0LgD6uinvGHc4nM l760pjjdLoIUXcYOAM3Q4L5Qo0ZkNpYdpo5osZRt7XSmbZ/nB2Le615ELC8k7K90TFpB Dkz7G0o1rvEuA9AMBfMc2XMU8jvQsDQVBUHhBebTrdSgLE0zkLojL3VVqJ04VS4ImfSN bQOkUFSiZBTVqOObV7vzQcmgCDoaTkwwQwNw/8P3TWo4kQDKsVxYlWXmhCM1LjHd+K9N H8RuiscV3mtt7DsjC+gUFH2Kux7X9b7foUJBqsyTLwIX22nUDVGkZMyTa8dHyNNfcqO9 SJpw== X-Gm-Message-State: AOAM532xc97O3UGehhFw+azevWti94fA6RzGogOjrv3nVBQ/xaAGckQP kiB4F3/o+hQctqHck2/ODrwwklQ5IL033w== X-Received: by 2002:a05:600c:2cc1:: with SMTP id l1mr2499601wmc.78.1599139898076; Thu, 03 Sep 2020 06:31:38 -0700 (PDT) Received: from localhost.localdomain ([212.45.67.2]) by smtp.googlemail.com with ESMTPSA id b2sm4310768wmh.47.2020.09.03.06.31.36 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 03 Sep 2020 06:31:37 -0700 (PDT) From: Georgi Djakov To: linux-pm@vger.kernel.org, bjorn.andersson@linaro.org Cc: devicetree@vger.kernel.org, robh+dt@kernel.org, sibis@codeaurora.org, mka@chromium.org, dianders@chromium.org, georgi.djakov@linaro.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 1/7] interconnect: Introduce xlate_extended() callback Date: Thu, 3 Sep 2020 16:31:28 +0300 Message-Id: <20200903133134.17201-2-georgi.djakov@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200903133134.17201-1-georgi.djakov@linaro.org> References: <20200903133134.17201-1-georgi.djakov@linaro.org> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Currently there is the xlate() callback, which is used by providers for mapping the nodes from phandle arguments. That's fine for simple mappings, but the phandle arguments could contain an additional data, such as tag information. Let's create another callback xlate_extended() for the cases where providers want also populate the path tag data. Tested-by: Sibi Sankar Reviewed-by: Sibi Sankar Reviewed-by: Matthias Kaehlcke Tested-by: Matthias Kaehlcke Signed-off-by: Georgi Djakov --- drivers/interconnect/core.c | 73 ++++++++++++++++++--------- include/linux/interconnect-provider.h | 17 ++++++- 2 files changed, 65 insertions(+), 25 deletions(-) diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c index befd111049c0..6ccf55818e68 100644 --- a/drivers/interconnect/core.c +++ b/drivers/interconnect/core.c @@ -336,12 +336,13 @@ EXPORT_SYMBOL_GPL(of_icc_xlate_onecell); * Looks for interconnect provider under the node specified by @spec and if * found, uses xlate function of the provider to map phandle args to node. * - * Returns a valid pointer to struct icc_node on success or ERR_PTR() + * Returns a valid pointer to struct icc_node_data on success or ERR_PTR() * on failure. */ -struct icc_node *of_icc_get_from_provider(struct of_phandle_args *spec) +struct icc_node_data *of_icc_get_from_provider(struct of_phandle_args *spec) { struct icc_node *node = ERR_PTR(-EPROBE_DEFER); + struct icc_node_data *data = NULL; struct icc_provider *provider; if (!spec) @@ -349,14 +350,33 @@ struct icc_node *of_icc_get_from_provider(struct of_phandle_args *spec) mutex_lock(&icc_lock); list_for_each_entry(provider, &icc_providers, provider_list) { - if (provider->dev->of_node == spec->np) - node = provider->xlate(spec, provider->data); - if (!IS_ERR(node)) - break; + if (provider->dev->of_node == spec->np) { + if (provider->xlate_extended) { + data = provider->xlate_extended(spec, provider->data); + if (!IS_ERR(data)) { + node = data->node; + break; + } + } else { + node = provider->xlate(spec, provider->data); + if (!IS_ERR(node)) + break; + } + } } mutex_unlock(&icc_lock); - return node; + if (IS_ERR(node)) + return ERR_CAST(node); + + if (!data) { + data = kzalloc(sizeof(*data), GFP_KERNEL); + if (!data) + return ERR_PTR(-ENOMEM); + data->node = node; + } + + return data; } EXPORT_SYMBOL_GPL(of_icc_get_from_provider); @@ -403,7 +423,7 @@ EXPORT_SYMBOL_GPL(devm_of_icc_get); struct icc_path *of_icc_get_by_index(struct device *dev, int idx) { struct icc_path *path; - struct icc_node *src_node, *dst_node; + struct icc_node_data *src_data, *dst_data; struct device_node *np; struct of_phandle_args src_args, dst_args; int ret; @@ -441,39 +461,46 @@ struct icc_path *of_icc_get_by_index(struct device *dev, int idx) of_node_put(dst_args.np); - src_node = of_icc_get_from_provider(&src_args); + src_data = of_icc_get_from_provider(&src_args); - if (IS_ERR(src_node)) { - if (PTR_ERR(src_node) != -EPROBE_DEFER) + if (IS_ERR(src_data)) { + if (PTR_ERR(src_data) != -EPROBE_DEFER) dev_err(dev, "error finding src node: %ld\n", - PTR_ERR(src_node)); - return ERR_CAST(src_node); + PTR_ERR(src_data)); + return ERR_CAST(src_data); } - dst_node = of_icc_get_from_provider(&dst_args); + dst_data = of_icc_get_from_provider(&dst_args); - if (IS_ERR(dst_node)) { - if (PTR_ERR(dst_node) != -EPROBE_DEFER) + if (IS_ERR(dst_data)) { + if (PTR_ERR(dst_data) != -EPROBE_DEFER) dev_err(dev, "error finding dst node: %ld\n", - PTR_ERR(dst_node)); - return ERR_CAST(dst_node); + PTR_ERR(dst_data)); + kfree(src_data); + return ERR_CAST(dst_data); } mutex_lock(&icc_lock); - path = path_find(dev, src_node, dst_node); + path = path_find(dev, src_data->node, dst_data->node); mutex_unlock(&icc_lock); if (IS_ERR(path)) { dev_err(dev, "%s: invalid path=%ld\n", __func__, PTR_ERR(path)); - return path; + goto free_icc_data; } + if (src_data->tag && src_data->tag == dst_data->tag) + icc_set_tag(path, src_data->tag); + path->name = kasprintf(GFP_KERNEL, "%s-%s", - src_node->name, dst_node->name); + src_data->node->name, dst_data->node->name); if (!path->name) { kfree(path); - return ERR_PTR(-ENOMEM); + path = ERR_PTR(-ENOMEM); } +free_icc_data: + kfree(src_data); + kfree(dst_data); return path; } EXPORT_SYMBOL_GPL(of_icc_get_by_index); @@ -975,7 +1002,7 @@ int icc_provider_add(struct icc_provider *provider) { if (WARN_ON(!provider->set)) return -EINVAL; - if (WARN_ON(!provider->xlate)) + if (WARN_ON(!provider->xlate && !provider->xlate_extended)) return -EINVAL; mutex_lock(&icc_lock); diff --git a/include/linux/interconnect-provider.h b/include/linux/interconnect-provider.h index 4735518de515..4d535fddd5d3 100644 --- a/include/linux/interconnect-provider.h +++ b/include/linux/interconnect-provider.h @@ -14,6 +14,17 @@ struct icc_node; struct of_phandle_args; +/** + * struct icc_node_data - icc node data + * + * @node: icc node + * @tag: tag + */ +struct icc_node_data { + struct icc_node *node; + u32 tag; +}; + /** * struct icc_onecell_data - driver data for onecell interconnect providers * @@ -39,6 +50,7 @@ struct icc_node *of_icc_xlate_onecell(struct of_phandle_args *spec, * @pre_aggregate: pointer to device specific function that is called * before the aggregation begins (optional) * @xlate: provider-specific callback for mapping nodes from phandle arguments + * @xlate_extended: vendor-specific callback for mapping node data from phandle arguments * @dev: the device this interconnect provider belongs to * @users: count of active users * @inter_set: whether inter-provider pairs will be configured with @set @@ -52,6 +64,7 @@ struct icc_provider { u32 peak_bw, u32 *agg_avg, u32 *agg_peak); void (*pre_aggregate)(struct icc_node *node); struct icc_node* (*xlate)(struct of_phandle_args *spec, void *data); + struct icc_node_data* (*xlate_extended)(struct of_phandle_args *spec, void *data); struct device *dev; int users; bool inter_set; @@ -105,7 +118,7 @@ void icc_node_del(struct icc_node *node); int icc_nodes_remove(struct icc_provider *provider); int icc_provider_add(struct icc_provider *provider); int icc_provider_del(struct icc_provider *provider); -struct icc_node *of_icc_get_from_provider(struct of_phandle_args *spec); +struct icc_node_data *of_icc_get_from_provider(struct of_phandle_args *spec); #else @@ -157,7 +170,7 @@ static inline int icc_provider_del(struct icc_provider *provider) return -ENOTSUPP; } -static inline struct icc_node *of_icc_get_from_provider(struct of_phandle_args *spec) +static inline struct icc_node_data *of_icc_get_from_provider(struct of_phandle_args *spec) { return ERR_PTR(-ENOTSUPP); }