From patchwork Tue Mar 22 20:23:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 8644981 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 375779F294 for ; Tue, 22 Mar 2016 20:26:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 255E42038F for ; Tue, 22 Mar 2016 20:26:02 +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 4A5EC2034B for ; Tue, 22 Mar 2016 20:26:01 +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 1aiSqi-0008Hf-Sd; Tue, 22 Mar 2016 20:24:20 +0000 Received: from mail-io0-x229.google.com ([2607:f8b0:4001:c06::229]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aiSqQ-00086U-DL for linux-arm-kernel@lists.infradead.org; Tue, 22 Mar 2016 20:24:03 +0000 Received: by mail-io0-x229.google.com with SMTP id 124so103055200iov.3 for ; Tue, 22 Mar 2016 13:23:42 -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=72MooLWUX4LpO6QkJxACSgj4QxjJhlP3ymJerxSrgNo=; b=RuDvdawGihK40ZU0We8z8x7Wlb4dJcXi2fcjVKMhPIHXVk6VHEqm0qeTQXxY/nvFBu on6gGcB5C+LiH8mpAGO6HIzxYDi3Ga1ZAMqaGNtFPhOP66xlaw5cCHyuzPASkaOuLUp5 pYcnLkJ2kVNVHepM/8V8Av02jU9gKUe6KSGeM= 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=72MooLWUX4LpO6QkJxACSgj4QxjJhlP3ymJerxSrgNo=; b=ZysHlxmdcD1sFEaGoJZJ7v6/V9fSXMMNwDBIb5w4pbxGpNuvUqKzhZXQvwnvD23Qma EwEkQeEPWW8nAsoeWId82LtlT7u4m0hWLY5Qm35amslxsXK8srhBow6EUUi8mSLScr00 pnTreWpNNmJeXV9D1INNbPiPgveGMvlomQqOI2hlAcufdzNmWGU+1RoWDV9xQhH9Agwn RR95n6/cWVDeDlQpLacHBcFGvo7UqUlZFy/alJ9ORZSAorUjAdBcrm+7MLswaOsqe0zy cAFnZFVEng+WkmBgKUM4EF1bh0F6Ie4eJe2kfQ1vE5yQaTYmRLeFBLPwKBmPFLKsDUPR Y9Qw== X-Gm-Message-State: AD7BkJJouIPM5jr+9mIjuA0BcSX5WWiPZCqyNqxk2mGnaXw20K64i84NVAaRjw6BKQYwy46k X-Received: by 10.107.11.213 with SMTP id 82mr41187632iol.152.1458678221363; Tue, 22 Mar 2016 13:23:41 -0700 (PDT) Received: from t430.cg.shawcable.net ([184.64.168.246]) by smtp.gmail.com with ESMTPSA id xo2sm8092061igb.0.2016.03.22.13.23.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 Mar 2016 13:23:40 -0700 (PDT) From: Mathieu Poirier To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 01/14] coresight: tmc: modifying naming convention Date: Tue, 22 Mar 2016 14:23:09 -0600 Message-Id: <1458678202-3447-2-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1458678202-3447-1-git-send-email-mathieu.poirier@linaro.org> References: <1458678202-3447-1-git-send-email-mathieu.poirier@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160322_132402_559277_9E643963 X-CRM114-Status: GOOD ( 13.57 ) X-Spam-Score: -2.7 (--) 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: linux-kernel@vger.kernel.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.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 According to the TMC architectural state machine, the 'stopped' state is reached when bit 2 (TMCReady) of the TMC Status register turns to '1'. The code is correct but the naming convention isn't. The 'Triggered' bit occupies position '1' of the TMC Status register and has nothing to do with the indication of the TMC entering the stopped state. As such renaming function "tmc_wait_for_triggered()" and changing the #define to reflect what the code is really doing. This patch has no effect other than clarifying the semantic. Signed-off-by: Mathieu Poirier --- drivers/hwtracing/coresight/coresight-tmc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-tmc.c b/drivers/hwtracing/coresight/coresight-tmc.c index f0a67f984591..8a9e4d789bd8 100644 --- a/drivers/hwtracing/coresight/coresight-tmc.c +++ b/drivers/hwtracing/coresight/coresight-tmc.c @@ -76,7 +76,7 @@ #define TMC_FFCR_TRIGON_TRIGIN BIT(8) #define TMC_FFCR_STOP_ON_FLUSH BIT(12) -#define TMC_STS_TRIGGERED_BIT 2 +#define TMC_STS_TMCREADY_BIT 2 #define TMC_FFCR_FLUSHMAN_BIT 6 enum tmc_config_type { @@ -131,11 +131,11 @@ struct tmc_drvdata { u32 trigger_cntr; }; -static void tmc_wait_for_ready(struct tmc_drvdata *drvdata) +static void tmc_wait_for_tmcready(struct tmc_drvdata *drvdata) { /* Ensure formatter, unformatter and hardware fifo are empty */ if (coresight_timeout(drvdata->base, - TMC_STS, TMC_STS_TRIGGERED_BIT, 1)) { + TMC_STS, TMC_STS_TMCREADY_BIT, 1)) { dev_err(drvdata->dev, "timeout observed when probing at offset %#x\n", TMC_STS); @@ -159,7 +159,7 @@ static void tmc_flush_and_stop(struct tmc_drvdata *drvdata) TMC_FFCR); } - tmc_wait_for_ready(drvdata); + tmc_wait_for_tmcready(drvdata); } static void tmc_enable_hw(struct tmc_drvdata *drvdata)