Commit 4df43576 authored by Kai Ye's avatar Kai Ye Committed by JiangShui
Browse files

crypto: hisilicon/qm - modify the process of regs dfx 

mainline inclusion
from mainline-v6.2-rc1
commit b40b62ed
category: feature
bugzilla: https://gitee/com/openeuler/kernel/issues/16VW8E
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=b40b62ed7b0ffe8eb2e6fe8bcfb47027c9a93e93



-------------------------------------------------------------------

The last register logic and different register logic are combined.
Use "u32" instead of 'int' in the regs function input parameter to
simplify some checks.

Signed-off-by: default avatarKai Ye <yekai13@huawei.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarJangShui <yangjiangshui@h-partners.com>
parent d55503c2

drivers/crypto/hisilicon/hpre/hpre_main.c

+3 −4
Original line number Diff line number Diff line
@@ -1101,8 +1101,7 @@ static int hpre_debugfs_init(struct hisi_qm *qm) 


	qm->debug.sqe_mask_offset = HPRE_SQE_MASK_OFFSET;

	qm->debug.sqe_mask_len = HPRE_SQE_MASK_LEN;

	ret = hisi_qm_diff_regs_init(qm, hpre_diff_regs,

				ARRAY_SIZE(hpre_diff_regs));

	ret = hisi_qm_regs_debugfs_init(qm, hpre_diff_regs, ARRAY_SIZE(hpre_diff_regs));

	if (ret) {

		dev_warn(dev, "Failed to init HPRE diff regs!\n");

		goto debugfs_remove;
@@ -1121,7 +1120,7 @@ static int hpre_debugfs_init(struct hisi_qm *qm) 
	return 0;



failed_to_create:

	hisi_qm_diff_regs_uninit(qm, ARRAY_SIZE(hpre_diff_regs));

	hisi_qm_regs_debugfs_uninit(qm, ARRAY_SIZE(hpre_diff_regs));

debugfs_remove:

	debugfs_remove_recursive(qm->debug.debug_root);

	return ret;
@@ -1129,7 +1128,7 @@ static int hpre_debugfs_init(struct hisi_qm *qm) 


static void hpre_debugfs_exit(struct hisi_qm *qm)

{

	hisi_qm_diff_regs_uninit(qm, ARRAY_SIZE(hpre_diff_regs));

	hisi_qm_regs_debugfs_uninit(qm, ARRAY_SIZE(hpre_diff_regs));



	debugfs_remove_recursive(qm->debug.debug_root);

}

drivers/crypto/hisilicon/qm.c

+86 −65
Original line number Diff line number Diff line
@@ -1722,8 +1722,21 @@ static int qm_regs_show(struct seq_file *s, void *unused) 


DEFINE_SHOW_ATTRIBUTE(qm_regs);



static void dfx_regs_uninit(struct hisi_qm *qm,

		struct dfx_diff_registers *dregs, int reg_len)

{

	int i;



	/* Setting the pointer is NULL to prevent double free */

	for (i = 0; i < reg_len; i++) {

		kfree(dregs[i].regs);

		dregs[i].regs = NULL;

	}

	kfree(dregs);

}



static struct dfx_diff_registers *dfx_regs_init(struct hisi_qm *qm,

	const struct dfx_diff_registers *cregs, int reg_len)

	const struct dfx_diff_registers *cregs, u32 reg_len)

{

	struct dfx_diff_registers *diff_regs;

	u32 j, base_offset;
@@ -1762,64 +1775,107 @@ static struct dfx_diff_registers *dfx_regs_init(struct hisi_qm *qm, 
	return ERR_PTR(-ENOMEM);

}



static void dfx_regs_uninit(struct hisi_qm *qm,

		struct dfx_diff_registers *dregs, int reg_len)

static int qm_diff_regs_init(struct hisi_qm *qm,

		struct dfx_diff_registers *dregs, u32 reg_len)

{

	qm->debug.qm_diff_regs = dfx_regs_init(qm, qm_diff_regs, ARRAY_SIZE(qm_diff_regs));

	if (IS_ERR(qm->debug.qm_diff_regs))

		return PTR_ERR(qm->debug.qm_diff_regs);



	qm->debug.acc_diff_regs = dfx_regs_init(qm, dregs, reg_len);

	if (IS_ERR(qm->debug.acc_diff_regs)) {

		dfx_regs_uninit(qm, qm->debug.qm_diff_regs, ARRAY_SIZE(qm_diff_regs));

		return PTR_ERR(qm->debug.acc_diff_regs);

	}



	return 0;

}



static void qm_last_regs_uninit(struct hisi_qm *qm)

{

	struct qm_debug *debug = &qm->debug;



	if (qm->fun_type == QM_HW_VF || !debug->qm_last_words)

		return;



	kfree(debug->qm_last_words);

	debug->qm_last_words = NULL;

}



static int qm_last_regs_init(struct hisi_qm *qm)

{

	int dfx_regs_num = ARRAY_SIZE(qm_dfx_regs);

	struct qm_debug *debug = &qm->debug;

	int i;



	/* Setting the pointer is NULL to prevent double free */

	for (i = 0; i < reg_len; i++) {

		kfree(dregs[i].regs);

		dregs[i].regs = NULL;

	if (qm->fun_type == QM_HW_VF)

		return 0;



	debug->qm_last_words = kcalloc(dfx_regs_num, sizeof(unsigned int), GFP_KERNEL);

	if (!debug->qm_last_words)

		return -ENOMEM;



	for (i = 0; i < dfx_regs_num; i++) {

		debug->qm_last_words[i] = readl_relaxed(qm->io_base +

			qm_dfx_regs[i].offset);

	}

	kfree(dregs);



	return 0;

}



static void qm_diff_regs_uninit(struct hisi_qm *qm, u32 reg_len)

{

	dfx_regs_uninit(qm, qm->debug.acc_diff_regs, reg_len);

	dfx_regs_uninit(qm, qm->debug.qm_diff_regs, ARRAY_SIZE(qm_diff_regs));

}



/**

 * hisi_qm_diff_regs_init() - Allocate memory for registers.

 * hisi_qm_regs_debugfs_init() - Allocate memory for registers.

 * @qm: device qm handle.

 * @dregs: diff registers handle.

 * @reg_len: diff registers region length.

 */

int hisi_qm_diff_regs_init(struct hisi_qm *qm,

		struct dfx_diff_registers *dregs, int reg_len)

int hisi_qm_regs_debugfs_init(struct hisi_qm *qm,

		struct dfx_diff_registers *dregs, u32 reg_len)

{

	if (!qm || !dregs || reg_len <= 0)

	int ret;



	if (!qm || !dregs)

		return -EINVAL;



	if (qm->fun_type != QM_HW_PF)

		return 0;



	qm->debug.qm_diff_regs = dfx_regs_init(qm, qm_diff_regs,

						ARRAY_SIZE(qm_diff_regs));

	if (IS_ERR(qm->debug.qm_diff_regs))

		return PTR_ERR(qm->debug.qm_diff_regs);

	ret = qm_last_regs_init(qm);

	if (ret) {

		dev_info(&qm->pdev->dev, "failed to init qm words memory!\n");

		return ret;

	}



	qm->debug.acc_diff_regs = dfx_regs_init(qm, dregs, reg_len);

	if (IS_ERR(qm->debug.acc_diff_regs)) {

		dfx_regs_uninit(qm, qm->debug.qm_diff_regs,

				ARRAY_SIZE(qm_diff_regs));

		return PTR_ERR(qm->debug.acc_diff_regs);

	ret = qm_diff_regs_init(qm, dregs, reg_len);

	if (ret) {

		qm_last_regs_uninit(qm);

		return ret;

	}



	return 0;

}

EXPORT_SYMBOL_GPL(hisi_qm_diff_regs_init);

EXPORT_SYMBOL_GPL(hisi_qm_regs_debugfs_init);



/**

 * hisi_qm_diff_regs_uninit() - Free memory for registers.

 * hisi_qm_regs_debugfs_uninit() - Free memory for registers.

 * @qm: device qm handle.

 * @reg_len: diff registers region length.

 */

void hisi_qm_diff_regs_uninit(struct hisi_qm *qm, int reg_len)

void hisi_qm_regs_debugfs_uninit(struct hisi_qm *qm, u32 reg_len)

{

	if (!qm  || reg_len <= 0 || qm->fun_type != QM_HW_PF)

	if (!qm || qm->fun_type != QM_HW_PF)

		return;



	dfx_regs_uninit(qm, qm->debug.acc_diff_regs, reg_len);

	dfx_regs_uninit(qm, qm->debug.qm_diff_regs, ARRAY_SIZE(qm_diff_regs));

	qm_diff_regs_uninit(qm, reg_len);

	qm_last_regs_uninit(qm);

}

EXPORT_SYMBOL_GPL(hisi_qm_diff_regs_uninit);

EXPORT_SYMBOL_GPL(hisi_qm_regs_debugfs_uninit);



/**

 * hisi_qm_acc_diff_regs_dump() - Dump registers's value.
@@ -1829,12 +1885,12 @@ EXPORT_SYMBOL_GPL(hisi_qm_diff_regs_uninit); 
 * @regs_len: diff registers region length.

 */

void hisi_qm_acc_diff_regs_dump(struct hisi_qm *qm, struct seq_file *s,

	struct dfx_diff_registers *dregs, int regs_len)

	struct dfx_diff_registers *dregs, u32 regs_len)

{

	u32 j, val, base_offset;

	int i, ret;



	if (!qm || !s || !dregs || regs_len <= 0)

	if (!qm || !s || !dregs)

		return;



	ret = hisi_qm_get_dfx_access(qm);
@@ -3721,17 +3777,6 @@ static void hisi_qm_set_state(struct hisi_qm *qm, enum vf_state state) 
		writel(state, qm->io_base + QM_VF_STATE);

}



static void qm_last_regs_uninit(struct hisi_qm *qm)

{

	struct qm_debug *debug = &qm->debug;



	if (qm->fun_type == QM_HW_VF || !debug->qm_last_words)

		return;



	kfree(debug->qm_last_words);

	debug->qm_last_words = NULL;

}



static void hisi_qm_unint_work(struct hisi_qm *qm)

{

	destroy_workqueue(qm->wq);
@@ -3762,8 +3807,6 @@ static void hisi_qm_memory_uninit(struct hisi_qm *qm) 
 */

void hisi_qm_uninit(struct hisi_qm *qm)

{

	qm_last_regs_uninit(qm);



	qm_cmd_uninit(qm);

	hisi_qm_unint_work(qm);

	down_write(&qm->qps_lock);
@@ -6345,26 +6388,6 @@ static int hisi_qm_memory_init(struct hisi_qm *qm) 
	return ret;

}



static void qm_last_regs_init(struct hisi_qm *qm)

{

	int dfx_regs_num = ARRAY_SIZE(qm_dfx_regs);

	struct qm_debug *debug = &qm->debug;

	int i;



	if (qm->fun_type == QM_HW_VF)

		return;



	debug->qm_last_words = kcalloc(dfx_regs_num, sizeof(unsigned int),

								GFP_KERNEL);

	if (!debug->qm_last_words)

		return;



	for (i = 0; i < dfx_regs_num; i++) {

		debug->qm_last_words[i] = readl_relaxed(qm->io_base +

			qm_dfx_regs[i].offset);

	}

}



/**

 * hisi_qm_init() - Initialize configures about qm.

 * @qm: The qm needing init.
@@ -6413,8 +6436,6 @@ int hisi_qm_init(struct hisi_qm *qm) 
	qm_cmd_init(qm);

	atomic_set(&qm->status.flags, QM_INIT);



	qm_last_regs_init(qm);



	return 0;



err_free_qm_memory:

drivers/crypto/hisilicon/sec2/sec_main.c

+3 −4
Original line number Diff line number Diff line
@@ -899,8 +899,7 @@ static int sec_debugfs_init(struct hisi_qm *qm) 
	qm->debug.sqe_mask_offset = SEC_SQE_MASK_OFFSET;

	qm->debug.sqe_mask_len = SEC_SQE_MASK_LEN;



	ret = hisi_qm_diff_regs_init(qm, sec_diff_regs,

				ARRAY_SIZE(sec_diff_regs));

	ret = hisi_qm_regs_debugfs_init(qm, sec_diff_regs, ARRAY_SIZE(sec_diff_regs));

	if (ret) {

		dev_warn(dev, "Failed to init SEC diff regs!\n");

		goto debugfs_remove;
@@ -915,7 +914,7 @@ static int sec_debugfs_init(struct hisi_qm *qm) 
	return 0;



failed_to_create:

	hisi_qm_diff_regs_uninit(qm, ARRAY_SIZE(sec_diff_regs));

	hisi_qm_regs_debugfs_uninit(qm, ARRAY_SIZE(sec_diff_regs));

debugfs_remove:

	debugfs_remove_recursive(sec_debugfs_root);

	return ret;
@@ -923,7 +922,7 @@ static int sec_debugfs_init(struct hisi_qm *qm) 


static void sec_debugfs_exit(struct hisi_qm *qm)

{

	hisi_qm_diff_regs_uninit(qm, ARRAY_SIZE(sec_diff_regs));

	hisi_qm_regs_debugfs_uninit(qm, ARRAY_SIZE(sec_diff_regs));



	debugfs_remove_recursive(qm->debug.debug_root);

}

drivers/crypto/hisilicon/zip/zip_main.c

+3 −4
Original line number Diff line number Diff line
@@ -849,8 +849,7 @@ static int hisi_zip_debugfs_init(struct hisi_qm *qm) 
	qm->debug.sqe_mask_offset = HZIP_SQE_MASK_OFFSET;

	qm->debug.sqe_mask_len = HZIP_SQE_MASK_LEN;

	qm->debug.debug_root = dev_d;

	ret = hisi_qm_diff_regs_init(qm, hzip_diff_regs,

				ARRAY_SIZE(hzip_diff_regs));

	ret = hisi_qm_regs_debugfs_init(qm, hzip_diff_regs, ARRAY_SIZE(hzip_diff_regs));

	if (ret) {

		dev_warn(dev, "Failed to init ZIP diff regs!\n");

		goto debugfs_remove;
@@ -869,7 +868,7 @@ static int hisi_zip_debugfs_init(struct hisi_qm *qm) 
	return 0;



failed_to_create:

	hisi_qm_diff_regs_uninit(qm, ARRAY_SIZE(hzip_diff_regs));

	hisi_qm_regs_debugfs_uninit(qm, ARRAY_SIZE(hzip_diff_regs));

debugfs_remove:

	debugfs_remove_recursive(hzip_debugfs_root);

	return ret;
@@ -895,7 +894,7 @@ static void hisi_zip_debug_regs_clear(struct hisi_qm *qm) 


static void hisi_zip_debugfs_exit(struct hisi_qm *qm)

{

	hisi_qm_diff_regs_uninit(qm, ARRAY_SIZE(hzip_diff_regs));

	hisi_qm_regs_debugfs_uninit(qm, ARRAY_SIZE(hzip_diff_regs));



	debugfs_remove_recursive(qm->debug.debug_root);

include/linux/hisi_acc_qm.h

+4 −4
Original line number Diff line number Diff line
@@ -472,11 +472,11 @@ int hisi_qm_sriov_disable(struct pci_dev *pdev, bool is_frozen); 
int hisi_qm_sriov_configure(struct pci_dev *pdev, int num_vfs);

void hisi_qm_dev_err_init(struct hisi_qm *qm);

void hisi_qm_dev_err_uninit(struct hisi_qm *qm);

int hisi_qm_diff_regs_init(struct hisi_qm *qm,

		struct dfx_diff_registers *dregs, int reg_len);

void hisi_qm_diff_regs_uninit(struct hisi_qm *qm, int reg_len);

int hisi_qm_regs_debugfs_init(struct hisi_qm *qm,

			  struct dfx_diff_registers *dregs, u32 reg_len);

void hisi_qm_regs_debugfs_uninit(struct hisi_qm *qm, u32 reg_len);

void hisi_qm_acc_diff_regs_dump(struct hisi_qm *qm, struct seq_file *s,

		struct dfx_diff_registers *dregs, int regs_len);

				struct dfx_diff_registers *dregs, u32 regs_len);



pci_ers_result_t hisi_qm_dev_err_detected(struct pci_dev *pdev,

					  pci_channel_state_t state);