mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-11-02 07:28:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

nvme: properly support versions older than 1.4

Browse Source
This commit is contained in:
Matheus
2023-08-07 20:36:01 -03:00
parent ff52baf4f4
commit bd715ac5e9
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel-src/io/block/nvme.c
+13 -2
View File
@@ -678,13 +678,14 @@ static void initcontroller(pcienum_t *e) {
if (STATUS_FATAL(bar0->status)) { if (STATUS_FATAL(bar0->status)) {
printf("nvme: controller returned fatal while initializing\n"); printf("nvme: controller returned fatal while initializing\n");
pmm_free(acq, 2);
return; return;
} }
nvmecontroller_t *controller = alloc(sizeof(nvmecontroller_t)); nvmecontroller_t *controller = alloc(sizeof(nvmecontroller_t));
__assert(controller); __assert(controller);
controller->id = ctlrid++; controller->id = ctlrid;
controller->bar0 = bar0; controller->bar0 = bar0;
controller->dbstride = CAP_DOORBELLSTRIDE(bar0->cap); controller->dbstride = CAP_DOORBELLSTRIDE(bar0->cap);
controller->maxentries = CAP_MAXENTRIES(bar0->cap); controller->maxentries = CAP_MAXENTRIES(bar0->cap);
@@ -713,7 +714,17 @@ static void initcontroller(pcienum_t *e) {
__assert(controllerid); __assert(controllerid);
__assert(IDENTIFY_CONTROLLER(controller, controllerid) == 0); __assert(IDENTIFY_CONTROLLER(controller, controllerid) == 0);
__assert(controllerid->type == CONTROLLER_TYPE_IO); // <=1.3 controllers will report a 0 in this field. >=1.4 controllers have a proper type here
if (controllerid->type != 0 && controllerid->type != CONTROLLER_TYPE_IO) {
printf("nvme: controller type not supported\n");
// FIXME free ISRs
pmm_free(acq, 2);
free(controllerid);
free(controller);
return;
}
++ctlrid;
resetsoftwareprogress(controller); resetsoftwareprogress(controller);