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

* Cleanup, no functional change.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33951 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2009-11-08 17:31:39 +00:00
parent 9a72152e73
commit 01ce3f26d2
2 changed files with 44 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/kernel/arch/x86/arch_int.h
+5 -5
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2005, Axel Dörfler, [email protected]. All rights reserved. * Copyright 2005-2009, Axel Dörfler, [email protected].
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
#ifndef _KERNEL_ARCH_x86_INT_H #ifndef _KERNEL_ARCH_x86_INT_H
@@ -25,14 +25,14 @@ arch_int_disable_interrupts_inline(void)
asm volatile("pushfl;\n" asm volatile("pushfl;\n"
"popl %0;\n" "popl %0;\n"
"cli" : "=g" (flags)); "cli" : "=g" (flags));
return flags & 0x200 ? 1 : 0; return (flags & 0x200) != 0;
} }
static inline void static inline void
arch_int_restore_interrupts_inline(int oldstate) arch_int_restore_interrupts_inline(int oldState)
{ {
int flags = oldstate ? 0x200 : 0; int flags = oldState ? 0x200 : 0;
asm volatile("pushfl;\n" asm volatile("pushfl;\n"
"popl %0;\n" "popl %0;\n"
@@ -51,7 +51,7 @@ arch_int_are_interrupts_enabled_inline(void)
asm volatile("pushfl;\n" asm volatile("pushfl;\n"
"popl %0;\n" : "=g" (flags)); "popl %0;\n" : "=g" (flags));
return flags & 0x200 ? 1 : 0; return (flags & 0x200) != 0;
} }
src/system/kernel/arch/x86/arch_int.cpp
+39 -44
View File
@@ -1,12 +1,13 @@
/* /*
* Copyright 2009, Ingo Weinhold, [email protected]. * Copyright 2009, Ingo Weinhold, [email protected].
* Copyright 2002-2008, Axel Dörfler, [email protected]. * Copyright 2002-2009, Axel Dörfler, [email protected].
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Copyright 2001, Travis Geiselbrecht. All rights reserved. * Copyright 2001, Travis Geiselbrecht. All rights reserved.
* Distributed under the terms of the NewOS License. * Distributed under the terms of the NewOS License.
*/ */
#include <cpu.h> #include <cpu.h>
#include <int.h> #include <int.h>
#include <kscheduler.h> #include <kscheduler.h>
@@ -42,6 +43,7 @@
# define TRACE(x) ; # define TRACE(x) ;
#endif #endif
// Definitions for the PIC 8259 controller // Definitions for the PIC 8259 controller
// (this is not a complete list, only what we're actually using) // (this is not a complete list, only what we're actually using)
@@ -143,8 +145,7 @@ typedef struct interrupt_controller_s {
void (*end_of_interrupt)(int32 num); void (*end_of_interrupt)(int32 num);
} interrupt_controller; } interrupt_controller;
static interrupt_controller *sCurrentPIC = NULL; static const interrupt_controller *sCurrentPIC = NULL;
static const char *kInterruptNames[] = { static const char *kInterruptNames[] = {
/* 0 */ "Divide Error Exception", /* 0 */ "Divide Error Exception",
@@ -250,11 +251,13 @@ x86_get_idt(int32 cpu)
} }
/** Tests if the interrupt in-service register of the responsible // #pragma mark - PIC
* PIC is set for interrupts 7 and 15, and if that's not the case,
* it must assume it's a spurious interrupt.
*/
/*! Tests if the interrupt in-service register of the responsible
PIC is set for interrupts 7 and 15, and if that's not the case,
it must assume it's a spurious interrupt.
*/
static bool static bool
pic_is_spurious_interrupt(int32 num) pic_is_spurious_interrupt(int32 num)
{ {
@@ -275,11 +278,10 @@ pic_is_spurious_interrupt(int32 num)
} }
/** Sends a non-specified EOI (end of interrupt) notice to the PIC in /*! Sends a non-specified EOI (end of interrupt) notice to the PIC in
* question (or both of them). question (or both of them).
* This clears the PIC interrupt in-service bit. This clears the PIC interrupt in-service bit.
*/ */
static void static void
pic_end_of_interrupt(int32 num) pic_end_of_interrupt(int32 num)
{ {
@@ -415,6 +417,9 @@ pic_init(void)
} }
// #pragma mark - I/O APIC
static inline uint32 static inline uint32
ioapic_read_32(uint8 registerSelect) ioapic_read_32(uint8 registerSelect)
{ {
@@ -540,13 +545,7 @@ ioapic_configure_io_interrupt(int32 num, uint32 config)
static void static void
ioapic_init(kernel_args *args) ioapic_init(kernel_args *args)
{ {
uint32 i; static const interrupt_controller ioapicController = {
uint32 version;
uint64 targetAPIC;
void *settings;
acpi_module_info *acpi;
static interrupt_controller ioapicController = {
"82093AA IOAPIC", "82093AA IOAPIC",
&ioapic_enable_io_interrupt, &ioapic_enable_io_interrupt,
&ioapic_disable_io_interrupt, &ioapic_disable_io_interrupt,
@@ -560,18 +559,12 @@ ioapic_init(kernel_args *args)
return; return;
} }
bool disableAPIC = false; bool disableAPIC = get_safemode_boolean(B_SAFEMODE_DISABLE_APIC, false);
void *handle = load_driver_settings(B_SAFEMODE_DRIVER_SETTINGS);
if (handle != NULL) {
disableAPIC = get_driver_boolean_parameter(handle, B_SAFEMODE_DISABLE_APIC,
disableAPIC, disableAPIC);
unload_driver_settings(handle);
}
if (disableAPIC) { if (disableAPIC) {
args->arch_args.apic = NULL; args->arch_args.apic = NULL;
return; return;
} }
// always map the local apic as it can be used for timers even if we // always map the local apic as it can be used for timers even if we
// don't end up using the io apic // don't end up using the io apic
sLocalAPIC = args->arch_args.apic; sLocalAPIC = args->arch_args.apic;
@@ -581,23 +574,22 @@ ioapic_init(kernel_args *args)
panic("mapping the local apic failed"); panic("mapping the local apic failed");
return; return;
} }
if (args->arch_args.ioapic == NULL) { if (args->arch_args.ioapic == NULL) {
dprintf("no ioapic available, not using ioapics for interrupt routing\n"); dprintf("no ioapic available, not using ioapics for interrupt routing\n");
return; return;
} }
settings = load_driver_settings(B_SAFEMODE_DRIVER_SETTINGS); if (!get_safemode_boolean(B_SAFEMODE_DISABLE_IOAPIC, false)) {
if (settings != NULL && get_driver_boolean_parameter(settings, dprintf("ioapic explicitly disabled, not using ioapics for interrupt "
B_SAFEMODE_DISABLE_IOAPIC, false, false)) { "routing\n");
dprintf("ioapic explicitly disabled, not using ioapics for interrupt routing\n");
unload_driver_settings(settings);
return; return;
} else if (settings != NULL) }
unload_driver_settings(settings);
// TODO: remove when the PCI IRQ routing through ACPI is available below // TODO: remove when the PCI IRQ routing through ACPI is available below
return; return;
acpi_module_info *acpi;
if (get_module(B_ACPI_MODULE_NAME, (module_info **)&acpi) != B_OK) { if (get_module(B_ACPI_MODULE_NAME, (module_info **)&acpi) != B_OK) {
dprintf("acpi module not available, not configuring ioapic\n"); dprintf("acpi module not available, not configuring ioapic\n");
return; return;
@@ -606,13 +598,13 @@ ioapic_init(kernel_args *args)
// map in the ioapic // map in the ioapic
sIOAPIC = (ioapic *)args->arch_args.ioapic; sIOAPIC = (ioapic *)args->arch_args.ioapic;
if (map_physical_memory("ioapic", (void *)args->arch_args.ioapic_phys, if (map_physical_memory("ioapic", (void *)args->arch_args.ioapic_phys,
B_PAGE_SIZE, B_EXACT_ADDRESS, B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA, B_PAGE_SIZE, B_EXACT_ADDRESS,
(void **)&sIOAPIC) < B_OK) { B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA, (void **)&sIOAPIC) < 0) {
panic("mapping the ioapic failed"); panic("mapping the ioapic failed");
return; return;
} }
version = ioapic_read_32(IO_APIC_VERSION); uint32 version = ioapic_read_32(IO_APIC_VERSION);
if (version == 0xffffffff) { if (version == 0xffffffff) {
dprintf("ioapic seems inaccessible, not using it\n"); dprintf("ioapic seems inaccessible, not using it\n");
return; return;
@@ -621,13 +613,13 @@ ioapic_init(kernel_args *args)
sLevelTriggeredInterrupts = 0; sLevelTriggeredInterrupts = 0;
sIOAPICMaxRedirectionEntry sIOAPICMaxRedirectionEntry
= ((version >> IO_APIC_MAX_REDIRECTION_ENTRY_SHIFT) = ((version >> IO_APIC_MAX_REDIRECTION_ENTRY_SHIFT)
& IO_APIC_MAX_REDIRECTION_ENTRY_MASK); & IO_APIC_MAX_REDIRECTION_ENTRY_MASK);
// use the boot CPU as the target for all interrupts // use the boot CPU as the target for all interrupts
targetAPIC = args->arch_args.cpu_apic_id[0]; uint64 targetAPIC = args->arch_args.cpu_apic_id[0];
// program the interrupt vectors of the ioapic // program the interrupt vectors of the ioapic
for (i = 0; i <= sIOAPICMaxRedirectionEntry; i++) { for (uint32 i = 0; i <= sIOAPICMaxRedirectionEntry; i++) {
// initialize everything to deliver to the boot CPU in physical mode // initialize everything to deliver to the boot CPU in physical mode
// and masked until explicitly enabled through enable_io_interrupt() // and masked until explicitly enabled through enable_io_interrupt()
uint64 entry = (targetAPIC << IO_APIC_DESTINATION_FIELD_SHIFT) uint64 entry = (targetAPIC << IO_APIC_DESTINATION_FIELD_SHIFT)
@@ -657,7 +649,7 @@ ioapic_init(kernel_args *args)
} }
// setup default 1:1 mapping // setup default 1:1 mapping
for (i = 0; i < 256; i++) for (uint32 i = 0; i < 256; i++)
sIRQToIOAPICPin[i] = i; sIRQToIOAPICPin[i] = i;
// TODO: here ACPI needs to be used to properly set up the PCI IRQ // TODO: here ACPI needs to be used to properly set up the PCI IRQ
@@ -671,6 +663,9 @@ ioapic_init(kernel_args *args)
} }
// #pragma mark -
void void
arch_int_enable_io_interrupt(int irq) arch_int_enable_io_interrupt(int irq)
{ {
@@ -713,9 +708,9 @@ arch_int_disable_interrupts(void)
void void
arch_int_restore_interrupts(int oldstate) arch_int_restore_interrupts(int oldState)
{ {
arch_int_restore_interrupts_inline(oldstate); arch_int_restore_interrupts_inline(oldState);
} }