[v5] tpm_ffa_crb: add support direct message request v2

[PATCH v5 2/2] tpm_crb_ffa: use dev_xx() macro to print log

Posted by Yeoreum Yun 8 months, 1 week ago

Instead of pr_xxx() macro, use dev_xxx() to print log.
This patch changes some error log level to warn log level when
the tpm_crb_ffa secure partition doesn't support properly but
system can run without it.
(i.e) unsupport of direct message ABI or unsupported ABI version

Signed-off-by: Yeoreum Yun <yeoreum.yun@arm.com>
---
 drivers/char/tpm/tpm_crb_ffa.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/char/tpm/tpm_crb_ffa.c b/drivers/char/tpm/tpm_crb_ffa.c
index fed775cf53ab..66b38b2cbdd5 100644
--- a/drivers/char/tpm/tpm_crb_ffa.c
+++ b/drivers/char/tpm/tpm_crb_ffa.c
@@ -303,7 +303,7 @@ static int tpm_crb_ffa_probe(struct ffa_device *ffa_dev)
 
 	if (!ffa_partition_supports_direct_recv(ffa_dev) &&
 	    !ffa_partition_supports_direct_req2_recv(ffa_dev)) {
-		pr_err("TPM partition doesn't support direct message receive.\n");
+		dev_warn(&ffa_dev->dev, "partition doesn't support direct message receive.\n");
 		return -EINVAL;
 	}
 
@@ -324,17 +324,17 @@ static int tpm_crb_ffa_probe(struct ffa_device *ffa_dev)
 	rc = tpm_crb_ffa_get_interface_version(&tpm_crb_ffa->major_version,
 					       &tpm_crb_ffa->minor_version);
 	if (rc) {
-		pr_err("failed to get crb interface version. rc:%d", rc);
+		dev_err(&ffa_dev->dev, "failed to get crb interface version. rc:%d\n", rc);
 		goto out;
 	}
 
-	pr_info("ABI version %u.%u", tpm_crb_ffa->major_version,
+	dev_info(&ffa_dev->dev, "ABI version %u.%u\n", tpm_crb_ffa->major_version,
 		tpm_crb_ffa->minor_version);
 
 	if (tpm_crb_ffa->major_version != CRB_FFA_VERSION_MAJOR ||
 	    (tpm_crb_ffa->minor_version > 0 &&
 	    tpm_crb_ffa->minor_version < CRB_FFA_VERSION_MINOR)) {
-		pr_err("Incompatible ABI version");
+		dev_warn(&ffa_dev->dev, "Incompatible ABI version\n");
 		goto out;
 	}
 
-- 
LEVI:{C3F47F37-75D8-414A-A8BA-3980EC8A46D7}

Re: [PATCH v5 2/2] tpm_crb_ffa: use dev_xx() macro to print log

Posted by Jarkko Sakkinen 7 months, 3 weeks ago

On Tue, Apr 15, 2025 at 07:50:13PM +0100, Yeoreum Yun wrote:
> Instead of pr_xxx() macro, use dev_xxx() to print log.
> This patch changes some error log level to warn log level when
> the tpm_crb_ffa secure partition doesn't support properly but
> system can run without it.
> (i.e) unsupport of direct message ABI or unsupported ABI version
> 
> Signed-off-by: Yeoreum Yun <yeoreum.yun@arm.com>
> ---
>  drivers/char/tpm/tpm_crb_ffa.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/char/tpm/tpm_crb_ffa.c b/drivers/char/tpm/tpm_crb_ffa.c
> index fed775cf53ab..66b38b2cbdd5 100644
> --- a/drivers/char/tpm/tpm_crb_ffa.c
> +++ b/drivers/char/tpm/tpm_crb_ffa.c
> @@ -303,7 +303,7 @@ static int tpm_crb_ffa_probe(struct ffa_device *ffa_dev)
>  
>  	if (!ffa_partition_supports_direct_recv(ffa_dev) &&
>  	    !ffa_partition_supports_direct_req2_recv(ffa_dev)) {
> -		pr_err("TPM partition doesn't support direct message receive.\n");
> +		dev_warn(&ffa_dev->dev, "partition doesn't support direct message receive.\n");
>  		return -EINVAL;
>  	}
>  
> @@ -324,17 +324,17 @@ static int tpm_crb_ffa_probe(struct ffa_device *ffa_dev)
>  	rc = tpm_crb_ffa_get_interface_version(&tpm_crb_ffa->major_version,
>  					       &tpm_crb_ffa->minor_version);
>  	if (rc) {
> -		pr_err("failed to get crb interface version. rc:%d", rc);
> +		dev_err(&ffa_dev->dev, "failed to get crb interface version. rc:%d\n", rc);
>  		goto out;
>  	}
>  
> -	pr_info("ABI version %u.%u", tpm_crb_ffa->major_version,
> +	dev_info(&ffa_dev->dev, "ABI version %u.%u\n", tpm_crb_ffa->major_version,
>  		tpm_crb_ffa->minor_version);
>  
>  	if (tpm_crb_ffa->major_version != CRB_FFA_VERSION_MAJOR ||
>  	    (tpm_crb_ffa->minor_version > 0 &&
>  	    tpm_crb_ffa->minor_version < CRB_FFA_VERSION_MINOR)) {
> -		pr_err("Incompatible ABI version");
> +		dev_warn(&ffa_dev->dev, "Incompatible ABI version\n");
>  		goto out;
>  	}
>  
> -- 
> LEVI:{C3F47F37-75D8-414A-A8BA-3980EC8A46D7}
> 
> 

Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>

BR, Jarkko

Re: [PATCH v5 2/2] tpm_crb_ffa: use dev_xx() macro to print log

Posted by Stefano Garzarella 8 months, 1 week ago

On Tue, Apr 15, 2025 at 07:50:13PM +0100, Yeoreum Yun wrote:
>Instead of pr_xxx() macro, use dev_xxx() to print log.
>This patch changes some error log level to warn log level when
>the tpm_crb_ffa secure partition doesn't support properly but
>system can run without it.
>(i.e) unsupport of direct message ABI or unsupported ABI version
>
>Signed-off-by: Yeoreum Yun <yeoreum.yun@arm.com>
>---
> drivers/char/tpm/tpm_crb_ffa.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)

LGTM!

Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>

>
>diff --git a/drivers/char/tpm/tpm_crb_ffa.c b/drivers/char/tpm/tpm_crb_ffa.c
>index fed775cf53ab..66b38b2cbdd5 100644
>--- a/drivers/char/tpm/tpm_crb_ffa.c
>+++ b/drivers/char/tpm/tpm_crb_ffa.c
>@@ -303,7 +303,7 @@ static int tpm_crb_ffa_probe(struct ffa_device *ffa_dev)
>
> 	if (!ffa_partition_supports_direct_recv(ffa_dev) &&
> 	    !ffa_partition_supports_direct_req2_recv(ffa_dev)) {
>-		pr_err("TPM partition doesn't support direct message receive.\n");
>+		dev_warn(&ffa_dev->dev, "partition doesn't support direct message receive.\n");
> 		return -EINVAL;
> 	}
>
>@@ -324,17 +324,17 @@ static int tpm_crb_ffa_probe(struct ffa_device *ffa_dev)
> 	rc = tpm_crb_ffa_get_interface_version(&tpm_crb_ffa->major_version,
> 					       &tpm_crb_ffa->minor_version);
> 	if (rc) {
>-		pr_err("failed to get crb interface version. rc:%d", rc);
>+		dev_err(&ffa_dev->dev, "failed to get crb interface version. rc:%d\n", rc);
> 		goto out;
> 	}
>
>-	pr_info("ABI version %u.%u", tpm_crb_ffa->major_version,
>+	dev_info(&ffa_dev->dev, "ABI version %u.%u\n", tpm_crb_ffa->major_version,
> 		tpm_crb_ffa->minor_version);
>
> 	if (tpm_crb_ffa->major_version != CRB_FFA_VERSION_MAJOR ||
> 	    (tpm_crb_ffa->minor_version > 0 &&
> 	    tpm_crb_ffa->minor_version < CRB_FFA_VERSION_MINOR)) {
>-		pr_err("Incompatible ABI version");
>+		dev_warn(&ffa_dev->dev, "Incompatible ABI version\n");
> 		goto out;
> 	}
>
>-- 
>LEVI:{C3F47F37-75D8-414A-A8BA-3980EC8A46D7}
>