From nobody Wed Sep 10 11:03:51 2025 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 66823C6FD18 for ; Tue, 25 Apr 2023 14:37:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234298AbjDYOh0 (ORCPT ); Tue, 25 Apr 2023 10:37:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45626 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233801AbjDYOgp (ORCPT ); Tue, 25 Apr 2023 10:36:45 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id D330B13FBB for ; Tue, 25 Apr 2023 07:36:43 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 9AE12C14; Tue, 25 Apr 2023 07:37:27 -0700 (PDT) Received: from localhost.localdomain (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 153D73F587; Tue, 25 Apr 2023 07:36:41 -0700 (PDT) From: James Clark To: coresight@lists.linaro.org, quic_jinlmao@quicinc.com, mike.leach@linaro.org, suzuki.poulose@arm.com Cc: James Clark , Leo Yan , Alexander Shishkin , Mathieu Poirier , Greg Kroah-Hartman , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 07/13] coresight: Store pointers to connections rather than an array of them Date: Tue, 25 Apr 2023 15:35:34 +0100 Message-Id: <20230425143542.2305069-8-james.clark@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230425143542.2305069-1-james.clark@arm.com> References: <20230425143542.2305069-1-james.clark@arm.com> 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" This will allow the same connection object to be referenced via the input connection list in a later commit rather than duplicating them. Reviewed-by: Mike Leach Signed-off-by: James Clark --- drivers/hwtracing/coresight/coresight-core.c | 47 ++++++++++--------- .../hwtracing/coresight/coresight-platform.c | 19 ++++++-- drivers/hwtracing/coresight/coresight-priv.h | 1 + .../hwtracing/coresight/coresight-tmc-etr.c | 2 +- include/linux/coresight.h | 5 +- 5 files changed, 44 insertions(+), 30 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-core.c b/drivers/hwtraci= ng/coresight/coresight-core.c index 91274e7e6944..0b738960973b 100644 --- a/drivers/hwtracing/coresight/coresight-core.c +++ b/drivers/hwtracing/coresight/coresight-core.c @@ -119,7 +119,7 @@ static int coresight_find_link_inport(struct coresight_= device *csdev, struct coresight_connection *conn; =20 for (i =3D 0; i < parent->pdata->nr_outconns; i++) { - conn =3D &parent->pdata->out_conns[i]; + conn =3D parent->pdata->out_conns[i]; if (conn->dest_dev =3D=3D csdev) return conn->dest_port; } @@ -137,7 +137,7 @@ static int coresight_find_link_outport(struct coresight= _device *csdev, struct coresight_connection *conn; =20 for (i =3D 0; i < csdev->pdata->nr_outconns; i++) { - conn =3D &csdev->pdata->out_conns[i]; + conn =3D csdev->pdata->out_conns[i]; if (conn->dest_dev =3D=3D child) return conn->src_port; } @@ -606,7 +606,7 @@ coresight_find_enabled_sink(struct coresight_device *cs= dev) for (i =3D 0; i < csdev->pdata->nr_outconns; i++) { struct coresight_device *child_dev; =20 - child_dev =3D csdev->pdata->out_conns[i].dest_dev; + child_dev =3D csdev->pdata->out_conns[i]->dest_dev; if (child_dev) sink =3D coresight_find_enabled_sink(child_dev); if (sink) @@ -722,7 +722,7 @@ static int coresight_grab_device(struct coresight_devic= e *csdev) for (i =3D 0; i < csdev->pdata->nr_outconns; i++) { struct coresight_device *child; =20 - child =3D csdev->pdata->out_conns[i].dest_dev; + child =3D csdev->pdata->out_conns[i]->dest_dev; if (child && child->type =3D=3D CORESIGHT_DEV_TYPE_HELPER) if (!coresight_get_ref(child)) goto err; @@ -733,7 +733,7 @@ static int coresight_grab_device(struct coresight_devic= e *csdev) for (i--; i >=3D 0; i--) { struct coresight_device *child; =20 - child =3D csdev->pdata->out_conns[i].dest_dev; + child =3D csdev->pdata->out_conns[i]->dest_dev; if (child && child->type =3D=3D CORESIGHT_DEV_TYPE_HELPER) coresight_put_ref(child); } @@ -752,7 +752,7 @@ static void coresight_drop_device(struct coresight_devi= ce *csdev) for (i =3D 0; i < csdev->pdata->nr_outconns; i++) { struct coresight_device *child; =20 - child =3D csdev->pdata->out_conns[i].dest_dev; + child =3D csdev->pdata->out_conns[i]->dest_dev; if (child && child->type =3D=3D CORESIGHT_DEV_TYPE_HELPER) coresight_put_ref(child); } @@ -794,7 +794,7 @@ static int _coresight_build_path(struct coresight_devic= e *csdev, for (i =3D 0; i < csdev->pdata->nr_outconns; i++) { struct coresight_device *child_dev; =20 - child_dev =3D csdev->pdata->out_conns[i].dest_dev; + child_dev =3D csdev->pdata->out_conns[i]->dest_dev; if (child_dev && _coresight_build_path(child_dev, sink, path) =3D=3D 0) { found =3D true; @@ -964,7 +964,7 @@ coresight_find_sink(struct coresight_device *csdev, int= *depth) struct coresight_device *child_dev, *sink =3D NULL; int child_depth =3D curr_depth; =20 - child_dev =3D csdev->pdata->out_conns[i].dest_dev; + child_dev =3D csdev->pdata->out_conns[i]->dest_dev; if (child_dev) sink =3D coresight_find_sink(child_dev, &child_depth); =20 @@ -1334,7 +1334,7 @@ static int coresight_orphan_match(struct device *dev,= void *data) * an orphan connection whose name matches @csdev, link it. */ for (i =3D 0; i < i_csdev->pdata->nr_outconns; i++) { - conn =3D &i_csdev->pdata->out_conns[i]; + conn =3D i_csdev->pdata->out_conns[i]; =20 /* We have found at least one orphan connection */ if (conn->dest_dev =3D=3D NULL) { @@ -1372,7 +1372,7 @@ static int coresight_fixup_device_conns(struct coresi= ght_device *csdev) int i, ret =3D 0; =20 for (i =3D 0; i < csdev->pdata->nr_outconns; i++) { - struct coresight_connection *conn =3D &csdev->pdata->out_conns[i]; + struct coresight_connection *conn =3D csdev->pdata->out_conns[i]; =20 conn->dest_dev =3D coresight_find_csdev_by_fwnode(conn->dest_fwnode); @@ -1406,15 +1406,12 @@ static int coresight_remove_match(struct device *de= v, void *data) * a connection whose name matches @csdev, remove it. */ for (i =3D 0; i < iterator->pdata->nr_outconns; i++) { - conn =3D &iterator->pdata->out_conns[i]; + conn =3D iterator->pdata->out_conns[i]; =20 - if (conn->dest_dev =3D=3D NULL) - continue; - - if (csdev->dev.fwnode =3D=3D conn->dest_fwnode) { + /* Child_dev being set signifies that the links were made */ + if (csdev->dev.fwnode =3D=3D conn->dest_fwnode && conn->dest_dev) { iterator->orphan =3D true; coresight_remove_links(iterator, conn); - conn->dest_dev =3D NULL; /* No need to continue */ break; @@ -1534,22 +1531,26 @@ void coresight_write64(struct coresight_device *csd= ev, u64 val, u32 offset) * to the output port of this device. */ void coresight_release_platform_data(struct coresight_device *csdev, + struct device *dev, struct coresight_platform_data *pdata) { int i; - struct coresight_connection *conns =3D pdata->out_conns; + struct coresight_connection **conns =3D pdata->out_conns; =20 for (i =3D 0; i < pdata->nr_outconns; i++) { /* If we have made the links, remove them now */ - if (csdev && conns[i].dest_dev) - coresight_remove_links(csdev, &conns[i]); + if (csdev && conns[i]->dest_dev) + coresight_remove_links(csdev, conns[i]); /* * Drop the refcount and clear the handle as this device * is going away */ - fwnode_handle_put(conns[i].dest_fwnode); - conns[i].dest_fwnode =3D NULL; + fwnode_handle_put(conns[i]->dest_fwnode); + conns[i]->dest_fwnode =3D NULL; + devm_kfree(dev, conns[i]); } + devm_kfree(dev, pdata->out_conns); + devm_kfree(dev, pdata); if (csdev) coresight_remove_conns_sysfs_group(csdev); } @@ -1666,7 +1667,7 @@ struct coresight_device *coresight_register(struct co= resight_desc *desc) =20 err_out: /* Cleanup the connection information */ - coresight_release_platform_data(NULL, desc->pdata); + coresight_release_platform_data(NULL, desc->dev, desc->pdata); return ERR_PTR(ret); } EXPORT_SYMBOL_GPL(coresight_register); @@ -1679,7 +1680,7 @@ void coresight_unregister(struct coresight_device *cs= dev) cti_assoc_ops->remove(csdev); coresight_remove_conns(csdev); coresight_clear_default_sink(csdev); - coresight_release_platform_data(csdev, csdev->pdata); + coresight_release_platform_data(csdev, csdev->dev.parent, csdev->pdata); device_unregister(&csdev->dev); } EXPORT_SYMBOL_GPL(coresight_unregister); diff --git a/drivers/hwtracing/coresight/coresight-platform.c b/drivers/hwt= racing/coresight/coresight-platform.c index 8c2029336161..9c05f787278b 100644 --- a/drivers/hwtracing/coresight/coresight-platform.c +++ b/drivers/hwtracing/coresight/coresight-platform.c @@ -37,7 +37,7 @@ coresight_add_out_conn(struct device *dev, * Warn on any existing duplicate output port. */ for (i =3D 0; i < pdata->nr_outconns; ++i) { - conn =3D &pdata->out_conns[i]; + conn =3D pdata->out_conns[i]; /* Output =3D=3D -1 means ignore the port for example for helpers */ if (conn->src_port !=3D -1 && conn->src_port =3D=3D new_conn->src_port) { @@ -54,8 +54,19 @@ coresight_add_out_conn(struct device *dev, if (!pdata->out_conns) return ERR_PTR(-ENOMEM); =20 - pdata->out_conns[pdata->nr_outconns - 1] =3D *new_conn; - return &pdata->out_conns[pdata->nr_outconns - 1]; + conn =3D devm_kmalloc(dev, sizeof(struct coresight_connection), + GFP_KERNEL); + if (!conn) + return ERR_PTR(-ENOMEM); + + /* + * Copy the new connection into the allocation, save the pointer to the + * end of the connection array and also return it in case it needs to be + * used right away. + */ + *conn =3D *new_conn; + pdata->out_conns[pdata->nr_outconns - 1] =3D conn; + return conn; } EXPORT_SYMBOL_GPL(coresight_add_out_conn); =20 @@ -863,7 +874,7 @@ coresight_get_platform_data(struct device *dev) error: if (!IS_ERR_OR_NULL(pdata)) /* Cleanup the connection information */ - coresight_release_platform_data(NULL, pdata); + coresight_release_platform_data(NULL, dev, pdata); return ERR_PTR(ret); } EXPORT_SYMBOL_GPL(coresight_get_platform_data); diff --git a/drivers/hwtracing/coresight/coresight-priv.h b/drivers/hwtraci= ng/coresight/coresight-priv.h index 788ff19c60f6..65ae6d161c57 100644 --- a/drivers/hwtracing/coresight/coresight-priv.h +++ b/drivers/hwtracing/coresight/coresight-priv.h @@ -207,6 +207,7 @@ static inline void *coresight_get_uci_data(const struct= amba_id *id) } =20 void coresight_release_platform_data(struct coresight_device *csdev, + struct device *dev, struct coresight_platform_data *pdata); struct coresight_device * coresight_find_csdev_by_fwnode(struct fwnode_handle *r_fwnode); diff --git a/drivers/hwtracing/coresight/coresight-tmc-etr.c b/drivers/hwtr= acing/coresight/coresight-tmc-etr.c index 61234cb8052a..1bbe5410a23d 100644 --- a/drivers/hwtracing/coresight/coresight-tmc-etr.c +++ b/drivers/hwtracing/coresight/coresight-tmc-etr.c @@ -782,7 +782,7 @@ tmc_etr_get_catu_device(struct tmc_drvdata *drvdata) return NULL; =20 for (i =3D 0; i < etr->pdata->nr_outconns; i++) { - tmp =3D etr->pdata->out_conns[i].dest_dev; + tmp =3D etr->pdata->out_conns[i]->dest_dev; if (tmp && coresight_is_catu_device(tmp)) return tmp; } diff --git a/include/linux/coresight.h b/include/linux/coresight.h index 12fdbd03e2f7..abf36a37fdb0 100644 --- a/include/linux/coresight.h +++ b/include/linux/coresight.h @@ -104,14 +104,15 @@ union coresight_dev_subtype { * * @nr_inconns: Number of elements for the input connections. * @nr_outconns: Number of elements for the output connections. - * @out_conns: Array of nr_outconns connections from this component. + * @out_conns: Array of nr_outconns pointers to connections from this + * component. */ struct coresight_platform_data { int high_inport; int high_outport; int nr_inconns; int nr_outconns; - struct coresight_connection *out_conns; + struct coresight_connection **out_conns; }; =20 /** --=20 2.34.1