From mboxrd@z Thu Jan  1 00:00:00 1970
From: Julien Grall <julien.grall@citrix.com>
Subject: Re: [PATCH v5 2/3] xen/arm: Add p2m_ipa_bits
Date: Wed, 6 May 2015 14:00:36 +0100
Message-ID: <554A1074.4090506@citrix.com>
References: <1430890089-30708-1-git-send-email-edgar.iglesias@gmail.com>
	<1430890089-30708-3-git-send-email-edgar.iglesias@gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="windows-1252"
Content-Transfer-Encoding: quoted-printable
Return-path: <xen-devel-bounces@lists.xen.org>
In-Reply-To: <1430890089-30708-3-git-send-email-edgar.iglesias@gmail.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, xen-devel@lists.xen.org
Cc: julien.grall@citrix.com, edgar.iglesias@xilinx.com, tim@xen.org, ian.campbell@citrix.com, stefano.stabellini@citrix.com
List-Id: xen-devel@lists.xenproject.org

Hi Edgar,

On 06/05/15 06:28, Edgar E. Iglesias wrote:
> diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c
> index 59dd23a..98f1019 100644
> --- a/xen/arch/arm/p2m.c
> +++ b/xen/arch/arm/p2m.c
> @@ -17,9 +17,11 @@

[..]

> +const unsigned int __read_mostly p2m_ipa_bits =3D 40;

[..]

> diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h
> index 341df55..63748ef 100644
> --- a/xen/include/asm-arm/p2m.h
> +++ b/xen/include/asm-arm/p2m.h
> @@ -10,6 +10,9 @@
>  =

>  #define paddr_bits PADDR_BITS
>  =

> +/* Holds the bit size of IPAs in p2m tables.  */
> +extern unsigned int p2m_ipa_bits;
> +

The two declarations of p2m_ipa_bits are different on ARM32. GCC will
fail to build with:

p2m.c:24:34: error: conflicting type qualifiers for =91p2m_ipa_bits=92
 const unsigned int __read_mostly p2m_ipa_bits =3D 40;
                                  ^
In file included from works/xen/xen/include/asm/domain.h:8:0,
                 from works/xen/xen/include/xen/domain.h:6,
                 from works/xen/xen/include/xen/sched.h:10,
                 from p2m.c:2:
works/xen/xen/include/asm/p2m.h:14:21: note: previous declaration of
=91p2m_ipa_bits=92 was here
 extern unsigned int p2m_ipa_bits;
                     ^
I would either drop the const in p2m.c or use a define for ARM32 in
asm-arm/p2m.h

Regards,

-- =

Julien Grall