Skip to content

Commit 43dc4e8

Browse files
coresight: tmc: modifying naming convention
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 <mathieu.poirier@linaro.org> Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from commit 580ff804ecaf5bc59835fec26e17325bcd53fc91)
1 parent d840089 commit 43dc4e8

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

drivers/hwtracing/coresight/coresight-tmc.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
#define TMC_FFCR_TRIGON_TRIGIN BIT(8)
7878
#define TMC_FFCR_STOP_ON_FLUSH BIT(12)
7979

80-
#define TMC_STS_TRIGGERED_BIT 2
80+
#define TMC_STS_TMCREADY_BIT 2
8181
#define TMC_FFCR_FLUSHMAN_BIT 6
8282

8383
enum tmc_config_type {
@@ -132,11 +132,11 @@ struct tmc_drvdata {
132132
u32 trigger_cntr;
133133
};
134134

135-
static void tmc_wait_for_ready(struct tmc_drvdata *drvdata)
135+
static void tmc_wait_for_tmcready(struct tmc_drvdata *drvdata)
136136
{
137137
/* Ensure formatter, unformatter and hardware fifo are empty */
138138
if (coresight_timeout(drvdata->base,
139-
TMC_STS, TMC_STS_TRIGGERED_BIT, 1)) {
139+
TMC_STS, TMC_STS_TMCREADY_BIT, 1)) {
140140
dev_err(drvdata->dev,
141141
"timeout observed when probing at offset %#x\n",
142142
TMC_STS);
@@ -160,7 +160,7 @@ static void tmc_flush_and_stop(struct tmc_drvdata *drvdata)
160160
TMC_FFCR);
161161
}
162162

163-
tmc_wait_for_ready(drvdata);
163+
tmc_wait_for_tmcready(drvdata);
164164
}
165165

166166
static void tmc_enable_hw(struct tmc_drvdata *drvdata)

0 commit comments

Comments
 (0)