From 8723bbe1c176f62547e9b8234b81e10e43a30a4c Mon Sep 17 00:00:00 2001 From: Victoria Milhoan Date: Fri, 7 Nov 2014 10:48:32 -0700 Subject: MLK-9937 Use job ring 0 for secure memory access By default, job ring 0 is the owner of the Secure Memory area within CAAM. This patch modifies the Secure Memory module to use job ring 0 for all accesses. Signed-off-by: Victoria Milhoan (cherry picked from commit bb447bfb241d34492365bf881257b1a742a29c02) Signed-off-by: Dan Douglass --- drivers/crypto/caam/sm_store.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/crypto') diff --git a/drivers/crypto/caam/sm_store.c b/drivers/crypto/caam/sm_store.c index 9541a0d2b008..5562b74ad558 100644 --- a/drivers/crypto/caam/sm_store.c +++ b/drivers/crypto/caam/sm_store.c @@ -1018,7 +1018,7 @@ int caam_sm_startup(struct platform_device *pdev) * we can divorce the controller and ring drivers, and then assign * an SM instance to any ring instance). */ - smpriv->smringdev = caam_jr_alloc(); + smpriv->smringdev = &ctrlpriv->jrpdev[0]->dev; jrpriv = dev_get_drvdata(smpriv->smringdev); lpagect = 0; lpagedesc = kzalloc(sizeof(struct sm_page_descriptor) -- cgit v1.2.3