2012-03-21 06:35:15

by Shengzhou Liu

Subject: [PATCH][upstream] powerpc/crypto: caam - add backward compatible string sec4.0

In some device trees of previous version, there were string "fsl,sec4.0".
To be backward compatible with device trees, we have CAAM driver first
check "fsl,sec-v4.0", if it fails, then check for "fsl,sec4.0".

Signed-off-by: Shengzhou Liu <[email protected]>
---
drivers/crypto/caam/caamalg.c | 14 ++++++++++----
drivers/crypto/caam/ctrl.c | 16 ++++++++++++++++
2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c
index e73cf2e..d10d00b 100644
--- a/drivers/crypto/caam/caamalg.c
+++ b/drivers/crypto/caam/caamalg.c
@@ -2152,8 +2152,11 @@ static void __exit caam_algapi_exit(void)
int i, err;

dev_node = of_find_compatible_node(NULL, NULL, "fsl,sec-v4.0");
- if (!dev_node)
- return;
+ if (!dev_node) {
+ dev_node = of_find_compatible_node(NULL, NULL, "fsl,sec4.0");
+ if (!dev_node)
+ return;
+ }

pdev = of_find_device_by_node(dev_node);
if (!pdev)
@@ -2234,8 +2237,11 @@ static int __init caam_algapi_init(void)
int i = 0, err = 0;

dev_node = of_find_compatible_node(NULL, NULL, "fsl,sec-v4.0");
- if (!dev_node)
- return -ENODEV;
+ if (!dev_node) {
+ dev_node = of_find_compatible_node(NULL, NULL, "fsl,sec4.0");
+ if (!dev_node)
+ return -ENODEV;
+ }

pdev = of_find_device_by_node(dev_node);
if (!pdev)
diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index 8ae3ba2..f078fa0 100644
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -98,6 +98,12 @@ static int caam_probe(struct platform_device *pdev)
rspec = 0;
for_each_compatible_node(np, NULL, "fsl,sec-v4.0-job-ring")
rspec++;
+ if (!rspec) {
+ /* for backward compatible with device trees */
+ for_each_compatible_node(np, NULL, "fsl,sec4.0-job-ring")
+ rspec++;
+ }
+
ctrlpriv->jrdev = kzalloc(sizeof(struct device *) * rspec, GFP_KERNEL);
if (ctrlpriv->jrdev == NULL) {
iounmap(&topregs->ctrl);
@@ -111,6 +117,13 @@ static int caam_probe(struct platform_device *pdev)
ctrlpriv->total_jobrs++;
ring++;
}
+ if (!ring) {
+ for_each_compatible_node(np, NULL, "fsl,sec4.0-job-ring") {
+ caam_jr_probe(pdev, np, ring);
+ ctrlpriv->total_jobrs++;
+ ring++;
+ }
+ }

/* Check to see if QI present. If so, enable */
ctrlpriv->qi_present = !!(rd_reg64(&topregs->ctrl.perfmon.comp_parms) &
@@ -226,6 +239,9 @@ static struct of_device_id caam_match[] = {
{
.compatible = "fsl,sec-v4.0",
},
+ {
+ .compatible = "fsl,sec4.0",
+ },
{},
};
MODULE_DEVICE_TABLE(of, caam_match);
--
1.7.0.4

2012-03-23 00:16:49

by Kim Phillips

Subject: Re: [PATCH] powerpc/crypto: caam - add backward compatible string sec4.0

On Wed, 21 Mar 2012 14:09:10 +0800
Shengzhou Liu <[email protected]> wrote:

> In some device trees of previous version, there were string "fsl,sec4.0".
> To be backward compatible with device trees, we have CAAM driver first
> check "fsl,sec-v4.0", if it fails, then check for "fsl,sec4.0".
>
> Signed-off-by: Shengzhou Liu <[email protected]>
> ---

Acked-by: Kim Phillips <[email protected]>

Thanks,

Kim

2012-03-29 08:36:21

by Herbert Xu

Subject: Re: [PATCH] powerpc/crypto: caam - add backward compatible string sec4.0

On Thu, Mar 22, 2012 at 07:15:09PM -0500, Kim Phillips wrote:
> On Wed, 21 Mar 2012 14:09:10 +0800
> Shengzhou Liu <[email protected]> wrote:
>
> > In some device trees of previous version, there were string "fsl,sec4.0".
> > To be backward compatible with device trees, we have CAAM driver first
> > check "fsl,sec-v4.0", if it fails, then check for "fsl,sec4.0".
> >
> > Signed-off-by: Shengzhou Liu <[email protected]>
> > ---
>
> Acked-by: Kim Phillips <[email protected]>

Patch applied. Thanks a lot!
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt