Skip to content

Commit

Permalink
crypto: cavium - Fix statistics pending request value
Browse files Browse the repository at this point in the history
The pending request counter was read from the wrong register. While
at it, there is no need to use an atomic for it as it is only read
localy in a loop.

Signed-off-by: Jan Glauber <jglauber@cavium.com>
Reviewed-by: Robert Richter <rrichter@cavium.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  • Loading branch information
Jan Glauber authored and Herbert Xu committed Apr 20, 2018
1 parent a40c880 commit 1cc7e01
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
13 changes: 5 additions & 8 deletions drivers/crypto/cavium/zip/zip_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -469,17 +469,17 @@ static int zip_show_stats(struct seq_file *s, void *unused)
struct zip_stats *st;

for (index = 0; index < MAX_ZIP_DEVICES; index++) {
u64 pending = 0;

if (zip_dev[index]) {
zip = zip_dev[index];
st = &zip->stats;

/* Get all the pending requests */
for (q = 0; q < ZIP_NUM_QUEUES; q++) {
val = zip_reg_read((zip->reg_base +
ZIP_DBG_COREX_STA(q)));
val = (val >> 32);
val = val & 0xffffff;
atomic64_add(val, &st->pending_req);
ZIP_DBG_QUEX_STA(q)));
pending += val >> 32 & 0xffffff;
}

val = atomic64_read(&st->comp_req_complete);
Expand Down Expand Up @@ -514,10 +514,7 @@ static int zip_show_stats(struct seq_file *s, void *unused)
(u64)atomic64_read(&st->decomp_in_bytes),
(u64)atomic64_read(&st->decomp_out_bytes),
(u64)atomic64_read(&st->decomp_bad_reqs),
(u64)atomic64_read(&st->pending_req));

/* Reset pending requests count */
atomic64_set(&st->pending_req, 0);
pending);
}
}
return 0;
Expand Down
1 change: 0 additions & 1 deletion drivers/crypto/cavium/zip/zip_main.h
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ struct zip_stats {
atomic64_t comp_req_complete;
atomic64_t decomp_req_submit;
atomic64_t decomp_req_complete;
atomic64_t pending_req;
atomic64_t comp_in_bytes;
atomic64_t comp_out_bytes;
atomic64_t decomp_in_bytes;
Expand Down

0 comments on commit 1cc7e01

Please sign in to comment.