Commit 2ca2eccb authored by JiangShui Yang's avatar JiangShui Yang Committed by JiangShui
Browse files

Revert "vfio/hisilicon: modify QM for live migration driver" 

driver inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I8FI6W


CVE: NA

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

replace it with the mainline solusion.
This reverts commit cf8167ec.

Signed-off-by: default avatarJiangShui Yang <yangjiangshui@h-partners.com>
parent a9ab22e0

drivers/crypto/hisilicon/qm.c

+0 −14
Original line number Diff line number Diff line
@@ -3053,13 +3053,6 @@ 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)

{

	/* set vf driver state */

	if (qm->ver > QM_HW_V2)

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

}



static void hisi_qm_unint_work(struct hisi_qm *qm)

{

	destroy_workqueue(qm->wq);
@@ -3110,7 +3103,6 @@ void hisi_qm_uninit(struct hisi_qm *qm) 
	up_write(&qm->qps_lock);



	hisi_qm_memory_uninit(qm);

	hisi_qm_set_state(qm, VF_NOT_READY);



	qm_remove_uacce(qm);

	qm_irqs_unregister(qm);
@@ -3295,8 +3287,6 @@ int hisi_qm_start(struct hisi_qm *qm) 
	if (!ret)

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



	hisi_qm_set_state(qm, VF_READY);



err_unlock:

	up_write(&qm->qps_lock);

	return ret;
@@ -3390,8 +3380,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;
@@ -5432,8 +5420,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

+0 −7
Original line number Diff line number Diff line
@@ -91,7 +91,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,12 +138,6 @@ enum qm_debug_file { 
	DEBUG_FILE_NUM,

};



enum vf_state {

	VF_READY = 0x0,

	VF_NOT_READY,

	VF_PREPARE,

};



enum qm_mist_ctl_bits {

	QM_DRIVER_DOWN = 0x0,

	QM_RST_SCHED,