crypto: qat - replace disable_vf2pf_interrupts()

As a consequence of the refactored VF2PF interrupt handling logic, a
function that disables specific VF2PF interrupts is no longer needed.
Instead, a simpler function that disables all the interrupts, also
hiding the device specific amount of VFs to be disabled from the
pfvf_ops users, would be sufficient.

This patch replaces disable_vf2pf_interrupts() with the new
disable_all_vf2pf_interrupts(), which doesn't need any argument and
disables all the VF2PF interrupts.

Signed-off-by: Marco Chiappero <marco.chiappero@intel.com>
Reviewed-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/qat/qat_common/adf_accel_devices.h b/drivers/crypto/qat/qat_common/adf_accel_devices.h
index dfa7ee4..e927799 100644 (file)
--- a/drivers/crypto/qat/qat_common/adf_accel_devices.h
+++ b/drivers/crypto/qat/qat_common/adf_accel_devices.h
@@ -153,7 +153,7 @@ struct adf_pfvf_ops {
        u32 (*get_pf2vf_offset)(u32 i);
        u32 (*get_vf2pf_offset)(u32 i);
        void (*enable_vf2pf_interrupts)(void __iomem *pmisc_addr, u32 vf_mask);
-       void (*disable_vf2pf_interrupts)(void __iomem *pmisc_addr, u32 vf_mask);
+       void (*disable_all_vf2pf_interrupts)(void __iomem *pmisc_addr);
        u32 (*disable_pending_vf2pf_interrupts)(void __iomem *pmisc_addr);
        int (*send_msg)(struct adf_accel_dev *accel_dev, struct pfvf_message msg,
                        u32 pfvf_offset, struct mutex *csr_lock);

diff --git a/drivers/crypto/qat/qat_common/adf_common_drv.h b/drivers/crypto/qat/qat_common/adf_common_drv.h
index feecf10..da9d765 100644 (file)
--- a/drivers/crypto/qat/qat_common/adf_common_drv.h
+++ b/drivers/crypto/qat/qat_common/adf_common_drv.h
@@ -195,10 +195,9 @@ bool adf_misc_wq_queue_work(struct work_struct *work);
 #if defined(CONFIG_PCI_IOV)
 int adf_sriov_configure(struct pci_dev *pdev, int numvfs);
 void adf_disable_sriov(struct adf_accel_dev *accel_dev);
-void adf_disable_vf2pf_interrupts(struct adf_accel_dev *accel_dev,
-                                 u32 vf_mask);
 void adf_enable_vf2pf_interrupts(struct adf_accel_dev *accel_dev,
                                 u32 vf_mask);
+void adf_disable_all_vf2pf_interrupts(struct adf_accel_dev *accel_dev);
 bool adf_recv_and_handle_pf2vf_msg(struct adf_accel_dev *accel_dev);
 bool adf_recv_and_handle_vf2pf_msg(struct adf_accel_dev *accel_dev, u32 vf_nr);
 int adf_pf2vf_handle_pf_restarting(struct adf_accel_dev *accel_dev);

diff --git a/drivers/crypto/qat/qat_common/adf_gen2_pfvf.c b/drivers/crypto/qat/qat_common/adf_gen2_pfvf.c
index 8df952d..6064095 100644 (file)
--- a/drivers/crypto/qat/qat_common/adf_gen2_pfvf.c
+++ b/drivers/crypto/qat/qat_common/adf_gen2_pfvf.c
@@ -62,15 +62,12 @@ static void adf_gen2_enable_vf2pf_interrupts(void __iomem *pmisc_addr,
        }
 }
 
-static void adf_gen2_disable_vf2pf_interrupts(void __iomem *pmisc_addr,
-                                             u32 vf_mask)
+static void adf_gen2_disable_all_vf2pf_interrupts(void __iomem *pmisc_addr)
 {
        /* Disable VF2PF interrupts for VFs 0 through 15 per vf_mask[15:0] */
-       if (vf_mask & ADF_GEN2_VF_MSK) {
-               u32 val = ADF_CSR_RD(pmisc_addr, ADF_GEN2_ERRMSK3)
-                         | ADF_GEN2_ERR_MSK_VF2PF(vf_mask);
-               ADF_CSR_WR(pmisc_addr, ADF_GEN2_ERRMSK3, val);
-       }
+       u32 val = ADF_CSR_RD(pmisc_addr, ADF_GEN2_ERRMSK3)
+                 | ADF_GEN2_ERR_MSK_VF2PF(ADF_GEN2_VF_MSK);
+       ADF_CSR_WR(pmisc_addr, ADF_GEN2_ERRMSK3, val);
 }
 
 static u32 adf_gen2_disable_pending_vf2pf_interrupts(void __iomem *pmisc_addr)
@@ -385,7 +382,7 @@ void adf_gen2_init_pf_pfvf_ops(struct adf_pfvf_ops *pfvf_ops)
        pfvf_ops->get_pf2vf_offset = adf_gen2_pf_get_pfvf_offset;
        pfvf_ops->get_vf2pf_offset = adf_gen2_pf_get_pfvf_offset;
        pfvf_ops->enable_vf2pf_interrupts = adf_gen2_enable_vf2pf_interrupts;
-       pfvf_ops->disable_vf2pf_interrupts = adf_gen2_disable_vf2pf_interrupts;
+       pfvf_ops->disable_all_vf2pf_interrupts = adf_gen2_disable_all_vf2pf_interrupts;
        pfvf_ops->disable_pending_vf2pf_interrupts = adf_gen2_disable_pending_vf2pf_interrupts;
        pfvf_ops->send_msg = adf_gen2_pf2vf_send;
        pfvf_ops->recv_msg = adf_gen2_vf2pf_recv;

diff --git a/drivers/crypto/qat/qat_common/adf_gen4_pfvf.c b/drivers/crypto/qat/qat_common/adf_gen4_pfvf.c
index 4061725..8091fc5 100644 (file)
--- a/drivers/crypto/qat/qat_common/adf_gen4_pfvf.c
+++ b/drivers/crypto/qat/qat_common/adf_gen4_pfvf.c
@@ -46,13 +46,9 @@ static void adf_gen4_enable_vf2pf_interrupts(void __iomem *pmisc_addr,
        ADF_CSR_WR(pmisc_addr, ADF_4XXX_VM2PF_MSK, val);
 }
 
-static void adf_gen4_disable_vf2pf_interrupts(void __iomem *pmisc_addr,
-                                             u32 vf_mask)
+static void adf_gen4_disable_all_vf2pf_interrupts(void __iomem *pmisc_addr)
 {
-       unsigned int val;
-
-       val = ADF_CSR_RD(pmisc_addr, ADF_4XXX_VM2PF_MSK) | vf_mask;
-       ADF_CSR_WR(pmisc_addr, ADF_4XXX_VM2PF_MSK, val);
+       ADF_CSR_WR(pmisc_addr, ADF_4XXX_VM2PF_MSK, ADF_GEN4_VF_MSK);
 }
 
 static u32 adf_gen4_disable_pending_vf2pf_interrupts(void __iomem *pmisc_addr)
@@ -144,7 +140,7 @@ void adf_gen4_init_pf_pfvf_ops(struct adf_pfvf_ops *pfvf_ops)
        pfvf_ops->get_pf2vf_offset = adf_gen4_pf_get_pf2vf_offset;
        pfvf_ops->get_vf2pf_offset = adf_gen4_pf_get_vf2pf_offset;
        pfvf_ops->enable_vf2pf_interrupts = adf_gen4_enable_vf2pf_interrupts;
-       pfvf_ops->disable_vf2pf_interrupts = adf_gen4_disable_vf2pf_interrupts;
+       pfvf_ops->disable_all_vf2pf_interrupts = adf_gen4_disable_all_vf2pf_interrupts;
        pfvf_ops->disable_pending_vf2pf_interrupts = adf_gen4_disable_pending_vf2pf_interrupts;
        pfvf_ops->send_msg = adf_gen4_pfvf_send;
        pfvf_ops->recv_msg = adf_gen4_pfvf_recv;

diff --git a/drivers/crypto/qat/qat_common/adf_isr.c b/drivers/crypto/qat/qat_common/adf_isr.c
index 23f7fff..ad9e135 100644 (file)
--- a/drivers/crypto/qat/qat_common/adf_isr.c
+++ b/drivers/crypto/qat/qat_common/adf_isr.c
@@ -66,13 +66,13 @@ void adf_enable_vf2pf_interrupts(struct adf_accel_dev *accel_dev, u32 vf_mask)
        spin_unlock_irqrestore(&accel_dev->pf.vf2pf_ints_lock, flags);
 }
 
-void adf_disable_vf2pf_interrupts(struct adf_accel_dev *accel_dev, u32 vf_mask)
+void adf_disable_all_vf2pf_interrupts(struct adf_accel_dev *accel_dev)
 {
        void __iomem *pmisc_addr = adf_get_pmisc_base(accel_dev);
        unsigned long flags;
 
        spin_lock_irqsave(&accel_dev->pf.vf2pf_ints_lock, flags);
-       GET_PFVF_OPS(accel_dev)->disable_vf2pf_interrupts(pmisc_addr, vf_mask);
+       GET_PFVF_OPS(accel_dev)->disable_all_vf2pf_interrupts(pmisc_addr);
        spin_unlock_irqrestore(&accel_dev->pf.vf2pf_ints_lock, flags);
 }
 

diff --git a/drivers/crypto/qat/qat_common/adf_sriov.c b/drivers/crypto/qat/qat_common/adf_sriov.c
index 8e8421a..f38b2ff 100644 (file)
--- a/drivers/crypto/qat/qat_common/adf_sriov.c
+++ b/drivers/crypto/qat/qat_common/adf_sriov.c
@@ -106,7 +106,7 @@ void adf_disable_sriov(struct adf_accel_dev *accel_dev)
        pci_disable_sriov(accel_to_pci_dev(accel_dev));
 
        /* Disable VF to PF interrupts */
-       adf_disable_vf2pf_interrupts(accel_dev, GENMASK(31, 0));
+       adf_disable_all_vf2pf_interrupts(accel_dev);
 
        /* Clear Valid bits in AE Thread to PCIe Function Mapping */
        if (hw_data->configure_iov_threads)

diff --git a/drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c b/drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c
index 8618767..cb3bdd3 100644 (file)
--- a/drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c
+++ b/drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c
@@ -126,22 +126,19 @@ static void enable_vf2pf_interrupts(void __iomem *pmisc_addr, u32 vf_mask)
        }
 }
 
-static void disable_vf2pf_interrupts(void __iomem *pmisc_addr, u32 vf_mask)
+static void disable_all_vf2pf_interrupts(void __iomem *pmisc_addr)
 {
+       u32 val;
+
        /* Disable VF2PF interrupts for VFs 0 through 15 per vf_mask[15:0] */
-       if (vf_mask & 0xFFFF) {
-               u32 val = ADF_CSR_RD(pmisc_addr, ADF_GEN2_ERRMSK3)
-                         | ADF_DH895XCC_ERR_MSK_VF2PF_L(vf_mask);
-               ADF_CSR_WR(pmisc_addr, ADF_GEN2_ERRMSK3, val);
-       }
+       val = ADF_CSR_RD(pmisc_addr, ADF_GEN2_ERRMSK3)
+             | ADF_DH895XCC_ERR_MSK_VF2PF_L(ADF_DH895XCC_VF_MSK);
+       ADF_CSR_WR(pmisc_addr, ADF_GEN2_ERRMSK3, val);
 
        /* Disable VF2PF interrupts for VFs 16 through 31 per vf_mask[31:16] */
-       if (vf_mask >> 16) {
-               u32 val = ADF_CSR_RD(pmisc_addr, ADF_GEN2_ERRMSK5)
-                         | ADF_DH895XCC_ERR_MSK_VF2PF_U(vf_mask);
-
-               ADF_CSR_WR(pmisc_addr, ADF_GEN2_ERRMSK5, val);
-       }
+       val = ADF_CSR_RD(pmisc_addr, ADF_GEN2_ERRMSK5)
+             | ADF_DH895XCC_ERR_MSK_VF2PF_U(ADF_DH895XCC_VF_MSK);
+       ADF_CSR_WR(pmisc_addr, ADF_GEN2_ERRMSK5, val);
 }
 
 static u32 disable_pending_vf2pf_interrupts(void __iomem *pmisc_addr)
@@ -240,7 +237,7 @@ void adf_init_hw_data_dh895xcc(struct adf_hw_device_data *hw_data)
 
        adf_gen2_init_pf_pfvf_ops(&hw_data->pfvf_ops);
        hw_data->pfvf_ops.enable_vf2pf_interrupts = enable_vf2pf_interrupts;
-       hw_data->pfvf_ops.disable_vf2pf_interrupts = disable_vf2pf_interrupts;
+       hw_data->pfvf_ops.disable_all_vf2pf_interrupts = disable_all_vf2pf_interrupts;
        hw_data->pfvf_ops.disable_pending_vf2pf_interrupts = disable_pending_vf2pf_interrupts;
        adf_gen2_init_hw_csr_ops(&hw_data->csr_ops);
 }