crypto: qat - power up 4xxx device

[ Upstream commit ca605f97dae4bf070b7c584aec23c1c922e4d823 ]

After reset or boot, QAT 4xxx devices are inactive and require to be
explicitly activated.
This is done by writing the DRV_ACTIVE bit in the PM_INTERRUPT register
and polling the PM_INIT_STATE to make sure that the transaction has
completed properly.

If this is not done, the driver will fail the initialization sequence
reporting the following message:
    [   22.081193] 4xxx 0000:f7:00.0: enabling device (0140 -> 0142)
    [   22.720285] QAT: AE0 is inactive!!
    [   22.720287] QAT: failed to get device out of reset
    [   22.720288] 4xxx 0000:f7:00.0: qat_hal_clr_reset error
    [   22.720290] 4xxx 0000:f7:00.0: Failed to init the AEs
    [   22.720290] 4xxx 0000:f7:00.0: Failed to initialise Acceleration Engine
    [   22.720789] 4xxx 0000:f7:00.0: Resetting device qat_dev0
    [   22.825099] 4xxx: probe of 0000:f7:00.0 failed with error -14

The patch also temporarily disables the power management source of
interrupt, to avoid possible spurious interrupts as the power management
feature is not fully supported.

The device init function has been added to adf_dev_init(), and not in the
probe of 4xxx to make sure that the device is re-enabled in case of
reset.

Note that the error code reported by hw_data->init_device() in
adf_dev_init() has been shadowed for consistency with the other calls
in the same function.

Fixes: 8c8268166e83 ("crypto: qat - add qat_4xxx driver")
Signed-off-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
Reviewed-by: Wojciech Ziemba <wojciech.ziemba@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.c b/drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.c
index 33d8e50dcbdacf91414270fe96ceb997a96e7b26..88c0ded411f15792d27a6a858be4452f19f9a819 100644 (file)
--- a/drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.c
+++ b/drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.c
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0-only)
 /* Copyright(c) 2020 Intel Corporation */
+#include <linux/iopoll.h>
 #include <adf_accel_devices.h>
 #include <adf_common_drv.h>
 #include <adf_pf2vf_msg.h>
@@ -161,6 +162,35 @@ static void adf_enable_ints(struct adf_accel_dev *accel_dev)
        ADF_CSR_WR(addr, ADF_4XXX_SMIAPF_MASK_OFFSET, 0);
 }
 
+static int adf_init_device(struct adf_accel_dev *accel_dev)
+{
+       void __iomem *addr;
+       u32 status;
+       u32 csr;
+       int ret;
+
+       addr = (&GET_BARS(accel_dev)[ADF_4XXX_PMISC_BAR])->virt_addr;
+
+       /* Temporarily mask PM interrupt */
+       csr = ADF_CSR_RD(addr, ADF_4XXX_ERRMSK2);
+       csr |= ADF_4XXX_PM_SOU;
+       ADF_CSR_WR(addr, ADF_4XXX_ERRMSK2, csr);
+
+       /* Set DRV_ACTIVE bit to power up the device */
+       ADF_CSR_WR(addr, ADF_4XXX_PM_INTERRUPT, ADF_4XXX_PM_DRV_ACTIVE);
+
+       /* Poll status register to make sure the device is powered up */
+       ret = read_poll_timeout(ADF_CSR_RD, status,
+                               status & ADF_4XXX_PM_INIT_STATE,
+                               ADF_4XXX_PM_POLL_DELAY_US,
+                               ADF_4XXX_PM_POLL_TIMEOUT_US, true, addr,
+                               ADF_4XXX_PM_STATUS);
+       if (ret)
+               dev_err(&GET_DEV(accel_dev), "Failed to power up the device\n");
+
+       return ret;
+}
+
 static int adf_enable_pf2vf_comms(struct adf_accel_dev *accel_dev)
 {
        return 0;
@@ -215,6 +245,7 @@ void adf_init_hw_data_4xxx(struct adf_hw_device_data *hw_data)
        hw_data->exit_arb = adf_exit_arb;
        hw_data->get_arb_mapping = adf_get_arbiter_mapping;
        hw_data->enable_ints = adf_enable_ints;
+       hw_data->init_device = adf_init_device;
        hw_data->reset_device = adf_reset_flr;
        hw_data->admin_ae_mask = ADF_4XXX_ADMIN_AE_MASK;
        hw_data->uof_get_num_objs = uof_get_num_objs;

diff --git a/drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.h b/drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.h
index 4fe2a776293c2d9e51becdd9d8eee1402e9e6976..924bac6feb3722b2b0e1702a799dd1e5ada850d3 100644 (file)
--- a/drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.h
+++ b/drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.h
@@ -62,6 +62,16 @@
 #define ADF_4XXX_ADMINMSGLR_OFFSET     (0x500578)
 #define ADF_4XXX_MAILBOX_BASE_OFFSET   (0x600970)
 
+/* Power management */
+#define ADF_4XXX_PM_POLL_DELAY_US      20
+#define ADF_4XXX_PM_POLL_TIMEOUT_US    USEC_PER_SEC
+#define ADF_4XXX_PM_STATUS             (0x50A00C)
+#define ADF_4XXX_PM_INTERRUPT          (0x50A028)
+#define ADF_4XXX_PM_DRV_ACTIVE         BIT(20)
+#define ADF_4XXX_PM_INIT_STATE         BIT(21)
+/* Power management source in ERRSOU2 and ERRMSK2 */
+#define ADF_4XXX_PM_SOU                        BIT(18)
+
 /* Firmware Binaries */
 #define ADF_4XXX_FW            "qat_4xxx.bin"
 #define ADF_4XXX_MMP           "qat_4xxx_mmp.bin"

diff --git a/drivers/crypto/qat/qat_common/adf_accel_devices.h b/drivers/crypto/qat/qat_common/adf_accel_devices.h
index 38c0af6d4e43e75e72e559fe7cf57bed8485c9e9..580566cfcb04cf4aa5751efee323382aa0b7430b 100644 (file)
--- a/drivers/crypto/qat/qat_common/adf_accel_devices.h
+++ b/drivers/crypto/qat/qat_common/adf_accel_devices.h
@@ -166,6 +166,7 @@ struct adf_hw_device_data {
        int (*init_arb)(struct adf_accel_dev *accel_dev);
        void (*exit_arb)(struct adf_accel_dev *accel_dev);
        const u32 *(*get_arb_mapping)(void);
+       int (*init_device)(struct adf_accel_dev *accel_dev);
        void (*disable_iov)(struct adf_accel_dev *accel_dev);
        void (*configure_iov_threads)(struct adf_accel_dev *accel_dev,
                                      bool enable);

diff --git a/drivers/crypto/qat/qat_common/adf_init.c b/drivers/crypto/qat/qat_common/adf_init.c
index 60bc7b991d3519986942930edb66dc6229b1a7d0..e3749e5817d9443cf4f675e3f54be8384dba862b 100644 (file)
--- a/drivers/crypto/qat/qat_common/adf_init.c
+++ b/drivers/crypto/qat/qat_common/adf_init.c
@@ -79,6 +79,11 @@ int adf_dev_init(struct adf_accel_dev *accel_dev)
                return -EFAULT;
        }
 
+       if (hw_data->init_device && hw_data->init_device(accel_dev)) {
+               dev_err(&GET_DEV(accel_dev), "Failed to initialize device\n");
+               return -EFAULT;
+       }
+
        if (hw_data->init_admin_comms && hw_data->init_admin_comms(accel_dev)) {
                dev_err(&GET_DEV(accel_dev), "Failed initialize admin comms\n");
                return -EFAULT;