WebSVN – Kolibri OS – Diff – /kernel/trunk/blkdev/ahci.inc

                   rb (0x100 - 0xA0) ; 0xA0, Reserved
 ends
 ; --------------------------------------------------
+uglobal
 uglobal
+align 4
-align 4
+struct SD_DATA
-        ahci_controller AHCI_DATA
+        ahci_controller  AHCI_DATA
-        port_data_arr   rb (sizeof.PORT_DATA*AHCI_MAX_PORTS)
+        port_data_arr    rb (sizeof.PORT_DATA*AHCI_MAX_PORTS)
+        ahci_mutex       MUTEX
+ends
+sd1_data SD_DATA
+sd2_data SD_DATA
+sd3_data SD_DATA
+sd4_data SD_DATA
+sd5_data SD_DATA
+sd6_data SD_DATA
+sd7_data SD_DATA
+sd8_data SD_DATA
-        ahci_mutex      MUTEX
+sd_data dd ?
 endg
 iglobal
     dd  ahci_write
     dd  0   ; no flush function
     dd  0   ; use default cache size
 .end:
 hd_name db 'sd', 0, 0, 0
-hd_counter dd 0
+sd_counter dd 0
+controllers_counter dd 0
 endg
 ; -----------------------------------------------------------------------
 ; detect ahci controller and initialize
 align 4
-ahci_init:
-        mov     ecx, ahci_mutex
-        call    mutex_init
+ahci_init:
+        mov     ecx, sd1_data.ahci_controller
+        mov     esi, pcidev_list
-        mov     ecx, ahci_controller
+        mov     [sd_data], sd1_data
-        mov     esi, pcidev_list
+        mov     [sd_counter], 0
 .find_ahci_ctr:
         mov     esi, [esi + PCIDEV.fd]
         cmp     esi, pcidev_list
 .ahci_ctr_not_found:
         DEBUGF  1, "K: AHCI controller not found\n"
         ret
+.ahci_ctr_found:
+        push    esi
+        mov     ecx, [sd_data]
+        add     ecx, SD_DATA.ahci_mutex
+        call    mutex_init
+        mov     ecx, [sd_data]
-.ahci_ctr_found:
+        add     ecx, SD_DATA.ahci_controller
-        mov     [ahci_controller + AHCI_DATA.pcidev], esi
+        mov     [ecx + AHCI_DATA.pcidev], esi
         mov     eax, [esi+PCIDEV.class]
         movzx   ebx, byte [esi+PCIDEV.bus]
         inc     eax
         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]
-        stdcall map_io_mem, edi, eax, PG_SWR + PG_NOCACHE
+        add     ecx, SD_DATA.ahci_controller
+        mov     [ecx + AHCI_DATA.abar], eax
-        mov     [ahci_controller + AHCI_DATA.abar], eax
+        pop     ecx
         DEBUGF  1, "K: AHCI controller BAR5 mapped to virtual addr %x\n", eax
         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
         ; ; Print some register values to debug board
-        ; mov     esi, [ahci_controller + AHCI_DATA.abar]
+        ; mov     esi, [[sd_data].ahci_controller + AHCI_DATA.abar]
         ; 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
-        ; Request BIOS/OS ownership handoff, if supported. (TODO check correctness)
+        mov     esi, [ecx + AHCI_DATA.abar]
-        mov     esi, [ahci_controller + AHCI_DATA.abar]
+        pop     ecx
         ;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
         ; calculate irq line
         ; ahciHBA->ghc |= AHCI_GHC_IE;
         ; IDT::RegisterInterruptHandler(irq, InterruptHandler);
         ; ahciHBA->is = 0xffffffff;
         mov     [hd_counter], 0
         xor     ebx, ebx
 .detect_drives:
         cmp     ebx, AHCI_MAX_PORTS
         ; 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
-        mov     ecx, ebx
+        imul    ecx, sizeof.PORT_DATA
-        imul    ecx, sizeof.PORT_DATA
+        mov     ecx, [sd_data]
-        add     ecx, port_data_arr
+        add     ecx, SD_DATA.port_data_arr
         stdcall ahci_port_rebase, edi, ebx, ecx
         ; register disk in system:
         ;stdcall ahci_read_first_sector, ecx
         push    ecx
-        mov     eax, [hd_counter]
+        mov     eax, [sd_counter]
-        inc     [hd_counter]
+        inc     [sd_counter]
         xor     edx, edx
         mov     ecx, 10
-        div     ecx ; eax = hd_counter / 10, edx = hd_counter % 10
+        div     ecx ; eax = sd_counter / 10, edx = sd_counter % 10
         test    eax, eax
         jz      .concat_one
         add     al, '0'
         jmp     .detect_drives
+.end_detect_drives:
+        pop     esi
+        add     [sd_data], sizeof.SD_DATA
+        inc     [controllers_counter]
-.end_detect_drives:
+        cmp     [controllers_counter], 8
         jnz     .find_ahci_ctr
         DEBUGF  1, "AHCI: reached controllers number limit\n"
         ret
                 numsectors dd ?
         endl
         pushad
-        mov     ecx, ahci_mutex
+        mov     ecx, sd1_data.ahci_mutex
         call    mutex_lock
         adc     dword [startsector + 4], 0
         jmp     .read_loop
 .read_loop_end:
-        mov     ecx, ahci_mutex
+        mov     ecx, sd1_data.ahci_mutex
         call    mutex_unlock
                 numsectors dd ?
         endl
         pushad
-        mov     ecx, ahci_mutex
+        mov     ecx, sd1_data.ahci_mutex
         call    mutex_lock
         adc     dword [startsector + 4], 0
         jmp     .write_loop
 .write_loop_end:
-        mov     ecx, ahci_mutex
+        mov     ecx, sd1_data.ahci_mutex
         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, [ahci_controller + AHCI_DATA.abar]
+        mov     esi, [sd1_data.ahci_controller + AHCI_DATA.abar]
         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/trunk/blkdev/ahci.inc @ 9270 – Rev 9219 → 9231