Commit ca0d158d authored by Zaibo Xu's avatar Zaibo Xu Committed by Herbert Xu

crypto: hisilicon - Update debugfs usage of SEC V2

Applied some advices of Marco Elver on atomic usage of Debugfs,
which is carried out by basing on Arnd Bergmann's fixing patch.
Reported-by: default avatarArnd Bergmann <arnd@arndb.de>
Reported-by: default avatarMarco Elver <elver@google.com>
Signed-off-by: default avatarZaibo Xu <xuzaibo@huawei.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 279c075d
...@@ -40,7 +40,7 @@ struct sec_req { ...@@ -40,7 +40,7 @@ struct sec_req {
int req_id; int req_id;
/* Status of the SEC request */ /* Status of the SEC request */
atomic_t fake_busy; bool fake_busy;
}; };
/** /**
......
...@@ -141,7 +141,7 @@ static int sec_bd_send(struct sec_ctx *ctx, struct sec_req *req) ...@@ -141,7 +141,7 @@ static int sec_bd_send(struct sec_ctx *ctx, struct sec_req *req)
return -ENOBUFS; return -ENOBUFS;
if (!ret) { if (!ret) {
if (atomic_read(&req->fake_busy)) if (req->fake_busy)
ret = -EBUSY; ret = -EBUSY;
else else
ret = -EINPROGRESS; ret = -EINPROGRESS;
...@@ -641,7 +641,7 @@ static void sec_skcipher_callback(struct sec_ctx *ctx, struct sec_req *req) ...@@ -641,7 +641,7 @@ static void sec_skcipher_callback(struct sec_ctx *ctx, struct sec_req *req)
if (ctx->c_ctx.c_mode == SEC_CMODE_CBC && req->c_req.encrypt) if (ctx->c_ctx.c_mode == SEC_CMODE_CBC && req->c_req.encrypt)
sec_update_iv(req); sec_update_iv(req);
if (atomic_cmpxchg(&req->fake_busy, 1, 0) != 1) if (req->fake_busy)
sk_req->base.complete(&sk_req->base, -EINPROGRESS); sk_req->base.complete(&sk_req->base, -EINPROGRESS);
sk_req->base.complete(&sk_req->base, req->err_type); sk_req->base.complete(&sk_req->base, req->err_type);
...@@ -672,9 +672,9 @@ static int sec_request_init(struct sec_ctx *ctx, struct sec_req *req) ...@@ -672,9 +672,9 @@ static int sec_request_init(struct sec_ctx *ctx, struct sec_req *req)
} }
if (ctx->fake_req_limit <= atomic_inc_return(&qp_ctx->pending_reqs)) if (ctx->fake_req_limit <= atomic_inc_return(&qp_ctx->pending_reqs))
atomic_set(&req->fake_busy, 1); req->fake_busy = true;
else else
atomic_set(&req->fake_busy, 0); req->fake_busy = false;
ret = ctx->req_op->get_res(ctx, req); ret = ctx->req_op->get_res(ctx, req);
if (ret) { if (ret) {
......
...@@ -608,13 +608,13 @@ static const struct file_operations sec_dbg_fops = { ...@@ -608,13 +608,13 @@ static const struct file_operations sec_dbg_fops = {
.write = sec_debug_write, .write = sec_debug_write,
}; };
static int debugfs_atomic64_t_get(void *data, u64 *val) static int sec_debugfs_atomic64_get(void *data, u64 *val)
{ {
*val = atomic64_read((atomic64_t *)data); *val = atomic64_read((atomic64_t *)data);
return 0; return 0;
} }
DEFINE_DEBUGFS_ATTRIBUTE(fops_atomic64_t_ro, debugfs_atomic64_t_get, NULL, DEFINE_DEBUGFS_ATTRIBUTE(sec_atomic64_ops, sec_debugfs_atomic64_get,
"%lld\n"); NULL, "%lld\n");
static int sec_core_debug_init(struct sec_dev *sec) static int sec_core_debug_init(struct sec_dev *sec)
{ {
...@@ -636,11 +636,11 @@ static int sec_core_debug_init(struct sec_dev *sec) ...@@ -636,11 +636,11 @@ static int sec_core_debug_init(struct sec_dev *sec)
debugfs_create_regset32("regs", 0444, tmp_d, regset); debugfs_create_regset32("regs", 0444, tmp_d, regset);
debugfs_create_file("send_cnt", 0444, tmp_d, &dfx->send_cnt, debugfs_create_file("send_cnt", 0444, tmp_d,
&fops_atomic64_t_ro); &dfx->send_cnt, &sec_atomic64_ops);
debugfs_create_file("recv_cnt", 0444, tmp_d, &dfx->recv_cnt, debugfs_create_file("recv_cnt", 0444, tmp_d,
&fops_atomic64_t_ro); &dfx->recv_cnt, &sec_atomic64_ops);
return 0; return 0;
} }
......
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