GSoC/kolibrios-nvme-driver
2
0
Fork 0
mirror of https://git.missingno.dev/kolibrios-nvme-driver/ synced 2025-01-08 22:16:13 +01:00
Code Issues 2 Actions Activity

add assertions for nvme_identify and wip implementation of create_namespace

Browse Source
This commit is contained in:
Abdur-Rahman Mansoor 2024-06-06 13:28:31 -04:00
parent 8b8dca1c05
commit 654b095d6f
1 changed files with 50 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
drivers/nvme/nvme.asm
View File

@ -110,14 +110,41 @@ proc set_cdw0 stdcall, opcode:byte, cid:word
endp endp
proc nvme_identify stdcall, pci:dword, slot:dword, nsid:dword, dptr:dword, cid:word, cns:byte proc nvme_identify stdcall, pci:dword, nsid:dword, dptr:dword, cid:word, cns:byte
push esi push esi
mov esi, [pci] mov esi, [pci]
; It's important to check if CNS is a valid value here. In revision 1.0
; CNS is a 1 bit field and a two bit field in revision 1.1, using invalid
; values results in undefined behavior (see page 162 of NVMe 1.4 spec)
if __DEBUG__
push esi
mov esi, dword [esi + pcidev.mmio_ptr]
mov eax, dword [esi + NVME_MMIO.VS]
cmp eax, VS110
jne @f
cmp [cns], 11b
jle .ok
DEBUGF DBG_INFO, "(NVMe) FATAL ERROR: INVALID CNS VALUE ON v1.1.0 CONTROLLERS\n"
jmp .err
@@:
cmp eax, VS100
jne .ok
cmp [cns], 1b
jle .ok
DEBUGF DBG_INFO, "(NVMe) FATAL ERROR: INVALID CNS VALUE ON v1.0.0 CONTROLLERS\n"
jmp .err
.err:
jmp @b
.ok:
end if
mov esi, [esi + pcidev.sq_ptr] mov esi, [esi + pcidev.sq_ptr]
mov eax, [slot]
imul eax, sizeof.SQ_ENTRY
add esi, eax
stdcall memset, esi, 0, sizeof.SQ_ENTRY stdcall memset, esi, 0, sizeof.SQ_ENTRY
mov eax, [nsid] mov eax, [nsid]
@ -137,6 +164,22 @@ proc nvme_identify stdcall, pci:dword, slot:dword, nsid:dword, dptr:dword, cid:w
endp endp
; See pages 348-349 of the NVMe 1.4 specification for information on creating namespaces
proc create_namespace stdcall, pci:dword, cid:word
push esi
invoke AllocPage
test eax, eax
jz .fail
invoke GetPhysAddr
stdcall nvme_identify, [pci], 0xffffffff, eax, [cid], CNS_IDNS
.fail:
pop esi
ret
endp
; See page 101 of the NVMe 1.4 specification for reference ; See page 101 of the NVMe 1.4 specification for reference
proc create_io_completion_queue stdcall, pci:dword, prp1:dword, qid:word, ien:byte proc create_io_completion_queue stdcall, pci:dword, prp1:dword, qid:word, ien:byte
@ -216,6 +259,7 @@ proc abort stdcall, pci:dword, cid:word, sqid:word
endp endp
; See page 205 of the NVMe 1.4 specification for reference ; See page 205 of the NVMe 1.4 specification for reference
proc set_features stdcall, pci:dword, dptr:dword, fid:byte proc set_features stdcall, pci:dword, dptr:dword, fid:byte
@ -513,8 +557,8 @@ proc nvme_init stdcall, pci:dword
invoke AllocPage invoke AllocPage
test eax, eax test eax, eax
jz .exit_fail jz .exit_fail
; pci:dword, slot:dword, nsid:dword, dptr:dword, cid:word, cns:byte ; pci:dword, nsid:dword, dptr:dword, cid:word, cns:byte
stdcall nvme_identify, [pci], 0, 0, eax, 0, CNS_IDCS stdcall nvme_identify, [pci], 0, eax, 0, CNS_IDCS
xor eax, eax xor eax, eax
inc eax inc eax