crypto: qat - use admin mask to send fw constants

Introduce admin AE mask. If this mask set, the fw constant message is
sent only to engines that belong to that set, otherwise it is sent to
all engines.

This is in preparation for the qat_4xxx driver where the constant message
should be sent only to admin engines.

In GEN2 devices (c62x, c3xxx and dh895xcc), the admin AE mask is 0 and
the fw constants message is sent to all AEs.

Signed-off-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
Reviewed-by: Fiona Trahe <fiona.trahe@intel.com>
Reviewed-by: Wojciech Ziemba <wojciech.ziemba@intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.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 5f57850c2e8d28303f476e7cee23f08c163f769b..779f62fde3bd4efc91c840880e57507650a0e4b9 100644 (file)
--- a/drivers/crypto/qat/qat_common/adf_accel_devices.h
+++ b/drivers/crypto/qat/qat_common/adf_accel_devices.h
@@ -171,6 +171,7 @@ struct adf_hw_device_data {
        u32 instance_id;
        u16 accel_mask;
        u16 ae_mask;
+       u32 admin_ae_mask;
        u16 tx_rings_mask;
        u8 tx_rx_gap;
        u8 num_banks;

diff --git a/drivers/crypto/qat/qat_common/adf_admin.c b/drivers/crypto/qat/qat_common/adf_admin.c
index 6d94746d266f83f43d9cd2c0e37f0ed7b70a331d..dcd580d2afe258026de6b540d6d613b502f3e89b 100644 (file)
--- a/drivers/crypto/qat/qat_common/adf_admin.c
+++ b/drivers/crypto/qat/qat_common/adf_admin.c
@@ -182,7 +182,7 @@ static int adf_set_fw_constants(struct adf_accel_dev *accel_dev)
        struct icp_qat_fw_init_admin_req req;
        struct icp_qat_fw_init_admin_resp resp;
        struct adf_hw_device_data *hw_device = accel_dev->hw_device;
-       u32 ae_mask = hw_device->ae_mask;
+       u32 ae_mask = hw_device->admin_ae_mask ?: hw_device->ae_mask;
 
        memset(&req, 0, sizeof(req));
        memset(&resp, 0, sizeof(resp));