dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-03 01:32:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

x86: Wrap calls to 8259 with CONFIG_I8259_PIC

Browse Source 
mask_irq(), unmask_irq() and specific_eoi() are provided by the
i8259 PIC driver and should be wrapped with CONFIG_I8259_PIC.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Hannes Schmelzer <oe5hpm@oevsv.at>
This commit is contained in:
Bin Meng
2018-11-29 19:57:21 -08:00
parent da4cfa6b44
commit c641010452
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
arch/x86/lib/interrupts.c
View File

@@ -64,7 +64,8 @@ void irq_install_handler(int irq, interrupt_handler_t *handler, void *arg)
irq_handlers[irq].arg = arg; irq_handlers[irq].arg = arg;
irq_handlers[irq].count = 0; irq_handlers[irq].count = 0;
unmask_irq(irq); if (CONFIG_IS_ENABLED(I8259_PIC))
unmask_irq(irq);
if (status) if (status)
enable_interrupts(); enable_interrupts();
@@ -83,7 +84,8 @@ void irq_free_handler(int irq)
status = disable_interrupts(); status = disable_interrupts();
mask_irq(irq); if (CONFIG_IS_ENABLED(I8259_PIC))
mask_irq(irq);
irq_handlers[irq].handler = NULL; irq_handlers[irq].handler = NULL;
irq_handlers[irq].arg = NULL; irq_handlers[irq].arg = NULL;
@@ -104,14 +106,16 @@ void do_irq(int hw_irq)
} }
if (irq_handlers[irq].handler) { if (irq_handlers[irq].handler) {
mask_irq(irq); if (CONFIG_IS_ENABLED(I8259_PIC))
mask_irq(irq);
irq_handlers[irq].handler(irq_handlers[irq].arg); irq_handlers[irq].handler(irq_handlers[irq].arg);
irq_handlers[irq].count++; irq_handlers[irq].count++;
unmask_irq(irq); if (CONFIG_IS_ENABLED(I8259_PIC)) {
specific_eoi(irq); unmask_irq(irq);
specific_eoi(irq);
}
} else { } else {
if ((irq & 7) != 7) { if ((irq & 7) != 7) {
spurious_irq_cnt++; spurious_irq_cnt++;