crypto: caam - remove DECO access initialization code

Access to the SEC4 DECOs (DEscriptor COntrollers) (for debug purposes)
isn't supported or used, and its register access initialization code
erroneously makes illegal i/o accesses that show up as errors when
run under simulation.  Remove it until proper support (via DECORR)
is added.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
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 048bb23432316c7e3cf51899538ca736b10943b3..8ae3ba2a160d5e1e08269a5d960b15d3dd0c732d 100644 (file)
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -52,8 +52,6 @@ static int caam_probe(struct platform_device *pdev)
        struct caam_ctrl __iomem *ctrl;
        struct caam_full __iomem *topregs;
        struct caam_drv_private *ctrlpriv;
-       struct caam_deco **deco;
-       u32 deconum;
 #ifdef CONFIG_DEBUG_FS
        struct caam_perfmon *perfmon;
 #endif
@@ -92,17 +90,6 @@ static int caam_probe(struct platform_device *pdev)
        if (sizeof(dma_addr_t) == sizeof(u64))
                dma_set_mask(dev, DMA_BIT_MASK(36));
 
-       /* Find out how many DECOs are present */
-       deconum = (rd_reg64(&topregs->ctrl.perfmon.cha_num) &
-                  CHA_NUM_DECONUM_MASK) >> CHA_NUM_DECONUM_SHIFT;
-
-       ctrlpriv->deco = kmalloc(deconum * sizeof(struct caam_deco *),
-                                GFP_KERNEL);
-
-       deco = (struct caam_deco __force **)&topregs->deco;
-       for (d = 0; d < deconum; d++)
-               ctrlpriv->deco[d] = deco[d];
-
        /*
         * Detect and enable JobRs
         * First, find out how many ring spec'ed, allocate references

diff --git a/drivers/crypto/caam/regs.h b/drivers/crypto/caam/regs.h
index aee394e3905643dc02a9ef81cb7fb72984bdb174..e9f7a70cdd5efa443a9bd4d3d928d0a562002a0d 100644 (file)
--- a/drivers/crypto/caam/regs.h
+++ b/drivers/crypto/caam/regs.h
@@ -657,7 +657,6 @@ struct caam_full {
        u64 rsvd[512];
        struct caam_assurance assure;
        struct caam_queue_if qi;
-       struct caam_deco *deco;
 };
 
 #endif /* REGS_H */