Unverified Commit 5a39e8f3 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!2845 crypto: hisilicon - revert some patch 

Merge Pull Request from: @xiao_jiang_shui 
 
* issue: https://gitee.com/openeuler/kernel/issues/I8FI6W 
 
Link:https://gitee.com/openeuler/kernel/pulls/2845

 

Reviewed-by: default avatarYang Shen <shenyang39@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents bcec4836 6395c097

drivers/crypto/hisilicon/migration/acc_vf_migration.c

+2 −2
Original line number Diff line number Diff line
@@ -543,7 +543,7 @@ static void vf_qm_fun_restart(struct hisi_qm *qm, 
	 * normally at this time. so if Guest acc driver have removed,

	 * don't need to restart QP.

	 */

	if (vf_data->vf_state != VF_READY) {

	if (vf_data->vf_state != QM_READY) {

		dev_err(dev, "failed to restart VF!\n");

		return;

	}
@@ -1251,7 +1251,7 @@ static void acc_vf_reset(void *device_data) 
		vfio_pci_vendor_data(device_data);

	struct hisi_qm *qm = acc_vf_dev->vf_qm;

	struct device *dev = &qm->pdev->dev;

	u32 vf_state = VF_NOT_READY;

	u32 vf_state = QM_NOT_READY;

	int ret;



	dev_info(dev, "QEMU prepare to Reset Guest!\n");

drivers/crypto/hisilicon/qm.c

+9 −16
Original line number Diff line number Diff line
@@ -1062,12 +1062,13 @@ static void qm_get_complete_eqe_num(struct hisi_qm *qm) 
	u16 cqn, eqe_num = 0;



	if (QM_EQE_PHASE(eqe) != qm->status.eqc_phase) {

		atomic64_inc(&qm->debug.dfx.err_irq_cnt);

		qm_db(qm, 0, QM_DOORBELL_CMD_EQ, qm->status.eq_head, 0);

		return;

	}



	cqn = le32_to_cpu(eqe->dw0) & QM_EQE_CQN_MASK;

	if (cqn >= qm->qp_num)

	if (unlikely(cqn >= qm->qp_num))

		return;

	poll_data = &qm->poll_data[cqn];
@@ -1089,12 +1090,9 @@ static void qm_get_complete_eqe_num(struct hisi_qm *qm) 
			break;

	}



	qm_db(qm, 0, QM_DOORBELL_CMD_EQ, qm->status.eq_head, 0);



	if (poll_data) {

	poll_data->eqe_num = eqe_num;

	queue_work(qm->wq, &poll_data->work);

	}

	qm_db(qm, 0, QM_DOORBELL_CMD_EQ, qm->status.eq_head, 0);

}



static irqreturn_t qm_eq_irq(int irq, void *data)
@@ -3053,10 +3051,9 @@ static void hisi_qm_pci_uninit(struct hisi_qm *qm) 
	pci_disable_device(pdev);

}



static void hisi_qm_set_state(struct hisi_qm *qm, enum vf_state state)

static void hisi_qm_set_state(struct hisi_qm *qm, u8 state)

{

	/* set vf driver state */

	if (qm->ver > QM_HW_V2)

	if (qm->ver > QM_HW_V2 && qm->fun_type == QM_HW_VF)

		writel(state, qm->io_base + QM_VF_STATE);

}
@@ -3109,7 +3106,7 @@ void hisi_qm_uninit(struct hisi_qm *qm) 
	}



	hisi_qm_memory_uninit(qm);

	hisi_qm_set_state(qm, VF_NOT_READY);

	hisi_qm_set_state(qm, QM_NOT_READY);

	up_write(&qm->qps_lock);



	qm_remove_uacce(qm);
@@ -3125,6 +3122,7 @@ EXPORT_SYMBOL_GPL(hisi_qm_uninit); 
 * @number: The number of queues in vft.

 *

 * We can allocate multiple queues to a qm by configuring virtual function

 * table. We get related configures by this function. Normally, we call this

 * function in VF driver to get the queue information.

 *

 * qm hw v1 does not support this interface.
@@ -3294,8 +3292,7 @@ int hisi_qm_start(struct hisi_qm *qm) 
	if (!ret)

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



	hisi_qm_set_state(qm, VF_READY);



	hisi_qm_set_state(qm, QM_READY);

err_unlock:

	up_write(&qm->qps_lock);

	return ret;
@@ -3389,8 +3386,6 @@ int hisi_qm_stop(struct hisi_qm *qm, enum qm_stop_reason r) 
	struct device *dev = &qm->pdev->dev;

	int ret = 0;



	hisi_qm_set_state(qm, VF_PREPARE);



	down_write(&qm->qps_lock);



	qm->status.stop_reason = r;
@@ -5431,8 +5426,6 @@ static int hisi_qm_pci_init(struct hisi_qm *qm) 
		goto err_get_pci_res;

	pci_set_master(pdev);



	hisi_qm_set_state(qm, VF_PREPARE);



	num_vec = qm_get_irq_num(qm);

	ret = pci_alloc_irq_vectors(pdev, num_vec, num_vec, PCI_IRQ_MSI);

	if (ret < 0) {

include/linux/hisi_acc_qm.h

+4 −5
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ 
#define QM_DB_RAND_SHIFT_V2		16

#define QM_DB_INDEX_SHIFT_V2		32

#define QM_DB_PRIORITY_SHIFT_V2		48

#define QM_VF_STATE			0x60



/* qm cache */

#define QM_CACHE_CTL			0x100050
@@ -91,7 +92,6 @@ 
#define QM_SHAPER_CFG			0x100164

#define QM_SHAPER_ENABLE		BIT(30)

#define QM_SHAPER_TYPE1_OFFSET		10

#define QM_VF_STATE			0x0060



/* page number for queue file region */

#define QM_DOORBELL_PAGE_NR		1
@@ -139,10 +139,9 @@ enum qm_debug_file { 
	DEBUG_FILE_NUM,

};



enum vf_state {

	VF_READY = 0x0,

	VF_NOT_READY,

	VF_PREPARE,

enum qm_vf_state {

	QM_READY = 0,

	QM_NOT_READY,

};



enum qm_mist_ctl_bits {