crypto: qat - remove redundant arbiter configuration

The default arbiter configuration for ring weights and response ordering
is exactly what we want so we don't need to configure anything more.
This will also fix the problem where number of bundles is different
between different devices.

Reported-by: Ahsan Atta <ahsan.atta@intel.com>
Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/qat/qat_common/adf_hw_arbiter.c b/drivers/crypto/qat/qat_common/adf_hw_arbiter.c
index f267d9e42e0b539099dd57eba615cda92dd372d8..d7dd18d9bef82731dbf7dcb355a3b44ec5306627 100644 (file)
--- a/drivers/crypto/qat/qat_common/adf_hw_arbiter.c
+++ b/drivers/crypto/qat/qat_common/adf_hw_arbiter.c
@@ -49,7 +49,6 @@
 #include "adf_transport_internal.h"
 
 #define ADF_ARB_NUM 4
-#define ADF_ARB_REQ_RING_NUM 8
 #define ADF_ARB_REG_SIZE 0x4
 #define ADF_ARB_WTR_SIZE 0x20
 #define ADF_ARB_OFFSET 0x30000
@@ -64,15 +63,6 @@
        ADF_CSR_WR(csr_addr, ADF_ARB_RINGSRVARBEN_OFFSET + \
        (ADF_ARB_REG_SLOT * index), value)
 
-#define WRITE_CSR_ARB_RESPORDERING(csr_addr, index, value) \
-       ADF_CSR_WR(csr_addr, (ADF_ARB_OFFSET + \
-       ADF_ARB_RO_EN_OFFSET) + (ADF_ARB_REG_SIZE * index), value)
-
-#define WRITE_CSR_ARB_WEIGHT(csr_addr, arb, index, value) \
-       ADF_CSR_WR(csr_addr, (ADF_ARB_OFFSET + \
-       ADF_ARB_WTR_OFFSET) + (ADF_ARB_WTR_SIZE * arb) + \
-       (ADF_ARB_REG_SIZE * index), value)
-
 #define WRITE_CSR_ARB_SARCONFIG(csr_addr, index, value) \
        ADF_CSR_WR(csr_addr, ADF_ARB_OFFSET + \
        (ADF_ARB_REG_SIZE * index), value)
@@ -99,15 +89,6 @@ int adf_init_arb(struct adf_accel_dev *accel_dev)
        for (arb = 0; arb < ADF_ARB_NUM; arb++)
                WRITE_CSR_ARB_SARCONFIG(csr, arb, arb_cfg);
 
-       /* Setup service weighting */
-       for (arb = 0; arb < ADF_ARB_NUM; arb++)
-               for (i = 0; i < ADF_ARB_REQ_RING_NUM; i++)
-                       WRITE_CSR_ARB_WEIGHT(csr, arb, i, 0xFFFFFFFF);
-
-       /* Setup ring response ordering */
-       for (i = 0; i < ADF_ARB_REQ_RING_NUM; i++)
-               WRITE_CSR_ARB_RESPORDERING(csr, i, 0xFFFFFFFF);
-
        /* Setup worker queue registers */
        for (i = 0; i < hw_data->num_engines; i++)
                WRITE_CSR_ARB_WQCFG(csr, i, i);