crypto: hisilicon - qm updates BAR configuration

On new platforms greater than QM_HW_V3, the configuration region for the
live migration function of the accelerator device is no longer
placed in the VF, but is instead placed in the PF.

Therefore, the configuration region of the live migration function
needs to be opened when the QM driver is loaded. When the QM driver
is uninstalled, the driver needs to clear this configuration.

Signed-off-by: Longfang Liu <liulongfang@huawei.com>
Reviewed-by: Shameer Kolothum <shameerkolothum@gmail.com>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Link: https://lore.kernel.org/r/20251030015744.131771-2-liulongfang@huawei.com
Signed-off-by: Alex Williamson <alex@shazbot.org>

diff --git a/drivers/crypto/hisilicon/qm.c b/drivers/crypto/hisilicon/qm.c
index a5b96adf2d1e76c5b057ad371dfa5fcfbffcbe89..e88085c2cbb3222d39904a1d1ecd8bf1327da34b 100644 (file)
--- a/drivers/crypto/hisilicon/qm.c
+++ b/drivers/crypto/hisilicon/qm.c
@@ -3019,11 +3019,36 @@ static void qm_put_pci_res(struct hisi_qm *qm)
        pci_release_mem_regions(pdev);
 }
 
+static void hisi_mig_region_clear(struct hisi_qm *qm)
+{
+       u32 val;
+
+       /* Clear migration region set of PF */
+       if (qm->fun_type == QM_HW_PF && qm->ver > QM_HW_V3) {
+               val = readl(qm->io_base + QM_MIG_REGION_SEL);
+               val &= ~QM_MIG_REGION_EN;
+               writel(val, qm->io_base + QM_MIG_REGION_SEL);
+       }
+}
+
+static void hisi_mig_region_enable(struct hisi_qm *qm)
+{
+       u32 val;
+
+       /* Select migration region of PF */
+       if (qm->fun_type == QM_HW_PF && qm->ver > QM_HW_V3) {
+               val = readl(qm->io_base + QM_MIG_REGION_SEL);
+               val |= QM_MIG_REGION_EN;
+               writel(val, qm->io_base + QM_MIG_REGION_SEL);
+       }
+}
+
 static void hisi_qm_pci_uninit(struct hisi_qm *qm)
 {
        struct pci_dev *pdev = qm->pdev;
 
        pci_free_irq_vectors(pdev);
+       hisi_mig_region_clear(qm);
        qm_put_pci_res(qm);
        pci_disable_device(pdev);
 }
@@ -5725,6 +5750,7 @@ int hisi_qm_init(struct hisi_qm *qm)
                goto err_free_qm_memory;
 
        qm_cmd_init(qm);
+       hisi_mig_region_enable(qm);
 
        return 0;
 
@@ -5863,6 +5889,7 @@ static int qm_rebuild_for_resume(struct hisi_qm *qm)
        }
 
        qm_cmd_init(qm);
+       hisi_mig_region_enable(qm);
        hisi_qm_dev_err_init(qm);
        /* Set the doorbell timeout to QM_DB_TIMEOUT_CFG ns. */
        writel(QM_DB_TIMEOUT_SET, qm->io_base + QM_DB_TIMEOUT_CFG);

diff --git a/include/linux/hisi_acc_qm.h b/include/linux/hisi_acc_qm.h
index c4690e365ade90bd6418664e861e4a5ec2386991..ca1ec437a3ca3bfc829ef94326a4583df96544b8 100644 (file)
--- a/include/linux/hisi_acc_qm.h
+++ b/include/linux/hisi_acc_qm.h
@@ -99,6 +99,9 @@
 
 #define QM_DEV_ALG_MAX_LEN             256
 
+#define QM_MIG_REGION_SEL              0x100198
+#define QM_MIG_REGION_EN               BIT(0)
+
 /* uacce mode of the driver */
 #define UACCE_MODE_NOUACCE             0 /* don't use uacce */
 #define UACCE_MODE_SVA                 1 /* use uacce sva mode */