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

 FIS_TYPE_DATA       = 0x46 ; Data FIS - bidirectional
 FIS_TYPE_BIST       = 0x58 ; BIST activate FIS - bidirectional
 FIS_TYPE_PIO_SETUP  = 0x5F ; PIO setup FIS - device to host
 FIS_TYPE_DEV_BITS   = 0xA1 ; Set device bits FIS - device to host
-struct AHCI_DATA
-        abar    dd ?       ; pointer to HBA Memory (BAR5) mapped to virtual kernelspace memory
-        pcidev  dd ?       ; pointer to corresponding PCIDEV structure
-ends
 ; Generic Host Control registers
 struct HBA_MEM
         cap                   dd ?                    ; 0x00, Host capabilities
         ghc                   dd ?                    ; 0x04, Global host control
 ; --------------------------------------------------
 uglobal
+align 4
-align 4
+; AHCI controller structure
+struct AHCI_CTR
-struct SD_DATA
+        abar             dd ?    ; pointer to HBA Memory (BAR5) mapped to virtual kernelspace memory
-        ahci_controller  AHCI_DATA
+        pcidev           dd ?    ; pointer to corresponding PCIDEV structure
         port_data_arr    rb (sizeof.PORT_DATA*AHCI_MAX_PORTS)
-        ahci_mutex       MUTEX
+        mutex            MUTEX
 ends
-sd1_data SD_DATA
+ctr1_data AHCI_CTR
-sd2_data SD_DATA
+ctr2_data AHCI_CTR
-sd3_data SD_DATA
+ctr3_data AHCI_CTR
-sd4_data SD_DATA
+ctr4_data AHCI_CTR
-sd5_data SD_DATA
+ctr5_data AHCI_CTR
-sd6_data SD_DATA
+ctr6_data AHCI_CTR
-sd7_data SD_DATA
+ctr7_data AHCI_CTR
-sd8_data SD_DATA
+ctr8_data AHCI_CTR
-sd_data dd ?
+ctr_ptr dd ?
     dd  ahci_write
     dd  0   ; no flush function
     dd  0   ; use default cache size
 .end:
 hd_name db 'sd', 0, 0, 0
-sd_counter dd 0
+sata_dev_counter dd 0    ; sata devices counter
+; TODO: satapi_dev_counter dd 0 ; satapi devices (optical drives) counter
-controllers_counter dd 0
+ctr_counter dd 0         ; controllers counter
 endg
 ; -----------------------------------------------------------------------
 ; detect ahci controller and initialize
 align 4
-ahci_init:
-        mov     ecx, sd1_data.ahci_controller
+ahci_init:
         mov     esi, pcidev_list
-        mov     [sd_data], sd1_data
+        mov     [ctr_ptr], ctr1_data
-        mov     [sd_counter], 0
+        mov     [sata_dev_counter], 0
 .find_ahci_ctr:
         mov     esi, [esi + PCIDEV.fd]
         cmp     esi, pcidev_list
         jz      .ahci_ctr_not_found
         ret
 .ahci_ctr_found:
         push    esi
-        mov     ecx, [sd_data]
+        mov     ecx, [ctr_ptr]
-        add     ecx, SD_DATA.ahci_mutex
+        add     ecx, AHCI_CTR.mutex
-        call    mutex_init
+        call    mutex_init
         mov     ecx, [sd_data]
-        add     ecx, SD_DATA.ahci_controller
+        mov     ecx, [ctr_ptr]
-        mov     [ecx + AHCI_DATA.pcidev], esi
+        mov     [ecx + AHCI_CTR.pcidev], esi
         DEBUGF  1, "K: AHCI: MMIO region size = 0x%x bytes\n", eax
         ; Map MMIO region to virtual memory
         stdcall map_io_mem, edi, eax, PG_SWR + PG_NOCACHE
         push    ecx
-        mov     ecx, [sd_data]
-        add     ecx, SD_DATA.ahci_controller
+        mov     ecx, [ctr_ptr]
-        mov     [ecx + AHCI_DATA.abar], eax
+        mov     [ecx + AHCI_CTR.abar], eax
         pop     ecx
         DEBUGF  1, "K: AHCI controller BAR5 mapped to virtual addr %x\n", eax
         or      eax, 0x06 ; pci.command |= 0x06 (dma bus mastering + memory space access)
         btr     eax, 10 ; clear the "disable interrupts" bit
         DEBUGF  1, "K: AHCI: pci_status_command = %x\n", eax
         stdcall pci_write32, ebx, ebp, PCI_REG_STATUS_COMMAND, eax
+        mov     esi, [ctr_ptr]
+        mov     esi, [esi + AHCI_CTR.abar]
-        ; ; Print some register values to debug board
-        ; mov     esi, [[sd_data].ahci_controller + AHCI_DATA.abar]
+        ; ; Print some register values to debug board
         ; DEBUGF  1, "K: AHCI: HBA.cap = %x, HBA.ghc = %x, HBA_MEM.version = %x\n", [esi + HBA_MEM.cap], [esi + HBA_MEM.ghc], [esi + HBA_MEM.version]
-        ;-------------------------------------------------------
-        ; Request BIOS/OS ownership handoff, if supported. (TODO check correctness)
-        push    ecx
-        mov     ecx, [sd_data]
-        add     ecx, SD_DATA.ahci_controller
-        mov     esi, [ecx + AHCI_DATA.abar]
+        ;-------------------------------------------------------
-        pop     ecx
+        ; Request BIOS/OS ownership handoff, if supported. (TODO check correctness)
         ;mov     ebx, [esi + HBA_MEM.cap2]
         ;DEBUGF  1, "K: AHCI: HBA_MEM.cap2 = %x\n", ebx
         bt      [esi + HBA_MEM.cap2], bit_AHCI_HBA_CAP2_BOH
         ; DEBUGF  1, "K: AHCI: found drive at port %d, cmd = 0x%x, ssts = 0x%x, signature = 0x%x\n", ebx, [edi + HBA_PORT.command], [edi + HBA_PORT.sata_status], [edi + HBA_PORT.signature]
         mov     ecx, ebx
         imul    ecx, sizeof.PORT_DATA
-        mov     ecx, [sd_data]
+        add     ecx, AHCI_CTR.port_data_arr
-        add     ecx, SD_DATA.port_data_arr
+        add     ecx, [ctr_ptr]
         stdcall ahci_port_rebase, edi, ebx, ecx
         ; register disk in system:
         ;stdcall ahci_read_first_sector, ecx
         push    ecx
-        mov     eax, [sd_counter]
+        mov     eax, [sata_dev_counter]
-        inc     [sd_counter]
+        inc     [sata_dev_counter]
         xor     edx, edx
         mov     ecx, 10
-        div     ecx ; eax = sd_counter / 10, edx = sd_counter % 10
+        div     ecx ; eax = sata_dev_counter / 10, edx = sata_dev_counter % 10
         test    eax, eax
         jz      .concat_one
         add     al, '0'
 .end_detect_drives:
         pop     esi
-        add     [sd_data], sizeof.SD_DATA
+        add     [ctr_ptr], sizeof.AHCI_CTR
-        inc     [controllers_counter]
+        inc     [ctr_counter]
-        cmp     [controllers_counter], 8
+        cmp     [ctr_counter], 8
         jnz     .find_ahci_ctr
         pop     edx ecx
         xor     eax, eax
         ret
 endp
-; Read/write sectors
+; Read/write sectors, note: currently work for SATA, not SATAPI
 ; return value: 0 = success, otherwise = error
 proc ahci_rw_sectors stdcall pdata: dword, vbuf: dword, startsector: qword, numsectors: dword, is_write: dword
         locals
             cmdslot dd ?
                 numsectors dd ?
         endl
         pushad
-        mov     ecx, sd1_data.ahci_mutex
+        mov     ecx, ctr1_data.mutex  ; why ctr1 ? TODO: make for corresponding controller
         call    mutex_lock
         adc     dword [startsector + 4], 0
         jmp     .read_loop
 .read_loop_end:
-        mov     ecx, sd1_data.ahci_mutex
+        mov     ecx, ctr1_data.mutex  ; why ctr1 ? TODO: make for corresponding controller
         call    mutex_unlock
                 numsectors dd ?
         endl
         pushad
-        mov     ecx, sd1_data.ahci_mutex
+        mov     ecx, ctr1_data.mutex  ; why ctr1 ? TODO: make for corresponding controller
         call    mutex_lock
         adc     dword [startsector + 4], 0
         jmp     .write_loop
 .write_loop_end:
-        mov     ecx, sd1_data.ahci_mutex
+        mov     ecx, ctr1_data.mutex  ; why ctr1 ? TODO: make for corresponding controller
         call    mutex_unlock
         push    ebx ecx edx esi
         ; If not set in SACT and CI, the slot is free
         mov     ebx, [eax + HBA_PORT.sata_active]
         or      ebx, [eax + HBA_PORT.command_issue] ; ebx = slots
-        mov     esi, [sd1_data.ahci_controller + AHCI_DATA.abar]
+        mov     esi, [ctr1_data.abar] ; why ctr1 ? TODO: make for corresponding controller
         mov     edx, [esi + HBA_MEM.cap]
         shr     edx, 8
         and     edx, 0xf
         ; DEBUGF  1, "Number of Command Slots on each port = %u\n", edx

Subversion Repositories Kolibri OS

(root)/kernel/branches/kolibri-ahci/blkdev/ahci.inc – Rev 9264 → 9271