diff options
| author | cinap_lenrek <cinap_lenrek@felloff.net> | 2017-03-30 23:39:03 +0200 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@felloff.net> | 2017-03-30 23:39:03 +0200 |
| commit | 330916bfa517734e93cf8799ecf3fe7dd1b53e69 (patch) | |
| tree | 9cc89acc630ffbfa59e3f98878d4c3e688b7ac23 | |
| parent | 0d3c3ba93506094d0360df9d10c4b787218e59dc (diff) | |
| parent | 557cbe10adb61ffd3d29689b26c9f42fa2f850c9 (diff) | |
merge
| -rw-r--r-- | sys/src/9/pc/pccpuf | 1 | ||||
| -rw-r--r-- | sys/src/9/pc/pcf | 1 | ||||
| -rw-r--r-- | sys/src/9/pc/sdnvme.c | 6 | ||||
| -rw-r--r-- | sys/src/9/pc64/pc64 | 1 |
4 files changed, 5 insertions, 4 deletions
diff --git a/sys/src/9/pc/pccpuf b/sys/src/9/pc/pccpuf index 72a412f00..1f1011942 100644 --- a/sys/src/9/pc/pccpuf +++ b/sys/src/9/pc/pccpuf @@ -101,6 +101,7 @@ misc sdodin pci sdscsi led sdvirtio pci sdscsi sdmmc pci pmmc + sdnvme pci sdloop vga3dfx +cur diff --git a/sys/src/9/pc/pcf b/sys/src/9/pc/pcf index 2ea4b9ec5..a34964559 100644 --- a/sys/src/9/pc/pcf +++ b/sys/src/9/pc/pcf @@ -98,6 +98,7 @@ misc sdodin pci sdscsi led sdvirtio pci sdscsi sdmmc pci pmmc + sdnvme pci sdloop uarti8250 diff --git a/sys/src/9/pc/sdnvme.c b/sys/src/9/pc/sdnvme.c index c8605c0d2..537578d5d 100644 --- a/sys/src/9/pc/sdnvme.c +++ b/sys/src/9/pc/sdnvme.c @@ -165,7 +165,7 @@ nvmeintr(Ureg *, void *arg) if(cq->base == nil) continue; phaseshift = 16 - cq->shift; - for(;; cq->head++){ + for(;;){ e = &cq->base[(cq->head & cq->mask)<<2]; if(((e[3] ^ (cq->head << phaseshift)) & 0x10000) == 0) break; @@ -183,11 +183,9 @@ nvmeintr(Ureg *, void *arg) *wp = nil; wakeup(z); } + ctlr->reg[DBell + ((cq-ctlr->cq)*2+1 << ctlr->dstrd)] = ++cq->head & cq->mask; } - ctlr->reg[DBell + ((cq-ctlr->cq)*2+1 << ctlr->dstrd)] = cq->head & cq->mask; } - if((ctlr->reg[CSts] & 3) != 1) - iprint("nvmeintr: fatal controller error\n"); ctlr->reg[IntMc] = ctlr->ints; iunlock(&ctlr->intr); } diff --git a/sys/src/9/pc64/pc64 b/sys/src/9/pc64/pc64 index ca047e0ff..ba51d7ccd 100644 --- a/sys/src/9/pc64/pc64 +++ b/sys/src/9/pc64/pc64 @@ -96,6 +96,7 @@ misc # sdodin pci sdscsi led sdvirtio pci sdscsi sdmmc pci pmmc + sdnvme pci sdloop uarti8250 |