提交 0a63b09d 编写于 作者: N Nitesh Lal 提交者: Herbert Xu

crypto: caam - Fix job ring discovery in controller driver

The SEC Controller driver creates platform devices for it's child job ring nodes.
Currently the driver uses for_each_compatible routine which traverses
the whole device tree to create the job rings for the platform device.
The patch changes this to search for the compatible property of job ring
only in the child nodes i.e., the job rings are created as per the number
of children associated with the crypto node.
Signed-off-by: NNitesh Lal <NiteshNarayanLal@freescale.com>
Reviewed-by: NHoria Geanta <horia.geanta@freescale.com>
Signed-off-by: NHerbert Xu <herbert@gondor.apana.org.au>
上级 2021abaa
...@@ -443,13 +443,10 @@ static int caam_probe(struct platform_device *pdev) ...@@ -443,13 +443,10 @@ static int caam_probe(struct platform_device *pdev)
* for all, then go probe each one. * for all, then go probe each one.
*/ */
rspec = 0; rspec = 0;
for_each_compatible_node(np, NULL, "fsl,sec-v4.0-job-ring") for_each_available_child_of_node(nprop, np)
rspec++; if (of_device_is_compatible(np, "fsl,sec-v4.0-job-ring") ||
if (!rspec) { of_device_is_compatible(np, "fsl,sec4.0-job-ring"))
/* for backward compatible with device trees */
for_each_compatible_node(np, NULL, "fsl,sec4.0-job-ring")
rspec++; rspec++;
}
ctrlpriv->jrpdev = kzalloc(sizeof(struct platform_device *) * rspec, ctrlpriv->jrpdev = kzalloc(sizeof(struct platform_device *) * rspec,
GFP_KERNEL); GFP_KERNEL);
...@@ -460,18 +457,9 @@ static int caam_probe(struct platform_device *pdev) ...@@ -460,18 +457,9 @@ static int caam_probe(struct platform_device *pdev)
ring = 0; ring = 0;
ctrlpriv->total_jobrs = 0; ctrlpriv->total_jobrs = 0;
for_each_compatible_node(np, NULL, "fsl,sec-v4.0-job-ring") { for_each_available_child_of_node(nprop, np)
ctrlpriv->jrpdev[ring] = if (of_device_is_compatible(np, "fsl,sec-v4.0-job-ring") ||
of_platform_device_create(np, NULL, dev); of_device_is_compatible(np, "fsl,sec4.0-job-ring")) {
if (!ctrlpriv->jrpdev[ring]) {
pr_warn("JR%d Platform device creation error\n", ring);
continue;
}
ctrlpriv->total_jobrs++;
ring++;
}
if (!ring) {
for_each_compatible_node(np, NULL, "fsl,sec4.0-job-ring") {
ctrlpriv->jrpdev[ring] = ctrlpriv->jrpdev[ring] =
of_platform_device_create(np, NULL, dev); of_platform_device_create(np, NULL, dev);
if (!ctrlpriv->jrpdev[ring]) { if (!ctrlpriv->jrpdev[ring]) {
...@@ -482,7 +470,6 @@ static int caam_probe(struct platform_device *pdev) ...@@ -482,7 +470,6 @@ static int caam_probe(struct platform_device *pdev)
ctrlpriv->total_jobrs++; ctrlpriv->total_jobrs++;
ring++; ring++;
} }
}
/* Check to see if QI present. If so, enable */ /* Check to see if QI present. If so, enable */
ctrlpriv->qi_present = !!(rd_reg64(&topregs->ctrl.perfmon.comp_parms) & ctrlpriv->qi_present = !!(rd_reg64(&topregs->ctrl.perfmon.comp_parms) &
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册