From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Grall Subject: Re: [PATCH v4 06/16] xen/arm: segregate and split GIC low level functionality Date: Tue, 27 May 2014 20:13:21 +0100 Message-ID: <5384E3D1.5080108@linaro.org> References: <1401100009-7326-1-git-send-email-vijay.kilari@gmail.com> <1401100009-7326-7-git-send-email-vijay.kilari@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1401100009-7326-7-git-send-email-vijay.kilari@gmail.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: vijay.kilari@gmail.com, Ian.Campbell@citrix.com, stefano.stabellini@eu.citrix.com, stefano.stabellini@citrix.com, xen-devel@lists.xen.org Cc: Prasun.Kapoor@caviumnetworks.com, vijaya.kumar@caviumnetworks.com List-Id: xen-devel@lists.xenproject.org Hi Vijay, On 05/26/2014 11:26 AM, vijay.kilari@gmail.com wrote: > + /* > + * Domain 0 gets the hardware address. > + * Guests get the virtual platform layout. > + */ > + if ( d->domain_id == 0 ) > + { > + d->arch.vgic.dbase = gicv2.dbase; > + d->arch.vgic.cbase = gicv2.cbase; > + } I guess you had conflict when you rebase your patch... You should avoid to ignore them. Some of this code (here is one of the example) is modified while you are sending new version of your patch series. The original code (i.e in gic.c) was: if ( is_hardware_domain(d) ) { d->arch.vgic.dbase = gicv2.dbase; d->arch.vgic.cbase = gicv2.cbase; } Now, you've moved the code and we end up to: if ( d->domain_id == 0 ) { d->arch.vgic.dbase = gicv2.dbase; d->arch.vgic.cbase = gicv2.cbase; } I didn't check every place closely, but this can be a serious problem with Stefano's patch series. His serie still baking and he made some important changes in the v8 serie. We don't want to loose them. Regards, -- Julien Grall