linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: Tingwei Zhang <tingwei@codeaurora.org>
To: Mathieu Poirier <mathieu.poirier@linaro.org>,
	Suzuki K Poulose <suzuki.poulose@arm.com>,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>,
	Mike Leach <mike.leach@linaro.org>
Cc: tsoni@codeaurora.org,
	Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>,
	Kim Phillips <kim.phillips@arm.com>,
	Mao Jinlong <jinlmao@codeaurora.org>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	coresight@lists.linaro.org, Randy Dunlap <rdunlap@infradead.org>,
	Mian Yousaf Kaukab <ykaukab@suse.de>,
	Russell King <linux@armlinux.org.uk>,
	linux-kernel@vger.kernel.org,
	Tingwei Zhang <tingwei@codeaurora.org>,
	Leo Yan <leo.yan@linaro.org>,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH v9 19/24] coresight: cti: don't disable ect device if it's not enabled
Date: Thu, 20 Aug 2020 13:47:13 +0800	[thread overview]
Message-ID: <20200820054718.20115-20-tingwei@codeaurora.org> (raw)
In-Reply-To: <20200820054718.20115-1-tingwei@codeaurora.org>

If associated ect device is not enabled at first place, disable
routine should not be called. Add ect_enabled flag to check whether
ect device is enabled. Fix the issue in below case.  Ect device is
not available when associated coresight device enabled and the
association is established after coresight device is enabled.

Signed-off-by: Mike Leach <mike.leach@linaro.org>
Signed-off-by: Tingwei Zhang <tingwei@codeaurora.org>
---
 drivers/hwtracing/coresight/coresight.c | 11 ++++++++---
 include/linux/coresight.h               |  1 +
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/drivers/hwtracing/coresight/coresight.c b/drivers/hwtracing/coresight/coresight.c
index 6c09be15d60c..d354fd57474e 100644
--- a/drivers/hwtracing/coresight/coresight.c
+++ b/drivers/hwtracing/coresight/coresight.c
@@ -244,13 +244,18 @@ coresight_control_assoc_ectdev(struct coresight_device *csdev, bool enable)
 
 	if (!ect_csdev)
 		return 0;
+	if ((!ect_ops(ect_csdev)->enable) || (!ect_ops(ect_csdev)->disable))
+		return 0;
 
 	if (enable) {
-		if (ect_ops(ect_csdev)->enable)
-			ect_ret = ect_ops(ect_csdev)->enable(ect_csdev);
+		ect_ret = ect_ops(ect_csdev)->enable(ect_csdev);
+		if (!ect_ret)
+			csdev->ect_enabled = true;
 	} else {
-		if (ect_ops(ect_csdev)->disable)
+		if (csdev->ect_enabled) {
 			ect_ret = ect_ops(ect_csdev)->disable(ect_csdev);
+			csdev->ect_enabled = false;
+		}
 	}
 
 	/* output warning if ECT enable is preventing trace operation */
diff --git a/include/linux/coresight.h b/include/linux/coresight.h
index 3bb738f9a326..7d3c87e5b97c 100644
--- a/include/linux/coresight.h
+++ b/include/linux/coresight.h
@@ -208,6 +208,7 @@ struct coresight_device {
 	/* sysfs links between components */
 	int nr_links;
 	bool has_conns_grp;
+	bool ect_enabled; /* true only if associated ect device is enabled */
 };
 
 /*
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2020-08-20  5:54 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-20  5:46 [PATCH v9 00/24] coresight: allow to build coresight as modules Tingwei Zhang
2020-08-20  5:46 ` [PATCH v9 01/24] coresight: cpu_debug: add module name in Kconfig Tingwei Zhang
2020-08-20  5:46 ` [PATCH v9 02/24] coresight: cpu_debug: define MODULE_DEVICE_TABLE Tingwei Zhang
2020-08-20  5:46 ` [PATCH v9 03/24] coresight: use IS_ENABLED for CONFIGs that may be modules Tingwei Zhang
2020-08-20  5:46 ` [PATCH v9 04/24] coresight: add coresight prefix to barrier_pkt Tingwei Zhang
2020-08-20  5:46 ` [PATCH v9 05/24] coresight: export global symbols Tingwei Zhang
2020-08-20  5:47 ` [PATCH v9 06/24] coresight: add try_get_module() in coresight_grab_device() Tingwei Zhang
2020-08-20  5:47 ` [PATCH v9 07/24] coresight: stm: allow to build coresight-stm as a module Tingwei Zhang
2020-08-20  5:47 ` [PATCH v9 08/24] coresight: etm: perf: Fix warning caused by etm_setup_aux failure Tingwei Zhang
2020-08-20  5:47 ` [PATCH v9 09/24] coresight: etm3x: allow etm3x to be built as a module Tingwei Zhang
2020-08-20  5:47 ` [PATCH v9 10/24] coresight: etm4x: allow etm4x " Tingwei Zhang
2020-08-20  5:47 ` [PATCH v9 11/24] coresight: etb: allow etb " Tingwei Zhang
2020-08-20  5:47 ` [PATCH v9 12/24] coresight: tpiu: allow tpiu " Tingwei Zhang
2020-08-20  5:47 ` [PATCH v9 13/24] coresight: tmc: allow tmc " Tingwei Zhang
2020-08-20  5:47 ` [PATCH v9 14/24] coresight: allow funnel driver to be built as module Tingwei Zhang
2020-08-20  5:47 ` [PATCH v9 15/24] coresight: allow replicator " Tingwei Zhang
2020-08-20  5:47 ` [PATCH v9 16/24] coresight: cti: add function to register cti associate ops Tingwei Zhang
2020-08-20  5:47 ` [PATCH v9 17/24] coresight: cti: Fix remove sysfs link error Tingwei Zhang
2020-08-20  5:47 ` [PATCH v9 18/24] coresight: cti: Fix bug clearing sysfs links on callback Tingwei Zhang
2020-08-20  5:47 ` Tingwei Zhang [this message]
2020-08-20  5:47 ` [PATCH v9 20/24] coresight: cti: increase reference count when enabling cti Tingwei Zhang
2020-08-20  5:47 ` [PATCH v9 21/24] coresight: cti: allow cti to be built as a module Tingwei Zhang
2020-08-20  5:47 ` [PATCH v9 22/24] coresight: tmc-etr: add function to register catu ops Tingwei Zhang
2020-08-20  5:47 ` [PATCH v9 23/24] coresight: catu: allow catu drivers to be built as modules Tingwei Zhang
2020-08-20  5:47 ` [PATCH v9 24/24] coresight: allow the coresight core driver to be built as a module Tingwei Zhang
2020-09-08 17:53 ` [PATCH v9 00/24] coresight: allow to build coresight as modules Mathieu Poirier
2020-09-09  2:54   ` Tingwei Zhang
     [not found]   ` <0101017470c9475d-00e296fc-1173-4afa-95cb-22ac70d85d5b-000000@us-west-2.amazonses.com>
2020-09-09 16:15     ` Mathieu Poirier
2020-09-09 20:45       ` tsoni
     [not found]       ` <c8737d9935a1b7a7372c41492939648d@codeaurora.org>
2020-09-09 23:56         ` Tingwei Zhang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200820054718.20115-20-tingwei@codeaurora.org \
    --to=tingwei@codeaurora.org \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=coresight@lists.linaro.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=jinlmao@codeaurora.org \
    --cc=kim.phillips@arm.com \
    --cc=leo.yan@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@armlinux.org.uk \
    --cc=mathieu.poirier@linaro.org \
    --cc=mike.leach@linaro.org \
    --cc=rdunlap@infradead.org \
    --cc=saiprakash.ranjan@codeaurora.org \
    --cc=suzuki.poulose@arm.com \
    --cc=tsoni@codeaurora.org \
    --cc=ykaukab@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).