From nobody Tue Feb 10 00:22:31 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 C594FC74A5B for ; Wed, 29 Mar 2023 11:55:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229986AbjC2LzJ (ORCPT ); Wed, 29 Mar 2023 07:55:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55802 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229448AbjC2Lyw (ORCPT ); Wed, 29 Mar 2023 07:54:52 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 2ACA74487 for ; Wed, 29 Mar 2023 04:54:33 -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 412711576; Wed, 29 Mar 2023 04:55:08 -0700 (PDT) Received: from localhost.localdomain (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 344F83F6C4; Wed, 29 Mar 2023 04:54:22 -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 , Mathieu Poirier , Leo Yan , Alexander Shishkin , Maxime Coquelin , Alexandre Torgue , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com Subject: [PATCH v3 08/13] coresight: Simplify connection fixup mechanism Date: Wed, 29 Mar 2023 12:53:21 +0100 Message-Id: <20230329115329.2747724-9-james.clark@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230329115329.2747724-1-james.clark@arm.com> References: <20230329115329.2747724-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" There is some duplication between coresight_fixup_device_conns() and coresight_fixup_orphan_conns(). They both do the same thing except for the fact that coresight_fixup_orphan_conns() can't handle iterating over itself. By making it able to handle fixing up it's own connections the other function can be removed. Signed-off-by: James Clark --- drivers/hwtracing/coresight/coresight-core.c | 72 +++++++------------- 1 file changed, 26 insertions(+), 46 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-core.c b/drivers/hwtraci= ng/coresight/coresight-core.c index 389f6203c8f0..2f4aa15ef8f9 100644 --- a/drivers/hwtracing/coresight/coresight-core.c +++ b/drivers/hwtracing/coresight/coresight-core.c @@ -1316,38 +1316,42 @@ static int coresight_orphan_match(struct device *de= v, void *data) { int i, ret =3D 0; bool still_orphan =3D false; - struct coresight_device *csdev, *i_csdev; + struct coresight_device *csdev =3D data; + struct coresight_device *i_csdev =3D to_coresight_device(dev); struct coresight_connection *conn; =20 - csdev =3D data; - i_csdev =3D to_coresight_device(dev); - - /* No need to check oneself */ - if (csdev =3D=3D i_csdev) - return 0; - /* Move on to another component if no connection is orphan */ if (!i_csdev->orphan) return 0; /* - * Circle throuch all the connection of that component. If we find + * Circle through all the connections of that component. If we find * 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]; =20 - /* We have found at least one orphan connection */ - if (conn->dest_dev =3D=3D NULL) { - /* Does it match this newly added device? */ - if (conn->dest_fwnode =3D=3D csdev->dev.fwnode) { - ret =3D coresight_make_links(i_csdev, - conn, csdev); - if (ret) - return ret; - } else { - /* This component still has an orphan */ - still_orphan =3D true; - } + /* Skip the port if it's already connected. */ + if (conn->dest_dev) + continue; + + /* + * When connecting the newly registered device, we need to find + * the remote instead of using the *data shortcut that avoids + * the need for this search. + */ + if (csdev =3D=3D i_csdev) + csdev =3D coresight_find_csdev_by_fwnode( + conn->dest_fwnode); + + /* Does it match this newly added device? */ + if (csdev && conn->dest_fwnode =3D=3D csdev->dev.fwnode) { + ret =3D coresight_make_links(i_csdev, conn, csdev); + if (ret) + return ret; + + } else { + /* This component still has an orphan */ + still_orphan =3D true; } } =20 @@ -1366,28 +1370,6 @@ static int coresight_fixup_orphan_conns(struct cores= ight_device *csdev) csdev, coresight_orphan_match); } =20 - -static int coresight_fixup_device_conns(struct coresight_device *csdev) -{ - int i, ret =3D 0; - - for (i =3D 0; i < csdev->pdata->nr_outconns; i++) { - struct coresight_connection *conn =3D csdev->pdata->out_conns[i]; - - conn->dest_dev =3D - coresight_find_csdev_by_fwnode(conn->dest_fwnode); - if (conn->dest_dev && conn->dest_dev->has_conns_grp) { - ret =3D coresight_make_links(csdev, conn, conn->dest_dev); - if (ret) - break; - } else { - csdev->orphan =3D true; - } - } - - return ret; -} - static int coresight_remove_match(struct device *dev, void *data) { int i; @@ -1594,7 +1576,7 @@ struct coresight_device *coresight_register(struct co= resight_desc *desc) csdev->subtype =3D desc->subtype; csdev->ops =3D desc->ops; csdev->access =3D desc->access; - csdev->orphan =3D false; + csdev->orphan =3D true; =20 csdev->dev.type =3D &coresight_dev_type[desc->type]; csdev->dev.groups =3D desc->groups; @@ -1644,8 +1626,6 @@ struct coresight_device *coresight_register(struct co= resight_desc *desc) registered =3D true; =20 ret =3D coresight_create_conns_sysfs_group(csdev); - if (!ret) - ret =3D coresight_fixup_device_conns(csdev); if (!ret) ret =3D coresight_fixup_orphan_conns(csdev); =20 --=20 2.34.1