|
@@ -200,19 +200,6 @@ static void gic_poke_irq(struct irq_data *d, u32 offset)
|
|
|
rwp_wait();
|
|
|
}
|
|
|
|
|
|
-static int gic_peek_irq(struct irq_data *d, u32 offset)
|
|
|
-{
|
|
|
- u32 mask = 1 << (gic_irq(d) % 32);
|
|
|
- void __iomem *base;
|
|
|
-
|
|
|
- if (gic_irq_in_rdist(d))
|
|
|
- base = gic_data_rdist_sgi_base();
|
|
|
- else
|
|
|
- base = gic_data.dist_base;
|
|
|
-
|
|
|
- return !!(readl_relaxed(base + offset + (gic_irq(d) / 32) * 4) & mask);
|
|
|
-}
|
|
|
-
|
|
|
static void gic_mask_irq(struct irq_data *d)
|
|
|
{
|
|
|
gic_poke_irq(d, GICD_ICENABLER);
|
|
@@ -401,6 +388,19 @@ static void gic_cpu_init(void)
|
|
|
}
|
|
|
|
|
|
#ifdef CONFIG_SMP
|
|
|
+static int gic_peek_irq(struct irq_data *d, u32 offset)
|
|
|
+{
|
|
|
+ u32 mask = 1 << (gic_irq(d) % 32);
|
|
|
+ void __iomem *base;
|
|
|
+
|
|
|
+ if (gic_irq_in_rdist(d))
|
|
|
+ base = gic_data_rdist_sgi_base();
|
|
|
+ else
|
|
|
+ base = gic_data.dist_base;
|
|
|
+
|
|
|
+ return !!(readl_relaxed(base + offset + (gic_irq(d) / 32) * 4) & mask);
|
|
|
+}
|
|
|
+
|
|
|
static int gic_secondary_init(struct notifier_block *nfb,
|
|
|
unsigned long action, void *hcpu)
|
|
|
{
|