|
@@ -102,45 +102,8 @@ static struct irqaction cascade_irqaction = {
|
|
.name = "cascade",
|
|
.name = "cascade",
|
|
};
|
|
};
|
|
|
|
|
|
-static inline void mask_loongson_irq(struct irq_data *d)
|
|
|
|
-{
|
|
|
|
- clear_c0_status(0x100 << (d->irq - MIPS_CPU_IRQ_BASE));
|
|
|
|
- irq_disable_hazard();
|
|
|
|
-
|
|
|
|
- /* Workaround: UART IRQ may deliver to any core */
|
|
|
|
- if (d->irq == LOONGSON_UART_IRQ) {
|
|
|
|
- int cpu = smp_processor_id();
|
|
|
|
- int node_id = cpu_logical_map(cpu) / loongson_sysconf.cores_per_node;
|
|
|
|
- int core_id = cpu_logical_map(cpu) % loongson_sysconf.cores_per_node;
|
|
|
|
- u64 intenclr_addr = smp_group[node_id] |
|
|
|
|
- (u64)(&LOONGSON_INT_ROUTER_INTENCLR);
|
|
|
|
- u64 introuter_lpc_addr = smp_group[node_id] |
|
|
|
|
- (u64)(&LOONGSON_INT_ROUTER_LPC);
|
|
|
|
-
|
|
|
|
- *(volatile u32 *)intenclr_addr = 1 << 10;
|
|
|
|
- *(volatile u8 *)introuter_lpc_addr = 0x10 + (1<<core_id);
|
|
|
|
- }
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
-static inline void unmask_loongson_irq(struct irq_data *d)
|
|
|
|
-{
|
|
|
|
- /* Workaround: UART IRQ may deliver to any core */
|
|
|
|
- if (d->irq == LOONGSON_UART_IRQ) {
|
|
|
|
- int cpu = smp_processor_id();
|
|
|
|
- int node_id = cpu_logical_map(cpu) / loongson_sysconf.cores_per_node;
|
|
|
|
- int core_id = cpu_logical_map(cpu) % loongson_sysconf.cores_per_node;
|
|
|
|
- u64 intenset_addr = smp_group[node_id] |
|
|
|
|
- (u64)(&LOONGSON_INT_ROUTER_INTENSET);
|
|
|
|
- u64 introuter_lpc_addr = smp_group[node_id] |
|
|
|
|
- (u64)(&LOONGSON_INT_ROUTER_LPC);
|
|
|
|
-
|
|
|
|
- *(volatile u32 *)intenset_addr = 1 << 10;
|
|
|
|
- *(volatile u8 *)introuter_lpc_addr = 0x10 + (1<<core_id);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- set_c0_status(0x100 << (d->irq - MIPS_CPU_IRQ_BASE));
|
|
|
|
- irq_enable_hazard();
|
|
|
|
-}
|
|
|
|
|
|
+static inline void mask_loongson_irq(struct irq_data *d) { }
|
|
|
|
+static inline void unmask_loongson_irq(struct irq_data *d) { }
|
|
|
|
|
|
/* For MIPS IRQs which shared by all cores */
|
|
/* For MIPS IRQs which shared by all cores */
|
|
static struct irq_chip loongson_irq_chip = {
|
|
static struct irq_chip loongson_irq_chip = {
|
|
@@ -183,7 +146,7 @@ void __init mach_init_irq(void)
|
|
chip->irq_set_affinity = plat_set_irq_affinity;
|
|
chip->irq_set_affinity = plat_set_irq_affinity;
|
|
|
|
|
|
irq_set_chip_and_handler(LOONGSON_UART_IRQ,
|
|
irq_set_chip_and_handler(LOONGSON_UART_IRQ,
|
|
- &loongson_irq_chip, handle_level_irq);
|
|
|
|
|
|
+ &loongson_irq_chip, handle_percpu_irq);
|
|
|
|
|
|
/* setup HT1 irq */
|
|
/* setup HT1 irq */
|
|
setup_irq(LOONGSON_HT1_IRQ, &cascade_irqaction);
|
|
setup_irq(LOONGSON_HT1_IRQ, &cascade_irqaction);
|