crypto: caam - move DMA mask selection into a function

Exactly the same code to figure out DMA mask is repeated twice in the
driver code. To avoid repetition, move that logic into a standalone
subroutine in intern.h. While at it re-shuffle the code to make it
more readable with early returns.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Reviewed-by: Horia Geantă <horia.geanta@nxp.com>
Cc: Chris Spencer <christopher.spencer@sea.co.uk>
Cc: Cory Tusar <cory.tusar@zii.aero>
Cc: Chris Healy <cphealy@gmail.com>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Horia Geantă <horia.geanta@nxp.com>
Cc: Aymen Sghaier <aymen.sghaier@nxp.com>
Cc: Leonard Crestez <leonard.crestez@nxp.com>
Cc: linux-crypto@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index e0590beae2403feae3f9883f5c433808342fc4c2..50336494f285ff398bffeae3bd21a0e04edbcb37 100644 (file)
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -711,16 +711,7 @@ static int caam_probe(struct platform_device *pdev)
                              JRSTART_JR1_START | JRSTART_JR2_START |
                              JRSTART_JR3_START);
 
-       if (sizeof(dma_addr_t) == sizeof(u64)) {
-               if (caam_dpaa2)
-                       ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(49));
-               else if (of_device_is_compatible(nprop, "fsl,sec-v5.0"))
-                       ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(40));
-               else
-                       ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(36));
-       } else {
-               ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));
-       }
+       ret = dma_set_mask_and_coherent(dev, caam_get_dma_mask(dev));
        if (ret) {
                dev_err(dev, "dma_set_mask_and_coherent failed (%d)\n", ret);
                goto disable_caam_emi_slow;

diff --git a/drivers/crypto/caam/intern.h b/drivers/crypto/caam/intern.h
index 6af84bbc612c7c36629c30ac758271b149e0e9d1..ec25d260fa400eceb9e7cd98db12f41965240b5a 100644 (file)
--- a/drivers/crypto/caam/intern.h
+++ b/drivers/crypto/caam/intern.h
@@ -10,6 +10,8 @@
 #ifndef INTERN_H
 #define INTERN_H
 
+#include "ctrl.h"
+
 /* Currently comes from Kconfig param as a ^2 (driver-required) */
 #define JOBR_DEPTH (1 << CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE)
 
@@ -215,4 +217,22 @@ DEFINE_SIMPLE_ATTRIBUTE(caam_fops_u32_ro, caam_debugfs_u32_get, NULL, "%llu\n");
 DEFINE_SIMPLE_ATTRIBUTE(caam_fops_u64_ro, caam_debugfs_u64_get, NULL, "%llu\n");
 #endif
 
+static inline u64 caam_get_dma_mask(struct device *dev)
+{
+       struct device_node *nprop = dev->of_node;
+
+       if (sizeof(dma_addr_t) != sizeof(u64))
+               return DMA_BIT_MASK(32);
+
+       if (caam_dpaa2)
+               return DMA_BIT_MASK(49);
+
+       if (of_device_is_compatible(nprop, "fsl,sec-v5.0-job-ring") ||
+           of_device_is_compatible(nprop, "fsl,sec-v5.0"))
+               return DMA_BIT_MASK(40);
+
+       return DMA_BIT_MASK(36);
+}
+
+
 #endif /* INTERN_H */

diff --git a/drivers/crypto/caam/jr.c b/drivers/crypto/caam/jr.c
index cea811fed320b7a2efa95484c2a38f40ef2e2fb1..4b25b2fa3d02f8c455d72b032f465b3c00a95f75 100644 (file)
--- a/drivers/crypto/caam/jr.c
+++ b/drivers/crypto/caam/jr.c
@@ -543,20 +543,7 @@ static int caam_jr_probe(struct platform_device *pdev)
 
        jrpriv->rregs = (struct caam_job_ring __iomem __force *)ctrl;
 
-       if (sizeof(dma_addr_t) == sizeof(u64)) {
-               if (caam_dpaa2)
-                       error = dma_set_mask_and_coherent(jrdev,
-                                                         DMA_BIT_MASK(49));
-               else if (of_device_is_compatible(nprop,
-                                                "fsl,sec-v5.0-job-ring"))
-                       error = dma_set_mask_and_coherent(jrdev,
-                                                         DMA_BIT_MASK(40));
-               else
-                       error = dma_set_mask_and_coherent(jrdev,
-                                                         DMA_BIT_MASK(36));
-       } else {
-               error = dma_set_mask_and_coherent(jrdev, DMA_BIT_MASK(32));
-       }
+       error = dma_set_mask_and_coherent(jrdev, caam_get_dma_mask(jrdev));
        if (error) {
                dev_err(jrdev, "dma_set_mask_and_coherent failed (%d)\n",
                        error);