UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

crypto: hisilicon/zip - modify debugfs interface parameters 

Update debugfs interface parameters

Signed-off-by: Shukun Tan <tanshukun1@huawei.com>
Signed-off-by: Yang Shen <shenyang39@huawei.com>
Reviewed-by: Zhou Wang <wangzhou1@hisilicon.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Shukun Tan 2020-09-07 16:21:55 +08:00 committed by Herbert Xu
parent 15b0694f79
commit 4b33f057ee
1 changed files with 24 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
drivers/crypto/hisilicon/zip/zip_main.c
View File

@ -156,7 +156,6 @@ struct ctrl_debug_file {
*/
struct hisi_zip_ctrl {
struct hisi_zip *hisi_zip;
struct dentry *debug_root;
struct ctrl_debug_file files[HZIP_DEBUG_FILE_NUM];
};
@ -509,10 +508,8 @@ static int zip_debugfs_atomic64_get(void *data, u64 *val)
DEFINE_DEBUGFS_ATTRIBUTE(zip_atomic64_ops, zip_debugfs_atomic64_get,
zip_debugfs_atomic64_set, "%llu\n");
static int hisi_zip_core_debug_init(struct hisi_zip_ctrl *ctrl)
static int hisi_zip_core_debug_init(struct hisi_qm *qm)
{
struct hisi_zip *hisi_zip = ctrl->hisi_zip;
struct hisi_qm *qm = &hisi_zip->qm;
struct device *dev = &qm->pdev->dev;
struct debugfs_regset32 *regset;
struct dentry *tmp_d;
@ -533,7 +530,7 @@ static int hisi_zip_core_debug_init(struct hisi_zip_ctrl *ctrl)
regset->nregs = ARRAY_SIZE(hzip_dfx_regs);
regset->base = qm->io_base + core_offsets[i];
tmp_d = debugfs_create_dir(buf, ctrl->debug_root);
tmp_d = debugfs_create_dir(buf, qm->debug.debug_root);
debugfs_create_regset32("regs", 0444, tmp_d, regset);
}
@ -552,33 +549,32 @@ static void hisi_zip_dfx_debug_init(struct hisi_qm *qm)
for (i = 0; i < ARRAY_SIZE(zip_dfx_files); i++) {
data = (atomic64_t *)((uintptr_t)dfx + zip_dfx_files[i].offset);
debugfs_create_file(zip_dfx_files[i].name,
0644,
tmp_dir,
data,
&zip_atomic64_ops);
0644, tmp_dir, data,
&zip_atomic64_ops);
}
}
static int hisi_zip_ctrl_debug_init(struct hisi_zip_ctrl *ctrl)
static int hisi_zip_ctrl_debug_init(struct hisi_qm *qm)
{
struct hisi_zip *zip = container_of(qm, struct hisi_zip, qm);
int i;
for (i = HZIP_CURRENT_QM; i < HZIP_DEBUG_FILE_NUM; i++) {
spin_lock_init(&ctrl->files[i].lock);
ctrl->files[i].ctrl = ctrl;
ctrl->files[i].index = i;
spin_lock_init(&zip->ctrl->files[i].lock);
zip->ctrl->files[i].ctrl = zip->ctrl;
zip->ctrl->files[i].index = i;
debugfs_create_file(ctrl_debug_file_name[i], 0600,
ctrl->debug_root, ctrl->files + i,
qm->debug.debug_root,
zip->ctrl->files + i,
&ctrl_debug_fops);
}
return hisi_zip_core_debug_init(ctrl);
return hisi_zip_core_debug_init(qm);
}
static int hisi_zip_debugfs_init(struct hisi_zip *hisi_zip)
static int hisi_zip_debugfs_init(struct hisi_qm *qm)
{
struct hisi_qm *qm = &hisi_zip->qm;
struct device *dev = &qm->pdev->dev;
struct dentry *dev_d;
int ret;
@ -593,8 +589,7 @@ static int hisi_zip_debugfs_init(struct hisi_zip *hisi_zip)
goto failed_to_create;
if (qm->fun_type == QM_HW_PF) {
hisi_zip->ctrl->debug_root = dev_d;
ret = hisi_zip_ctrl_debug_init(hisi_zip->ctrl);
ret = hisi_zip_ctrl_debug_init(qm);
if (ret)
goto failed_to_create;
}
@ -608,10 +603,8 @@ failed_to_create:
return ret;
}
static void hisi_zip_debug_regs_clear(struct hisi_zip *hisi_zip)
static void hisi_zip_debug_regs_clear(struct hisi_qm *qm)
{
struct hisi_qm *qm = &hisi_zip->qm;
writel(0x0, qm->io_base + QM_DFX_MB_CNT_VF);
writel(0x0, qm->io_base + QM_DFX_DB_CNT_VF);
writel(0x0, qm->io_base + HZIP_SOFT_CTRL_CNT_CLR_CE);
@ -619,14 +612,14 @@ static void hisi_zip_debug_regs_clear(struct hisi_zip *hisi_zip)
hisi_qm_debug_regs_clear(qm);
}
static void hisi_zip_debugfs_exit(struct hisi_zip *hisi_zip)
static void hisi_zip_debugfs_exit(struct hisi_qm *qm)
{
struct hisi_qm *qm = &hisi_zip->qm;
debugfs_remove_recursive(qm->debug.debug_root);
if (qm->fun_type == QM_HW_PF)
hisi_zip_debug_regs_clear(hisi_zip);
if (qm->fun_type == QM_HW_PF) {
hisi_zip_debug_regs_clear(qm);
qm->debug.curr_qm_qp_num = 0;
}
}
static void hisi_zip_log_hw_error(struct hisi_qm *qm, u32 err_sts)
@ -733,7 +726,7 @@ static int hisi_zip_pf_probe_init(struct hisi_zip *hisi_zip)
hisi_zip_set_user_domain_and_cache(qm);
hisi_qm_dev_err_init(qm);
hisi_zip_debug_regs_clear(hisi_zip);
hisi_zip_debug_regs_clear(qm);
return 0;
}
@ -809,7 +802,7 @@ static int hisi_zip_probe(struct pci_dev *pdev, const struct pci_device_id *id)
if (ret)
goto err_dev_err_uninit;
ret = hisi_zip_debugfs_init(hisi_zip);
ret = hisi_zip_debugfs_init(qm);
if (ret)
dev_err(&pdev->dev, "Failed to init debugfs (%d)!\n", ret);
@ -837,7 +830,7 @@ err_qm_alg_unregister:
hisi_qm_alg_unregister(qm, &zip_devices);
err_qm_stop:
hisi_zip_debugfs_exit(hisi_zip);
hisi_zip_debugfs_exit(qm);
hisi_qm_stop(qm, QM_NORMAL);
err_dev_err_uninit:
@ -860,7 +853,7 @@ static void hisi_zip_remove(struct pci_dev *pdev)
if (qm->fun_type == QM_HW_PF && qm->vfs_num)
hisi_qm_sriov_disable(pdev, qm->is_frozen);
hisi_zip_debugfs_exit(hisi_zip);
hisi_zip_debugfs_exit(qm);
hisi_qm_stop(qm, QM_NORMAL);
hisi_qm_dev_err_uninit(qm);
hisi_qm_uninit(qm);