On Wed, 28 Nov 2018, Julien Grall wrote:
> A follow-up patch will need to generate the VTTBR in a few places.
>
> Signed-off-by: Julien Grall <julien.gr...@arm.com>
> ---
> xen/arch/arm/p2m.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c
> index 6c76298ebc..8ebf1e8dba 100644
> --- a/xen/arch/arm/p2m.c
> +++ b/xen/arch/arm/p2m.c
> @@ -47,6 +47,11 @@ static const paddr_t level_masks[] =
> static const uint8_t level_orders[] =
> { ZEROETH_ORDER, FIRST_ORDER, SECOND_ORDER, THIRD_ORDER };
>
> +static uint64_t generate_vttbr(uint16_t vmid, mfn_t root_mfn)
> +{
> + return (mfn_to_maddr(root_mfn) | ((uint64_t)vmid << 48));
Outer brackets are not necessary. Regardless:
Reviewed-by: Stefano Stabellini <sstabell...@kernel.org>
> +}
> +
> /* Unlock the flush and do a P2M TLB flush if necessary */
> void p2m_write_unlock(struct p2m_domain *p2m)
> {
> @@ -1147,7 +1152,7 @@ static int p2m_alloc_table(struct domain *d)
>
> p2m->root = page;
>
> - p2m->vttbr = page_to_maddr(p2m->root) | ((uint64_t)p2m->vmid << 48);
> + p2m->vttbr = generate_vttbr(p2m->vmid, page_to_mfn(p2m->root));
>
> /*
> * Make sure that all TLBs corresponding to the new VMID are flushed
> --
> 2.11.0
>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
