From patchwork Tue Apr 26 22:10:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 66733 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp1857839qge; Tue, 26 Apr 2016 15:10:55 -0700 (PDT) X-Received: by 10.66.33.1 with SMTP id n1mr7018670pai.65.1461708655692; Tue, 26 Apr 2016 15:10:55 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r7si5487690paw.13.2016.04.26.15.10.55; Tue, 26 Apr 2016 15:10:55 -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 S1752603AbcDZWKm (ORCPT + 29 others); Tue, 26 Apr 2016 18:10:42 -0400 Received: from mail-ig0-f177.google.com ([209.85.213.177]:36430 "EHLO mail-ig0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752367AbcDZWKk (ORCPT ); Tue, 26 Apr 2016 18:10:40 -0400 Received: by mail-ig0-f177.google.com with SMTP id u10so55972706igr.1 for ; Tue, 26 Apr 2016 15:10:40 -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=DrXIc6AfsxTmkG1KmLUCj69Bd3PcZKbkK4+hvtnkpg0=; b=Xx8yEdJT2vzvkT7W7S39dtAtWKWHhxICQfb8hZGqRbg9oxE85XbWy2WjVqJlxMOPLY ySe/wnyJXjZ2rk/Uz1a4hOKQQakyQrD2HMq9lEf2QVCDhM//rGGfFmHxtPjPfDNYPvLc l8TvxjmbTpvR9vt0y+N/BrT5rygWSUt3xUV/k= 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=DrXIc6AfsxTmkG1KmLUCj69Bd3PcZKbkK4+hvtnkpg0=; b=YbnSbWUPGTIxrkcIAKVj0cKriReM+dOaNDWcaNRG3rXdh3Iyc3j8b1knSAeZQJqRwc IovDjhCnLJ5RXh6CRlrlYHepwvmyYOOK/OrihuS32/RHyHdh9S+d1svJbO5oWPBZLMjT ev4J173i25fySIM9Mw8YpzBJv/Ac8H/2Vn9oxhwP4Rd2LCzqKS47PaBqKD4bu1oG4qyR lsFQ6WIoCbrGqAOffSo7xkfs5F3CXyqLlYGe41Wytmhg4c3bynAtAJVjQDNt2peui18z k0ROp9Ps0ZZpYmnl7Jgs7h0/s27dGrWTytxoc8tyf3lJI2m5hIom0g2/nAmyMw4bDGht 3UPw== X-Gm-Message-State: AOPr4FWh5Pt3K12YzQ/9Eryv1XlMLafXOg3DuYvcYuyp5kYxxWXMQYLKCTBTA6V1Iij3BoI6 X-Received: by 10.50.217.129 with SMTP id oy1mr20651193igc.97.1461708639354; Tue, 26 Apr 2016 15:10:39 -0700 (PDT) Received: from t430.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id zd17sm2684818igc.8.2016.04.26.15.10.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 26 Apr 2016 15:10:38 -0700 (PDT) From: Mathieu Poirier To: linux-arm-kernel@lists.infradead.org, Suzuki.Poulose@arm.com Cc: linux-kernel@vger.kernel.org Subject: [PATCH V4 01/18] coresight: tmc: modifying naming convention Date: Tue, 26 Apr 2016 16:10:17 -0600 Message-Id: <1461708634-6327-2-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1461708634-6327-1-git-send-email-mathieu.poirier@linaro.org> References: <1461708634-6327-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 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 Reviewed-by: Suzuki K Poulose --- drivers/hwtracing/coresight/coresight-tmc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.5.0 diff --git a/drivers/hwtracing/coresight/coresight-tmc.c b/drivers/hwtracing/coresight/coresight-tmc.c index 2b42ecbd8831..3f646e29a99b 100644 --- a/drivers/hwtracing/coresight/coresight-tmc.c +++ b/drivers/hwtracing/coresight/coresight-tmc.c @@ -77,7 +77,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 { @@ -132,11 +132,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); @@ -160,7 +160,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)