[Xen-devel] [PATCH] arm/optee: Fix arm32 build

Andrew Cooper posted 1 patch 16 weeks ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/xen tags/patchew/20190628131821.19690-1-andrew.cooper3@citrix.com
xen/arch/arm/tee/optee.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)

[Xen-devel] [PATCH] arm/optee: Fix arm32 build

Posted by Andrew Cooper 16 weeks ago
A Travis randconfig build notices:

optee.c: In function ‘allocate_and_pin_shm_rpc’:
optee.c:383:13: error: format ‘%lx’ expects argument of type
   ‘long unsigned int’, but argument 5 has type ‘uint64_t’ [-Werror=format=]
    gdprintk(XENLOG_WARNING, "Guest tries to use the same RPC SHM cookie %lx\n",
             ^

Use PRIx64 instead of %lx

Full logs https://travis-ci.org/andyhhp/xen/jobs/551754253

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Stefano Stabellini <sstabellini@kernel.org>
CC: Julien Grall <julien.grall@arm.com>
CC: Volodymyr Babchuk <Volodymyr_Babchuk@epam.com>
---
 xen/arch/arm/tee/optee.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/xen/arch/arm/tee/optee.c b/xen/arch/arm/tee/optee.c
index 61029855d4..1d79c2c159 100644
--- a/xen/arch/arm/tee/optee.c
+++ b/xen/arch/arm/tee/optee.c
@@ -380,7 +380,8 @@ static struct shm_rpc *allocate_and_pin_shm_rpc(struct optee_domain *ctx,
         if ( shm_rpc_tmp->cookie == cookie )
         {
             spin_unlock(&ctx->lock);
-            gdprintk(XENLOG_WARNING, "Guest tries to use the same RPC SHM cookie %lx\n",
+            gdprintk(XENLOG_WARNING,
+                     "Guest tries to use the same RPC SHM cookie %"PRIx64"\n",
                      cookie);
             goto err;
         }
@@ -493,7 +494,8 @@ static struct optee_shm_buf *allocate_optee_shm_buf(struct optee_domain *ctx,
         if ( optee_shm_buf_tmp->cookie == cookie )
         {
             spin_unlock(&ctx->lock);
-            gdprintk(XENLOG_WARNING, "Guest tries to use the same SHM buffer cookie %lx\n",
+            gdprintk(XENLOG_WARNING,
+                     "Guest tries to use the same SHM buffer cookie %"PRIx64"\n",
                      cookie);
             err_code = -EINVAL;
             goto err;
@@ -574,7 +576,8 @@ static void free_optee_shm_buf_pg_list(struct optee_domain *ctx,
     if ( found )
         free_pg_list(optee_shm_buf);
     else
-        gdprintk(XENLOG_ERR, "Can't find pagelist for SHM buffer with cookie %lx to free it\n",
+        gdprintk(XENLOG_ERR,
+                 "Can't find pagelist for SHM buffer with cookie %"PRIx64" to free it\n",
                  cookie);
 }
 
@@ -1018,7 +1021,8 @@ static int handle_rpc_return(struct optee_domain *ctx,
              * will overwrite it with actual result. So we can just
              * continue the call.
              */
-            gprintk(XENLOG_ERR, "Can't find SHM-RPC with cookie %lx\n", cookie);
+            gprintk(XENLOG_ERR, "Can't find SHM-RPC with cookie %"PRIx64"\n",
+                    cookie);
 
             return -ERESTART;
         }
@@ -1219,7 +1223,8 @@ static void handle_rpc_cmd_alloc(struct optee_domain *ctx,
     if ( shm_rpc->xen_arg->params[0].attr != (OPTEE_MSG_ATTR_TYPE_TMEM_OUTPUT |
                                               OPTEE_MSG_ATTR_NONCONTIG) )
     {
-        gdprintk(XENLOG_WARNING, "Invalid attrs for shared mem buffer: %lx\n",
+        gdprintk(XENLOG_WARNING,
+                 "Invalid attrs for shared mem buffer: %"PRIx64"\n",
                  shm_rpc->xen_arg->params[0].attr);
         return;
     }
@@ -1268,7 +1273,8 @@ static void handle_rpc_cmd(struct optee_domain *ctx, struct cpu_user_regs *regs,
 
     if ( !shm_rpc )
     {
-        gdprintk(XENLOG_ERR, "Can't find SHM-RPC with cookie %lx\n", cookie);
+        gdprintk(XENLOG_ERR, "Can't find SHM-RPC with cookie %"PRIx64"\n",
+                 cookie);
         return;
     }
 
-- 
2.11.0


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [Xen-devel] [PATCH] arm/optee: Fix arm32 build

Posted by Stefano Stabellini 16 weeks ago
On Fri, 28 Jun 2019, Andrew Cooper wrote:
> A Travis randconfig build notices:
> 
> optee.c: In function ‘allocate_and_pin_shm_rpc’:
> optee.c:383:13: error: format ‘%lx’ expects argument of type
>    ‘long unsigned int’, but argument 5 has type ‘uint64_t’ [-Werror=format=]
>     gdprintk(XENLOG_WARNING, "Guest tries to use the same RPC SHM cookie %lx\n",
>              ^
> 
> Use PRIx64 instead of %lx
> 
> Full logs https://travis-ci.org/andyhhp/xen/jobs/551754253
> 
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>

> ---
> CC: Stefano Stabellini <sstabellini@kernel.org>
> CC: Julien Grall <julien.grall@arm.com>
> CC: Volodymyr Babchuk <Volodymyr_Babchuk@epam.com>
> ---
>  xen/arch/arm/tee/optee.c | 18 ++++++++++++------
>  1 file changed, 12 insertions(+), 6 deletions(-)
> 
> diff --git a/xen/arch/arm/tee/optee.c b/xen/arch/arm/tee/optee.c
> index 61029855d4..1d79c2c159 100644
> --- a/xen/arch/arm/tee/optee.c
> +++ b/xen/arch/arm/tee/optee.c
> @@ -380,7 +380,8 @@ static struct shm_rpc *allocate_and_pin_shm_rpc(struct optee_domain *ctx,
>          if ( shm_rpc_tmp->cookie == cookie )
>          {
>              spin_unlock(&ctx->lock);
> -            gdprintk(XENLOG_WARNING, "Guest tries to use the same RPC SHM cookie %lx\n",
> +            gdprintk(XENLOG_WARNING,
> +                     "Guest tries to use the same RPC SHM cookie %"PRIx64"\n",
>                       cookie);
>              goto err;
>          }
> @@ -493,7 +494,8 @@ static struct optee_shm_buf *allocate_optee_shm_buf(struct optee_domain *ctx,
>          if ( optee_shm_buf_tmp->cookie == cookie )
>          {
>              spin_unlock(&ctx->lock);
> -            gdprintk(XENLOG_WARNING, "Guest tries to use the same SHM buffer cookie %lx\n",
> +            gdprintk(XENLOG_WARNING,
> +                     "Guest tries to use the same SHM buffer cookie %"PRIx64"\n",
>                       cookie);
>              err_code = -EINVAL;
>              goto err;
> @@ -574,7 +576,8 @@ static void free_optee_shm_buf_pg_list(struct optee_domain *ctx,
>      if ( found )
>          free_pg_list(optee_shm_buf);
>      else
> -        gdprintk(XENLOG_ERR, "Can't find pagelist for SHM buffer with cookie %lx to free it\n",
> +        gdprintk(XENLOG_ERR,
> +                 "Can't find pagelist for SHM buffer with cookie %"PRIx64" to free it\n",
>                   cookie);
>  }
>  
> @@ -1018,7 +1021,8 @@ static int handle_rpc_return(struct optee_domain *ctx,
>               * will overwrite it with actual result. So we can just
>               * continue the call.
>               */
> -            gprintk(XENLOG_ERR, "Can't find SHM-RPC with cookie %lx\n", cookie);
> +            gprintk(XENLOG_ERR, "Can't find SHM-RPC with cookie %"PRIx64"\n",
> +                    cookie);
>  
>              return -ERESTART;
>          }
> @@ -1219,7 +1223,8 @@ static void handle_rpc_cmd_alloc(struct optee_domain *ctx,
>      if ( shm_rpc->xen_arg->params[0].attr != (OPTEE_MSG_ATTR_TYPE_TMEM_OUTPUT |
>                                                OPTEE_MSG_ATTR_NONCONTIG) )
>      {
> -        gdprintk(XENLOG_WARNING, "Invalid attrs for shared mem buffer: %lx\n",
> +        gdprintk(XENLOG_WARNING,
> +                 "Invalid attrs for shared mem buffer: %"PRIx64"\n",
>                   shm_rpc->xen_arg->params[0].attr);
>          return;
>      }
> @@ -1268,7 +1273,8 @@ static void handle_rpc_cmd(struct optee_domain *ctx, struct cpu_user_regs *regs,
>  
>      if ( !shm_rpc )
>      {
> -        gdprintk(XENLOG_ERR, "Can't find SHM-RPC with cookie %lx\n", cookie);
> +        gdprintk(XENLOG_ERR, "Can't find SHM-RPC with cookie %"PRIx64"\n",
> +                 cookie);
>          return;
>      }
>  
> -- 
> 2.11.0
> _______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel