From patchwork Sun Oct 18 18:24:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 7432141 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EF5BD9F37F for ; Sun, 18 Oct 2015 18:49:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F1ED0205BA for ; Sun, 18 Oct 2015 18:49:20 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BA9BA20585 for ; Sun, 18 Oct 2015 18:49:19 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Znt0H-0004US-Ox; Sun, 18 Oct 2015 18:48:21 +0000 Received: from mail-pa0-f42.google.com ([209.85.220.42]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Znsev-0004sc-Bf for linux-arm-kernel@lists.infradead.org; Sun, 18 Oct 2015 18:26:18 +0000 Received: by pabrc13 with SMTP id rc13so167569529pab.0 for ; Sun, 18 Oct 2015 11:26:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=AUYFE+F8AbWFkKdd9QOIG1eGjwWFNKHov/mZRfhma0w=; b=CITszVy2lw39FvosPI722+Oovd3z+Kjp7ipKEFA26tW8+eV/lWU6HQYS96eITbKgox snB22m/XltYtX33y9q/RLGj9URNGC2/0+ZjQ1dkRZWDJqG7/giSw+XubLxhB84Yeh2p4 TUUX5Sf1s46+P1HdHFD0a4AJXu88/iw0NkwSC/Ues84QJYY6LUtI6uoSwE3P2FJSo+i+ ZYRYBQ+fWNW5M3EL/Ze5RUNUjldABWJNTHrDq+iM15Ficq+XOpuUEPJO835097DiR3vO 0t4SMrCyTLZtOBNdCSv5hPt+WTlGzAoP1QN983PgRdss3gGNH+rLKIjQhe/LEH+Sexpr kQ7w== X-Gm-Message-State: ALoCoQnT5eYpxTSCEGjSv03+44UWGu3DwfEqsVkFXUpQXsyRQem5VRosE4LhEp7/u4qHJslf4vEb X-Received: by 10.66.230.169 with SMTP id sz9mr29530982pac.136.1445192760278; Sun, 18 Oct 2015 11:26:00 -0700 (PDT) Received: from t430.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [184.64.168.246]) by smtp.gmail.com with ESMTPSA id hq1sm20402076pbb.43.2015.10.18.11.25.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 18 Oct 2015 11:25:59 -0700 (PDT) From: Mathieu Poirier To: gregkh@linuxfoundation.org, a.p.zijlstra@chello.nl, alexander.shishkin@linux.intel.com, acme@kernel.org, mingo@redhat.com, corbet@lwn.net, nicolas.pitre@linaro.org Subject: [PATCH V2 16/30] coresight: keeping track of enabled sink buffers Date: Sun, 18 Oct 2015 12:24:33 -0600 Message-Id: <1445192687-24112-17-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1445192687-24112-1-git-send-email-mathieu.poirier@linaro.org> References: <1445192687-24112-1-git-send-email-mathieu.poirier@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151018_112617_563688_3AAF25DF X-CRM114-Status: GOOD ( 16.90 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: al.grant@arm.com, mathieu.poirier@linaro.org, pawel.moll@arm.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, adrian.hunter@intel.com, tor@ti.com, mike.leach@arm.com, zhang.chunyan@linaro.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Keep track of enabled sink buffers as a path between source and sinks is being built. That way sinks associated to a source can be accessed quickly. Signed-off-by: Mathieu Poirier --- drivers/hwtracing/coresight/coresight-priv.h | 3 ++- drivers/hwtracing/coresight/coresight.c | 16 ++++++++++------ include/linux/coresight.h | 2 ++ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-priv.h b/drivers/hwtracing/coresight/coresight-priv.h index 8a52fdcb4bd6..3d7467f315ed 100644 --- a/drivers/hwtracing/coresight/coresight-priv.h +++ b/drivers/hwtracing/coresight/coresight-priv.h @@ -53,7 +53,8 @@ static inline void CS_UNLOCK(void __iomem *addr) } int coresight_build_paths(struct coresight_device *csdev, - struct list_head *path, bool enable); + struct list_head *path, + struct list_head *sinks, bool enable); #ifdef CONFIG_CORESIGHT_SOURCE_ETM3X extern int etm_readl_cp14(u32 off, unsigned int *val); diff --git a/drivers/hwtracing/coresight/coresight.c b/drivers/hwtracing/coresight/coresight.c index 083080d435af..a40519d5a9e2 100644 --- a/drivers/hwtracing/coresight/coresight.c +++ b/drivers/hwtracing/coresight/coresight.c @@ -302,7 +302,8 @@ static int coresight_disable_path(struct list_head *path) } int coresight_build_paths(struct coresight_device *csdev, - struct list_head *path, bool enable) + struct list_head *path, + struct list_head *sinks, bool enable) { int i, ret = -EINVAL; struct coresight_connection *conn; @@ -312,15 +313,18 @@ int coresight_build_paths(struct coresight_device *csdev, if ((csdev->type == CORESIGHT_DEV_TYPE_SINK || csdev->type == CORESIGHT_DEV_TYPE_LINKSINK) && csdev->activated) { - if (enable) + if (enable) { ret = coresight_enable_path(path); - else + if (!ret && sinks) + list_add(&csdev->sinks, sinks); + } else { ret = coresight_disable_path(path); + } } else { for (i = 0; i < csdev->nr_outport; i++) { conn = &csdev->conns[i]; if (coresight_build_paths(conn->child_dev, - path, enable) == 0) + path, sinks, enable) == 0) ret = 0; } } @@ -347,7 +351,7 @@ int coresight_enable(struct coresight_device *csdev) if (csdev->enable) goto out; - if (coresight_build_paths(csdev, &path, true)) { + if (coresight_build_paths(csdev, &path, NULL, true)) { dev_err(&csdev->dev, "building path(s) failed\n"); goto out; } @@ -373,7 +377,7 @@ void coresight_disable(struct coresight_device *csdev) goto out; coresight_disable_source(csdev); - if (coresight_build_paths(csdev, &path, false)) + if (coresight_build_paths(csdev, &path, NULL, false)) dev_err(&csdev->dev, "releasing path(s) failed\n"); out: diff --git a/include/linux/coresight.h b/include/linux/coresight.h index 0601da01eeb2..dd530a6d3e21 100644 --- a/include/linux/coresight.h +++ b/include/linux/coresight.h @@ -153,6 +153,7 @@ struct coresight_connection { * @dev: The device entity associated to this component. * @refcnt: keep track of what is in use. * @path_link: link of current component into the path being enabled. + * @sinks: link of currently enabled sinks for a source. * @orphan: true if the component has connections that haven't been linked. * @enable: 'true' if component is currently part of an active path. * @activated: 'true' only if a _sink_ has been activated. A sink can be @@ -169,6 +170,7 @@ struct coresight_device { struct device dev; atomic_t *refcnt; struct list_head path_link; + struct list_head sinks; bool orphan; bool enable; /* true only if configured as part of a path */ bool activated; /* true only if a sink is part of a path */