From f3bb0969f582e5972ec275241368276f0906ba10 Mon Sep 17 00:00:00 2001 From: "Marat Zakiyanov (Mario79)" Date: Fri, 23 Aug 2013 23:22:21 +0000 Subject: [PATCH] Fix for r.3762 - separate interrupt handlers for the irq14 and irq15. git-svn-id: svn://kolibrios.org@3870 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/trunk/blkdev/hd_drv.inc | 99 +++++++++++++++++++++++++++------- kernel/trunk/kernel.asm | 16 +++++- 2 files changed, 94 insertions(+), 21 deletions(-) diff --git a/kernel/trunk/blkdev/hd_drv.inc b/kernel/trunk/blkdev/hd_drv.inc index 5d50aa8a0a..e28ad343fd 100644 --- a/kernel/trunk/blkdev/hd_drv.inc +++ b/kernel/trunk/blkdev/hd_drv.inc @@ -722,17 +722,20 @@ wait_for_sector_dma_ide0: align 4 .wait: call change_task - cmp [IDE_common_irq_param], irq14_num - jnz .done + cmp [IDE_common_irq_param], 0 + jz .done call check_hd_wait_timeout cmp [hd_error], 0 jz .wait + pushfd + cli mov [IDE_common_irq_param], 0 mov dx, [IDEContrRegsBaseAddr] mov al, 0 out dx, al + popfd .done: pop edx pop eax @@ -747,18 +750,21 @@ wait_for_sector_dma_ide1: align 4 .wait: call change_task - cmp [IDE_common_irq_param], irq15_num - jnz .done + cmp [IDE_common_irq_param], 0 + jz .done call check_hd_wait_timeout cmp [hd_error], 0 jz .wait + pushfd + cli mov [IDE_common_irq_param], 0 mov dx, [IDEContrRegsBaseAddr] add dx, 8 mov al, 0 out dx, al + popfd .done: pop edx pop eax @@ -791,33 +797,72 @@ allow_dma_access db 0 endg ;----------------------------------------------------------------------------- align 4 +IDE_irq_14_handler: + cmp [IDE_common_irq_param], irq14_num + jne .exit + + pushfd + cli + pushad + + mov [IDE_common_irq_param], 0 + mov dx, [IDEContrRegsBaseAddr] + mov al, 0 + out dx, al + + popad + popfd +.exit: + mov al, 1 + ret +;----------------------------------------------------------------------------- +align 4 +IDE_irq_15_handler: + cmp [IDE_common_irq_param], irq15_num + jne .exit + + pushfd + cli + pushad + + mov [IDE_common_irq_param], 0 + mov dx, [IDEContrRegsBaseAddr] + add dx, 8 + mov al, 0 + out dx, al + + popad + popfd +.exit: + mov al, 1 + ret +;----------------------------------------------------------------------------- +align 4 IDE_common_irq_handler: + cmp [IDE_common_irq_param], 0 + je .exit + pushfd cli pushad xor ebx, ebx - mov eax, IDE_common_irq_param - cmp [eax], irq15_num - mov [eax], ebx - je @f -;-------------------------------------- mov dx, [IDEContrRegsBaseAddr] - mov al, 0 - out dx, al - jmp .end + mov eax, IDE_common_irq_param + cmp [eax], irq14_num + mov [eax], bl + xor eax, eax + je @f + + add dx, 8 ;-------------------------------------- align 4 @@: - mov dx, [IDEContrRegsBaseAddr] - add dx, 8 - mov al, 0 out dx, al -;-------------------------------------- -align 4 -.end: + popad popfd +.exit: mov al, 1 ret ;----------------------------------------------------------------------------- @@ -849,10 +894,12 @@ hd_read_dma: pop eax ret .notread: +; set data for PRD Table mov eax, IDE_descriptor_table mov dword [eax], IDE_DMA mov word [eax+4], 0x2000 sub eax, OS_BASE +; select controller Primary or Secondary mov dx, [IDEContrRegsBaseAddr] push eax mov eax, [hd_address_table] @@ -862,13 +909,21 @@ hd_read_dma: add edx, 8 @@: push edx +; Bus Master IDE PRD Table Address add edx, 4 +; save IDE_descriptor_table out dx, eax pop edx +; clear Bus Master IDE Command register mov al, 0 out dx, al +; set write to memory +; mov al, 8 ; 1000b +; out dx, al +; clear Bus Master IDE Status register +; clear Error bit and Interrupt bit add edx, 2 - mov al, 6 + mov al, 6 ; 110b out dx, al ; Select the desired drive @@ -958,18 +1013,23 @@ hd_read_dma: out dx, al ; ATACommand регистр команд ;-------------------------------------- .continue: +; select controller Primary or Secondary mov dx, [IDEContrRegsBaseAddr] mov eax, [hd_address_table] cmp [hdbase], eax ; 0x1F0 jz @f add dx, 8 @@: +; set write to memory and Start Bus Master mov al, 9 out dx, al + mov eax, [CURRENT_TASK] mov [dma_process], eax + mov eax, [TASK_BASE] mov [dma_slot_ptr], eax + mov eax, [hd_address_table] cmp [hdbase], eax ; 0x1F0 jnz .ide1 @@ -980,6 +1040,7 @@ hd_read_dma: mov [IDE_common_irq_param], irq15_num @@: popfd +; wait for interrupt mov eax, [hd_address_table] cmp [hdbase], eax ; 0x1F0 jnz .wait_ide1 diff --git a/kernel/trunk/kernel.asm b/kernel/trunk/kernel.asm index 0161aa86f4..3783560d07 100644 --- a/kernel/trunk/kernel.asm +++ b/kernel/trunk/kernel.asm @@ -1112,6 +1112,18 @@ if preboot_blogesc jne .bll1 end if + push eax edx + mov dx, [IDEContrRegsBaseAddr] + xor eax, eax + add dx, 2 + in al, dx + DEBUGF 1, "K : Primary Bus Master IDE Status Register %x\n", eax + + add dx, 8 + in al, dx + DEBUGF 1, "K : Secondary Bus Master IDE Status Register %x\n", eax + pop edx eax + cmp [IDEContrRegsBaseAddr], 0 setnz [dma_hdd] @@ -1142,9 +1154,9 @@ set_interrupts_for_IDE_controllers: cmp [IDEContrRegsBaseAddr], 0 je .end_set_interrupts - stdcall attach_int_handler, 14, IDE_common_irq_handler, 0 + stdcall attach_int_handler, 14, IDE_irq_14_handler, 0 DEBUGF 1, "K : Set IDE IRQ14 return code %x\n", eax - stdcall attach_int_handler, 15, IDE_common_irq_handler, 0 + stdcall attach_int_handler, 15, IDE_irq_15_handler, 0 DEBUGF 1, "K : Set IDE IRQ15 return code %x\n", eax jmp .enable_IDE_interrupt ;--------------------------------------