xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

sdnvme: pass 0 instead of 0xffffffff as NSID for identify controller and create completion/submission queue commands (thanks Ori_B)

Browse source 
Samsung SSD 960 EVO fails with invalid namespace error otherwise...
This commit is contained in:
cinap_lenrek 2017-08-29 09:52:53 +02:00
parent c4e51c5678
commit 30ea7ad58a
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sys/src/9/pc/sdnvme.c
View file

@ -394,7 +394,7 @@ setupqueues(Ctlr *ctlr)
/* CQID1: shared completion queue */ /* CQID1: shared completion queue */
cq = &ctlr->cq[1]; cq = &ctlr->cq[1];
cqalloc(ctlr, cq, lgsize); cqalloc(ctlr, cq, lgsize);
e = qcmd(&ws, ctlr, 1, 0x05, ~0, nil, cq->base, 1<<lgsize); e = qcmd(&ws, ctlr, 1, 0x05, 0, nil, cq->base, 1<<lgsize);
e[10] = (cq - ctlr->cq) | cq->mask<<16; e[10] = (cq - ctlr->cq) | cq->mask<<16;
e[11] = 3; /* IEN | PC */ e[11] = 3; /* IEN | PC */
checkstatus(wcmd(&ws), "create completion queue"); checkstatus(wcmd(&ws), "create completion queue");
@ -403,7 +403,7 @@ setupqueues(Ctlr *ctlr)
for(i=1; i<=conf.nmach; i++){ for(i=1; i<=conf.nmach; i++){
sq = &ctlr->sq[i]; sq = &ctlr->sq[i];
sqalloc(ctlr, sq, 12); sqalloc(ctlr, sq, 12);
e = qcmd(&ws, ctlr, 1, 0x01, ~0, nil, sq->base, 0x1000); e = qcmd(&ws, ctlr, 1, 0x01, 0, nil, sq->base, 0x1000);
e[10] = i | sq->mask<<16; e[10] = i | sq->mask<<16;
e[11] = (cq - ctlr->cq)<<16 | 1; /* CQID<<16 | PC */ e[11] = (cq - ctlr->cq)<<16 | 1; /* CQID<<16 | PC */
checkstatus(wcmd(&ws), "create submission queue"); checkstatus(wcmd(&ws), "create submission queue");
@ -428,7 +428,7 @@ identify(Ctlr *ctlr)
if((ctlr->nsid = mallocalign(0x1000, ctlr->mps, 0, 0)) == nil) if((ctlr->nsid = mallocalign(0x1000, ctlr->mps, 0, 0)) == nil)
error(Enomem); error(Enomem);
e = qcmd(&ws, ctlr, 1, 0x06, ~0, nil, ctlr->ident, 0x1000); e = qcmd(&ws, ctlr, 1, 0x06, 0, nil, ctlr->ident, 0x1000);
e[10] = 1; // identify controller e[10] = 1; // identify controller
checkstatus(wcmd(&ws), "identify controller"); checkstatus(wcmd(&ws), "identify controller");