Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irqchip updates from Ingo Molnar: "Various irqchip driver updates, plus a genirq core update that allows the initial spreading of irqs amonst CPUs without having to do it from user-space" * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: genirq: Fix null pointer reference in irq_set_affinity_hint() irqchip: gic: Allow interrupt level to be set for PPIs irqchip: mips-gic: Handle pending interrupts once in __gic_irq_dispatch() irqchip: Conexant CX92755 interrupts controller driver irqchip: Devicetree: document Conexant Digicolor irq binding irqchip: omap-intc: Remove unused legacy interface for omap2 irqchip: omap-intc: Fix support for dm814 and dm816 irqchip: mtk-sysirq: Get irq number from register resource size irqchip: renesas-intc-irqpin: r8a7779 IRLM setup support genirq: Set initial affinity in irq_set_affinity_hint()
此提交包含在:
@@ -235,9 +235,9 @@ int gic_get_c0_perfcount_int(void)
|
||||
GIC_LOCAL_TO_HWIRQ(GIC_LOCAL_INT_PERFCTR));
|
||||
}
|
||||
|
||||
static unsigned int gic_get_int(void)
|
||||
static void gic_handle_shared_int(void)
|
||||
{
|
||||
unsigned int i;
|
||||
unsigned int i, intr, virq;
|
||||
unsigned long *pcpu_mask;
|
||||
unsigned long pending_reg, intrmask_reg;
|
||||
DECLARE_BITMAP(pending, GIC_MAX_INTRS);
|
||||
@@ -259,7 +259,16 @@ static unsigned int gic_get_int(void)
|
||||
bitmap_and(pending, pending, intrmask, gic_shared_intrs);
|
||||
bitmap_and(pending, pending, pcpu_mask, gic_shared_intrs);
|
||||
|
||||
return find_first_bit(pending, gic_shared_intrs);
|
||||
intr = find_first_bit(pending, gic_shared_intrs);
|
||||
while (intr != gic_shared_intrs) {
|
||||
virq = irq_linear_revmap(gic_irq_domain,
|
||||
GIC_SHARED_TO_HWIRQ(intr));
|
||||
do_IRQ(virq);
|
||||
|
||||
/* go to next pending bit */
|
||||
bitmap_clear(pending, intr, 1);
|
||||
intr = find_first_bit(pending, gic_shared_intrs);
|
||||
}
|
||||
}
|
||||
|
||||
static void gic_mask_irq(struct irq_data *d)
|
||||
@@ -386,16 +395,26 @@ static struct irq_chip gic_edge_irq_controller = {
|
||||
#endif
|
||||
};
|
||||
|
||||
static unsigned int gic_get_local_int(void)
|
||||
static void gic_handle_local_int(void)
|
||||
{
|
||||
unsigned long pending, masked;
|
||||
unsigned int intr, virq;
|
||||
|
||||
pending = gic_read(GIC_REG(VPE_LOCAL, GIC_VPE_PEND));
|
||||
masked = gic_read(GIC_REG(VPE_LOCAL, GIC_VPE_MASK));
|
||||
|
||||
bitmap_and(&pending, &pending, &masked, GIC_NUM_LOCAL_INTRS);
|
||||
|
||||
return find_first_bit(&pending, GIC_NUM_LOCAL_INTRS);
|
||||
intr = find_first_bit(&pending, GIC_NUM_LOCAL_INTRS);
|
||||
while (intr != GIC_NUM_LOCAL_INTRS) {
|
||||
virq = irq_linear_revmap(gic_irq_domain,
|
||||
GIC_LOCAL_TO_HWIRQ(intr));
|
||||
do_IRQ(virq);
|
||||
|
||||
/* go to next pending bit */
|
||||
bitmap_clear(&pending, intr, 1);
|
||||
intr = find_first_bit(&pending, GIC_NUM_LOCAL_INTRS);
|
||||
}
|
||||
}
|
||||
|
||||
static void gic_mask_local_irq(struct irq_data *d)
|
||||
@@ -454,19 +473,8 @@ static struct irq_chip gic_all_vpes_local_irq_controller = {
|
||||
|
||||
static void __gic_irq_dispatch(void)
|
||||
{
|
||||
unsigned int intr, virq;
|
||||
|
||||
while ((intr = gic_get_local_int()) != GIC_NUM_LOCAL_INTRS) {
|
||||
virq = irq_linear_revmap(gic_irq_domain,
|
||||
GIC_LOCAL_TO_HWIRQ(intr));
|
||||
do_IRQ(virq);
|
||||
}
|
||||
|
||||
while ((intr = gic_get_int()) != gic_shared_intrs) {
|
||||
virq = irq_linear_revmap(gic_irq_domain,
|
||||
GIC_SHARED_TO_HWIRQ(intr));
|
||||
do_IRQ(virq);
|
||||
}
|
||||
gic_handle_local_int();
|
||||
gic_handle_shared_int();
|
||||
}
|
||||
|
||||
static void gic_irq_dispatch(unsigned int irq, struct irq_desc *desc)
|
||||
|
新增問題並參考
封鎖使用者