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

sdvirtio: move common "queue i/o and wait" code into vqio() function, handle notify suppression

Browse source
This commit is contained in:
cinap_lenrek 2014-12-22 12:17:48 +01:00
parent 515893dda6
commit b486d8871b
1 changed files with 29 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

71
sys/src/9/pc/sdvirtio.c
View file

@ -298,10 +298,34 @@ viodone(void *arg)
return ((struct Rock*)arg)->done; return ((struct Rock*)arg)->done;
} }
static void
vqio(Vqueue *q, int head)
{
struct Rock rock;
rock.done = 0;
rock.sleep = &up->sleep;
q->rock[head] = &rock;
q->availent[q->avail->idx & (q->size-1)] = head;
coherence();
q->avail->idx++;
iunlock(q);
if((q->used->flags & 1) == 0)
outs(q->dev->port+Qnotify, q->idx);
while(!rock.done){
while(waserror())
;
tsleep(rock.sleep, viodone, &rock, 1000);
poperror();
if(!rock.done)
vqinterrupt(q);
}
}
static int static int
vioblkreq(Vdev *vd, int typ, void *a, long count, long secsize, uvlong lba) vioblkreq(Vdev *vd, int typ, void *a, long count, long secsize, uvlong lba)
{ {
struct Rock rock;
int free, head; int free, head;
Vqueue *q; Vqueue *q;
Vdesc *d; Vdesc *d;
@ -318,9 +342,6 @@ vioblkreq(Vdev *vd, int typ, void *a, long count, long secsize, uvlong lba)
req.prio = 0; req.prio = 0;
req.lba = lba; req.lba = lba;
rock.done = 0;
rock.sleep = &up->sleep;
q = vd->queue[0]; q = vd->queue[0];
ilock(q); ilock(q);
while(q->nfree < 3){ while(q->nfree < 3){
@ -353,23 +374,8 @@ vioblkreq(Vdev *vd, int typ, void *a, long count, long secsize, uvlong lba)
q->free = free; q->free = free;
q->nfree -= 3; q->nfree -= 3;
q->rock[head] = &rock; /* queue io, unlock and wait for completion */
vqio(q, head);
coherence();
q->availent[q->avail->idx++ & (q->size-1)] = head;
coherence();
outs(vd->port+Qnotify, q->idx);
iunlock(q);
while(!rock.done){
while(waserror())
;
tsleep(rock.sleep, viodone, &rock, 1000);
poperror();
if(!rock.done)
vqinterrupt(q);
}
return status; return status;
} }
@ -379,7 +385,6 @@ vioscsireq(SDreq *r)
{ {
u8int resp[4+4+2+2+SENSESIZE]; u8int resp[4+4+2+2+SENSESIZE];
u8int req[8+8+3+CDBSIZE]; u8int req[8+8+3+CDBSIZE];
struct Rock rock;
int free, head; int free, head;
u32int len; u32int len;
Vqueue *q; Vqueue *q;
@ -402,9 +407,6 @@ vioscsireq(SDreq *r)
memmove(&req[8+8+3], r->cmd, r->clen); memmove(&req[8+8+3], r->cmd, r->clen);
rock.done = 0;
rock.sleep = &up->sleep;
q = vd->queue[2]; q = vd->queue[2];
ilock(q); ilock(q);
while(q->nfree < 3){ while(q->nfree < 3){
@ -448,23 +450,8 @@ vioscsireq(SDreq *r)
q->free = free; q->free = free;
q->nfree -= 2 + (r->dlen > 0); q->nfree -= 2 + (r->dlen > 0);
q->rock[head] = &rock; /* queue io, unlock and wait for completion */
vqio(q, head);
coherence();
q->availent[q->avail->idx++ & (q->size-1)] = head;
coherence();
outs(vd->port+Qnotify, q->idx);
iunlock(q);
while(!rock.done){
while(waserror())
;
tsleep(rock.sleep, viodone, &rock, 1000);
poperror();
if(!rock.done)
vqinterrupt(q);
}
/* response+status */ /* response+status */
r->status = resp[10]; r->status = resp[10];