From patchwork Wed Jul 6 13:01:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 71457 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp854150qgy; Wed, 6 Jul 2016 06:04:12 -0700 (PDT) X-Received: by 10.36.149.130 with SMTP id m124mr20347297itd.94.1467810251657; Wed, 06 Jul 2016 06:04:11 -0700 (PDT) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id e191si805436ita.67.2016.07.06.06.04.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Jul 2016 06:04:11 -0700 (PDT) Received-SPF: neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) client-ip=192.237.175.120; Authentication-Results: mx.google.com; spf=neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) smtp.mailfrom=xen-devel-bounces@lists.xen.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bKmSQ-0000G4-Jy; Wed, 06 Jul 2016 13:01:38 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bKmSP-0000Dg-2j for xen-devel@lists.xen.org; Wed, 06 Jul 2016 13:01:37 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 4E/66-28758-0310D775; Wed, 06 Jul 2016 13:01:36 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrKLMWRWlGSWpSXmKPExsVysyfVTVefsTb c4P9uHYslHxezODB6HN39mymAMYo1My8pvyKBNWN6wx/2gufCFYs7ZrM1MJ7j7WLk4hAS2MQo cWjid2YI5zSjxOHfpxm7GDk52AQ0Je58/sQEYosISEtc+3wZLM4s4CDx5uM9FhBbWCBKYvnNc 0DNHBwsAqoS784GgoR5BVwl/q35zQpiSwjISZw8NhnM5gSKT7/2mB3EFhJwkdi+eBLzBEbuBY wMqxjVi1OLylKLdE31kooy0zNKchMzc3QNDYz1clOLixPTU3MSk4r1kvNzNzECvVvPwMC4g/H yV6dDjJIcTEqivCzfqsOF+JLyUyozEosz4otKc1KLDzHKcHAoSfA2/K8JFxIsSk1PrUjLzAGG GUxagoNHSYT3EUiat7ggMbc4Mx0idYpRUUqctxMkIQCSyCjNg2uDhfYlRlkpYV5GBgYGIZ6C1 KLczBJU+VeM4hyMSsK8N/8BTeHJzCuBm/4KaDET0OKfLtUgi0sSEVJSDYwOxcXT3CaterSoby /flKvz7d13yJtxfX5+O8yIQWdL9HX7BW/rw+3rd9r6ztmlnuZeo+WVNkEgcYeIe8aCVe8tDvd Ulyc2Lu92eLtnmd/DXWkrwwp15mf+EhCemNxs1jVj8c8mBelJXE3H6hTe9EkYfdN70arrNt1M ydVeRMu7WMKHafEpOyWW4oxEQy3mouJEAF/wFv5oAgAA X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1467810093!32456182!2 X-Originating-IP: [217.140.101.70] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8836 invoked from network); 6 Jul 2016 13:01:35 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-12.tower-31.messagelabs.com with SMTP; 6 Jul 2016 13:01:35 -0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 31C3DBBC; Wed, 6 Jul 2016 06:02:34 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.215.28]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id A66133F21A; Wed, 6 Jul 2016 06:01:34 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Wed, 6 Jul 2016 14:01:09 +0100 Message-Id: <1467810073-27971-11-git-send-email-julien.grall@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1467810073-27971-1-git-send-email-julien.grall@arm.com> References: <1467810073-27971-1-git-send-email-julien.grall@arm.com> Cc: Julien Grall , sstabellini@kernel.org Subject: [Xen-devel] [PATCH v6 10/14] xen/arm: Use the typesafes mfn and gfn in map_dev_mmio_region... X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" to avoid mixing machine frame with guest frame. Also drop the prefix start_. Signed-off-by: Julien Grall --- Changes in v6: - Qualify what is being mapped - Use PRI_mfn Changes in v4: - Patch added --- xen/arch/arm/mm.c | 2 +- xen/arch/arm/p2m.c | 12 ++++++------ xen/include/asm-arm/p2m.h | 4 ++-- 3 files changed, 9 insertions(+), 9 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 f11094e..5fe1b91 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); + printk(XENLOG_G_ERR "Unable to map MFNs [%#"PRI_mfn" - %#"PRI_mfn" in Dom%d\n", + 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,