From mboxrd@z Thu Jan  1 00:00:00 1970
From: Julien Grall <julien.grall@linaro.org>
Subject: Re: [PATCH 4/6] xen/arm: implement gic_irq_enable and
	gic_irq_disable
Date: Fri, 06 Dec 2013 18:29:48 +0000
Message-ID: <52A2179C.90508@linaro.org>
References: <alpine.DEB.2.02.1312061715200.7093@kaball.uk.xensource.com>
	<1386350808-13648-4-git-send-email-stefano.stabellini@eu.citrix.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"; Format="flowed"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
In-Reply-To: <1386350808-13648-4-git-send-email-stefano.stabellini@eu.citrix.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: Stefano Stabellini <stefano.stabellini@eu.citrix.com>, xen-devel@lists.xen.org
Cc: ian.campbell@citrix.com
List-Id: xen-devel@lists.xenproject.org



On 12/06/2013 05:26 PM, Stefano Stabellini wrote:
> Rename gic_irq_startup to gic_irq_enable.
> Rename gic_irq_shutdown to gic_irq_disable.
>
> Implement gic_irq_startup and gic_irq_shutdown calling gic_irq_enable
> and gic_irq_disable.
>
> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Julien Grall <julien.grall@linaro.org>
> ---
>   xen/arch/arm/gic.c |   15 +++++++--------
>   1 file changed, 7 insertions(+), 8 deletions(-)
>
> diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c
> index a8a5c2a..5ec3ff9 100644
> --- a/xen/arch/arm/gic.c
> +++ b/xen/arch/arm/gic.c
> @@ -129,7 +129,7 @@ void gic_restore_state(struct vcpu *v)
>       gic_restore_pending_irqs(v);
>   }
>
> -static unsigned int gic_irq_startup(struct irq_desc *desc)
> +static void gic_irq_enable(struct irq_desc *desc)
>   {
>       uint32_t enabler;
>       int irq = desc->irq;
> @@ -137,11 +137,9 @@ static unsigned int gic_irq_startup(struct irq_desc *desc)
>       /* Enable routing */
>       enabler = GICD[GICD_ISENABLER + irq / 32];
>       GICD[GICD_ISENABLER + irq / 32] = enabler | (1u << (irq % 32));
> -
> -    return 0;
>   }
>
> -static void gic_irq_shutdown(struct irq_desc *desc)
> +static void gic_irq_disable(struct irq_desc *desc)
>   {
>       int irq = desc->irq;
>
> @@ -149,14 +147,15 @@ static void gic_irq_shutdown(struct irq_desc *desc)
>       GICD[GICD_ICENABLER + irq / 32] = (1u << (irq % 32));
>   }
>
> -static void gic_irq_enable(struct irq_desc *desc)
> +static unsigned int gic_irq_startup(struct irq_desc *desc)
>   {
> -
> +    gic_irq_enable(desc);
> +    return 0;
>   }
>
> -static void gic_irq_disable(struct irq_desc *desc)
> +static void gic_irq_shutdown(struct irq_desc *desc)
>   {
> -
> +    gic_irq_disable(desc);
>   }
>
>   static void gic_irq_ack(struct irq_desc *desc)
>

-- 
Julien Grall