From patchwork Mon Jul 31 22:42:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Tipton X-Patchwork-Id: 128899 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2322045vqg; Mon, 31 Jul 2023 16:18:11 -0700 (PDT) X-Google-Smtp-Source: APBJJlFRsHGfwTNzkTuNPdaIHgJ/SyQu310pHPku62qtjf+igcrLlKyUnEAwb2TPhYI950Dzk44b X-Received: by 2002:a17:902:b201:b0:1bb:cd10:8215 with SMTP id t1-20020a170902b20100b001bbcd108215mr8187493plr.4.1690845491457; Mon, 31 Jul 2023 16:18:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690845491; cv=none; d=google.com; s=arc-20160816; b=X0Jw5BT/pWMEr+4JDEuL7UR3SJHtdU5VxB8UxPguR46OjKEooINM9JdEEBOX/7qKHB DG75JfE8q7LXol7QB6/S5q6XkKUjKbpMsxsAdM4Y5y9UVvymrDG9D3ldvlYK9v4XMh2M xQRCIG33loYy7BNUhpStbuJ5PtkaboggZyECTnLf1mXX/Hfo1T4csLynSN6IUBbKGXpq u9QPFFKY+cpw42ac5FIZtzIJs8+IuhrOo+6bLJNMqW/KfQsWzUAlhILbD5JKrMf9e1qC jsE3hrQXM1yI4Zmjh1VIfdqHaxlmCLDYrSYIWQgDeMYXDww2NXOuf/26ABY/EI0pdzVX DQVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=fBx6wXCdVZN4Tj2uR5yWntWgXsoRGX1U3sGwd9xI88Y=; fh=oJHz3hZSyGFxyPWLWfyeIlTSffNsCO2WiHDXD1SPjf4=; b=QXRqNllj1X23WNpeqIwZizgXED2UxtJeNmvUtwOQwQLtOQVAxzmdywLQqCEqTeO9kF QUNVWS19rStnVRLM2fZRgqFYbJzxaepAiaiOvwEc74Z1DFf2fv1FHkvmnfsfiXII0aM6 ykMikM+HVKNeZdppZOC4kDgVYjmBOZL/FYjGOVts0RpBtTjHsf3M7sAuhFYES/n8sKJF YNAHLZA/ueO91xx7ACet2/ct+tAJPtKiyD4FXWuICrvrZPH+gqCU27/M6dbXDVoqZ6K/ 9Bs67/Q0+rGQ2COaDbGIFeg6tZ7CV6gzXkHVT3VUDVUze6ekuYJVprmm/sxPqk8u6lsZ l7sw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=aMyq7uUF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id kb14-20020a170903338e00b001bb792749a2si7693657plb.146.2023.07.31.16.17.59; Mon, 31 Jul 2023 16:18:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=aMyq7uUF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231282AbjGaWnY (ORCPT + 99 others); Mon, 31 Jul 2023 18:43:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230443AbjGaWnP (ORCPT ); Mon, 31 Jul 2023 18:43:15 -0400 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9DEA119AE; Mon, 31 Jul 2023 15:43:14 -0700 (PDT) Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 36VLcIS1031532; Mon, 31 Jul 2023 22:43:02 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=qcppdkim1; bh=fBx6wXCdVZN4Tj2uR5yWntWgXsoRGX1U3sGwd9xI88Y=; b=aMyq7uUFEBv9ooXmA62IcKnU3k1e1298q0E6lRVHf4SOREqd7aU954MlRRDZoOYeGwXl kUYPuR1wBu4UlkgJPnD+MZPKrJBFBDiP5foyWMpcQQWrqmk56EFuJTDNiLPKa/tvxk7k HiFhMYNpL+rhd8gio7sPzcocn4zBP5K/xTTBmBjAi19lvFW6e2Pv6DVAjgTdy/fH2fiw RJfcw/1Zbb39b2K7tyQrfXcEM6fwHhoA6iodVIaK1+xHPSIklih9YvESvCnkp3mXb6++ K3EBq/NlARDXmGTRYgVPLiSHKnh2LrbKF+IYuKCTDJxZ1MQw/NbRp8KfqAs4NsGh1n/G yg== Received: from nalasppmta04.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3s6a50242p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 31 Jul 2023 22:43:02 +0000 Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA04.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 36VMh15T025432 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 31 Jul 2023 22:43:01 GMT Received: from hu-mdtipton-lv.qualcomm.com (10.49.16.6) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.30; Mon, 31 Jul 2023 15:43:01 -0700 From: Mike Tipton To: , , , CC: , , , , , , Mike Tipton Subject: [PATCH v2 2/3] interconnect: Reintroduce icc_get() Date: Mon, 31 Jul 2023 15:42:46 -0700 Message-ID: <20230731224247.10846-3-quic_mdtipton@quicinc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230731224247.10846-1-quic_mdtipton@quicinc.com> References: <20230731224247.10846-1-quic_mdtipton@quicinc.com> MIME-Version: 1.0 X-Originating-IP: [10.49.16.6] X-ClientProxiedBy: nalasex01a.na.qualcomm.com (10.47.209.196) To nalasex01a.na.qualcomm.com (10.47.209.196) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: AeeIEog-xvuakvtmZJD-8JUpK0uVRr2F X-Proofpoint-ORIG-GUID: AeeIEog-xvuakvtmZJD-8JUpK0uVRr2F X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-07-31_15,2023-07-31_02,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 malwarescore=0 priorityscore=1501 phishscore=0 clxscore=1015 mlxscore=0 lowpriorityscore=0 impostorscore=0 bulkscore=0 suspectscore=0 mlxlogscore=999 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2307310206 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772980002153403478 X-GMAIL-MSGID: 1772980002153403478 The original icc_get() that took integer node IDs was removed due to lack of users. Reintroduce a new version that takes string node names, which is needed for the debugfs client. Signed-off-by: Mike Tipton --- drivers/interconnect/core.c | 63 +++++++++++++++++++++++++++++++++ drivers/interconnect/internal.h | 2 ++ 2 files changed, 65 insertions(+) diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c index 5fac448c28fd..fc1461dfc61b 100644 --- a/drivers/interconnect/core.c +++ b/drivers/interconnect/core.c @@ -147,6 +147,21 @@ static struct icc_node *node_find(const int id) return idr_find(&icc_idr, id); } +static struct icc_node *node_find_by_name(const char *name) +{ + struct icc_provider *provider; + struct icc_node *n; + + list_for_each_entry(provider, &icc_providers, provider_list) { + list_for_each_entry(n, &provider->nodes, node_list) { + if (!strcmp(n->name, name)) + return n; + } + } + + return NULL; +} + static struct icc_path *path_init(struct device *dev, struct icc_node *dst, ssize_t num_nodes) { @@ -561,6 +576,54 @@ struct icc_path *of_icc_get(struct device *dev, const char *name) } EXPORT_SYMBOL_GPL(of_icc_get); +/** + * icc_get() - get a path handle between two endpoints + * @dev: device pointer for the consumer device + * @src: source node name + * @dst: destination node name + * + * This function will search for a path between two endpoints and return an + * icc_path handle on success. Use icc_put() to release constraints when they + * are not needed anymore. + * + * Return: icc_path pointer on success or ERR_PTR() on error. NULL is returned + * when the API is disabled. + */ +struct icc_path *icc_get(struct device *dev, const char *src, const char *dst) +{ + struct icc_node *src_node, *dst_node; + struct icc_path *path = ERR_PTR(-EPROBE_DEFER); + + mutex_lock(&icc_lock); + + src_node = node_find_by_name(src); + if (!src_node) { + dev_err(dev, "%s: invalid src=%s\n", __func__, src); + goto out; + } + + dst_node = node_find_by_name(dst); + if (!dst_node) { + dev_err(dev, "%s: invalid dst=%s\n", __func__, dst); + goto out; + } + + path = path_find(dev, src_node, dst_node); + if (IS_ERR(path)) { + dev_err(dev, "%s: invalid path=%ld\n", __func__, PTR_ERR(path)); + goto out; + } + + path->name = kasprintf(GFP_KERNEL, "%s-%s", src_node->name, dst_node->name); + if (!path->name) { + kfree(path); + path = ERR_PTR(-ENOMEM); + } +out: + mutex_unlock(&icc_lock); + return path; +} + /** * icc_set_tag() - set an optional tag on a path * @path: the path we want to tag diff --git a/drivers/interconnect/internal.h b/drivers/interconnect/internal.h index f5f82a5c939e..95d6ba27bf78 100644 --- a/drivers/interconnect/internal.h +++ b/drivers/interconnect/internal.h @@ -41,4 +41,6 @@ struct icc_path { struct icc_req reqs[]; }; +struct icc_path *icc_get(struct device *dev, const char *src, const char *dst); + #endif