aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHoria Geant? <horia.geanta@nxp.com>2016-01-12 10:59:29 -0500
committerHerbert Xu <herbert@gondor.apana.org.au>2016-01-25 08:47:44 -0500
commite7a7104e432c0db8469ca3568daf4f1d1afe3e73 (patch)
tree38836deda78b08580a8a9387fd8bb66355948020
parent92e963f50fc74041b5e9e744c330dca48e04f08d (diff)
crypto: caam - make write transactions bufferable on PPC platforms
Previous change (see "Fixes" tag) to the MCFGR register clears AWCACHE[0] ("bufferable" AXI3 attribute) (which is "1" at POR). This makes all writes non-bufferable, causing a ~ 5% performance drop for PPC-based platforms. Rework previous change such that MCFGR[AWCACHE]=4'b0011 (bufferable + cacheable) for all platforms. Note: For ARM-based platforms, AWCACHE[0] is ignored by the interconnect IP. Cc: <stable@vger.kernel.org> # 4.3+ Fixes: f10967495144 ("crypto: caam - fix snooping for write transactions") Signed-off-by: Horia Geant? <horia.geanta@nxp.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r--drivers/crypto/caam/ctrl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index 8abb4bc548cc..69d4a1326fee 100644
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -534,8 +534,8 @@ static int caam_probe(struct platform_device *pdev)
534 * long pointers in master configuration register 534 * long pointers in master configuration register
535 */ 535 */
536 clrsetbits_32(&ctrl->mcr, MCFGR_AWCACHE_MASK, MCFGR_AWCACHE_CACH | 536 clrsetbits_32(&ctrl->mcr, MCFGR_AWCACHE_MASK, MCFGR_AWCACHE_CACH |
537 MCFGR_WDENABLE | (sizeof(dma_addr_t) == sizeof(u64) ? 537 MCFGR_AWCACHE_BUFF | MCFGR_WDENABLE |
538 MCFGR_LONG_PTR : 0)); 538 (sizeof(dma_addr_t) == sizeof(u64) ? MCFGR_LONG_PTR : 0));
539 539
540 /* 540 /*
541 * Read the Compile Time paramters and SCFGR to determine 541 * Read the Compile Time paramters and SCFGR to determine