From patchwork Thu Feb 18 00:51:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 62137 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp308188lbl; Wed, 17 Feb 2016 16:52:45 -0800 (PST) X-Received: by 10.66.97.40 with SMTP id dx8mr6292839pab.29.1455756760441; Wed, 17 Feb 2016 16:52:40 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p2si5352260pfj.212.2016.02.17.16.52.40; Wed, 17 Feb 2016 16:52:40 -0800 (PST) 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; 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; dkim=pass header.i=@linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423808AbcBRAw1 (ORCPT + 30 others); Wed, 17 Feb 2016 19:52:27 -0500 Received: from mail-ob0-f175.google.com ([209.85.214.175]:34273 "EHLO mail-ob0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965719AbcBRAwT (ORCPT ); Wed, 17 Feb 2016 19:52:19 -0500 Received: by mail-ob0-f175.google.com with SMTP id wb13so43110662obb.1 for ; Wed, 17 Feb 2016 16:52:19 -0800 (PST) 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=PraNqYFxepoI8Z3g2lBe6OWiBAOB6daEao/96jQ78Dk=; b=E9cwLZStF4FwfghFoK1GadCfKhHhcBXxA7e1Xugr5i6N6fTcVKlBBQGzdc5wORAQ1C 4RxoZrOVh7NEm/XC73hLqVUu+ZcJ7///eWrOPOUWXIQux3SQUDTHXsk3XfFiDkE7c5gz eCsODyKcd5N0C7azC3fAQKmS5cnwysjJMFTlc= 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=PraNqYFxepoI8Z3g2lBe6OWiBAOB6daEao/96jQ78Dk=; b=LLN+zxjfhc9SrYFFgMBWcw6MzFQw1eL31z594VnCt01T/BVigYLMO9/JyhNtpjtNnj 0lDTGjOM3CHH1BVIw7j6WueyxIhR2tPggsd5zBxRH6Q7WQoVJik8yib1aI0T1+mqCLqi SvjOSlDd+2CxmiRN5Llh/SwSacdfK3MIUnnCDh6H4oBRDW3Z7X9umuISi0iE3hflcUDL 00GIT/srkKErJvK6A4nV9n3z9NhYmJ+wEt3pT2O5jPpFtSVkhFgbrx9x0eMmUcFNtzTv gltsBF2/uYhy04YKCRn/X1gC4/CzH9T+iGUaMLJ3oc9NZ+FxtzCUWLdXT6zQ4dr8eEE+ 2LOg== X-Gm-Message-State: AG10YOQE2Z6Y+MffNNdN0fSbzI1cCySIM3EJJMh/HMdt/DcbJ1BmXnwWgtWXrxx8bDs3R+YG X-Received: by 10.60.220.230 with SMTP id pz6mr3810446oec.49.1455756739433; Wed, 17 Feb 2016 16:52:19 -0800 (PST) Received: from t430.globalsuite.net (h58.159.185.173.static.ip.windstream.net. [173.185.159.58]) by smtp.gmail.com with ESMTPSA id gi5sm2357650obb.6.2016.02.17.16.52.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 17 Feb 2016 16:52:18 -0800 (PST) From: Mathieu Poirier To: gregkh@linuxfoundation.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 13/21] coresight: etm3x: consolidating initial config Date: Wed, 17 Feb 2016 17:51:55 -0700 Message-Id: <1455756723-8456-14-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1455756723-8456-1-git-send-email-mathieu.poirier@linaro.org> References: <1455756723-8456-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 There is really no point in having two functions to take care of doing the initial tracer configuration. As such moving everything to 'etm_set_default()'. Signed-off-by: Mathieu Poirier --- drivers/hwtracing/coresight/coresight-etm3x.c | 37 ++++++++++----------------- 1 file changed, 14 insertions(+), 23 deletions(-) -- 2.1.4 diff --git a/drivers/hwtracing/coresight/coresight-etm3x.c b/drivers/hwtracing/coresight/coresight-etm3x.c index 92139674bea4..34a69583ccbc 100644 --- a/drivers/hwtracing/coresight/coresight-etm3x.c +++ b/drivers/hwtracing/coresight/coresight-etm3x.c @@ -41,7 +41,6 @@ module_param_named(boot_enable, boot_enable, int, S_IRUGO); /* The number of ETM/PTM currently registered */ static int etm_count; static struct etm_drvdata *etmdrvdata[NR_CPUS]; -static void etm_init_default_data(struct etm_config *config); /* * Memory mapped writes to clear os lock are not supported on some processors @@ -194,6 +193,19 @@ void etm_set_default(struct etm_config *config) if (WARN_ON_ONCE(!config)) return; + /* + * Taken verbatim from the TRM: + * + * To trace all memory: + * set bit [24] in register 0x009, the ETMTECR1, to 1 + * set all other bits in register 0x009, the ETMTECR1, to 0 + * set all bits in register 0x007, the ETMTECR2, to 0 + * set register 0x008, the ETMTEEVR, to 0x6F (TRUE). + */ + config->enable_ctrl1 = BIT(24); + config->enable_ctrl2 = 0x0; + config->enable_event = ETM_HARD_WIRE_RES_A; + config->trigger_event = ETM_DEFAULT_EVENT_VAL; config->enable_event = ETM_HARD_WIRE_RES_A; @@ -577,27 +589,6 @@ static void etm_init_arch_data(void *info) CS_LOCK(drvdata->base); } -static void etm_init_default_data(struct etm_config *config) -{ - if (WARN_ON_ONCE(!config)) - return; - - etm_set_default(config); - - /* - * Taken verbatim from the TRM: - * - * To trace all memory: - * set bit [24] in register 0x009, the ETMTECR1, to 1 - * set all other bits in register 0x009, the ETMTECR1, to 0 - * set all bits in register 0x007, the ETMTECR2, to 0 - * set register 0x008, the ETMTEEVR, to 0x6F (TRUE). - */ - config->enable_ctrl1 = BIT(24); - config->enable_ctrl2 = 0x0; - config->enable_event = ETM_HARD_WIRE_RES_A; -} - static void etm_init_trace_id(struct etm_drvdata *drvdata) { /* @@ -674,7 +665,7 @@ static int etm_probe(struct amba_device *adev, const struct amba_id *id) } etm_init_trace_id(drvdata); - etm_init_default_data(&drvdata->config); + etm_set_default(&drvdata->config); desc->type = CORESIGHT_DEV_TYPE_SOURCE; desc->subtype.source_subtype = CORESIGHT_DEV_SUBTYPE_SOURCE_PROC;