From patchwork Thu Jul 26 15:33:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 1243811 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 6A6003FD48 for ; Thu, 26 Jul 2012 16:32:00 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SuQr6-0003a6-Ik; Thu, 26 Jul 2012 16:24:04 +0000 Received: from smtp.citrix.com ([66.165.176.89]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1SuQR9-0006Ja-Dn for linux-arm-kernel@lists.infradead.org; Thu, 26 Jul 2012 15:57:17 +0000 X-IronPort-AV: E=Sophos;i="4.77,659,1336363200"; d="scan'208";a="32691226" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 26 Jul 2012 11:57:07 -0400 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.213.0; Thu, 26 Jul 2012 11:57:07 -0400 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1SuQ5N-0006qa-5d; Thu, 26 Jul 2012 16:34:45 +0100 From: Stefano Stabellini To: Subject: [PATCH 14/24] xen/arm: initialize grant_table on ARM Date: Thu, 26 Jul 2012 16:33:56 +0100 Message-ID: <1343316846-25860-14-git-send-email-stefano.stabellini@eu.citrix.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Note: CRM114 invocation failed X-Spam-Note: SpamAssassin invocation failed Cc: xen-devel@lists.xensource.com, linaro-dev@lists.linaro.org, Ian.Campbell@citrix.com, arnd@arndb.de, konrad.wilk@oracle.com, catalin.marinas@arm.com, Stefano Stabellini , tim@xen.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Initialize the grant table mapping at the address specified at index 0 in the DT under the /xen node. After the grant table is initialized, call xenbus_probe (if not dom0). Signed-off-by: Stefano Stabellini --- arch/arm/xen/enlighten.c | 13 +++++++++++++ drivers/xen/grant-table.c | 2 +- 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c index 2e013cf..854af1e 100644 --- a/arch/arm/xen/enlighten.c +++ b/arch/arm/xen/enlighten.c @@ -1,8 +1,12 @@ #include #include #include +#include #include #include +#include +#include +#include #include #include #include @@ -51,12 +55,16 @@ int __init xen_guest_init(void) struct xen_add_to_physmap xatp; static struct shared_info *shared_info_page = 0; struct device_node *node; + struct resource res; node = of_find_compatible_node(NULL, NULL, "arm,xen"); if (!node) { pr_info("No Xen support\n"); return 0; } + if (of_address_to_resource(node, 0, &res)) + return -EINVAL; + xen_hvm_resume_frames = res.start >> PAGE_SHIFT; xen_domain_type = XEN_HVM_DOMAIN; xen_setup_features(); @@ -97,6 +105,11 @@ int __init xen_guest_init(void) per_cpu(xen_vcpu, cpu) = &HYPERVISOR_shared_info->vcpu_info[cpu]; } + + gnttab_init(); + if (!xen_initial_domain()) + xenbus_probe(NULL); + return 0; } EXPORT_SYMBOL_GPL(xen_guest_init); diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c index 1d0d95e..fd2137a 100644 --- a/drivers/xen/grant-table.c +++ b/drivers/xen/grant-table.c @@ -62,7 +62,7 @@ static grant_ref_t **gnttab_list; static unsigned int nr_grant_frames; -static unsigned int boot_max_nr_grant_frames; +static unsigned int boot_max_nr_grant_frames = 1; static int gnttab_free_count; static grant_ref_t gnttab_free_head; static DEFINE_SPINLOCK(gnttab_list_lock);