| Message ID | 20171101140316.31333-2-julien.grall@linaro.org |
|---|---|
| State | Accepted |
| Commit | 4da2ec1b1584975012ceda49160bd2f276076d5d |
| Headers | show |
| Series | xen: Convert __page_to_mfn and _mfn_to_page to use typesafe MFN | expand |
On Wed, 1 Nov 2017, Julien Grall wrote: > - Remove spurious () > - Add missing spaces > - Turn 1 << to 1UL << > - Rename spfn to smfn and switch to mfn_t > > Signed-off-by: Julien Grall <julien.grall@linaro.org> Reviewed-by: Stefano Stabellini <sstabellini@kernel.org> > --- > > Cc: Stefano Stabellini <sstabellini@kernel.org> > > Changes in v2: > - Remove double space > - s/spfn/smfn/ and switch to mfn_t > --- > xen/arch/arm/domain_build.c | 17 ++++++++++------- > 1 file changed, 10 insertions(+), 7 deletions(-) > > diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c > index bf29299707..5532068ab1 100644 > --- a/xen/arch/arm/domain_build.c > +++ b/xen/arch/arm/domain_build.c > @@ -50,6 +50,8 @@ struct map_range_data > /* Override macros from asm/page.h to make them work with mfn_t */ > #undef virt_to_mfn > #define virt_to_mfn(va) _mfn(__virt_to_mfn(va)) > +#undef page_to_mfn > +#define page_to_mfn(pg) _mfn(__page_to_mfn(pg)) > > //#define DEBUG_11_ALLOCATION > #ifdef DEBUG_11_ALLOCATION > @@ -104,16 +106,16 @@ static bool insert_11_bank(struct domain *d, > unsigned int order) > { > int res, i; > - paddr_t spfn; > + mfn_t smfn; > paddr_t start, size; > > - spfn = page_to_mfn(pg); > - start = pfn_to_paddr(spfn); > - size = pfn_to_paddr((1 << order)); > + smfn = page_to_mfn(pg); > + start = mfn_to_maddr(smfn); > + size = pfn_to_paddr(1UL << order); > > D11PRINT("Allocated %#"PRIpaddr"-%#"PRIpaddr" (%ldMB/%ldMB, order %d)\n", > start, start + size, > - 1UL << (order+PAGE_SHIFT-20), > + 1UL << (order + PAGE_SHIFT - 20), > /* Don't want format this as PRIpaddr (16 digit hex) */ > (unsigned long)(kinfo->unassigned_mem >> 20), > order); > @@ -126,7 +128,7 @@ static bool insert_11_bank(struct domain *d, > goto fail; > } > > - res = guest_physmap_add_page(d, _gfn(spfn), _mfn(spfn), order); > + res = guest_physmap_add_page(d, _gfn(mfn_x(smfn)), smfn, order); > if ( res ) > panic("Failed map pages to DOM0: %d", res); > > @@ -167,7 +169,8 @@ static bool insert_11_bank(struct domain *d, > */ > if ( start + size < bank->start && kinfo->mem.nr_banks < NR_MEM_BANKS ) > { > - memmove(bank + 1, bank, sizeof(*bank)*(kinfo->mem.nr_banks - i)); > + memmove(bank + 1, bank, > + sizeof(*bank) * (kinfo->mem.nr_banks - i)); > kinfo->mem.nr_banks++; > bank->start = start; > bank->size = size; > -- > 2.11.0 >
diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index bf29299707..5532068ab1 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -50,6 +50,8 @@ struct map_range_data /* Override macros from asm/page.h to make them work with mfn_t */ #undef virt_to_mfn #define virt_to_mfn(va) _mfn(__virt_to_mfn(va)) +#undef page_to_mfn +#define page_to_mfn(pg) _mfn(__page_to_mfn(pg)) //#define DEBUG_11_ALLOCATION #ifdef DEBUG_11_ALLOCATION @@ -104,16 +106,16 @@ static bool insert_11_bank(struct domain *d, unsigned int order) { int res, i; - paddr_t spfn; + mfn_t smfn; paddr_t start, size; - spfn = page_to_mfn(pg); - start = pfn_to_paddr(spfn); - size = pfn_to_paddr((1 << order)); + smfn = page_to_mfn(pg); + start = mfn_to_maddr(smfn); + size = pfn_to_paddr(1UL << order); D11PRINT("Allocated %#"PRIpaddr"-%#"PRIpaddr" (%ldMB/%ldMB, order %d)\n", start, start + size, - 1UL << (order+PAGE_SHIFT-20), + 1UL << (order + PAGE_SHIFT - 20), /* Don't want format this as PRIpaddr (16 digit hex) */ (unsigned long)(kinfo->unassigned_mem >> 20), order); @@ -126,7 +128,7 @@ static bool insert_11_bank(struct domain *d, goto fail; } - res = guest_physmap_add_page(d, _gfn(spfn), _mfn(spfn), order); + res = guest_physmap_add_page(d, _gfn(mfn_x(smfn)), smfn, order); if ( res ) panic("Failed map pages to DOM0: %d", res); @@ -167,7 +169,8 @@ static bool insert_11_bank(struct domain *d, */ if ( start + size < bank->start && kinfo->mem.nr_banks < NR_MEM_BANKS ) { - memmove(bank + 1, bank, sizeof(*bank)*(kinfo->mem.nr_banks - i)); + memmove(bank + 1, bank, + sizeof(*bank) * (kinfo->mem.nr_banks - i)); kinfo->mem.nr_banks++; bank->start = start; bank->size = size;
- Remove spurious () - Add missing spaces - Turn 1 << to 1UL << - Rename spfn to smfn and switch to mfn_t Signed-off-by: Julien Grall <julien.grall@linaro.org> --- Cc: Stefano Stabellini <sstabellini@kernel.org> Changes in v2: - Remove double space - s/spfn/smfn/ and switch to mfn_t --- xen/arch/arm/domain_build.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)