GSoC/kolibrios-nvme-driver
2
0
Fork 0
mirror of https://git.missingno.dev/kolibrios-nvme-driver/ synced 2025-01-09 06:25:55 +01:00
Code Issues 2 Actions Activity

refactor(nvme_init): use separately allocated queue pointers instead of using dptr

Browse Source
This commit is contained in:
Abdur-Rahman Mansoor 2024-06-20 18:14:28 -04:00
parent 0cb86ee2ab
commit ca5ccaa86b
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/nvme/nvme.asm
View File

@ -511,7 +511,7 @@ proc nvme_init stdcall, pci:dword
; we want to disable all interrupts for now, since the controller randomly ; we want to disable all interrupts for now, since the controller randomly
; generates interrupts while starting up ; generates interrupts while starting up
mov dword [edi + NVME_MMIO.INTMS], 0xffffffff ;mov dword [edi + NVME_MMIO.INTMS], 0xffffffff
; Attach interrupt handler ; Attach interrupt handler
movzx eax, byte [esi + pcidev.iline] movzx eax, byte [esi + pcidev.iline]
@ -523,45 +523,45 @@ proc nvme_init stdcall, pci:dword
; Restart the controller ; Restart the controller
stdcall nvme_controller_start, edi stdcall nvme_controller_start, edi
mov dword [edi + NVME_MMIO.INTMC], 0xffffffff ; re-enable interrupts ;mov dword [edi + NVME_MMIO.INTMC], 0xffffffff ; re-enable interrupts
invoke KernelAlloc, 0x1000 invoke KernelAlloc, 0x1000
test eax, eax test eax, eax
jz .exit_fail jz .exit_fail
mov dword [dptr], eax mov ebx, eax
invoke GetPhysAddr invoke GetPhysAddr
; pci:dword, nsid:dword, dptr:dword, cns:byte ; pci:dword, nsid:dword, dptr:dword, cns:byte
stdcall nvme_identify, [pci], 0, eax, CNS_IDCS stdcall nvme_identify, [pci], 0, eax, CNS_IDCS
stdcall nvme_cmd_wait, [pci], 0, 0 stdcall nvme_cmd_wait, [pci], 0, 0
mov edx, dword [dptr] mov edi, ebx
lea edx, byte [edx + IDENTC.sn] lea ebx, byte [edi + IDENTC.sn]
lea eax, byte [esi + pcidev.serial] lea eax, byte [esi + pcidev.serial]
stdcall memcpy, eax, edx, 20 stdcall memcpy, eax, ebx, 20
DEBUGF DBG_INFO, "(NVMe) Serial Number: %s\n", eax DEBUGF DBG_INFO, "(NVMe) Serial Number: %s\n", eax
add edx, 20 add ebx, 20
lea eax, byte [esi + pcidev.model] lea eax, byte [esi + pcidev.model]
stdcall memcpy, eax, edx, 40 stdcall memcpy, eax, ebx, 40
DEBUGF DBG_INFO, "(NVMe) Model: %s\n", eax DEBUGF DBG_INFO, "(NVMe) Model: %s\n", eax
mov ebx, dword [esi + pcidev.version] mov edx, dword [esi + pcidev.version]
mov esi, dword [dptr]
cmp ebx, VS140 cmp edx, VS140
jl @f jl @f
; This is a reserved field in pre-1.4 controllers ; This is a reserved field in pre-1.4 controllers
mov al, byte [esi + IDENTC.cntrltype] mov al, byte [edi + IDENTC.cntrltype]
cmp al, CNTRLTYPE_IO_CONTROLLER cmp al, CNTRLTYPE_IO_CONTROLLER
jne .exit_fail jne .exit_fail
DEBUGF DBG_INFO, "(NVMe) I/O controller detected...\n" DEBUGF DBG_INFO, "(NVMe) I/O controller detected...\n"
@@: @@:
mov al, byte [esi + IDENTC.sqes] mov al, byte [edi + IDENTC.sqes]
and al, 11110000b and al, 11110000b
cmp al, 0x60 ; maximum submission queue size should at least be 64 bytes cmp al, 0x60 ; maximum submission queue size should at least be 64 bytes
jl .exit_fail jl .exit_fail
mov al, byte [esi + IDENTC.cqes] mov al, byte [edi + IDENTC.cqes]
and al, 11110000b and al, 11110000b
and al, 0x40 ; maximum completion queue entry size should at least be 16 bytes and al, 0x40 ; maximum completion queue entry size should at least be 16 bytes
jl .exit_fail jl .exit_fail
invoke KernelFree, edi
mov eax, (NVM_ASQS - 1) or ((NVM_ACQS - 1) shl 16) ; CDW11 (set the number of queues we want) mov eax, (NVM_ASQS - 1) or ((NVM_ACQS - 1) shl 16) ; CDW11 (set the number of queues we want)
stdcall set_features, [pci], NULLPTR, FID_NUMBER_OF_QUEUES, eax stdcall set_features, [pci], NULLPTR, FID_NUMBER_OF_QUEUES, eax
@ -578,10 +578,19 @@ proc nvme_init stdcall, pci:dword
jnz .exit_fail jnz .exit_fail
; Create I/O Queues ; Create I/O Queues
mov eax, dword [dptr] mov esi, [pci]
mov esi, dword [esi + pcidev.queue_entries]
lea esi, [esi + sizeof.NVM_QUEUE_ENTRY]
invoke KernelAlloc, 0x1000
test eax, eax
jz .exit_fail
mov dword [esi + NVM_QUEUE_ENTRY.cq_ptr], eax
invoke GetPhysAddr invoke GetPhysAddr
stdcall create_io_completion_queue, [pci], eax, 1, IEN_ON stdcall create_io_completion_queue, [pci], eax, 1, IEN_ON
mov eax, dword [dptr] invoke KernelAlloc, 0x1000
test eax, eax
jz .exit_fail
mov dword [esi + NVM_QUEUE_ENTRY.sq_ptr], eax
invoke GetPhysAddr invoke GetPhysAddr
stdcall create_io_submission_queue, [pci], eax, 1, 1 stdcall create_io_submission_queue, [pci], eax, 1, 1
@ -880,7 +889,6 @@ endp
align 4 align 4
p_nvme_devices dd 0 p_nvme_devices dd 0
pcidevs_len dd 0 pcidevs_len dd 0
dptr dd ?
my_service db "NVMe",0 ;max 16 chars include zero my_service db "NVMe",0 ;max 16 chars include zero
if __DEBUG__ if __DEBUG__
include_debug_strings include_debug_strings