From patchwork Thu Aug 4 16:53:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 73290 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp1494564qga; Thu, 4 Aug 2016 09:53:56 -0700 (PDT) X-Received: by 10.98.73.24 with SMTP id w24mr128201061pfa.27.1470329634017; Thu, 04 Aug 2016 09:53:54 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w4si15428826pfw.47.2016.08.04.09.53.51; Thu, 04 Aug 2016 09:53:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965277AbcHDQxj (ORCPT + 27 others); Thu, 4 Aug 2016 12:53:39 -0400 Received: from mail-it0-f48.google.com ([209.85.214.48]:37009 "EHLO mail-it0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965165AbcHDQxe (ORCPT ); Thu, 4 Aug 2016 12:53:34 -0400 Received: by mail-it0-f48.google.com with SMTP id f6so881560ith.0 for ; Thu, 04 Aug 2016 09:53:33 -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; bh=nVeXFXZoqyLyV4O9YiXBF02GhrQnLh36GlA6xO8ccXU=; b=jgIXMP52DvLfIhejkAw2kp5t424pFpNEET5GhT+v7mWnOtkflngs7kqDiLcth6ustv Mg3ipbgX9CqAxPixaxSpyCLsT5EqiaPddHPHc64UGOuEPOWuO80Y3Tp3yJtNZ3idfPCd pwWDMP1nyhEB+Hp+6u01q5ynK59BK1Jk3IW3w= 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=nVeXFXZoqyLyV4O9YiXBF02GhrQnLh36GlA6xO8ccXU=; b=EbWgli34PCNW/HNh9SvnONwKJQFJFYEGGhXrjOi2054G1gZIVf0EYZ63T0Znldc3QU N8xIZ48pntp/Z8sdcR4FllD009NR0LSlsV/eXicon/QzCjwHGUIoHhdaHNB6ndzooxBk prh2lVThXEmPpKNLTQakBr5x9I5mMhLzrdefsy5ODfdkZYY79Hi0bw/gDmnEQJ0YtvRO OztFxl447Tn68iVUDiFVdSJb+SHzy5Ta4xO1/G70OKYekeg/KPUay0VdoAAW5hahpXIo HQFE5brxK+kdRv5GYVDJnBZncHFoFZgyx0l0okm4TG8/nsxVNwXAe50KSx+/DjNI8GII 47Zg== X-Gm-Message-State: AEkoouu6mFqu2OLGOwLBUBRS1V1e0qXrhx2Tw4IBw+ErJvG5XFGZgp5FwbJUISQxyRDYuOWX X-Received: by 10.36.91.134 with SMTP id g128mr78208316itb.42.1470329613351; Thu, 04 Aug 2016 09:53:33 -0700 (PDT) Received: from t430.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id l19sm6117846iod.10.2016.08.04.09.53.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 04 Aug 2016 09:53:32 -0700 (PDT) From: Mathieu Poirier To: acme@kernel.org, jolsa@kernel.org Cc: peterz@infradead.org, mingo@redhat.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH V4 5/6] coresight: adding sink parameter to function coresight_build_path() Date: Thu, 4 Aug 2016 10:53:23 -0600 Message-Id: <1470329604-14356-6-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1470329604-14356-1-git-send-email-mathieu.poirier@linaro.org> References: <1470329604-14356-1-git-send-email-mathieu.poirier@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Up to now function coresight_build_path() was counting on a sink to have been selected (from sysFS) prior to being called. This patch adds a string argument so that a sink matching the argument can be selected. Signed-off-by: Mathieu Poirier --- drivers/hwtracing/coresight/coresight-etm-perf.c | 2 +- drivers/hwtracing/coresight/coresight-priv.h | 3 +- drivers/hwtracing/coresight/coresight.c | 43 ++++++++++++++++-------- 3 files changed, 32 insertions(+), 16 deletions(-) -- 2.7.4 diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwtracing/coresight/coresight-etm-perf.c index f4174f36c5a0..f8c7a8733b23 100644 --- a/drivers/hwtracing/coresight/coresight-etm-perf.c +++ b/drivers/hwtracing/coresight/coresight-etm-perf.c @@ -184,7 +184,7 @@ static void *etm_setup_aux(struct perf_event *event, void **pages, * list of devices from source to sink that can be * referenced later when the path is actually needed. */ - event_data->path[cpu] = coresight_build_path(csdev); + event_data->path[cpu] = coresight_build_path(csdev, NULL); if (!event_data->path[cpu]) goto err; } diff --git a/drivers/hwtracing/coresight/coresight-priv.h b/drivers/hwtracing/coresight/coresight-priv.h index ad975c58080d..3cb574b3cdd9 100644 --- a/drivers/hwtracing/coresight/coresight-priv.h +++ b/drivers/hwtracing/coresight/coresight-priv.h @@ -94,7 +94,8 @@ static inline void CS_UNLOCK(void __iomem *addr) void coresight_disable_path(struct list_head *path); int coresight_enable_path(struct list_head *path, u32 mode); struct coresight_device *coresight_get_sink(struct list_head *path); -struct list_head *coresight_build_path(struct coresight_device *csdev); +struct list_head *coresight_build_path(struct coresight_device *csdev, + const char *sink); void coresight_release_path(struct list_head *path); #ifdef CONFIG_CORESIGHT_SOURCE_ETM3X diff --git a/drivers/hwtracing/coresight/coresight.c b/drivers/hwtracing/coresight/coresight.c index d08d1ab9bba5..2b7196aa54c3 100644 --- a/drivers/hwtracing/coresight/coresight.c +++ b/drivers/hwtracing/coresight/coresight.c @@ -372,30 +372,44 @@ struct coresight_device *coresight_get_sink(struct list_head *path) * _coresight_build_path - recursively build a path from a @csdev to a sink. * @csdev: The device to start from. * @path: The list to add devices to. + * @sink: The name of the sink this path should connect with. * - * The tree of Coresight device is traversed until an activated sink is - * found. From there the sink is added to the list along with all the - * devices that led to that point - the end result is a list from source - * to sink. In that list the source is the first device and the sink the - * last one. + * The tree of Coresight device is traversed until an activated sink or + * the one specified by @sink is found. + * From there the sink is added to the list along with all the devices that + * led to that point - the end result is a list from source to sink. In that + * list the source is the first device and the sink the last one. */ static int _coresight_build_path(struct coresight_device *csdev, - struct list_head *path) + struct list_head *path, const char *sink) { int i; bool found = false; struct coresight_node *node; - /* An activated sink has been found. Enqueue the element */ - if ((csdev->type == CORESIGHT_DEV_TYPE_SINK || - csdev->type == CORESIGHT_DEV_TYPE_LINKSINK) && csdev->activated) - goto out; + /* + * First see if we are dealing with a sink. If we have one check if + * it was selected via sysFS or the perf cmd line. + */ + if (csdev->type == CORESIGHT_DEV_TYPE_SINK || + csdev->type == CORESIGHT_DEV_TYPE_LINKSINK) { + /* Discourage meddling in sysFS if using the perf interface */ + if (sink && csdev->activated) + return -EINVAL; + /* Activated via perf cmd line */ + if (sink && !strcmp(dev_name(&csdev->dev), sink)) + goto out; + /* Activated via sysFS */ + if (csdev->activated) + goto out; + } /* Not a sink - recursively explore each port found on this element */ for (i = 0; i < csdev->nr_outport; i++) { struct coresight_device *child_dev = csdev->conns[i].child_dev; - if (child_dev && _coresight_build_path(child_dev, path) == 0) { + if (child_dev && + _coresight_build_path(child_dev, path, sink) == 0) { found = true; break; } @@ -422,7 +436,8 @@ out: return 0; } -struct list_head *coresight_build_path(struct coresight_device *csdev) +struct list_head *coresight_build_path(struct coresight_device *csdev, + const char *sink) { struct list_head *path; int rc; @@ -433,7 +448,7 @@ struct list_head *coresight_build_path(struct coresight_device *csdev) INIT_LIST_HEAD(path); - rc = _coresight_build_path(csdev, path); + rc = _coresight_build_path(csdev, path, sink); if (rc) { kfree(path); return ERR_PTR(rc); @@ -508,7 +523,7 @@ int coresight_enable(struct coresight_device *csdev) if (csdev->enable) goto out; - path = coresight_build_path(csdev); + path = coresight_build_path(csdev, NULL); if (IS_ERR(path)) { pr_err("building path(s) failed\n"); ret = PTR_ERR(path);