diff options
Diffstat (limited to 'arch/mips/cavium-octeon/octeon-irq.c')
| -rw-r--r-- | arch/mips/cavium-octeon/octeon-irq.c | 71 |
1 files changed, 17 insertions, 54 deletions
diff --git a/arch/mips/cavium-octeon/octeon-irq.c b/arch/mips/cavium-octeon/octeon-irq.c index 03c081da3df4..ffd4ae660f79 100644 --- a/arch/mips/cavium-octeon/octeon-irq.c +++ b/arch/mips/cavium-octeon/octeon-irq.c @@ -152,19 +152,6 @@ static void octeon_irq_core_bus_sync_unlock(struct irq_data *data) mutex_unlock(&cd->core_irq_mutex); } - -static void octeon_irq_core_cpu_online(struct irq_data *data) -{ - if (irqd_irq_disabled(data)) - octeon_irq_core_eoi(data); -} - -static void octeon_irq_core_cpu_offline(struct irq_data *data) -{ - if (irqd_irq_disabled(data)) - octeon_irq_core_ack(data); -} - static struct irq_chip octeon_irq_chip_core = { .name = "Core", .irq_enable = octeon_irq_core_enable, @@ -174,8 +161,9 @@ static struct irq_chip octeon_irq_chip_core = { .irq_bus_lock = octeon_irq_core_bus_lock, .irq_bus_sync_unlock = octeon_irq_core_bus_sync_unlock, - .irq_cpu_online = octeon_irq_core_cpu_online, - .irq_cpu_offline = octeon_irq_core_cpu_offline, + .irq_cpu_online = octeon_irq_core_eoi, + .irq_cpu_offline = octeon_irq_core_ack, + .flags = IRQCHIP_ONOFFLINE_ENABLED, }; static void __init octeon_irq_init_core(void) @@ -517,30 +505,6 @@ static void octeon_irq_ciu_enable_all_v2(struct irq_data *data) } } -static void octeon_irq_cpu_online_mbox(struct irq_data *data) -{ - if (irqd_irq_disabled(data)) - octeon_irq_ciu_enable_local(data); -} - -static void octeon_irq_cpu_online_mbox_v2(struct irq_data *data) -{ - if (irqd_irq_disabled(data)) - octeon_irq_ciu_enable_local_v2(data); -} - -static void octeon_irq_cpu_offline_mbox(struct irq_data *data) -{ - if (irqd_irq_disabled(data)) - octeon_irq_ciu_disable_local(data); -} - -static void octeon_irq_cpu_offline_mbox_v2(struct irq_data *data) -{ - if (irqd_irq_disabled(data)) - octeon_irq_ciu_disable_local_v2(data); -} - #ifdef CONFIG_SMP static void octeon_irq_cpu_offline_ciu(struct irq_data *data) @@ -570,8 +534,7 @@ static int octeon_irq_ciu_set_affinity(struct irq_data *data, const struct cpumask *dest, bool force) { int cpu; - struct irq_desc *desc = irq_to_desc(data->irq); - int enable_one = (desc->status & IRQ_DISABLED) == 0; + bool enable_one = !irqd_irq_disabled(data) && !irqd_irq_masked(data); unsigned long flags; union octeon_ciu_chip_data cd; @@ -585,7 +548,7 @@ static int octeon_irq_ciu_set_affinity(struct irq_data *data, if (cpumask_weight(dest) != 1) return -EINVAL; - if (desc->status & IRQ_DISABLED) + if (!enable_one) return 0; if (cd.s.line == 0) { @@ -595,7 +558,7 @@ static int octeon_irq_ciu_set_affinity(struct irq_data *data, unsigned long *pen = &per_cpu(octeon_irq_ciu0_en_mirror, cpu); if (cpumask_test_cpu(cpu, dest) && enable_one) { - enable_one = 0; + enable_one = false; set_bit(cd.s.bit, pen); } else { clear_bit(cd.s.bit, pen); @@ -610,7 +573,7 @@ static int octeon_irq_ciu_set_affinity(struct irq_data *data, unsigned long *pen = &per_cpu(octeon_irq_ciu1_en_mirror, cpu); if (cpumask_test_cpu(cpu, dest) && enable_one) { - enable_one = 0; + enable_one = false; set_bit(cd.s.bit, pen); } else { clear_bit(cd.s.bit, pen); @@ -631,12 +594,11 @@ static int octeon_irq_ciu_set_affinity_v2(struct irq_data *data, bool force) { int cpu; - struct irq_desc *desc = irq_to_desc(data->irq); - int enable_one = (desc->status & IRQ_DISABLED) == 0; + bool enable_one = !irqd_irq_disabled(data) && !irqd_irq_masked(data); u64 mask; union octeon_ciu_chip_data cd; - if (desc->status & IRQ_DISABLED) + if (!enable_one) return 0; cd.p = data->chip_data; @@ -647,7 +609,7 @@ static int octeon_irq_ciu_set_affinity_v2(struct irq_data *data, unsigned long *pen = &per_cpu(octeon_irq_ciu0_en_mirror, cpu); int index = octeon_coreid_for_cpu(cpu) * 2; if (cpumask_test_cpu(cpu, dest) && enable_one) { - enable_one = 0; + enable_one = false; set_bit(cd.s.bit, pen); cvmx_write_csr(CVMX_CIU_INTX_EN0_W1S(index), mask); } else { @@ -660,7 +622,7 @@ static int octeon_irq_ciu_set_affinity_v2(struct irq_data *data, unsigned long *pen = &per_cpu(octeon_irq_ciu1_en_mirror, cpu); int index = octeon_coreid_for_cpu(cpu) * 2 + 1; if (cpumask_test_cpu(cpu, dest) && enable_one) { - enable_one = 0; + enable_one = false; set_bit(cd.s.bit, pen); cvmx_write_csr(CVMX_CIU_INTX_EN1_W1S(index), mask); } else { @@ -679,7 +641,6 @@ static int octeon_irq_ciu_set_affinity_v2(struct irq_data *data, */ static void octeon_irq_dummy_mask(struct irq_data *data) { - return; } /* @@ -741,8 +702,9 @@ static struct irq_chip octeon_irq_chip_ciu_mbox_v2 = { .irq_ack = octeon_irq_ciu_disable_local_v2, .irq_eoi = octeon_irq_ciu_enable_local_v2, - .irq_cpu_online = octeon_irq_cpu_online_mbox_v2, - .irq_cpu_offline = octeon_irq_cpu_offline_mbox_v2, + .irq_cpu_online = octeon_irq_ciu_enable_local_v2, + .irq_cpu_offline = octeon_irq_ciu_disable_local_v2, + .flags = IRQCHIP_ONOFFLINE_ENABLED, }; static struct irq_chip octeon_irq_chip_ciu_mbox = { @@ -750,8 +712,9 @@ static struct irq_chip octeon_irq_chip_ciu_mbox = { .irq_enable = octeon_irq_ciu_enable_all, .irq_disable = octeon_irq_ciu_disable_all, - .irq_cpu_online = octeon_irq_cpu_online_mbox, - .irq_cpu_offline = octeon_irq_cpu_offline_mbox, + .irq_cpu_online = octeon_irq_ciu_enable_local, + .irq_cpu_offline = octeon_irq_ciu_disable_local, + .flags = IRQCHIP_ONOFFLINE_ENABLED, }; /* |