From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: Re: [PATCH v7 2/3] xen/arm: Make gic-v2 code handle hip04-d01 platform Date: Mon, 2 Mar 2015 16:39:12 +0000 Message-ID: <1425314352.24959.11.camel@citrix.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Frediano Ziglio Cc: Tim Deegan , xen-devel@lists.xen.org, Julien Grall , Stefano Stabellini , zoltan.kiss@huawei.com List-Id: xen-devel@lists.xenproject.org On Fri, 2015-02-27 at 14:44 +0000, Frediano Ziglio wrote: > The GIC in this platform is mainly compatible with the standard > GICv2 beside: > - ITARGET is extended to 16 bit to support 16 CPUs; > - SGI mask is extended to support 16 CPUs; > - maximum supported interrupt is 510; > - GICH APR and LR register offsets. > > Signed-off-by: Frediano Ziglio > Signed-off-by: Zoltan Kiss > --- > xen/arch/arm/Makefile | 1 + > xen/arch/arm/domain_build.c | 2 +- > xen/arch/arm/gic-hip04.c | 400 +++++++++++++++++++++++--------------------- Please add an entry to the MAINTAINERS file for this new driver. > 3 files changed, 207 insertions(+), 196 deletions(-) > > diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile > index 41aba2e..72499e9 100644 > --- a/xen/arch/arm/Makefile > +++ b/xen/arch/arm/Makefile > @@ -12,6 +12,7 @@ obj-y += domctl.o > obj-y += sysctl.o > obj-y += domain_build.o > obj-y += gic.o gic-v2.o > +obj-$(arm32) += gic-hip04.o > obj-$(CONFIG_ARM_64) += gic-v3.o Please follow the example immediately below the line you added. > obj-y += io.o > obj-y += irq.o > diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c > index 9f1f59f..83951a3 100644 > --- a/xen/arch/arm/domain_build.c > +++ b/xen/arch/arm/domain_build.c > @@ -1069,7 +1069,7 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, > > /* Replace these nodes with our own. Note that the original may be > * used_by DOMID_XEN so this check comes first. */ > - if ( dt_match_node(gic_matches, node) ) > + if ( node == dt_interrupt_controller || dt_match_node(gic_matches, node) ) > return make_gic_node(d, kinfo->fdt, node); This generic change should be its own patch, with a suitable justification etc. Ian.