diff options
| author | Damien Zammit <damien@zamaudio.com> | 2019-11-10 16:27:42 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2019-11-10 16:28:50 +0100 |
| commit | 1d34167488e56e36ad702627b17be7ac18a9db9c (patch) | |
| tree | 9f107a4647490b81793e6548d0e0da444f742584 /i386/i386at | |
| parent | 09c207eb2e7dd63d51c1f5e2abccf2562e6fd87e (diff) | |
simplify interrupt handling
We have removed spl levels, now remove the machinery to manage different
PIC masks according to levels. Only keep machinery to disable interrupts
whatever the level.
* i386/i386/pic.c (pic_mask): Remove array.
(picinit): Do not form PIC mask. Set initial PIC mask to 0.
(form_pic_mask): Remove function.
* i386/i386/pic.h (form_pic_mask, pic_mask): Remove declarations.
* i386/i386/spl.S (SETMASK): Remove macro.
(XEN_SETMASK): Add macro, containing the Xen version of SETMASK.
(spl0, splx_cli, spl) [MACH_XEN]: Call XEN_SETMASK instead of SETMASK.
* i386/i386/pit.c (clkstart): Do not call form_pic_mask.
* i386/i386at/autoconf.c (take_dev_irq, take_ctlr_irq): Likewise.
* i386/i386at/kd_mouse.c (kd_mouse_open, kd_mouse_close): Likewise.
* linux/dev/arch/i386/kernel/irq.c (mask_irq, unmask_irq): Directly update
curr_pic_mask without using pic_mask array.
(init_IRQ, restore_IRQ): do not call form_pic_mask.
* linux/dev/include/asm-i386/system.h: Include <i386/ipl.h>.
(__save_flags, __restore_flags): Use curr_ipl and splx instead of
hardware flags.
* linux/dev/init/main.c (linux_init): Do not call cli.
* linux/dev/kernel/sched.c (linux_timer_intr): Do not use pic_mask.
* linux/src/drivers/block/ide.c (try_to_identify): Disable irq probing.
* linux/src/drivers/scsi/NCR53c406a.c (NCR53c406a_detect): Disable irq
probing.
Diffstat (limited to 'i386/i386at')
| -rw-r--r-- | i386/i386at/autoconf.c | 2 | ||||
| -rw-r--r-- | i386/i386at/kd_mouse.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/i386/i386at/autoconf.c b/i386/i386at/autoconf.c index 908c3ec0..6ed2270c 100644 --- a/i386/i386at/autoconf.c +++ b/i386/i386at/autoconf.c @@ -130,7 +130,6 @@ void take_dev_irq( iunit[pic] = dev->unit; ivect[pic] = dev->intr; intpri[pic] = (int)dev->sysdep; - form_pic_mask(); } else { printf("The device below will clobber IRQ %d.\n", pic); printf("You have two devices at the same IRQ.\n"); @@ -151,7 +150,6 @@ void take_ctlr_irq( iunit[pic] = ctlr->unit; ivect[pic] = ctlr->intr; intpri[pic] = (int)ctlr->sysdep; - form_pic_mask(); } else { printf("The device below will clobber IRQ %d.\n", pic); printf("You have two devices at the same IRQ. This won't work.\n"); diff --git a/i386/i386at/kd_mouse.c b/i386/i386at/kd_mouse.c index 20a8c88c..05280055 100644 --- a/i386/i386at/kd_mouse.c +++ b/i386/i386at/kd_mouse.c @@ -228,7 +228,6 @@ kd_mouse_open( ivect[mouse_pic] = kdintr; oldspl = intpri[mouse_pic]; intpri[mouse_pic] = SPL6; - form_pic_mask(); splx(s); } @@ -291,7 +290,6 @@ kd_mouse_close( ivect[mouse_pic] = oldvect; intpri[mouse_pic] = oldspl; - form_pic_mask(); splx(s); } |