Commit cfd9f630 authored by Mathieu Poirier's avatar Mathieu Poirier Committed by Greg Kroah-Hartman

coresight: Correct buffer lost increment

Many conditions may cause synchronisation to be lost when updating
the perf ring buffer but the end result is still the same: synchronisation
is lost.  As such there is no need to increment the lost count for each
condition, just once will suffice.
Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2fb4f258
...@@ -353,6 +353,7 @@ static void etb_update_buffer(struct coresight_device *csdev, ...@@ -353,6 +353,7 @@ static void etb_update_buffer(struct coresight_device *csdev,
struct perf_output_handle *handle, struct perf_output_handle *handle,
void *sink_config) void *sink_config)
{ {
bool lost = false;
int i, cur; int i, cur;
u8 *buf_ptr; u8 *buf_ptr;
u32 read_ptr, write_ptr, capacity; u32 read_ptr, write_ptr, capacity;
...@@ -384,7 +385,7 @@ static void etb_update_buffer(struct coresight_device *csdev, ...@@ -384,7 +385,7 @@ static void etb_update_buffer(struct coresight_device *csdev,
(unsigned long)write_ptr); (unsigned long)write_ptr);
write_ptr &= ~(ETB_FRAME_SIZE_WORDS - 1); write_ptr &= ~(ETB_FRAME_SIZE_WORDS - 1);
perf_aux_output_flag(handle, PERF_AUX_FLAG_TRUNCATED); lost = true;
} }
/* /*
...@@ -395,7 +396,7 @@ static void etb_update_buffer(struct coresight_device *csdev, ...@@ -395,7 +396,7 @@ static void etb_update_buffer(struct coresight_device *csdev,
*/ */
status = readl_relaxed(drvdata->base + ETB_STATUS_REG); status = readl_relaxed(drvdata->base + ETB_STATUS_REG);
if (status & ETB_STATUS_RAM_FULL) { if (status & ETB_STATUS_RAM_FULL) {
perf_aux_output_flag(handle, PERF_AUX_FLAG_TRUNCATED); lost = true;
to_read = capacity; to_read = capacity;
read_ptr = write_ptr; read_ptr = write_ptr;
} else { } else {
...@@ -428,9 +429,12 @@ static void etb_update_buffer(struct coresight_device *csdev, ...@@ -428,9 +429,12 @@ static void etb_update_buffer(struct coresight_device *csdev,
if (read_ptr > (drvdata->buffer_depth - 1)) if (read_ptr > (drvdata->buffer_depth - 1))
read_ptr -= drvdata->buffer_depth; read_ptr -= drvdata->buffer_depth;
/* let the decoder know we've skipped ahead */ /* let the decoder know we've skipped ahead */
perf_aux_output_flag(handle, PERF_AUX_FLAG_TRUNCATED); lost = true;
} }
if (lost)
perf_aux_output_flag(handle, PERF_AUX_FLAG_TRUNCATED);
/* finally tell HW where we want to start reading from */ /* finally tell HW where we want to start reading from */
writel_relaxed(read_ptr, drvdata->base + ETB_RAM_READ_POINTER); writel_relaxed(read_ptr, drvdata->base + ETB_RAM_READ_POINTER);
......
...@@ -369,6 +369,7 @@ static void tmc_update_etf_buffer(struct coresight_device *csdev, ...@@ -369,6 +369,7 @@ static void tmc_update_etf_buffer(struct coresight_device *csdev,
struct perf_output_handle *handle, struct perf_output_handle *handle,
void *sink_config) void *sink_config)
{ {
bool lost = false;
int i, cur; int i, cur;
u32 *buf_ptr; u32 *buf_ptr;
u32 read_ptr, write_ptr; u32 read_ptr, write_ptr;
...@@ -397,7 +398,7 @@ static void tmc_update_etf_buffer(struct coresight_device *csdev, ...@@ -397,7 +398,7 @@ static void tmc_update_etf_buffer(struct coresight_device *csdev,
*/ */
status = readl_relaxed(drvdata->base + TMC_STS); status = readl_relaxed(drvdata->base + TMC_STS);
if (status & TMC_STS_FULL) { if (status & TMC_STS_FULL) {
perf_aux_output_flag(handle, PERF_AUX_FLAG_TRUNCATED); lost = true;
to_read = drvdata->size; to_read = drvdata->size;
} else { } else {
to_read = CIRC_CNT(write_ptr, read_ptr, drvdata->size); to_read = CIRC_CNT(write_ptr, read_ptr, drvdata->size);
...@@ -442,9 +443,12 @@ static void tmc_update_etf_buffer(struct coresight_device *csdev, ...@@ -442,9 +443,12 @@ static void tmc_update_etf_buffer(struct coresight_device *csdev,
read_ptr -= drvdata->size; read_ptr -= drvdata->size;
/* Tell the HW */ /* Tell the HW */
writel_relaxed(read_ptr, drvdata->base + TMC_RRP); writel_relaxed(read_ptr, drvdata->base + TMC_RRP);
perf_aux_output_flag(handle, PERF_AUX_FLAG_TRUNCATED); lost = true;
} }
if (lost)
perf_aux_output_flag(handle, PERF_AUX_FLAG_TRUNCATED);
cur = buf->cur; cur = buf->cur;
offset = buf->offset; offset = buf->offset;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment