ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

crypto: hisilicon - fixes some coding style

Browse Source 
Clean up extra blank lines

Signed-off-by: Longfang Liu <liulongfang@huawei.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Longfang Liu
2020-10-15 10:23:04 +08:00
committed by Herbert Xu
parent e68f9cf660
commit 633e507fba
2 changed files with 18 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/crypto/hisilicon/sec2/sec_crypto.c
View File

@@ -101,6 +101,7 @@ static int sec_alloc_req_id(struct sec_req *req, struct sec_qp_ctx *qp_ctx)
req->qp_ctx = qp_ctx; req->qp_ctx = qp_ctx;
qp_ctx->req_list[req_id] = req; qp_ctx->req_list[req_id] = req;
return req_id; return req_id;
} }
@@ -317,6 +318,7 @@ static int sec_alloc_pbuf_resource(struct device *dev, struct sec_alg_res *res)
j * SEC_PBUF_PKG + pbuf_page_offset; j * SEC_PBUF_PKG + pbuf_page_offset;
} }
} }
return 0; return 0;
} }
@@ -345,12 +347,12 @@ static int sec_alg_resource_alloc(struct sec_ctx *ctx,
} }
return 0; return 0;
alloc_pbuf_fail: alloc_pbuf_fail:
if (ctx->alg_type == SEC_AEAD) if (ctx->alg_type == SEC_AEAD)
sec_free_mac_resource(dev, qp_ctx->res); sec_free_mac_resource(dev, qp_ctx->res);
alloc_fail: alloc_fail:
sec_free_civ_resource(dev, res); sec_free_civ_resource(dev, res);
return ret; return ret;
} }
@@ -419,7 +421,6 @@ err_free_c_in_pool:
hisi_acc_free_sgl_pool(dev, qp_ctx->c_in_pool); hisi_acc_free_sgl_pool(dev, qp_ctx->c_in_pool);
err_destroy_idr: err_destroy_idr:
idr_destroy(&qp_ctx->req_idr); idr_destroy(&qp_ctx->req_idr);
return ret; return ret;
} }
@@ -557,9 +558,9 @@ static int sec_skcipher_init(struct crypto_skcipher *tfm)
goto err_cipher_init; goto err_cipher_init;
return 0; return 0;
err_cipher_init: err_cipher_init:
sec_ctx_base_uninit(ctx); sec_ctx_base_uninit(ctx);
return ret; return ret;
} }
@@ -740,7 +741,6 @@ static void sec_cipher_pbuf_unmap(struct sec_ctx *ctx, struct sec_req *req,
if (unlikely(pbuf_length != copy_size)) if (unlikely(pbuf_length != copy_size))
dev_err(dev, "copy pbuf data to dst error!\n"); dev_err(dev, "copy pbuf data to dst error!\n");
} }
static int sec_cipher_map(struct sec_ctx *ctx, struct sec_req *req, static int sec_cipher_map(struct sec_ctx *ctx, struct sec_req *req,
@@ -913,9 +913,9 @@ static int sec_aead_setkey(struct crypto_aead *tfm, const u8 *key,
} }
return 0; return 0;
bad_key: bad_key:
memzero_explicit(&keys, sizeof(struct crypto_authenc_keys)); memzero_explicit(&keys, sizeof(struct crypto_authenc_keys));
return -EINVAL; return -EINVAL;
} }
@@ -966,7 +966,6 @@ static int sec_request_transfer(struct sec_ctx *ctx, struct sec_req *req)
unmap_req_buf: unmap_req_buf:
ctx->req_op->buf_unmap(ctx, req); ctx->req_op->buf_unmap(ctx, req);
return ret; return ret;
} }
@@ -1107,7 +1106,6 @@ static void sec_skcipher_callback(struct sec_ctx *ctx, struct sec_req *req,
atomic64_inc(&ctx->sec->debug.dfx.recv_busy_cnt); atomic64_inc(&ctx->sec->debug.dfx.recv_busy_cnt);
} }
sk_req->base.complete(&sk_req->base, err); sk_req->base.complete(&sk_req->base, err);
} }
@@ -1279,7 +1277,6 @@ err_send_req:
sec_request_untransfer(ctx, req); sec_request_untransfer(ctx, req);
err_uninit_req: err_uninit_req:
sec_request_uninit(ctx, req); sec_request_uninit(ctx, req);
return ret; return ret;
} }
@@ -1349,7 +1346,6 @@ err_cipher_init:
sec_auth_uninit(ctx); sec_auth_uninit(ctx);
err_auth_init: err_auth_init:
sec_ctx_base_uninit(ctx); sec_ctx_base_uninit(ctx);
return ret; return ret;
} }
@@ -1437,8 +1433,8 @@ static int sec_skcipher_param_check(struct sec_ctx *ctx, struct sec_req *sreq)
} }
return 0; return 0;
} }
dev_err(dev, "skcipher algorithm error!\n"); dev_err(dev, "skcipher algorithm error!\n");
return -EINVAL; return -EINVAL;
} }
@@ -1554,7 +1550,6 @@ static int sec_aead_param_check(struct sec_ctx *ctx, struct sec_req *sreq)
if (unlikely(c_alg != SEC_CALG_AES)) { if (unlikely(c_alg != SEC_CALG_AES)) {
dev_err(SEC_CTX_DEV(ctx), "aead crypto alg error!\n"); dev_err(SEC_CTX_DEV(ctx), "aead crypto alg error!\n");
return -EINVAL; return -EINVAL;
} }
if (sreq->c_req.encrypt) if (sreq->c_req.encrypt)
sreq->c_req.c_len = req->cryptlen; sreq->c_req.c_len = req->cryptlen;

30
drivers/crypto/hisilicon/sec2/sec_main.c
View File

@@ -660,12 +660,10 @@ static int sec_debugfs_init(struct hisi_qm *qm)
if (ret) if (ret)
goto failed_to_create; goto failed_to_create;
return 0; return 0;
failed_to_create: failed_to_create:
debugfs_remove_recursive(sec_debugfs_root); debugfs_remove_recursive(sec_debugfs_root);
return ret; return ret;
} }
@@ -683,13 +681,13 @@ static void sec_log_hw_error(struct hisi_qm *qm, u32 err_sts)
while (errs->msg) { while (errs->msg) {
if (errs->int_msk & err_sts) { if (errs->int_msk & err_sts) {
dev_err(dev, "%s [error status=0x%x] found\n", dev_err(dev, "%s [error status=0x%x] found\n",
errs->msg, errs->int_msk); errs->msg, errs->int_msk);
if (SEC_CORE_INT_STATUS_M_ECC & errs->int_msk) { if (SEC_CORE_INT_STATUS_M_ECC & errs->int_msk) {
err_val = readl(qm->io_base + err_val = readl(qm->io_base +
SEC_CORE_SRAM_ECC_ERR_INFO); SEC_CORE_SRAM_ECC_ERR_INFO);
dev_err(dev, "multi ecc sram num=0x%x\n", dev_err(dev, "multi ecc sram num=0x%x\n",
SEC_ECC_NUM(err_val)); SEC_ECC_NUM(err_val));
} }
} }
errs++; errs++;
@@ -724,13 +722,13 @@ static const struct hisi_qm_err_ini sec_err_ini = {
.log_dev_hw_err = sec_log_hw_error, .log_dev_hw_err = sec_log_hw_error,
.open_axi_master_ooo = sec_open_axi_master_ooo, .open_axi_master_ooo = sec_open_axi_master_ooo,
.err_info = { .err_info = {
.ce = QM_BASE_CE, .ce = QM_BASE_CE,
.nfe = QM_BASE_NFE | QM_ACC_DO_TASK_TIMEOUT | .nfe = QM_BASE_NFE | QM_ACC_DO_TASK_TIMEOUT |
QM_ACC_WB_NOT_READY_TIMEOUT, QM_ACC_WB_NOT_READY_TIMEOUT,
.fe = 0, .fe = 0,
.ecc_2bits_mask = SEC_CORE_INT_STATUS_M_ECC, .ecc_2bits_mask = SEC_CORE_INT_STATUS_M_ECC,
.msi_wr_port = BIT(0), .msi_wr_port = BIT(0),
.acpi_rst = "SRST", .acpi_rst = "SRST",
} }
}; };
@@ -899,17 +897,13 @@ static int sec_probe(struct pci_dev *pdev, const struct pci_device_id *id)
err_alg_unregister: err_alg_unregister:
hisi_qm_alg_unregister(qm, &sec_devices); hisi_qm_alg_unregister(qm, &sec_devices);
err_qm_stop: err_qm_stop:
sec_debugfs_exit(qm); sec_debugfs_exit(qm);
hisi_qm_stop(qm, QM_NORMAL); hisi_qm_stop(qm, QM_NORMAL);
err_probe_uninit: err_probe_uninit:
sec_probe_uninit(qm); sec_probe_uninit(qm);
err_qm_uninit: err_qm_uninit:
sec_qm_uninit(qm); sec_qm_uninit(qm);
return ret; return ret;
} }
@@ -936,9 +930,9 @@ static void sec_remove(struct pci_dev *pdev)
static const struct pci_error_handlers sec_err_handler = { static const struct pci_error_handlers sec_err_handler = {
.error_detected = hisi_qm_dev_err_detected, .error_detected = hisi_qm_dev_err_detected,
.slot_reset = hisi_qm_dev_slot_reset, .slot_reset = hisi_qm_dev_slot_reset,
.reset_prepare = hisi_qm_reset_prepare, .reset_prepare = hisi_qm_reset_prepare,
.reset_done = hisi_qm_reset_done, .reset_done = hisi_qm_reset_done,
}; };
static struct pci_driver sec_pci_driver = { static struct pci_driver sec_pci_driver = {