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: <catalin.marinas@arm.com>, <will.deacon@arm.com>,
<mark.rutland@arm.com>, <julien.grall@citrix.com>,
<xen-devel@lists.xen.org>, <devicetree@vger.kernel.org>,
<linux-efi@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<ian.campbell@citrix.com>, <shannon.zhao@linaro.org>,
<peter.huangpeng@huawei.com>
Subject: [PATCH v4 04/17] arm/xen: Use xen_xlate_map_ballooned_pages to setup grant table
Date: Fri, 5 Feb 2016 11:05:39 +0800 [thread overview]
Message-ID: <1454641552-12576-5-git-send-email-zhaoshenglong@huawei.com> (raw)
In-Reply-To: <1454641552-12576-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
next prev parent reply other threads:[~2016-02-05 3:12 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-05 3:05 [PATCH v4 00/17] Add ACPI support for Xen Dom0 on ARM64 Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 01/17] Xen: ACPI: Hide UART used by Xen Shannon Zhao
2016-02-06 10:23 ` Rafael J. Wysocki
2016-02-08 10:57 ` Stefano Stabellini
2016-02-08 22:25 ` Rafael J. Wysocki
2016-02-09 11:19 ` Stefano Stabellini
2016-02-10 22:29 ` Rafael J. Wysocki
2016-02-11 16:04 ` Stefano Stabellini
2016-02-11 22:22 ` Rafael J. Wysocki
2016-02-12 11:50 ` Stefano Stabellini
2016-02-12 12:57 ` Rafael J. Wysocki
2016-02-29 2:02 ` Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 02/17] xen/grant-table: Move xlated_setup_gnttab_pages to common place Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 03/17] Xen: xlate: Use page_to_xen_pfn instead of page_to_pfn Shannon Zhao
2016-02-05 3:05 ` Shannon Zhao [this message]
2016-02-05 3:05 ` [PATCH v4 05/17] xen: memory : Add new XENMAPSPACE type XENMAPSPACE_dev_mmio Shannon Zhao
2016-02-08 11:43 ` Stefano Stabellini
2016-02-05 3:05 ` [PATCH v4 06/17] Xen: ARM: Add support for mapping platform device mmio Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 07/17] Xen: ARM: Add support for mapping AMBA " Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 08/17] Xen: public/hvm: sync changes of HVM_PARAM_CALLBACK_VIA ABI from Xen Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 09/17] xen/hvm/params: Add a new delivery type for event-channel in HVM_PARAM_CALLBACK_IRQ Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 10/17] arm/xen: Get event-channel irq through HVM_PARAM when booting with ACPI Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 11/17] ARM: XEN: Move xen_early_init() before efi_init() Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 12/17] ARM64: ACPI: Check if it runs on Xen to enable or disable ACPI Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 13/17] ARM: Xen: Document UEFI support on Xen ARM virtual platforms Shannon Zhao
2016-02-08 11:31 ` Stefano Stabellini
2016-02-05 3:05 ` [PATCH v4 14/17] XEN: EFI: Move x86 specific codes to architecture directory Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 15/17] ARM64: XEN: Add a function to initialize Xen specific UEFI runtime services Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 16/17] FDT: Add a helper to get specified name subnode Shannon Zhao
2016-02-05 14:15 ` Stefano Stabellini
2016-02-09 5:04 ` Rob Herring
2016-02-23 11:13 ` Shannon Zhao
2016-02-24 14:53 ` Rob Herring
2016-02-05 3:05 ` [PATCH v4 17/17] Xen: EFI: Parse DT parameters for Xen specific UEFI Shannon Zhao
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=1454641552-12576-5-git-send-email-zhaoshenglong@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@citrix.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 \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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 read-only IMAP folder(s) and NNTP newsgroup(s).