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

fixed the complete system lockup by programming the hardware interrupt masking properly

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18811 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Marcus Overhagen
2006-09-11 22:07:28 +00:00
parent ed67ddb83d
commit 329dab53e0
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/busses/ide/silicon_image_3112/silicon_image_3112.c
+13 -11
View File
@@ -358,17 +358,12 @@ controller_init(device_node_handle node, void *user_cookie, void **controller_co
if (asic_index == ASIC_SI3114) { if (asic_index == ASIC_SI3114) {
// I put a magic spell on you // I put a magic spell on you
temp = *(volatile uint32 *)mmio_addr + SI_BMDMA2; temp = *(volatile uint32 *)(mmio_addr + SI_BMDMA2);
*(volatile uint32 *)(mmio_addr + SI_BMDMA2) = temp | SI_INT_STEERING; *(volatile uint32 *)(mmio_addr + SI_BMDMA2) = temp | SI_INT_STEERING;
*(volatile uint32 *)(mmio_addr + SI_BMDMA2); // flush *(volatile uint32 *)(mmio_addr + SI_BMDMA2); // flush
} }
temp = *(volatile uint32 *)mmio_addr + SI_SYSCFG; // disable all sata phy interrupts
temp &= (asic_index == ASIC_SI3114) ? ~SI_MASK_4PORT : ~SI_MASK_2PORT;
*(volatile uint32 *)(mmio_addr + SI_SYSCFG) = temp;
*(volatile uint32 *)(mmio_addr + SI_SYSCFG); // flush
// disable interrupts
for (i = 0; i < asic_data[asic_index].channel_count; i++) for (i = 0; i < asic_data[asic_index].channel_count; i++)
*(volatile uint32 *)(mmio_addr + controller_channel_data[i].sien) = 0; *(volatile uint32 *)(mmio_addr + controller_channel_data[i].sien) = 0;
*(volatile uint32 *)(mmio_addr + controller_channel_data[0].sien); // flush *(volatile uint32 *)(mmio_addr + controller_channel_data[0].sien); // flush
@@ -381,6 +376,12 @@ controller_init(device_node_handle node, void *user_cookie, void **controller_co
delete_area(mmio_area); delete_area(mmio_area);
free(controller); free(controller);
} }
// unmask interrupts
temp = *(volatile uint32 *)(mmio_addr + SI_SYSCFG);
temp &= (asic_index == ASIC_SI3114) ? (~SI_MASK_4PORT) : (~SI_MASK_2PORT);
*(volatile uint32 *)(mmio_addr + SI_SYSCFG) = temp;
*(volatile uint32 *)(mmio_addr + SI_SYSCFG); // flush
*controller_cookie = controller; *controller_cookie = controller;
@@ -393,14 +394,15 @@ static status_t
controller_uninit(void *controller_cookie) controller_uninit(void *controller_cookie)
{ {
controller_data *controller = controller_cookie; controller_data *controller = controller_cookie;
int i; uint32 temp;
TRACE("controller_uninit enter\n"); TRACE("controller_uninit enter\n");
// disable interrupts // disable interrupts
for (i = 0; i < asic_data[controller->asic_index].channel_count; i++) temp = *(volatile uint32 *)(controller->mmio_addr + SI_SYSCFG);
*(volatile uint32 *)(controller->mmio_addr + controller_channel_data[i].sien) = 0; temp |= (controller->asic_index == ASIC_SI3114) ? SI_MASK_4PORT : SI_MASK_2PORT;
*(volatile uint32 *)(controller->mmio_addr + controller_channel_data[0].sien); // flush *(volatile uint32 *)(controller->mmio_addr + SI_SYSCFG) = temp;
*(volatile uint32 *)(controller->mmio_addr + SI_SYSCFG); // flush
remove_io_interrupt_handler(controller->int_num, handle_interrupt, controller); remove_io_interrupt_handler(controller->int_num, handle_interrupt, controller);