]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
ARM64: Round-Robin dispatch IRQs between CPUs.
authorMichael Zoran <mzoran@crowfest.net>
Sun, 15 Jan 2017 05:43:57 +0000 (21:43 -0800)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Tue, 19 Sep 2017 10:07:49 +0000 (12:07 +0200)
IRQ-CPU mapping is round robined on ARM64 to increase
concurrency and allow multiple interrupts to be serviced
at a time.  This reduces the need for FIQ.

Signed-off-by: Michael Zoran <mzoran@crowfest.net>
drivers/irqchip/irq-bcm2835.c
drivers/irqchip/irq-bcm2836.c

index 8ed457fd74bd23bee27b64a2c9e3828ce0e4fb87..a035e1ceacc0494fa293e6811ff8f7e3ea05e362 100644 (file)
@@ -168,10 +168,23 @@ static void armctrl_unmask_irq(struct irq_data *d)
        }
 }
 
+#ifdef CONFIG_ARM64
+void bcm2836_arm_irqchip_spin_gpu_irq(void);
+
+static void armctrl_ack_irq(struct irq_data *d)
+{
+       bcm2836_arm_irqchip_spin_gpu_irq();
+}
+
+#endif
+
 static struct irq_chip armctrl_chip = {
        .name = "ARMCTRL-level",
        .irq_mask = armctrl_mask_irq,
-       .irq_unmask = armctrl_unmask_irq
+       .irq_unmask = armctrl_unmask_irq,
+#ifdef CONFIG_ARM64
+       .irq_ack    = armctrl_ack_irq
+#endif
 };
 
 static int armctrl_xlate(struct irq_domain *d, struct device_node *ctrlr,
index a8db33b50ad9ff83d284fa54fe4d3b65f859df0f..67dcac46cca72db4ebe2300eab04f0a867e8e14b 100644 (file)
@@ -145,6 +145,27 @@ static void bcm2836_arm_irqchip_unmask_gpu_irq(struct irq_data *d)
 {
 }
 
+#ifdef CONFIG_ARM64
+
+void bcm2836_arm_irqchip_spin_gpu_irq(void)
+{
+       u32 i;
+       void __iomem *gpurouting = (intc.base + LOCAL_GPU_ROUTING);
+       u32 routing_val = readl(gpurouting);
+
+       for (i = 1; i <= 3; i++) {
+               u32 new_routing_val = (routing_val + i) & 3;
+
+               if (cpu_active(new_routing_val)) {
+                       writel(new_routing_val, gpurouting);
+                       return;
+               }
+       }
+}
+EXPORT_SYMBOL(bcm2836_arm_irqchip_spin_gpu_irq);
+
+#endif
+
 static struct irq_chip bcm2836_arm_irqchip_gpu = {
        .name           = "bcm2836-gpu",
        .irq_mask       = bcm2836_arm_irqchip_mask_gpu_irq,