mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-11-01 17:08:10 +00:00
Code Issues Releases Wiki Activity

bf60x: Add double fault, hardware error and NMI SEC handler

Browse source 
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Bob Liu <lliubbo@gmail.com>
This commit is contained in:
Sonic Zhang 2012-07-04 19:22:55 +08:00 committed by Bob Liu
parent 2a26a20552
commit 06051fdefd
2 changed files with 35 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/blackfin/include/asm/traps.h
View file

@ -125,5 +125,7 @@
level " for Supervisor use: Supervisor only registers, all MMRs, and Supervisor\n" \ level " for Supervisor use: Supervisor only registers, all MMRs, and Supervisor\n" \
level " only instructions.\n" level " only instructions.\n"
extern void double_fault_c(struct pt_regs *fp);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* _BFIN_TRAPS_H */ #endif /* _BFIN_TRAPS_H */

34
arch/blackfin/mach-common/ints-priority.c
View file

@ -26,6 +26,7 @@
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/irq_handler.h> #include <asm/irq_handler.h>
#include <asm/dpmc.h> #include <asm/dpmc.h>
#include <asm/traps.h>
#ifndef SEC_GCTL #ifndef SEC_GCTL
# define SIC_SYSIRQ(irq) (irq - (IRQ_CORETMR + 1)) # define SIC_SYSIRQ(irq) (irq - (IRQ_CORETMR + 1))
@ -413,6 +414,34 @@ void handle_sec_fault(unsigned int irq, struct irq_desc *desc)
raw_spin_unlock(&desc->lock); raw_spin_unlock(&desc->lock);
} }
void handle_core_fault(unsigned int irq, struct irq_desc *desc)
{
struct pt_regs *fp = get_irq_regs();
raw_spin_lock(&desc->lock);
switch (irq) {
case IRQ_C0_DBL_FAULT:
double_fault_c(fp);
break;
case IRQ_C0_HW_ERR:
dump_bfin_process(fp);
dump_bfin_mem(fp);
show_regs(fp);
printk(KERN_NOTICE "Kernel Stack\n");
show_stack(current, NULL);
print_modules();
panic("Kernel core hardware error");
break;
case IRQ_C0_NMI_L1_PARITY_ERR:
panic("NMI %d occurs unexpectedly");
break;
default:
panic("Core 1 fault %d occurs unexpectedly");
}
raw_spin_unlock(&desc->lock);
}
#endif #endif
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
@ -1522,9 +1551,12 @@ int __init init_arch_irq(void)
} else if (irq < BFIN_IRQ(0)) { } else if (irq < BFIN_IRQ(0)) {
irq_set_chip_and_handler(irq, &bfin_internal_irqchip, irq_set_chip_and_handler(irq, &bfin_internal_irqchip,
handle_simple_irq); handle_simple_irq);
} else if (irq < CORE_IRQS && irq != IRQ_CGU_EVT) { } else if (irq == IRQ_SEC_ERR) {
irq_set_chip_and_handler(irq, &bfin_sec_irqchip, irq_set_chip_and_handler(irq, &bfin_sec_irqchip,
handle_sec_fault); handle_sec_fault);
} else if (irq < CORE_IRQS && irq >= IRQ_C0_DBL_FAULT) {
irq_set_chip_and_handler(irq, &bfin_sec_irqchip,
handle_core_fault);
} else if (irq >= BFIN_IRQ(21) && irq <= BFIN_IRQ(26)) { } else if (irq >= BFIN_IRQ(21) && irq <= BFIN_IRQ(26)) {
irq_set_chip(irq, &bfin_sec_irqchip); irq_set_chip(irq, &bfin_sec_irqchip);
irq_set_chained_handler(irq, bfin_demux_gpio_irq); irq_set_chained_handler(irq, bfin_demux_gpio_irq);