From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Stabellini Subject: [PATCH v3 4/4] xen/arm: grant table Date: Thu, 26 Jul 2012 19:54:52 +0100 Message-ID: <1343328892-10195-4-git-send-email-stefano.stabellini@eu.citrix.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xensource.com Cc: Tim.Deegan@xen.org, Ian.Campbell@citrix.com, Stefano Stabellini List-Id: xen-devel@lists.xenproject.org Implement XENMAPSPACE_grant_table and grant_table_op. Changes in v3: - remove HVM_PARAM_GRANT_START_PFN. Signed-off-by: Stefano Stabellini Acked-by: Tim Deegan --- xen/arch/arm/mm.c | 29 ++++++++++++++++++++++++++++- xen/arch/arm/traps.c | 1 + 2 files changed, 29 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 96a4ca2..08bc55b 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -465,11 +466,37 @@ static int xenmem_add_to_physmap_once( struct domain *d, const struct xen_add_to_physmap *xatp) { - unsigned long mfn = 0; + unsigned long mfn = 0, idx = 0; int rc; switch ( xatp->space ) { + case XENMAPSPACE_grant_table: + spin_lock(&d->grant_table->lock); + + if ( d->grant_table->gt_version == 0 ) + d->grant_table->gt_version = 1; + + idx = xatp->idx; + if ( d->grant_table->gt_version == 2 && + (xatp->idx & XENMAPIDX_grant_table_status) ) + { + idx &= ~XENMAPIDX_grant_table_status; + if ( idx < nr_status_frames(d->grant_table) ) + mfn = virt_to_mfn(d->grant_table->status[idx]); + } + else + { + if ( (idx >= nr_grant_frames(d->grant_table)) && + (idx < max_nr_grant_frames) ) + gnttab_grow_table(d, idx + 1); + + if ( idx < nr_grant_frames(d->grant_table) ) + mfn = virt_to_mfn(d->grant_table->shared_raw[idx]); + } + + spin_unlock(&d->grant_table->lock); + break; case XENMAPSPACE_shared_info: if ( xatp->idx == 0 ) mfn = virt_to_mfn(d->shared_info); diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index ad308c3..d77879e 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -431,6 +431,7 @@ static arm_hypercall_t *arm_hypercall_table[] = { HYPERCALL(physdev_op), HYPERCALL(sysctl), HYPERCALL(hvm_op), + HYPERCALL(grant_table_op), }; static void do_debug_trap(struct cpu_user_regs *regs, unsigned int code) -- 1.7.2.5