xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Shannon Zhao <zhaoshenglong@huawei.com>
To: linux-arm-kernel@lists.infradead.org, ard.biesheuvel@linaro.org,
	stefano.stabellini@citrix.com, david.vrabel@citrix.com
Cc: mark.rutland@arm.com, devicetree@vger.kernel.org,
	linux-efi@vger.kernel.org, ian.campbell@citrix.com,
	catalin.marinas@arm.com, will.deacon@arm.com,
	linux-kernel@vger.kernel.org, xen-devel@lists.xen.org,
	julien.grall@arm.com, shannon.zhao@linaro.org,
	peter.huangpeng@huawei.com
Subject: [PATCH v6 04/17] arm/xen: Use xen_xlate_map_ballooned_pages to setup grant table
Date: Thu, 17 Mar 2016 17:57:03 +0800	[thread overview]
Message-ID: <1458208636-12960-5-git-send-email-zhaoshenglong__13623.9752792337$1458208776$gmane$org@huawei.com> (raw)
In-Reply-To: <1458208636-12960-1-git-send-email-zhaoshenglong@huawei.com>

From: Shannon Zhao <shannon.zhao@linaro.org>

Use xen_xlate_map_ballooned_pages to setup grant table. Then it doesn't
rely on DT or ACPI to pass the start address and size of grant table.

Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
 arch/arm/xen/enlighten.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c
index 75cd734..d94f726 100644
--- a/arch/arm/xen/enlighten.c
+++ b/arch/arm/xen/enlighten.c
@@ -282,18 +282,10 @@ static int __init xen_guest_init(void)
 {
 	struct xen_add_to_physmap xatp;
 	struct shared_info *shared_info_page = NULL;
-	struct resource res;
-	phys_addr_t grant_frames;
 
 	if (!xen_domain())
 		return 0;
 
-	if (of_address_to_resource(xen_node, GRANT_TABLE_PHYSADDR, &res)) {
-		pr_err("Xen grant table base address not found\n");
-		return -ENODEV;
-	}
-	grant_frames = res.start;
-
 	xen_events_irq = irq_of_parse_and_map(xen_node, 0);
 	if (!xen_events_irq) {
 		pr_err("Xen event channel interrupt not found\n");
@@ -328,7 +320,10 @@ static int __init xen_guest_init(void)
 	if (xen_vcpu_info == NULL)
 		return -ENOMEM;
 
-	if (gnttab_setup_auto_xlat_frames(grant_frames)) {
+	xen_auto_xlat_grant_frames.count = gnttab_max_grant_frames();
+	if (xen_xlate_map_ballooned_pages(&xen_auto_xlat_grant_frames.pfn,
+					  &xen_auto_xlat_grant_frames.vaddr,
+					  xen_auto_xlat_grant_frames.count)) {
 		free_percpu(xen_vcpu_info);
 		return -ENOMEM;
 	}
-- 
2.0.4



_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

  parent reply	other threads:[~2016-03-17  9:57 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-17  9:56 [PATCH v6 00/17] Add ACPI support for Xen Dom0 on ARM64 Shannon Zhao
2016-03-17  9:57 ` [PATCH v6 01/17] Xen: ACPI: Hide UART used by Xen Shannon Zhao
2016-03-17  9:57 ` [PATCH v6 02/17] xen/grant-table: Move xlated_setup_gnttab_pages to common place Shannon Zhao
2016-03-17  9:57 ` [PATCH v6 03/17] Xen: xlate: Use page_to_xen_pfn instead of page_to_pfn Shannon Zhao
2016-03-17  9:57 ` Shannon Zhao [this message]
2016-03-17  9:57 ` [PATCH v6 05/17] xen: memory : Add new XENMAPSPACE type XENMAPSPACE_dev_mmio Shannon Zhao
2016-03-17  9:57 ` [PATCH v6 06/17] Xen: ARM: Add support for mapping platform device mmio Shannon Zhao
2016-03-17  9:57 ` [PATCH v6 07/17] Xen: ARM: Add support for mapping AMBA " Shannon Zhao
2016-03-17  9:57 ` [PATCH v6 08/17] Xen: public/hvm: sync changes of HVM_PARAM_CALLBACK_VIA ABI from Xen Shannon Zhao
2016-03-17  9:57 ` [PATCH v6 09/17] xen/hvm/params: Add a new delivery type for event-channel in HVM_PARAM_CALLBACK_IRQ Shannon Zhao
2016-03-17  9:57 ` [PATCH v6 10/17] arm/xen: Get event-channel irq through HVM_PARAM when booting with ACPI Shannon Zhao
2016-03-17  9:57 ` [PATCH v6 11/17] ARM: XEN: Move xen_early_init() before efi_init() Shannon Zhao
2016-03-17  9:57 ` [PATCH v6 12/17] ARM64: ACPI: Check if it runs on Xen to enable or disable ACPI Shannon Zhao
2016-03-17  9:57 ` [PATCH v6 13/17] ARM: Xen: Document UEFI support on Xen ARM virtual platforms Shannon Zhao
2016-03-17  9:57 ` [PATCH v6 14/17] XEN: EFI: Move x86 specific codes to architecture directory Shannon Zhao
2016-03-17  9:57 ` [PATCH v6 15/17] ARM64: XEN: Add a function to initialize Xen specific UEFI runtime services Shannon Zhao
2016-03-17  9:57 ` [PATCH v6 16/17] FDT: Add a helper to get the subnode by given name Shannon Zhao
2016-03-17  9:57 ` [PATCH v6 17/17] Xen: EFI: Parse DT parameters for Xen specific UEFI Shannon Zhao
     [not found] ` <1458208636-12960-2-git-send-email-zhaoshenglong@huawei.com>
2016-03-17 12:59   ` [PATCH v6 01/17] Xen: ACPI: Hide UART used by Xen Rafael J. Wysocki
2016-03-24 12:21 ` [PATCH v6 00/17] Add ACPI support for Xen Dom0 on ARM64 Stefano Stabellini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='1458208636-12960-5-git-send-email-zhaoshenglong__13623.9752792337$1458208776$gmane$org@huawei.com' \
    --to=zhaoshenglong@huawei.com \
    --cc=ard.biesheuvel@linaro.org \
    --cc=catalin.marinas@arm.com \
    --cc=david.vrabel@citrix.com \
    --cc=devicetree@vger.kernel.org \
    --cc=ian.campbell@citrix.com \
    --cc=julien.grall@arm.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-efi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=peter.huangpeng@huawei.com \
    --cc=shannon.zhao@linaro.org \
    --cc=stefano.stabellini@citrix.com \
    --cc=will.deacon@arm.com \
    --cc=xen-devel@lists.xen.org \
    --subject='Re: [PATCH v6 04/17] arm/xen: Use xen_xlate_map_ballooned_pages to setup grant table' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).