crypto: qat - register crypto instances based on capability

Introduce the function adf_hw_dev_has_crypto() that returns true if a
device supports symmetric crypto, asymmetric crypto and authentication
services.
If a device has crypto capabilities, add crypto instances to the
configuration.
This is done since the function that allows to retrieve crypto
instances, qat_crypto_get_instance_node(), return instances that support
all crypto services.

Signed-off-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
Reviewed-by: Wojciech Ziemba <wojciech.ziemba@intel.com>
Reviewed-by: Fiona Trahe <fiona.trahe@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/qat_crypto.c b/drivers/crypto/qat/qat_common/qat_crypto.c
index ab621b7dbd203e700b1f252ac3c33a9d7b69318b..089d5d7b738e2f3a46be93cf3541b4c573dc4546 100644 (file)
--- a/drivers/crypto/qat/qat_common/qat_crypto.c
+++ b/drivers/crypto/qat/qat_common/qat_crypto.c
@@ -117,10 +117,15 @@ int qat_crypto_dev_config(struct adf_accel_dev *accel_dev)
 {
        int cpus = num_online_cpus();
        int banks = GET_MAX_BANKS(accel_dev);
-       int instances = min(cpus, banks);
        char key[ADF_CFG_MAX_KEY_LEN_IN_BYTES];
        int i;
        unsigned long val;
+       int instances;
+
+       if (adf_hw_dev_has_crypto(accel_dev))
+               instances = min(cpus, banks);
+       else
+               instances = 0;
 
        if (adf_cfg_section_add(accel_dev, ADF_KERNEL_SEC))
                goto err;

diff --git a/drivers/crypto/qat/qat_common/qat_crypto.h b/drivers/crypto/qat/qat_common/qat_crypto.h
index 8d11e94cbf08f5075bc2e519d337d945afd19cf9..b6a4c95ae003f1227c58cacf8b0ab0993c499348 100644 (file)
--- a/drivers/crypto/qat/qat_common/qat_crypto.h
+++ b/drivers/crypto/qat/qat_common/qat_crypto.h
@@ -55,4 +55,19 @@ struct qat_crypto_request {
        bool encryption;
 };
 
+static inline bool adf_hw_dev_has_crypto(struct adf_accel_dev *accel_dev)
+{
+       struct adf_hw_device_data *hw_device = accel_dev->hw_device;
+       u32 mask = ~hw_device->accel_capabilities_mask;
+
+       if (mask & ADF_ACCEL_CAPABILITIES_CRYPTO_SYMMETRIC)
+               return false;
+       if (mask & ADF_ACCEL_CAPABILITIES_CRYPTO_ASYMMETRIC)
+               return false;
+       if (mask & ADF_ACCEL_CAPABILITIES_AUTHENTICATION)
+               return false;
+
+       return true;
+}
+
 #endif