[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 05/16] pseries: Use #define for XICS base irq nu
From: |
Alexander Graf |
Subject: |
Re: [Qemu-devel] [PATCH 05/16] pseries: Use #define for XICS base irq number |
Date: |
Thu, 1 Nov 2012 11:15:43 +0100 |
On 30.10.2012, at 04:25, David Gibson wrote:
> From: Ben Herrenschmidt <address@hidden>
>
> Currently the lowest "real" irq number for the XICS irq controller (as
> opposed to numbers reserved for IPIs and other special purposes) is
> hard coded as 16 in two places - in xics_system_init() and in spapr.c.
>
> As well as being generally bad practice, we're going to need to change this
> number soon to fit in with the in-kernel XICS implementation. This patch
> adds a #define for this number to avoid future breakage.
>
> Signed-off-by: Michael Ellerman <address@hidden>
> Signed-off-by: Ben Herrenschmidt <address@hidden>
From: and Signed-off fields seem to not match.
Alex
> Signed-off-by: David Gibson <address@hidden>
> ---
> hw/spapr.c | 2 +-
> hw/xics.c | 2 +-
> hw/xics.h | 1 +
> 3 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/hw/spapr.c b/hw/spapr.c
> index 8d0ad3c..81c49dc 100644
> --- a/hw/spapr.c
> +++ b/hw/spapr.c
> @@ -799,7 +799,7 @@ static void ppc_spapr_init(QEMUMachineInitArgs *args)
>
> /* Set up Interrupt Controller */
> spapr->icp = xics_system_init(XICS_IRQS);
> - spapr->next_irq = 16;
> + spapr->next_irq = XICS_IRQ_BASE;
>
> /* Set up EPOW events infrastructure */
> spapr_events_init(spapr);
> diff --git a/hw/xics.c b/hw/xics.c
> index 7a899dd..db01fe3 100644
> --- a/hw/xics.c
> +++ b/hw/xics.c
> @@ -548,7 +548,7 @@ struct icp_state *xics_system_init(int nr_irqs)
>
> ics = g_malloc0(sizeof(*ics));
> ics->nr_irqs = nr_irqs;
> - ics->offset = 16;
> + ics->offset = XICS_IRQ_BASE;
> ics->irqs = g_malloc0(nr_irqs * sizeof(struct ics_irq_state));
>
> icp->ics = ics;
> diff --git a/hw/xics.h b/hw/xics.h
> index 6817268..c3bf008 100644
> --- a/hw/xics.h
> +++ b/hw/xics.h
> @@ -28,6 +28,7 @@
> #define __XICS_H__
>
> #define XICS_IPI 0x2
> +#define XICS_IRQ_BASE 0x10
>
> struct icp_state;
>
> --
> 1.7.10.4
>
- Re: [Qemu-devel] [PATCH 05/16] pseries: Use #define for XICS base irq number,
Alexander Graf <=