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

 $Revision$
 PCI_REG_STATUS_COMMAND = 0x0004
+PCI_REG_BAR5 = 0x0024
-PCI_REG_BAR5 = 0x0024
+AHCI_DBGLVL = 0 ; debug output verbosity level. 0 - less verbose, 1 - more verbose
 ; different SATA device signatures
 SATA_SIG_ATA	= 0x00000101	; SATA drive
 SATA_SIG_ATAPI	= 0xEB140101	; SATAPI drive
 AHCI_DEV_SATAPI = 4
 ; ATA commands
-ATA_IDENTIFY        = 0xEC
+ATA_IDENTIFY         = 0xEC
+ATA_CMD_READ_DMA_EX  = 0x25
-ATA_CMD_READ_DMA_EX = 0x25
+ATA_CMD_WRITE_DMA_EX = 0x35
 ; ATA constants
 ATA_DEV_BUSY    = 0x80
 ATA_DEV_DRQ     = 0x08
+; ATAPI commands
 ATAPI_IDENTIFY  = 0xA1
 ; ATAPI commands
-ATAPI_IDENTIFY  = 0xA1
+PRDT_MAX_ENTRIES = 16 ;65535
         bt      [esi + HBA_MEM.cap], 27 ; check Supports Staggered Spin-up bit in capabilities
         jnc     @f
         DEBUGF  1, "Supports Staggered Spin-up, spinning up the port..\n"
         or      [edi + HBA_PORT.command], (0x0002 or 0x0004 or 0x10000000)
         push    ebx
-        mov     ebx, 1 ; wait 10 ms
+        mov     ebx, 10 ; wait 100 ms
         call    delay_hs
         pop     ebx
 @@:
         ; Clear interrupt status and error status
         mov     [edi + HBA_PORT.sata_error], 0xFFFFFFFF
         pop     edx ecx
         xor     eax, eax
         ret
 endp
-; Read sectors
+; Read/write sectors
 ; return value: 0 = success, otherwise = error
-proc ahci_read stdcall pdata: dword, buffer: dword, startsector: qword, numsectors_ptr:dword
+proc ahci_rw_sectors stdcall pdata: dword, vbuf: dword, startsector: qword, numsectors: dword, is_write: dword
         locals
             cmdslot dd ?
             cmdheader dd ?
             cmdtable  dd ?
+            vbuf_orig dd ?
+            vbuf_len  dd ?
+            phys_region_start dd ?
-            numsectors dd ?
+            new_phys_region_start dd ?
-            buffer_pos dd ?
+            cur_prd   dd ?
+            cur_phys  dd ?
+            dbc       dd ?
+            cur_phys_page dd ?
+            next_phys_page dd ?
+            cur_antioffset dd ?
-            buffer_length dd ?
+            prdt_bytes_total dd ?
         endl
-        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:2, tmpstr
-;         inc     ecx
-;         jmp     .print_data
-; .end_print_data:
-;         DEBUGF  1, "\n"
-        mov     eax, [numsectors_ptr]
-        mov     eax, [eax]
-        mov     [numsectors], eax
+        pushad
-        DEBUGF  1, "  ahci_read: buffer = 0x%x, startsector = 0x%x:%x, numsectors = %u\n", [buffer], [startsector], [startsector + 4], eax
+        DEBUGF  AHCI_DBGLVL, "    ahci_rw_sectors: buffer = 0x%x, startsector = 0x%x:%x, numsectors = %u, is_write = %u\n", [vbuf], [startsector], [startsector + 4], [numsectors], [is_write]:1
         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
         mov     eax, edi
         call    ahci_find_cmdslot
         cmp     eax, -1
         jne      .cmdslot_found
-        DEBUGF  1, "No free cmdslot on port %u\n", [esi + PORT_DATA.portno]
+        DEBUGF  AHCI_DBGLVL, "No free cmdslot on port %u\n", [esi + PORT_DATA.portno]
-        jmp     .ret
+        jmp     .fail
 .cmdslot_found:
         mov     eax, [cmdheader]
         and     [eax + HBA_CMD_HDR.flags1], not 0x1F ; zero out lower 5 bits, they will be used for cfl
         or      [eax + HBA_CMD_HDR.flags1], (sizeof.FIS_REG_H2D / 4) ; set command fis length in dwords
         movzx   bx, [eax + HBA_CMD_HDR.flags1]
         btr     bx, 6 ; flag W = 0
+        cmp     [is_write], 1 ; if is_write then set W flag
+        jne     @f
+        bts     bx, 6
+@@:
         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     eax, [vbuf]
         mov     [vbuf_orig], eax
         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
+        mov     [vbuf_len], ebx
+        DEBUGF  AHCI_DBGLVL, "vbuf_len = %u bytes\n", ebx
+        mov     ebx, [vbuf]
+        and     ebx, 0xFFF
+        mov     eax, [vbuf]
+        call    get_pg_addr
+        add     eax, ebx
+        mov     [phys_region_start], eax
+        mov     [prdt_bytes_total], 0
+        mov     [cur_prd], 0
-        ;DEBUGF  1, "  prdtl = %u\n", [eax + HBA_CMD_HDR.prdtl]:2
+.fill_prdt:
+        cmp     [vbuf_len], 0
+        jbe     .fill_prdt_end
+        mov     eax, [vbuf]
+        call    get_pg_addr
+        mov     [cur_phys_page], eax
+        mov     eax, [vbuf]
+        add     eax, 4096
+        call    get_pg_addr
+        mov     [next_phys_page], eax
+        mov     eax, 4096
+        mov     ebx, [vbuf]
+        and     ebx, 0xFFF
-        ; zero out the command table with its prdt entries
+        sub     eax, ebx
-        dec     ebx
+        mov     [cur_antioffset], eax
-        shl     ebx, BSF sizeof.HBA_PRDT_ENTRY
+        mov     eax, [cur_phys_page]
+        add     eax, ebx
+        mov     [cur_phys], eax
+.check_if1:
+        mov     eax, [vbuf_len]
+        cmp     eax, [cur_antioffset]
-        add     ebx, sizeof.HBA_CMD_TBL
+        ja      .check_if2
+        mov     eax, [cur_phys]
+        sub     eax, [phys_region_start]
+        add     eax, [vbuf_len]
+        dec     eax
+        mov     [dbc], eax
+        mov     eax, [next_phys_page]
+        mov     [new_phys_region_start], eax
+        jmp     .add_prd
+.check_if2:
+        mov     eax, [cur_phys]
+        add     eax, [cur_antioffset]
+        cmp     eax, [next_phys_page]
+        je      .check_if3
+        mov     eax, [cur_phys]
+        add     eax, [cur_antioffset]
+        sub     eax, [phys_region_start]
+        dec     eax
+        mov     [dbc], eax
+        mov     eax, [next_phys_page]
+        mov     [new_phys_region_start], eax
+        jmp     .add_prd
+.check_if3:
+        mov     eax, [cur_phys]
+        add     eax, [cur_antioffset]
+        sub     eax, [phys_region_start]
+        cmp     eax, 4*1024*1024
+        jb      .after_ifs
-        stdcall _memset, [cmdtable], 0, ebx
+        mov     [dbc], 4*1024*1024 - 1
-        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, [phys_region_start]
-        mov     eax, [buffer]
+        add     eax, 4*1024*1024
-        mov     [buffer_pos], eax
-.prdt_fill:
-        cmp     ecx, edx
-        jae     .prdt_fill_end
+        jmp     .add_prd
-        mov     ebx, [buffer_pos]
-        and     ebx, 0xFFF
-        mov     eax, [buffer_pos]
+.after_ifs:
-        call    get_pg_addr ; eax = phys addr
+        jmp     .step_next
-        add     eax, ebx
+.add_prd:
+        mov     ebx, [cur_prd]
-        DEBUGF  1, "  PHYS = 0x%x\n", eax
+        shl     ebx, BSF sizeof.HBA_PRDT_ENTRY
-        mov     ebx, ecx
+        add     ebx, [cmdtable]
-        shl     ebx, BSF sizeof.HBA_PRDT_ENTRY
+        add     ebx, HBA_CMD_TBL.prdt_entry ; now ebx - address of 'th 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
+        DEBUGF  AHCI_DBGLVL, "Added PRDT entry: dba = 0x%x, dbc = %u\n", [phys_region_start], [dbc]
+        mov     eax, [phys_region_start]
+        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
+        mov     eax, [dbc]
+        or      [ebx + HBA_PRDT_ENTRY.flags], eax
-        and     [ebx + HBA_PRDT_ENTRY.flags], not 0x3FFFFF ; zero out lower 22 bits, they used for byte count
+        inc     [cur_prd]
-        or      [ebx + HBA_PRDT_ENTRY.flags], 4096 - 1 ; reason why -1 see in spec on this field
+        mov     eax, [dbc]
+        inc     eax
+        add     [prdt_bytes_total], eax
-        ; or      [eax + HBA_CMD_TBL.prdt_entry + HBA_PRDT_ENTRY.flags], 1 shl 31 ; enable interrupt on completion
+        mov     eax, [new_phys_region_start]
-        add     [buffer_pos], 4096
+        mov     [phys_region_start], eax
-        sub     [buffer_length], 4096
+        cmp     [cur_prd], PRDT_MAX_ENTRIES
+        jne     @f
+        jmp     .fill_prdt_end
-        inc     ecx
+@@:
-        jmp     .prdt_fill
-.prdt_fill_end:
+.step_next:
+        mov     eax, [vbuf_len]
+        cmp     eax, [cur_antioffset]
+        jbe     @f
-        mov     ebx, [buffer_pos]
+        mov     eax, [cur_antioffset]
-        and     ebx, 0xFFF
+@@:
-        mov     eax, [buffer_pos]
+        add     [vbuf], eax
-        call    get_pg_addr ; eax = phys addr
+        sub     [vbuf_len], eax
+        jmp     .fill_prdt
-        add     eax, ebx
-        DEBUGF  1, "  PHYS. = 0x%x\n", eax
-        DEBUGF  1, "  ecx = 0x%x\n", ecx
+.fill_prdt_end:
-        mov     ebx, ecx
-        shl     ebx, BSF sizeof.HBA_PRDT_ENTRY
+        mov     eax, [cmdheader]
-        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, [cur_prd]
-        mov     [ebx + HBA_PRDT_ENTRY.dbau], 0
+        DEBUGF  AHCI_DBGLVL, " PRDTL = %u\n", ebx
-        and     [ebx + HBA_PRDT_ENTRY.flags], not 0x3FFFFF ; zero out lower 22 bits, they used for byte count
+        mov     [eax + HBA_CMD_HDR.prdtl], bx
         mov     eax, [buffer_length]
-        dec     eax
+        mov     eax, [prdt_bytes_total]
-        DEBUGF  1, " DBC. = %u\n", eax
+        DEBUGF  AHCI_DBGLVL, " prdt_bytes_total = %u\n", eax
+        shr     eax, 9 ; /= 512
+        mov     [numsectors], eax
-        or      [ebx + HBA_PRDT_ENTRY.flags], eax ; reason why -1 see in spec on this field
+        mov     eax, [cmdtable]
-        ; or      [eax + HBA_CMD_TBL.prdt_entry + HBA_PRDT_ENTRY.flags], 1 shl 31 ; enable interrupt on completion
+        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     eax, [cmdtable]
+        bts     ebx, bit_AHCI_H2D_FLAG_CMD ; Set Command bit in H2D FIS.
-        mov     byte [eax + HBA_CMD_TBL.cfis + FIS_REG_H2D.fis_type], FIS_TYPE_REG_H2D
+        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     [edi + HBA_PORT.command_issue], eax ; Issue the command
         ; Wait for command completion
         stdcall ahci_port_cmd_wait, edi, eax;, AHCI_PORT_CMD_TIMEOUT
-        DEBUGF  1, "sata_error register = 0x%x\n", [edi + HBA_PORT.sata_error]
+        DEBUGF  AHCI_DBGLVL, "sata_error register = 0x%x\n", [edi + HBA_PORT.sata_error]
-        DEBUGF  1, "reading completed\n"
+        DEBUGF  AHCI_DBGLVL, "reading completed\n"
 ;         xor     ecx, ecx
-;         mov     esi, [buffer]
+;         mov     esi, [vbuf_orig]
 ;         inc     ecx
 ;         jmp     .print_data
 ; .end_print_data:
 ;         DEBUGF  1, "\n"
+        popad
+        ;mov     eax, [cmdheader]
+        ;mov     eax, [eax + HBA_CMD_HDR.prdbc]
+        mov     eax, [numsectors]
+        shl     eax, 9 ; *= 512
+        ret
+.fail:
+        popad
+        xor     eax, eax
+        ret
+endp
+tmpstr    rb 16
+; Read sectors
+; return value: 0 = success, otherwise = error
+proc ahci_read stdcall pdata: dword, buffer: dword, startsector: qword, numsectors_ptr:dword
+        locals
+                numsectors dd ?
+        endl
+        pushad
+        mov     ecx, ahci_mutex
+        call    mutex_lock
+        mov     eax, [numsectors_ptr]
+        mov     eax, [eax]
+        mov     [numsectors], eax
+        DEBUGF  AHCI_DBGLVL, "  ahci_read: buffer = 0x%x, startsector = 0x%x:%x, numsectors = %u\n", [buffer], [startsector], [startsector + 4], eax
+        xor     ecx, ecx ; how many sectors have been read
+.read_loop:
+        cmp     ecx, [numsectors]
+        jae     .read_loop_end
+        ; mov     eax, [buffer]
+        ; call    get_pg_addr
+        ; DEBUGF  1, "buf phys = 0x%x\n", eax
+        ; mov     eax, [buffer]
+        ; add     eax, 4096
+        ; call    get_pg_addr
+        ; DEBUGF  1, "buf + 4096 phys = 0x%x\n", eax
+        mov     ebx, [numsectors]
+        sub     ebx, ecx
+        ; DEBUGF  1, "buffer = 0x%x\n", [buffer]
+        stdcall ahci_rw_sectors, [pdata], [buffer], dword [startsector], dword [startsector + 4], ebx, 0
+        ;; TODO check if eax == 0 ?
+        DEBUGF  AHCI_DBGLVL, "    EAX = 0x%x\n", eax
+        add     [buffer], eax
+        shr     eax, 9 ; /=  512
+        add     ecx, eax
+        add     dword [startsector], eax
+        adc     dword [startsector + 4], 0
+        jmp     .read_loop
+.read_loop_end:
 .ret:
         mov     ecx, ahci_mutex
         call    mutex_unlock
         popad
         xor     eax, eax
-        ret
-endp
+        ret
-tmpstr    rb 16
+endp
 ; Start command engine
         jz      .wait_end
         inc     ecx
         jmp     .wait
 .wait_end:
         xor     eax, eax
-        DEBUGF  1, "port wait counter = %u\n", ecx
+        DEBUGF  AHCI_DBGLVL, "port wait counter = %u\n", ecx
         cmp     ecx, [timeout] ; if they equal it means port is hung
         setz    al
         pop     ecx ebx
         ret
 endp
         bt      [ebx + HBA_PORT.interrupt_status], bit_AHCI_HBA_PxIS_TFES ; check for Task File Error
         jc      .error
         inc     ecx
         jmp     .wait
 .wait_end:
-        DEBUGF  1, "port cmd wait counter = %u\n", ecx
+        DEBUGF  AHCI_DBGLVL, "port cmd wait counter = %u\n", ecx
         bt      [ebx + HBA_PORT.interrupt_status], bit_AHCI_HBA_PxIS_TFES ; check for Task File Error
         jc      .error
         jmp     .ret
 .error:
         mov     eax, 1
         mov     eax, [virt_page1]
         add     eax, 1024
         mov     [edi + PORT_DATA.fb], eax ; set pdata->fb
         stdcall _memset, eax, 0, 256 ; zero out
-        stdcall alloc_pages, 2
+        stdcall alloc_pages, 32*(64 + 16 + 48 + PRDT_MAX_ENTRIES*16)/4096
         mov     [phys_page23], eax
-        stdcall map_io_mem, eax, 2*4096, PG_NOCACHE + PG_SWR
+        stdcall map_io_mem, eax, 32*(64 + 16 + 48 + PRDT_MAX_ENTRIES*16), PG_NOCACHE + PG_SWR
         mov     [virt_page23], eax
-        ; Command table size = 256*32 = 8K per port
+        ; Command table size = N*32 per port
         mov     edx, [edi + PORT_DATA.clb] ; cmdheader array base
         xor     ecx, ecx
         mov     ebx, ecx
         shl     ebx, BSF sizeof.HBA_CMD_HDR
         add     ebx, edx ; ebx = cmdheader[ecx]
-        mov     [ebx + HBA_CMD_HDR.prdtl], 8 ; 8 prdt entries per command table
+        mov     [ebx + HBA_CMD_HDR.prdtl], PRDT_MAX_ENTRIES ; prdt entries per command table
-        ; 256 bytes per command table, 64+16+48+16*8
+        ; bytes per command table = 64+16+48+PRDT_MAX_ENTRIES*16 = N
+        push    edx
-        push    edx
+        ; cmdheader[ecx].ctba = phys_page23 + ecx*N
         mov     [ebx + HBA_CMD_HDR.ctba], ecx
-        ; cmdheader[ecx].ctba = phys_page23 + ecx*256
+        mov     edx, [ebx + HBA_CMD_HDR.ctba]
-        mov     [ebx + HBA_CMD_HDR.ctba], ecx
+        imul    edx, (64+16+48+PRDT_MAX_ENTRIES*16) ; *= N
-        shl     [ebx + HBA_CMD_HDR.ctba], BSF 256 ; *= 256
+        mov     [ebx + HBA_CMD_HDR.ctba], edx
         mov     eax, [ebx + HBA_CMD_HDR.ctba]
         mov     edx, [phys_page23]
         add     [ebx + HBA_CMD_HDR.ctba], edx
         add     eax, [virt_page23]
-        mov     [tmp], eax  ; tmp = virt_page23 + ecx*256
+        mov     [tmp], eax  ; tmp = virt_page23 + ecx*N
         lea     eax, [ecx*4 + edi + PORT_DATA.ctba_arr] ; eax = pdata->ctba_arr[ecx]
         mov     edx, [tmp]
-        mov     [eax], edx  ; pdata->ctba_arr[ecx] = virt_page23 + ecx*256
+        mov     [eax], edx  ; pdata->ctba_arr[ecx] = virt_page23 + ecx*N

Subversion Repositories Kolibri OS

(root)/kernel/branches/kolibri-ahci/blkdev/ahci.inc – Rev 9145 → 9162