Also change srat_region_mask to uint64_t as it is used to store the
return value of pdx_init_mask. uint64_t is always greater or equal to
u64.

Signed-off-by: Stefano Stabellini <stefanos@xilinx.com>
CC: JBeulich@suse.com
CC: andrew.cooper3@citrix.com
CC: julien.grall@arm.com
---
 xen/arch/arm/setup.c  | 2 +-
 xen/arch/x86/srat.c   | 2 +-
 xen/common/pdx.c      | 2 +-
 xen/include/xen/pdx.h | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c
index 2112715579..b03e7ac330 100644
--- a/xen/arch/arm/setup.c
+++ b/xen/arch/arm/setup.c
@@ -483,7 +483,7 @@ static void __init init_pdx(void)
 {
     paddr_t bank_start, bank_size, bank_end;
 
-    u64 mask = pdx_init_mask(bootinfo.mem.bank[0].start);
+    uint64_t mask = pdx_init_mask(bootinfo.mem.bank[0].start);
     int bank;
 
     for ( bank = 0 ; bank < bootinfo.mem.nr_banks; bank++ )
diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c
index 2d70b45909..47a4267220 100644
--- a/xen/arch/x86/srat.c
+++ b/xen/arch/x86/srat.c
@@ -401,7 +401,7 @@ static int __init nodes_cover_memory(void)
 
 void __init acpi_numa_arch_fixup(void) {}
 
-static u64 __initdata srat_region_mask;
+static uint64_t __initdata srat_region_mask;
 
 static int __init srat_parse_region(struct acpi_subtable_header *header,
 				    const unsigned long end)
diff --git a/xen/common/pdx.c b/xen/common/pdx.c
index bb7e437049..8356f03ce8 100644
--- a/xen/common/pdx.c
+++ b/xen/common/pdx.c
@@ -50,7 +50,7 @@ static u64 __init fill_mask(u64 mask)
     return mask;
 }
 
-u64 __init pdx_init_mask(u64 base_addr)
+uint64_t __init pdx_init_mask(uint64_t base_addr)
 {
     return fill_mask(base_addr - 1);
 }
diff --git a/xen/include/xen/pdx.h b/xen/include/xen/pdx.h
index a151aac1a2..770fadc06c 100644
--- a/xen/include/xen/pdx.h
+++ b/xen/include/xen/pdx.h
@@ -13,7 +13,7 @@ extern unsigned long pfn_top_mask, ma_top_mask;
                          (sizeof(*frame_table) & -sizeof(*frame_table)))
 extern unsigned long pdx_group_valid[];
 
-extern u64 pdx_init_mask(u64 base_addr);
+extern uint64_t pdx_init_mask(u64 base_addr);
 extern u64 pdx_region_mask(u64 base, u64 len);
 
 extern void set_pdx_range(unsigned long smfn, unsigned long emfn);
-- 
2.17.1


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

>>> On 17.06.19 at 20:50, <sstabellini@kernel.org> wrote:
> Also change srat_region_mask to uint64_t as it is used to store the
> return value of pdx_init_mask. uint64_t is always greater or equal to
> u64.
> 
> Signed-off-by: Stefano Stabellini <stefanos@xilinx.com>

Non-Arm bits
Acked-by: Jan Beulich <jbeulich@suse.com>
but could you make the title sound less like it's an actual change
to the function return type? Also it's not just its return type
you change.

Jan



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

Hi,

On 6/18/19 11:23 AM, Jan Beulich wrote:
>>>> On 17.06.19 at 20:50, <sstabellini@kernel.org> wrote:
>> Also change srat_region_mask to uint64_t as it is used to store the
>> return value of pdx_init_mask. uint64_t is always greater or equal to
>> u64.

I am a bit confused with the last sentence. In which instance, uint64_t 
would be greater to u64? Aren't they meant to both encode a 64-bit value?

>>
>> Signed-off-by: Stefano Stabellini <stefanos@xilinx.com>
> 
> Non-Arm bits
> Acked-by: Jan Beulich <jbeulich@suse.com>
> but could you make the title sound less like it's an actual change
> to the function return type? Also it's not just its return type
> you change.

To move this series forward, how about the following commit message:

"xen: Replace u64 with uint64_t in pdx_init_mask() and callers

Xen is phasing out the use of u64 in favor of uint64_t.

Therefore, the instance of u64 in the pdx_init_mask() (and the callers) 
are now replaced with uint64_t.

Take the opportunity to also modify srat_region_mask as this is used to 
store the result of pdx_init_mask().
"

Cheers,

-- 
Julien Grall

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

>>> On 20.06.19 at 15:15, <julien.grall@arm.com> wrote:
> On 6/18/19 11:23 AM, Jan Beulich wrote:
>>>>> On 17.06.19 at 20:50, <sstabellini@kernel.org> wrote:
>>> Also change srat_region_mask to uint64_t as it is used to store the
>>> return value of pdx_init_mask. uint64_t is always greater or equal to
>>> u64.
> 
> I am a bit confused with the last sentence. In which instance, uint64_t 
> would be greater to u64? Aren't they meant to both encode a 64-bit value?

Oh, indeed - somehow I didn't even notice this. If anything it's the other
way around actually, because uint64_t is mandated to be exactly 64 bits
wide, whereas there's no strict specification for u64 afaia, but I very
much assume the intentions there have been the same.

The proposed title and text replacements look fine to me.

Jan



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