[PATCH OLK-5.10 6/9] crypto: hisilicon/qm - save capability registers in qm init process

1 Dec 2023

driver inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8IVG6
CVE: NA
----------------------------------------------------------------------
In reset scenario, if reset failed after disabling the MSE, the value
of capability registers will become invalid. If we remove the device
under this situation, the unregister process will get the wrong irq
vector, and can not get the right irq number by pci_irq_vector().
This will cause the following call trace:
| Call trace:
        |  pci_irq_vector+0xfc/0x140
        |  hisi_qm_uninit+0x278/0x3b0 [hisi_qm]
        |  hpre_remove+0x16c/0x1c0 [hisi_hpre]
        |  pci_device_remove+0x6c/0x264
        |  device_release_driver_internal+0x1ec/0x3e0
        |  device_release_driver+0x3c/0x60
        |  pci_stop_bus_device+0xfc/0x22c
        |  pci_stop_and_remove_bus_device+0x38/0x70
        |  pci_iov_remove_virtfn+0x108/0x1c0
        |  sriov_disable+0x7c/0x1e4
        |  pci_disable_sriov+0x4c/0x6c
        |  hisi_qm_sriov_disable+0x90/0x160 [hisi_qm]
        |  hpre_remove+0x1a8/0x1c0 [hisi_hpre]
        |  pci_device_remove+0x6c/0x264
        |  device_release_driver_internal+0x1ec/0x3e0
        |  driver_detach+0x168/0x2d0
        |  bus_remove_driver+0xc0/0x230
        |  driver_unregister+0x58/0xdc
        |  pci_unregister_driver+0x40/0x220
        |  hpre_exit+0x34/0x64 [hisi_hpre]
        |  __arm64_sys_delete_module+0x374/0x620
        [...]
| Call trace:
        |  free_msi_irqs+0x25c/0x300
        |  pci_disable_msi+0x19c/0x264
        |  pci_free_irq_vectors+0x4c/0x70
        |  hisi_qm_pci_uninit+0x44/0x90 [hisi_qm]
        |  hisi_qm_uninit+0x28c/0x3b0 [hisi_qm]
        |  hpre_remove+0x16c/0x1c0 [hisi_hpre]
        |  pci_device_remove+0x6c/0x264
        [...]
So add a capability table structure to pre-store the valid value of the
capability register in qm init process, avoid obtaining invalid capability
register value after the MSE is disabled.
Signed-off-by: Zhiqi Song songzhiqi1@huawei.com
Signed-off-by: JiangShui Yang yangjiangshui@h-partners.com
---
 drivers/crypto/hisilicon/qm.c | 62 +++++++++++++++++++++++++++++------
 include/linux/hisi_acc_qm.h   | 12 +++++++
 2 files changed, 64 insertions(+), 10 deletions(-)

diff --git a/drivers/crypto/hisilicon/qm.c b/drivers/crypto/hisilicon/qm.c
index e2bb91fcb736..bd19a8746575 100644
--- a/drivers/crypto/hisilicon/qm.c
+++ b/drivers/crypto/hisilicon/qm.c
@@ -302,6 +302,13 @@ enum qm_basic_type {
    QM_VF_IRQ_NUM_CAP,
 };
+enum qm_pre_store_cap_idx {
+	QM_EQ_IRQ_TYPE_CAP_IDX = 0x0,
+	QM_AEQ_IRQ_TYPE_CAP_IDX,
+	QM_ABN_IRQ_TYPE_CAP_IDX,
+	QM_PF2VF_IRQ_TYPE_CAP_IDX,
+};
+
 static const struct hisi_qm_cap_info qm_cap_info_comm[] = {
    {QM_SUPPORT_DB_ISOLATION, 0x30,   0, BIT(0),  0x0, 0x0, 0x0},
    {QM_SUPPORT_FUNC_QOS,     0x3100, 0, BIT(8),  0x0, 0x0, 0x1},
@@ -331,6 +338,13 @@ static const struct hisi_qm_cap_info qm_basic_info[] = {
    {QM_VF_IRQ_NUM_CAP,     0x311c,   0,  GENMASK(15, 0), 0x1,       0x2,       0x3},
 };
+static const u32 qm_pre_store_caps[] = {
+	QM_EQ_IRQ_TYPE_CAP,
+	QM_AEQ_IRQ_TYPE_CAP,
+	QM_ABN_IRQ_TYPE_CAP,
+	QM_PF2VF_IRQ_TYPE_CAP,
+};
+
 struct qm_mailbox {
    __le16 w0;
    __le16 queue_num;
@@ -5002,7 +5016,7 @@ static void qm_unregister_abnormal_irq(struct hisi_qm *qm)
    if (qm->fun_type == QM_HW_VF)
    	return;
-	val = hisi_qm_get_hw_info(qm, qm_basic_info, QM_ABN_IRQ_TYPE_CAP, qm->cap_ver);
+	val = qm->cap_tables.qm_cap_table[QM_ABN_IRQ_TYPE_CAP_IDX].cap_val;
    if (!((val >> QM_IRQ_TYPE_SHIFT) & QM_ABN_IRQ_TYPE_MASK))
    	return;
@@ -5019,7 +5033,7 @@ static int qm_register_abnormal_irq(struct hisi_qm *qm)
    if (qm->fun_type == QM_HW_VF)
    	return 0;
-	val = hisi_qm_get_hw_info(qm, qm_basic_info, QM_ABN_IRQ_TYPE_CAP, qm->cap_ver);
+	val = qm->cap_tables.qm_cap_table[QM_ABN_IRQ_TYPE_CAP_IDX].cap_val;
    if (!((val >> QM_IRQ_TYPE_SHIFT) & QM_ABN_IRQ_TYPE_MASK))
    	return 0;
@@ -5036,7 +5050,7 @@ static void qm_unregister_mb_cmd_irq(struct hisi_qm *qm)
    struct pci_dev *pdev = qm->pdev;
    u32 irq_vector, val;
-	val = hisi_qm_get_hw_info(qm, qm_basic_info, QM_PF2VF_IRQ_TYPE_CAP, qm->cap_ver);
+	val = qm->cap_tables.qm_cap_table[QM_PF2VF_IRQ_TYPE_CAP_IDX].cap_val;
    if (!((val >> QM_IRQ_TYPE_SHIFT) & QM_IRQ_TYPE_MASK))
    	return;
@@ -5050,7 +5064,7 @@ static int qm_register_mb_cmd_irq(struct hisi_qm *qm)
    u32 irq_vector, val;
    int ret;
-	val = hisi_qm_get_hw_info(qm, qm_basic_info, QM_PF2VF_IRQ_TYPE_CAP, qm->cap_ver);
+	val = qm->cap_tables.qm_cap_table[QM_PF2VF_IRQ_TYPE_CAP_IDX].cap_val;
    if (!((val >> QM_IRQ_TYPE_SHIFT) & QM_IRQ_TYPE_MASK))
    	return 0;
@@ -5067,7 +5081,7 @@ static void qm_unregister_aeq_irq(struct hisi_qm *qm)
    struct pci_dev *pdev = qm->pdev;
    u32 irq_vector, val;
-	val = hisi_qm_get_hw_info(qm, qm_basic_info, QM_AEQ_IRQ_TYPE_CAP, qm->cap_ver);
+	val = qm->cap_tables.qm_cap_table[QM_AEQ_IRQ_TYPE_CAP_IDX].cap_val;
    if (!((val >> QM_IRQ_TYPE_SHIFT) & QM_IRQ_TYPE_MASK))
    	return;
@@ -5081,7 +5095,7 @@ static int qm_register_aeq_irq(struct hisi_qm *qm)
    u32 irq_vector, val;
    int ret;
-	val = hisi_qm_get_hw_info(qm, qm_basic_info, QM_AEQ_IRQ_TYPE_CAP, qm->cap_ver);
+	val = qm->cap_tables.qm_cap_table[QM_AEQ_IRQ_TYPE_CAP_IDX].cap_val;
    if (!((val >> QM_IRQ_TYPE_SHIFT) & QM_IRQ_TYPE_MASK))
    	return 0;
@@ -5099,7 +5113,7 @@ static void qm_unregister_eq_irq(struct hisi_qm *qm)
    struct pci_dev *pdev = qm->pdev;
    u32 irq_vector, val;
-	val = hisi_qm_get_hw_info(qm, qm_basic_info, QM_EQ_IRQ_TYPE_CAP, qm->cap_ver);
+	val = qm->cap_tables.qm_cap_table[QM_EQ_IRQ_TYPE_CAP_IDX].cap_val;
    if (!((val >> QM_IRQ_TYPE_SHIFT) & QM_IRQ_TYPE_MASK))
    	return;
@@ -5113,7 +5127,7 @@ static int qm_register_eq_irq(struct hisi_qm *qm)
    u32 irq_vector, val;
    int ret;
-	val = hisi_qm_get_hw_info(qm, qm_basic_info, QM_EQ_IRQ_TYPE_CAP, qm->cap_ver);
+	val = qm->cap_tables.qm_cap_table[QM_EQ_IRQ_TYPE_CAP_IDX].cap_val;
    if (!((val >> QM_IRQ_TYPE_SHIFT) & QM_IRQ_TYPE_MASK))
    	return 0;
@@ -5200,7 +5214,29 @@ static int qm_get_qp_num(struct hisi_qm *qm)
    return 0;
 }
-static void qm_get_hw_caps(struct hisi_qm *qm)
+static int qm_pre_store_irq_type_caps(struct hisi_qm *qm)
+{
+	struct hisi_qm_cap_record *qm_cap;
+	struct pci_dev *pdev = qm->pdev;
+	size_t i, size;
+
+	size = ARRAY_SIZE(qm_pre_store_caps);
+	qm_cap = devm_kzalloc(&pdev->dev, sizeof(*qm_cap) * size, GFP_KERNEL);
+	if (!qm_cap)
+		return -ENOMEM;
+
+	for (i = 0; i < size; i++) {
+		qm_cap[i].type = qm_pre_store_caps[i];
+		qm_cap[i].cap_val = hisi_qm_get_hw_info(qm, qm_basic_info,
+							qm_pre_store_caps[i], qm->cap_ver);
+	}
+
+	qm->cap_tables.qm_cap_table = qm_cap;
+
+	return 0;
+}
+
+static int qm_get_hw_caps(struct hisi_qm *qm)
 {
    const struct hisi_qm_cap_info *cap_info = qm->fun_type == QM_HW_PF ?
    					  qm_cap_info_pf : qm_cap_info_vf;
@@ -5231,6 +5267,9 @@ static void qm_get_hw_caps(struct hisi_qm *qm)
    	if (val)
    		set_bit(cap_info[i].type, &qm->caps);
    }
+
+	/* Fetch and save the value of irq type related capability registers */
+	return qm_pre_store_irq_type_caps(qm);
 }
static int qm_get_pci_res(struct hisi_qm *qm)
@@ -5252,7 +5291,10 @@ static int qm_get_pci_res(struct hisi_qm *qm)
    	goto err_request_mem_regions;
    }
-	qm_get_hw_caps(qm);
+	ret = qm_get_hw_caps(qm);
+	if (ret)
+		goto err_ioremap;
+
    if (test_bit(QM_SUPPORT_DB_ISOLATION, &qm->caps)) {
    	qm->db_interval = QM_QP_DB_INTERVAL;
    	qm->db_phys_base = pci_resource_start(pdev, PCI_BAR_4);
diff --git a/include/linux/hisi_acc_qm.h b/include/linux/hisi_acc_qm.h
index 12a86639d126..0cfc46a5eda2 100644
--- a/include/linux/hisi_acc_qm.h
+++ b/include/linux/hisi_acc_qm.h
@@ -285,6 +285,16 @@ struct hisi_qm_cap_info {
    u32 v3_val;
 };
+struct hisi_qm_cap_record {
+	u32 type;
+	u32 cap_val;
+};
+
+struct hisi_qm_cap_tables {
+	struct hisi_qm_cap_record *qm_cap_table;
+	struct hisi_qm_cap_record *dev_cap_table;
+};
+
 struct hisi_qm_list {
    struct mutex lock;
    struct list_head list;
@@ -398,6 +408,8 @@ struct hisi_qm {
    u32 mb_qos;
    u32 type_rate;
    struct qm_err_isolate isolate_data;
+
+	struct hisi_qm_cap_tables cap_tables;
 };
struct hisi_qp_status {
-- 
2.33.0


    

2024

2023

2022

2021

2020

2019

[PATCH OLK-5.10 6/9] crypto: hisilicon/qm - save capability registers in qm init process