Re: [PATCH v5 2/9] xen/arm: move regpair_to_uint64() and uint64_to_regpair() to regs.h

Re: [PATCH v5 2/9] xen/arm: move regpair_to_uint64() and uint64_to_regpair() to regs.h

[Michal Orzel]

Hi Jens,

On 18/08/2022 12:55, Jens Wiklander wrote:
> Moves the two helper functions regpair_to_uint64() and
> uint64_to_regpair() from xen/arch/arm/tee/optee.c to the common arm
> specific regs.h.
> 
Would be good to add a justification that these helpers will be needed by subsequent patches.
Also I can see that you make use of them only in the last patch so it would be natural to
move this patch right before the one making use of these helpers.

> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

As for the patch itself:
Reviewed-by: Michal Orzel <michal.orzel@amd.com>

~Michal

Re: [PATCH v5 2/9] xen/arm: move regpair_to_uint64() and uint64_to_regpair() to regs.h

[Jens Wiklander]

Hi Michal,

On Wed, Aug 24, 2022 at 10:23 AM Michal Orzel <michal.orzel@amd.com> wrote:
>
> Hi Jens,
>
> On 18/08/2022 12:55, Jens Wiklander wrote:
> > Moves the two helper functions regpair_to_uint64() and
> > uint64_to_regpair() from xen/arch/arm/tee/optee.c to the common arm
> > specific regs.h.
> >
> Would be good to add a justification that these helpers will be needed by subsequent patches.
> Also I can see that you make use of them only in the last patch so it would be natural to
> move this patch right before the one making use of these helpers.

I put it at the beginning of the patches to get prerequisites in place
before the tricky stuff, but I'll move it since that's preferred. I'll
add update the commit message.

>
> > Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
>
> As for the patch itself:
> Reviewed-by: Michal Orzel <michal.orzel@amd.com>

Thanks,
Jens

>
> ~Michal

[PATCH v5 2/9] xen/arm: move regpair_to_uint64() and uint64_to_regpair() to regs.h

[Jens Wiklander]

Moves the two helper functions regpair_to_uint64() and
uint64_to_regpair() from xen/arch/arm/tee/optee.c to the common arm
specific regs.h.

Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
---
 xen/arch/arm/include/asm/regs.h | 12 ++++++++++++
 xen/arch/arm/tee/optee.c        | 11 -----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/xen/arch/arm/include/asm/regs.h b/xen/arch/arm/include/asm/regs.h
index 794721a103a4..977fc3c07f4a 100644
--- a/xen/arch/arm/include/asm/regs.h
+++ b/xen/arch/arm/include/asm/regs.h
@@ -60,6 +60,18 @@ static inline bool guest_mode(const struct cpu_user_regs *r)
 register_t get_user_reg(struct cpu_user_regs *regs, int reg);
 void set_user_reg(struct cpu_user_regs *regs, int reg, register_t val);
 
+static inline uint64_t regpair_to_uint64(register_t reg0, register_t reg1)
+{
+    return ((uint64_t)reg0 << 32) | (uint32_t)reg1;
+}
+
+static inline void uint64_to_regpair(register_t *reg0, register_t *reg1,
+                                     uint64_t val)
+{
+    *reg0 = val >> 32;
+    *reg1 = (uint32_t)val;
+}
+
 #endif
 
 #endif /* __ARM_REGS_H__ */
diff --git a/xen/arch/arm/tee/optee.c b/xen/arch/arm/tee/optee.c
index 9cb9f16d43cb..47027ecef47c 100644
--- a/xen/arch/arm/tee/optee.c
+++ b/xen/arch/arm/tee/optee.c
@@ -268,17 +268,6 @@ static int optee_domain_init(struct domain *d)
     return 0;
 }
 
-static uint64_t regpair_to_uint64(register_t reg0, register_t reg1)
-{
-    return ((uint64_t)reg0 << 32) | (uint32_t)reg1;
-}
-
-static void uint64_to_regpair(register_t *reg0, register_t *reg1, uint64_t val)
-{
-    *reg0 = val >> 32;
-    *reg1 = (uint32_t)val;
-}
-
 static struct page_info *get_domain_ram_page(gfn_t gfn)
 {
     struct page_info *page;
-- 
2.31.1