From: Julien Grall <julien.grall@arm.com>
To: xen-devel@lists.xen.org
Cc: Julien Grall <julien.grall@arm.com>,
sstabellini@kernel.org, wei.chen@linaro.org
Subject: [PATCH v4 12/16] xen/arm: Use the typesafes mfn and gfn in map_dev_mmio_region...
Date: Mon, 27 Jun 2016 17:54:08 +0100 [thread overview]
Message-ID: <1467046452-1261-13-git-send-email-julien.grall@arm.com> (raw)
In-Reply-To: <1467046452-1261-1-git-send-email-julien.grall@arm.com>
to avoid mixing machine frame with guest frame. Also drop the prefix start_.
Signed-off-by: Julien Grall <julien.grall@arm.com>
---
Changes in v4:
- Patch added
---
xen/arch/arm/mm.c | 2 +-
xen/arch/arm/p2m.c | 10 +++++-----
xen/include/asm-arm/p2m.h | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c
index 0e408f8..b5fc034 100644
--- a/xen/arch/arm/mm.c
+++ b/xen/arch/arm/mm.c
@@ -1145,7 +1145,7 @@ int xenmem_add_to_physmap_one(
if ( extra.res0 )
return -EOPNOTSUPP;
- rc = map_dev_mmio_region(d, gfn_x(gfn), 1, idx);
+ rc = map_dev_mmio_region(d, gfn, 1, _mfn(idx));
return rc;
default:
diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c
index 685dc94..faadebf 100644
--- a/xen/arch/arm/p2m.c
+++ b/xen/arch/arm/p2m.c
@@ -1211,20 +1211,20 @@ int unmap_mmio_regions(struct domain *d,
}
int map_dev_mmio_region(struct domain *d,
- unsigned long start_gfn,
+ gfn_t gfn,
unsigned long nr,
- unsigned long mfn)
+ mfn_t mfn)
{
int res;
- if ( !(nr && iomem_access_permitted(d, mfn, mfn + nr - 1)) )
+ if ( !(nr && iomem_access_permitted(d, mfn_x(mfn), mfn_x(mfn) + nr - 1)) )
return 0;
- res = map_mmio_regions(d, _gfn(start_gfn), nr, _mfn(mfn));
+ res = map_mmio_regions(d, gfn, nr, mfn);
if ( res < 0 )
{
printk(XENLOG_G_ERR "Unable to map [%#lx - %#lx] in Dom%d\n",
- mfn, mfn + nr - 1, d->domain_id);
+ mfn_x(mfn), mfn_x(mfn) + nr - 1, d->domain_id);
return res;
}
diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h
index 4752161..8d29eda 100644
--- a/xen/include/asm-arm/p2m.h
+++ b/xen/include/asm-arm/p2m.h
@@ -152,9 +152,9 @@ int unmap_regions_rw_cache(struct domain *d,
unsigned long mfn);
int map_dev_mmio_region(struct domain *d,
- unsigned long start_gfn,
+ gfn_t gfn,
unsigned long nr,
- unsigned long mfn);
+ mfn_t mfn);
int guest_physmap_add_entry(struct domain *d,
gfn_t gfn,
--
1.9.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-06-27 16:54 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-27 16:53 [PATCH v4 00/16] xen/arm: Use the typesafes gfn and mfn Julien Grall
2016-06-27 16:53 ` [PATCH v4 01/16] xen: Use typesafe gfn/mfn in guest_physmap_* helpers Julien Grall
2016-06-27 16:53 ` [PATCH v4 02/16] xen: Use typesafe gfn in xenmem_add_to_physmap_one Julien Grall
2016-06-27 16:53 ` [PATCH v4 03/16] xen/arm: Rename grant_table_gfpn into grant_table_gfn and use the typesafe gfn Julien Grall
2016-06-27 16:54 ` [PATCH v4 04/16] xen: Use the typesafe mfn and gfn in map_mmio_regions Julien Grall
2016-06-27 16:54 ` [PATCH v4 05/16] xen/mm: Introduce INVALID_GFN_T and INVALID_MFN_T Julien Grall
2016-06-28 7:16 ` Jan Beulich
2016-06-28 7:29 ` Andrew Cooper
2016-06-28 7:54 ` Jan Beulich
2016-06-27 16:54 ` [PATCH v4 06/16] xen/arm: Rework the interface of p2m_lookup and use typesafe gfn and mfn Julien Grall
2016-06-27 16:54 ` [PATCH v4 07/16] xen/arm: Rework the interface of p2m_cache_flush and use typesafe gfn Julien Grall
2016-06-27 16:54 ` [PATCH v4 08/16] xen: Replace _mfn(INVALID_MFN) with MFN_INVALID_T Julien Grall
2016-06-28 7:19 ` Jan Beulich
2016-06-28 12:18 ` Julien Grall
2016-06-27 16:54 ` [PATCH v4 09/16] xen/arm: map_regions_rw_cache: Map the region with p2m->default_access Julien Grall
2016-06-27 16:54 ` [PATCH v4 10/16] xen/arm: dom0_build: Remove dead code in allocate_memory Julien Grall
2016-06-27 16:54 ` [PATCH v4 11/16] xen/arm: p2m: Remove unused operation ALLOCATE Julien Grall
2016-06-27 16:54 ` Julien Grall [this message]
2016-06-27 16:54 ` [PATCH v4 13/16] xen/arm: Use the typesafes mfn and gfn in map_regions_rw_cache Julien Grall
2016-06-27 16:54 ` [PATCH v4 14/16] xen/arm: p2m: Introduce helpers to insert and remove mapping Julien Grall
2016-06-27 16:54 ` [PATCH v4 15/16] xen/arm: p2m: Use typesafe gfn for {max, lowest}_mapped_gfn Julien Grall
2016-06-27 16:54 ` [PATCH v4 16/16] xen/arm: p2m: Rework the interface of apply_p2m_changes and use typesafe Julien Grall
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=1467046452-1261-13-git-send-email-julien.grall@arm.com \
--to=julien.grall@arm.com \
--cc=sstabellini@kernel.org \
--cc=wei.chen@linaro.org \
--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 NNTP newsgroup(s).