|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH 15/21] arm: Use per-CPU irq_desc for PPIs and SGIs
The first 32 interrupts on a GIC are the Peripheral Private Interrupts
and Software-Generated Interrupts and are local to each processor.
The irq_desc cannot be shared since we use irq_desc->status to track
whether the IRQ is in-progress etc. Therefore give each processor its
own local irq_desc for each of these interupts.
We must also route them on each CPU, so do so.
This feels like a bit of a layering violation (since the core ARM
irq.c now knows about thinkgs wich are really gic.c business)
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Acked-by: Tim Deegan <tim@xxxxxxx>
---
xen/arch/arm/gic.c | 23 ++++++++++++++++++-----
xen/arch/arm/gic.h | 3 ++-
xen/arch/arm/irq.c | 23 ++++++++++++++++++++++-
xen/arch/arm/setup.c | 3 ++-
xen/arch/arm/smpboot.c | 9 ++++++++-
xen/include/asm-arm/irq.h | 13 +++++++++++++
xen/include/asm-arm/setup.h | 2 --
xen/include/xen/irq.h | 10 ++--------
8 files changed, 67 insertions(+), 19 deletions(-)
diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c
index ab93404..5f06e08 100644
--- a/xen/arch/arm/gic.c
+++ b/xen/arch/arm/gic.c
@@ -50,9 +50,17 @@ static struct {
uint64_t lr_mask;
} gic;
-irq_desc_t irq_desc[NR_IRQS];
+static irq_desc_t irq_desc[NR_IRQS];
+static DEFINE_PER_CPU(irq_desc_t[NR_LOCAL_IRQS], local_irq_desc);
+
unsigned nr_lrs;
+irq_desc_t *__irq_to_desc(int irq)
+{
+ if (irq < NR_LOCAL_IRQS) return &this_cpu(local_irq_desc)[irq];
+ return &irq_desc[irq-NR_LOCAL_IRQS];
+}
+
void gic_save_state(struct vcpu *v)
{
int i;
@@ -260,8 +268,8 @@ static void __cpuinit gic_cpu_init(void)
{
int i;
- /* The first 32 interrupts (PPI and SGI) are banked per-cpu, so
- * even though they are controlled with GICD registers, they must
+ /* The first 32 interrupts (PPI and SGI) are banked per-cpu, so
+ * even though they are controlled with GICD registers, they must
* be set up here with the other per-cpu state. */
GICD[GICD_ICENABLER] = 0xffff0000; /* Disable all PPI */
GICD[GICD_ISENABLER] = 0x0000ffff; /* Enable all SGI */
@@ -342,7 +350,7 @@ void gic_disable_cpu(void)
spin_unlock_irq(&gic.lock);
}
-void gic_route_irqs(void)
+void gic_route_ppis(void)
{
/* XXX should get these from DT */
/* GIC maintenance */
@@ -351,6 +359,11 @@ void gic_route_irqs(void)
gic_route_irq(26, 1, 1u << smp_processor_id(), 0xa0);
/* Timer */
gic_route_irq(30, 1, 1u << smp_processor_id(), 0xa0);
+}
+
+void gic_route_spis(void)
+{
+ /* XXX should get these from DT */
/* UART */
gic_route_irq(37, 0, 1u << smp_processor_id(), 0xa0);
}
@@ -408,7 +421,7 @@ int __init setup_irq(unsigned int irq, struct irqaction
*new)
rc = __setup_irq(desc, irq, new);
- spin_unlock_irqrestore(&desc->lock,flags);
+ spin_unlock_irqrestore(&desc->lock, flags);
return rc;
}
diff --git a/xen/arch/arm/gic.h b/xen/arch/arm/gic.h
index fa2cf06..b8f9f201 100644
--- a/xen/arch/arm/gic.h
+++ b/xen/arch/arm/gic.h
@@ -132,7 +132,8 @@ extern int vcpu_vgic_init(struct vcpu *v);
extern void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq,int virtual);
extern struct pending_irq *irq_to_pending(struct vcpu *v, unsigned int irq);
-extern void gic_route_irqs(void);
+extern void gic_route_ppis(void);
+extern void gic_route_spis(void);
extern void gic_inject(void);
diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c
index f9d663b..72e83e6 100644
--- a/xen/arch/arm/irq.c
+++ b/xen/arch/arm/irq.c
@@ -58,20 +58,41 @@ static int __init init_irq_data(void)
{
int irq;
- for (irq = 0; irq < NR_IRQS; irq++) {
+ for (irq = NR_LOCAL_IRQS; irq < NR_IRQS; irq++) {
struct irq_desc *desc = irq_to_desc(irq);
init_one_irq_desc(desc);
desc->irq = irq;
desc->action = NULL;
}
+
+ return 0;
+}
+
+static int __cpuinit init_local_irq_data(void)
+{
+ int irq;
+
+ for (irq = 0; irq < NR_LOCAL_IRQS; irq++) {
+ struct irq_desc *desc = irq_to_desc(irq);
+ init_one_irq_desc(desc);
+ desc->irq = irq;
+ desc->action = NULL;
+ }
+
return 0;
}
void __init init_IRQ(void)
{
+ BUG_ON(init_local_irq_data() < 0);
BUG_ON(init_irq_data() < 0);
}
+void __cpuinit init_secondary_IRQ(void)
+{
+ BUG_ON(init_local_irq_data() < 0);
+}
+
int __init request_irq(unsigned int irq,
void (*handler)(int, void *, struct cpu_user_regs *),
unsigned long irqflags, const char * devname, void *dev_id)
diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c
index dc0e215..db8fe6a 100644
--- a/xen/arch/arm/setup.c
+++ b/xen/arch/arm/setup.c
@@ -200,7 +200,8 @@ void __init start_xen(unsigned long boot_phys_offset,
init_IRQ();
- gic_route_irqs();
+ gic_route_ppis();
+ gic_route_spis();
init_maintenance_interrupt();
init_timer_interrupt();
diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c
index 6463a8d..c0750c0 100644
--- a/xen/arch/arm/smpboot.c
+++ b/xen/arch/arm/smpboot.c
@@ -26,6 +26,8 @@
#include <xen/sched.h>
#include <xen/smp.h>
#include <xen/softirq.h>
+#include <xen/timer.h>
+#include <xen/irq.h>
#include <asm/vfp.h>
#include "gic.h"
@@ -129,8 +131,13 @@ void __cpuinit start_secondary(unsigned long
boot_phys_offset,
enable_vfp();
gic_init_secondary_cpu();
+
+ init_secondary_IRQ();
+
+ gic_route_ppis();
+
+ init_maintenance_interrupt();
init_timer_interrupt();
- gic_route_irqs();
set_current(idle_vcpu[cpuid]);
diff --git a/xen/include/asm-arm/irq.h b/xen/include/asm-arm/irq.h
index 21e0b85..abde839 100644
--- a/xen/include/asm-arm/irq.h
+++ b/xen/include/asm-arm/irq.h
@@ -17,10 +17,23 @@ struct irq_cfg {
#define arch_irq_desc irq_cfg
};
+#define NR_LOCAL_IRQS 32
+#define NR_IRQS 1024
+#define nr_irqs NR_IRQS
+
+struct irq_desc;
+
+struct irq_desc *__irq_to_desc(int irq);
+
+#define irq_to_desc(irq) __irq_to_desc(irq)
+
void do_IRQ(struct cpu_user_regs *regs, unsigned int irq, int is_fiq);
#define domain_pirq_to_irq(d, pirq) (pirq)
+void init_IRQ(void);
+void init_secondary_IRQ(void);
+
#endif /* _ASM_HW_IRQ_H */
/*
* Local variables:
diff --git a/xen/include/asm-arm/setup.h b/xen/include/asm-arm/setup.h
index 6433b4e..8769f66 100644
--- a/xen/include/asm-arm/setup.h
+++ b/xen/include/asm-arm/setup.h
@@ -9,8 +9,6 @@ void arch_get_xen_caps(xen_capabilities_info_t *info);
int construct_dom0(struct domain *d);
-void init_IRQ(void);
-
#endif
/*
* Local variables:
diff --git a/xen/include/xen/irq.h b/xen/include/xen/irq.h
index cbe1dbc..5973cce 100644
--- a/xen/include/xen/irq.h
+++ b/xen/include/xen/irq.h
@@ -88,21 +88,15 @@ typedef struct irq_desc {
struct list_head rl_link;
} __cacheline_aligned irq_desc_t;
+#ifndef irq_to_desc
#define irq_to_desc(irq) (&irq_desc[irq])
+#endif
int init_one_irq_desc(struct irq_desc *);
int arch_init_one_irq_desc(struct irq_desc *);
#define irq_desc_initialized(desc) ((desc)->handler != NULL)
-#if defined(__arm__)
-
-#define NR_IRQS 1024
-#define nr_irqs NR_IRQS
-extern irq_desc_t irq_desc[NR_IRQS];
-
-#endif
-
extern int setup_irq(unsigned int irq, struct irqaction *);
extern void release_irq(unsigned int irq);
extern int request_irq(unsigned int irq,
--
1.7.9.1
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |