crypto: qat - fix ring to service map for dcc in 420xx

If a device is configured for data compression chaining (dcc), half of the
engines are loaded with the symmetric crypto image and the rest are loaded
with the compression image.
However, in such configuration all rings can handle compression requests.

Fix the ring to service mapping so that when a device is configured for
dcc, the ring to service mapping reports that all rings in a bank can
be used for compression.

Fixes: fcf60f4bcf54 ("crypto: qat - add support for 420xx devices")
Signed-off-by: Damian Muszynski <damian.muszynski@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/intel/qat/qat_420xx/adf_420xx_hw_data.c b/drivers/crypto/intel/qat/qat_420xx/adf_420xx_hw_data.c
index a87d29ae724fe4f5f85a0160571bbd09bdf9be75..7909b51e97c30d44f222ae157ca42cce92e0fa5e 100644 (file)
--- a/drivers/crypto/intel/qat/qat_420xx/adf_420xx_hw_data.c
+++ b/drivers/crypto/intel/qat/qat_420xx/adf_420xx_hw_data.c
@@ -372,6 +372,13 @@ static u16 get_ring_to_svc_map(struct adf_accel_dev *accel_dev)
        if (!fw_config)
                return 0;
 
+       /* If dcc, all rings handle compression requests */
+       if (adf_get_service_enabled(accel_dev) == SVC_DCC) {
+               for (i = 0; i < RP_GROUP_COUNT; i++)
+                       rps[i] = COMP;
+               goto set_mask;
+       }
+
        for (i = 0; i < RP_GROUP_COUNT; i++) {
                switch (fw_config[i].ae_mask) {
                case ADF_AE_GROUP_0:
@@ -400,6 +407,7 @@ static u16 get_ring_to_svc_map(struct adf_accel_dev *accel_dev)
                }
        }
 
+set_mask:
        ring_to_svc_map = rps[RP_GROUP_0] << ADF_CFG_SERV_RING_PAIR_0_SHIFT |
                          rps[RP_GROUP_1] << ADF_CFG_SERV_RING_PAIR_1_SHIFT |
                          rps[RP_GROUP_0] << ADF_CFG_SERV_RING_PAIR_2_SHIFT |