diff options
author | Kim Phillips <kim.phillips@freescale.com> | 2011-12-12 15:59:16 -0500 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2011-12-20 02:20:05 -0500 |
commit | a1a38c4c6a0f73e8a9dc217c0e4e0ac483a89f25 (patch) | |
tree | 3cf55cfdcf54184e417797f0960c01349f6b8fef /drivers/crypto/caam/ctrl.c | |
parent | a2ecb155a30fea933cc539fc2064fef825fd9511 (diff) |
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>
Diffstat (limited to 'drivers/crypto/caam/ctrl.c')
-rw-r--r-- | drivers/crypto/caam/ctrl.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c index 048bb2343231..8ae3ba2a160d 100644 --- a/drivers/crypto/caam/ctrl.c +++ b/drivers/crypto/caam/ctrl.c | |||
@@ -52,8 +52,6 @@ static int caam_probe(struct platform_device *pdev) | |||
52 | struct caam_ctrl __iomem *ctrl; | 52 | struct caam_ctrl __iomem *ctrl; |
53 | struct caam_full __iomem *topregs; | 53 | struct caam_full __iomem *topregs; |
54 | struct caam_drv_private *ctrlpriv; | 54 | struct caam_drv_private *ctrlpriv; |
55 | struct caam_deco **deco; | ||
56 | u32 deconum; | ||
57 | #ifdef CONFIG_DEBUG_FS | 55 | #ifdef CONFIG_DEBUG_FS |
58 | struct caam_perfmon *perfmon; | 56 | struct caam_perfmon *perfmon; |
59 | #endif | 57 | #endif |
@@ -92,17 +90,6 @@ static int caam_probe(struct platform_device *pdev) | |||
92 | if (sizeof(dma_addr_t) == sizeof(u64)) | 90 | if (sizeof(dma_addr_t) == sizeof(u64)) |
93 | dma_set_mask(dev, DMA_BIT_MASK(36)); | 91 | dma_set_mask(dev, DMA_BIT_MASK(36)); |
94 | 92 | ||
95 | /* Find out how many DECOs are present */ | ||
96 | deconum = (rd_reg64(&topregs->ctrl.perfmon.cha_num) & | ||
97 | CHA_NUM_DECONUM_MASK) >> CHA_NUM_DECONUM_SHIFT; | ||
98 | |||
99 | ctrlpriv->deco = kmalloc(deconum * sizeof(struct caam_deco *), | ||
100 | GFP_KERNEL); | ||
101 | |||
102 | deco = (struct caam_deco __force **)&topregs->deco; | ||
103 | for (d = 0; d < deconum; d++) | ||
104 | ctrlpriv->deco[d] = deco[d]; | ||
105 | |||
106 | /* | 93 | /* |
107 | * Detect and enable JobRs | 94 | * Detect and enable JobRs |
108 | * First, find out how many ring spec'ed, allocate references | 95 | * First, find out how many ring spec'ed, allocate references |