i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Finally (!) fixed that stupid bug that prevented at least some Pentium-M laptops to

Browse Source 
work correctly when on power supply (ie. when running at full speed). Turns out we
misdetected a spurious interrupt on line 15 - we now ignore them completely which
seems to fix that problem.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17275 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2006-04-30 13:35:53 +00:00
parent aaff012f00
commit 5886ae3213
1 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/arch/x86/arch_int.c
+26 -15
View File
@@ -52,6 +52,10 @@
#define PIC_SLAVE_INIT3 PIC_SLAVE_MASK #define PIC_SLAVE_INIT3 PIC_SLAVE_MASK
#define PIC_SLAVE_INIT4 PIC_SLAVE_MASK #define PIC_SLAVE_INIT4 PIC_SLAVE_MASK
// the edge/level trigger control registers
#define PIC_MASTER_TRIGGER_MODE 0x4d0
#define PIC_SLAVE_TRIGGER_MODE 0x4d1
#define PIC_INIT1 0x10 #define PIC_INIT1 0x10
#define PIC_INIT1_SEND_INIT4 0x01 #define PIC_INIT1_SEND_INIT4 0x01
#define PIC_INIT3_IR2_IS_SLAVE 0x04 #define PIC_INIT3_IR2_IS_SLAVE 0x04
@@ -64,8 +68,8 @@
#define PIC_NON_SPECIFIC_EOI 0x20 #define PIC_NON_SPECIFIC_EOI 0x20
#define PIC_INT_BASE 0x20 #define PIC_INT_BASE ARCH_INTERRUPT_BASE
#define PIC_SLAVE_INT_BASE 0x28 #define PIC_SLAVE_INT_BASE (ARCH_INTERRUPT_BASE + 8)
#define PIC_NUM_INTS 0x0f #define PIC_NUM_INTS 0x0f
static const char *kInterruptNames[] = { static const char *kInterruptNames[] = {
@@ -94,13 +98,13 @@ static const int kInterruptNameCount = 20;
#define MAX_ARGS 16 #define MAX_ARGS 16
struct iframe_stack gBootFrameStack;
typedef struct { typedef struct {
uint32 a, b; uint32 a, b;
} desc_table; } desc_table;
static desc_table *sIDT = NULL; static desc_table *sIDT = NULL;
struct iframe_stack gBootFrameStack;
static void static void
set_gate(desc_table *gate_addr, addr_t addr, int type, int dpl) set_gate(desc_table *gate_addr, addr_t addr, int type, int dpl)
@@ -143,21 +147,21 @@ x86_set_task_gate(int32 n, int32 segment)
* it must assume it's a spurious interrupt. * it must assume it's a spurious interrupt.
*/ */
static bool static inline bool
pic_is_spurious_interrupt(int32 num) pic_is_spurious_interrupt(int32 num)
{ {
int32 port, isr; int32 isr;
if (num == 7) if (num != 7)
port = PIC_MASTER_CONTROL;
else if (num == 15)
port = PIC_SLAVE_CONTROL;
else
return false; return false;
out8(PIC_CONTROL3 | PIC_CONTROL3_READ_ISR, port); // Note, detecting spurious interrupts on line 15 obviously doesn't
isr = in8(port); // work correctly - and since those are extremely rare, anyway, we
out8(PIC_CONTROL3 | PIC_CONTROL3_READ_IRR, port); // just ignore them
out8(PIC_CONTROL3 | PIC_CONTROL3_READ_ISR, PIC_MASTER_CONTROL);
isr = in8(PIC_MASTER_CONTROL);
out8(PIC_CONTROL3 | PIC_CONTROL3_READ_IRR, PIC_MASTER_CONTROL);
return (isr & 0x80) == 0; return (isr & 0x80) == 0;
} }
@@ -203,6 +207,11 @@ pic_init(void)
out8(0xfb, PIC_MASTER_MASK); // Mask off all interrupts (except slave pic line IRQ 2). out8(0xfb, PIC_MASTER_MASK); // Mask off all interrupts (except slave pic line IRQ 2).
out8(0xff, PIC_SLAVE_MASK); // Mask off interrupts on the slave. out8(0xff, PIC_SLAVE_MASK); // Mask off interrupts on the slave.
// dump which interrupts are level or edge triggered
TRACE(("PIC level trigger mode: %04x\n", in8(PIC_MASTER_TRIGGER_MODE)
| (in8(PIC_SLAVE_TRIGGER_MODE) << 8)));
} }
@@ -504,8 +513,10 @@ i386_handle_trap(struct iframe frame)
if (frame.vector >= ARCH_INTERRUPT_BASE) { if (frame.vector >= ARCH_INTERRUPT_BASE) {
// This is a workaround for spurious assertions of interrupts 7/15 // This is a workaround for spurious assertions of interrupts 7/15
// which seems to be an often seen problem on the PC platform // which seems to be an often seen problem on the PC platform
if (pic_is_spurious_interrupt(frame.vector - ARCH_INTERRUPT_BASE)) if (pic_is_spurious_interrupt(frame.vector - ARCH_INTERRUPT_BASE)) {
TRACE(("got spurious interrupt at vector %ld\n", frame.vector));
break; break;
}
pic_end_of_interrupt(frame.vector); pic_end_of_interrupt(frame.vector);