WebSVN – Kolibri OS – Diff – /kernel/branches/kolibri-ahci/blkdev/ahci.inc

 ahci_callbacks:
     dd  ahci_callbacks.end - ahci_callbacks
     dd  0   ; no close function
     dd  0   ; no closemedia function
     dd  ahci_querymedia
-    dd  ahci_read
+    dd  0;ahci_read
     dd  0;ahci_write
     dd  0   ; no flush function
     dd  0   ; use default cache size
 .end:
 hd_name db 'hd', 0, 0, 0
         stdcall ahci_port_identify, ecx
         cmp     [ecx + PORT_DATA.drive_type], AHCI_DEV_SATA
         jne     .after_add_disk ; skip adding disk code
+        ; register disk in system:
+        stdcall ahci_read_first_sector, ecx
         ; register disk in system:
         push    ecx edx
         mov     eax, [hd_counter]
         xor     edx, edx
         mov     ecx, 10
         stdcall disk_add, ahci_callbacks, hd_name, ecx, 0
         test    eax, eax
         jz      .disk_add_fail
+        stdcall disk_media_changed, eax, 1 ; system will scan for partitions on disk
         stdcall disk_media_changed, eax, 1 ; system will scan for partitions on disk
         jmp     .after_add_disk
 .disk_add_fail:
         pop     edx ecx
         xor     eax, eax
         ret
 endp
-; Read sectors
+;------------------------TEST-------------------------------
-; return value: 0 = success, otherwise = error
-proc ahci_read stdcall pdata: dword, buffer: dword, startsector: qword, numsectors_ptr:dword
+proc ahci_read_first_sector stdcall pdata: dword
         locals
             cmdslot dd ?
             cmdheader dd ?
             cmdtable  dd ?
-            numsectors dd ?
+            buf_phys  dd ?
-            buffer_pos dd ?
+            buf_virt  dd ?
-            buffer_length dd ?
+            ;numsectors dd ?
         endl
         pushad
         pushad
-        mov     ecx, ahci_mutex
-        call    mutex_lock
-;         xor     ecx, ecx
-;         mov     esi, [buffer]
-; .print_data:
-;         cmp     ecx, 512
-;         jae     .end_print_data
-;         mov     al, byte [esi + ecx]
-;         mov     byte [tmpstr], al
-;         mov     byte [tmpstr + 1], 0
-;         DEBUGF  1, "0x%x(%s) ", al:1, tmpstr
-;         inc     ecx
-;         jmp     .print_data
-; .end_print_data:
-;         DEBUGF  1, "\n"
-        mov     eax, [numsectors_ptr]
-        mov     eax, [eax]
-        mov     [numsectors], eax
         mov     ecx, ahci_mutex
-        DEBUGF  1, "  ahci_read: buffer = 0x%x, startsector = 0x%x:%x, numsectors = %u\n", [buffer], [startsector], [startsector + 4], eax
+        call    mutex_lock
         mov     esi, [pdata] ; esi - address of PORT_DATA struct of port
         mov     edi, [esi + PORT_DATA.port] ; edi - address of HBA_PORT struct of port
         DEBUGF  1, "No free cmdslot on port %u\n", [esi + PORT_DATA.portno]
         jmp     .ret
 .cmdslot_found:
         mov     [cmdslot], eax
-        ; DEBUGF  1, "Found free cmdslot %u on port %u\n", [cmdslot], [esi + PORT_DATA.portno]
+        DEBUGF  1, "Found free cmdslot %u on port %u\n", [cmdslot], [esi + PORT_DATA.portno]
         shl     eax, BSF sizeof.HBA_CMD_HDR
         add     eax, [esi + PORT_DATA.clb]
         mov     [eax + HBA_CMD_HDR.flags1], bl
         movzx   bx, [eax + HBA_CMD_HDR.flags2]
         btr     bx, 2 ; flag C = 0
         mov     [eax + HBA_CMD_HDR.flags2], bl
-        mov     ebx, [numsectors]
-        shl     ebx, 9 ; *= 512
-        mov     [buffer_length], ebx
-        dec     ebx
-        shr     ebx, 12 ; /= 4096
-        inc     ebx
-        mov     [eax + HBA_CMD_HDR.prdtl], bx
-        ;DEBUGF  1, "  prdtl = %u\n", [eax + HBA_CMD_HDR.prdtl]:2
+        mov     [eax + HBA_CMD_HDR.prdtl], 1
-        ; zero out the command table with its prdt entries
-        dec     ebx
-        shl     ebx, BSF sizeof.HBA_PRDT_ENTRY
-        add     ebx, sizeof.HBA_CMD_TBL
+        ; zero out the command table
-        stdcall _memset, [cmdtable], 0, ebx
-        DEBUGF  1, "  prdtl = %u\n", [eax + HBA_CMD_HDR.prdtl]:2
-        ;jmp     .ret
-        xor     ecx, ecx
-        movzx   edx, [eax + HBA_CMD_HDR.prdtl]
-        dec     edx
-        mov     eax, [buffer]
-        mov     [buffer_pos], eax
-.prdt_fill:
-        cmp     ecx, edx
-        jae     .prdt_fill_end
-        mov     ebx, [buffer_pos]
-        and     ebx, 0xFFF
-        call    get_pg_addr ; eax = phys addr
-        add     eax, ebx
-        DEBUGF  1, "  PHYS = 0x%x\n", eax
-        mov     ebx, ecx
-        shl     ebx, BSF sizeof.HBA_PRDT_ENTRY
-        add     ebx, [cmdtable]
-        add     ebx, HBA_CMD_TBL.prdt_entry ; now ebx - address of ecx'th prdt_entry
-        mov     [ebx + HBA_PRDT_ENTRY.dba], eax
-        mov     [ebx + HBA_PRDT_ENTRY.dbau], 0
-        and     [ebx + HBA_PRDT_ENTRY.flags], not 0x3FFFFF ; zero out lower 22 bits, they used for byte count
+        stdcall _memset, [cmdtable], 0, sizeof.HBA_CMD_TBL
-        or      [ebx + HBA_PRDT_ENTRY.flags], 4096 - 1 ; reason why -1 see in spec on this field
-        ; or      [eax + HBA_CMD_TBL.prdt_entry + HBA_PRDT_ENTRY.flags], 1 shl 31 ; enable interrupt on completion
+        DEBUGF  1, "  prdtl = %u\n", [eax + HBA_CMD_HDR.prdtl]:2
-        add     [buffer_pos], 4096
-        sub     [buffer_length], 4096
+        call    alloc_page
+        mov     [buf_phys], eax
-        inc     ecx
-        jmp     .prdt_fill
-.prdt_fill_end:
-        mov     ebx, [buffer_pos]
-        and     ebx, 0xFFF
-        call    get_pg_addr ; eax = phys addr
-        add     eax, ebx
+        stdcall map_io_mem, eax, 4096, PG_NOCACHE + PG_SWR  ; map to virt memory so we can work with it
-        DEBUGF  1, "  PHYS. = 0x%x\n", eax
+        mov     [buf_virt], eax
-        mov     ebx, ecx
-        shl     ebx, BSF sizeof.HBA_PRDT_ENTRY
-        add     ebx, [cmdtable]
-        add     ebx, HBA_CMD_TBL.prdt_entry ; now ebx - address of ecx'th prdt_entry
-        mov     [ebx + HBA_PRDT_ENTRY.dba], eax
+        mov     eax, [cmdtable]
-        mov     [ebx + HBA_PRDT_ENTRY.dbau], 0
+        mov     ebx, [buf_phys]
-        and     [ebx + HBA_PRDT_ENTRY.flags], not 0x3FFFFF ; zero out lower 22 bits, they used for byte count
+        DEBUGF  1, "DBA = 0x%x\n", ebx
-        mov     eax, [buffer_length]
+        mov     [eax + HBA_CMD_TBL.prdt_entry + HBA_PRDT_ENTRY.dba], ebx
-        dec     eax
+        mov     [eax + HBA_CMD_TBL.prdt_entry + HBA_PRDT_ENTRY.dbau], 0
-        DEBUGF  1, " DBC = %u\n", eax
+        and     [eax + HBA_CMD_TBL.prdt_entry + HBA_PRDT_ENTRY.flags], not 0x3FFFFF ; zero out lower 22 bits, they used for byte count
-        or      [ebx + HBA_PRDT_ENTRY.flags], eax ; reason why -1 see in spec on this field
+        or      [eax + HBA_CMD_TBL.prdt_entry + HBA_PRDT_ENTRY.flags], 512 - 1 ; reason why -1 see in spec on this field
         ; or      [eax + HBA_CMD_TBL.prdt_entry + HBA_PRDT_ENTRY.flags], 1 shl 31 ; enable interrupt on completion
         mov     eax, [cmdtable]
-        mov     byte [eax + HBA_CMD_TBL.cfis + FIS_REG_H2D.fis_type], FIS_TYPE_REG_H2D
-        movzx   ebx, byte [eax + HBA_CMD_TBL.cfis + FIS_REG_H2D.flags]
+        mov     byte [eax + HBA_CMD_TBL.cfis + FIS_REG_H2D.fis_type], FIS_TYPE_REG_H2D
-        bts     ebx, bit_AHCI_H2D_FLAG_CMD ; Set Command bit in H2D FIS.
-        mov     byte [eax + HBA_CMD_TBL.cfis + FIS_REG_H2D.flags], bl
+        movzx   ebx, byte [eax + HBA_CMD_TBL.cfis + FIS_REG_H2D.flags]
         bts     ebx, bit_AHCI_H2D_FLAG_CMD ; Set Command bit in H2D FIS.
-        mov     byte [eax + HBA_CMD_TBL.cfis + FIS_REG_H2D.command], ATA_CMD_READ_DMA_EX
         mov     byte [eax + HBA_CMD_TBL.cfis + FIS_REG_H2D.flags], bl
-        mov     ebx, dword [startsector]
         mov     byte [eax + HBA_CMD_TBL.cfis + FIS_REG_H2D.lba0], bl
-        shr     ebx, 8
-        mov     byte [eax + HBA_CMD_TBL.cfis + FIS_REG_H2D.lba1], bl
+        mov     byte [eax + HBA_CMD_TBL.cfis + FIS_REG_H2D.command], ATA_CMD_READ_DMA_EX
-        shr     ebx, 8
-        mov     byte [eax + HBA_CMD_TBL.cfis + FIS_REG_H2D.lba2], bl
+        mov     ebx, 0 ; start sector is 0
+        mov     byte [eax + HBA_CMD_TBL.cfis + FIS_REG_H2D.lba0], bl
+        mov     byte [eax + HBA_CMD_TBL.cfis + FIS_REG_H2D.lba1], bl
-        mov     byte [eax + HBA_CMD_TBL.cfis + FIS_REG_H2D.device], 1 shl 6 ; LBA mode
+        mov     byte [eax + HBA_CMD_TBL.cfis + FIS_REG_H2D.lba2], bl
-        shr     ebx, 8
+        mov     byte [eax + HBA_CMD_TBL.cfis + FIS_REG_H2D.device], 1 shl 6 ; LBA mode
         mov     byte [eax + HBA_CMD_TBL.cfis + FIS_REG_H2D.lba3], bl
-        mov     ebx, dword [startsector + 4]
+        mov     byte [eax + HBA_CMD_TBL.cfis + FIS_REG_H2D.lba4], bl
-        mov     byte [eax + HBA_CMD_TBL.cfis + FIS_REG_H2D.lba4], bl
+        mov     byte [eax + HBA_CMD_TBL.cfis + FIS_REG_H2D.lba5], bl
         shr     ebx, 8
+        ; num sectors to read  = 1
+        mov     byte [eax + HBA_CMD_TBL.cfis + FIS_REG_H2D.countl], 1
-        mov     byte [eax + HBA_CMD_TBL.cfis + FIS_REG_H2D.lba5], bl
+        mov     byte [eax + HBA_CMD_TBL.cfis + FIS_REG_H2D.counth], 0
-        mov     ebx, [numsectors]
+        ;mov     eax, [cmdheader]
-        mov     byte [eax + HBA_CMD_TBL.cfis + FIS_REG_H2D.countl], bl
+        ;DEBUGF  1, "PRDBC = %u\n", [eax + HBA_CMD_HDR.prdbc]
+        ; Wait on previous command to complete, before issuing new command.
+        stdcall ahci_port_wait, edi, AHCI_PORT_TIMEOUT
         shr     ebx, 8
-        mov     byte [eax + HBA_CMD_TBL.cfis + FIS_REG_H2D.counth], bl
+        mov     eax, [cmdslot]
         bts     [edi + HBA_PORT.command_issue], eax ; Issue the command
         ; Wait on previous command to complete, before issuing new command.
-        stdcall ahci_port_wait, edi, AHCI_PORT_TIMEOUT
+        ; mov     ebx, 20
         ; call    delay_hs
-        mov     eax, [cmdslot]
+        ; Wait for command completion
-        bts     [edi + HBA_PORT.command_issue], eax ; Issue the command
+        stdcall ahci_port_cmd_wait, edi, eax;, AHCI_PORT_CMD_TIMEOUT
-        ; Wait for command completion
+        DEBUGF  1, "sata_error register = 0x%x\n", [edi + HBA_PORT.sata_error]
         stdcall ahci_port_cmd_wait, edi, eax;, AHCI_PORT_CMD_TIMEOUT
         DEBUGF  1, "reading completed\n"
         DEBUGF  1, "sata_error register = 0x%x\n", [edi + HBA_PORT.sata_error]
         popad
         xor     eax, eax
         ret
 endp
+tmpstr2    rb 16
-tmpstr    rb 16
+;----------------------------------------------------------
 ; Start command engine
 ; in: eax - address of HBA_PORT structure

Subversion Repositories Kolibri OS

(root)/kernel/branches/kolibri-ahci/blkdev/ahci.inc – Rev 9140 → 9141