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

audiohda: use PCIWADDR() instead of PADDR(), handle 64-bit dma addresses

Browse source
This commit is contained in:
cinap_lenrek 2020-10-18 17:00:04 +02:00
parent 83efe2f157
commit 30417c12fd
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
sys/src/9/pc/audiohda.c
View file

@ -1164,6 +1164,7 @@ writering(Ring *r, uchar *p, long n)
static int static int
streamalloc(Ctlr *ctlr, Stream *s, int num) streamalloc(Ctlr *ctlr, Stream *s, int num)
{ {
u64int pa;
Ring *r; Ring *r;
int i; int i;
@ -1175,8 +1176,9 @@ streamalloc(Ctlr *ctlr, Stream *s, int num)
return -1; return -1;
} }
for(i=0; i<Nblocks; i++){ for(i=0; i<Nblocks; i++){
s->blds[i].addrlo = PADDR(r->buf) + i*Blocksize; pa = PCIWADDR(r->buf) + i*Blocksize;
s->blds[i].addrhi = 0; s->blds[i].addrlo = pa;
s->blds[i].addrhi = pa >> 32;
s->blds[i].len = Blocksize; s->blds[i].len = Blocksize;
s->blds[i].flags = 0x01; /* interrupt on completion */ s->blds[i].flags = 0x01; /* interrupt on completion */
} }
@ -1205,8 +1207,9 @@ streamalloc(Ctlr *ctlr, Stream *s, int num)
csr16(ctlr, Sdfmt+s->sdctl) = s->afmt; csr16(ctlr, Sdfmt+s->sdctl) = s->afmt;
/* program stream DMA & parms */ /* program stream DMA & parms */
csr32(ctlr, Sdbdplo+s->sdctl) = PADDR(s->blds); pa = PCIWADDR(s->blds);
csr32(ctlr, Sdbdphi+s->sdctl) = 0; csr32(ctlr, Sdbdplo+s->sdctl) = pa;
csr32(ctlr, Sdbdphi+s->sdctl) = pa >> 32;
csr32(ctlr, Sdcbl+s->sdctl) = r->nbuf; csr32(ctlr, Sdcbl+s->sdctl) = r->nbuf;
csr16(ctlr, Sdlvi+s->sdctl) = (Nblocks - 1) & 0xff; csr16(ctlr, Sdlvi+s->sdctl) = (Nblocks - 1) & 0xff;
@ -1661,6 +1664,7 @@ hdastart(Ctlr *ctlr)
{ {
static int cmdbufsize[] = { 2, 16, 256, 2048 }; static int cmdbufsize[] = { 2, 16, 256, 2048 };
int n, size; int n, size;
u64int pa;
uint cap; uint cap;
/* reset controller */ /* reset controller */
@ -1712,8 +1716,9 @@ hdastart(Ctlr *ctlr)
csr8(ctlr, Rirbsts) = csr8(ctlr, Rirbsts); csr8(ctlr, Rirbsts) = csr8(ctlr, Rirbsts);
/* setup CORB */ /* setup CORB */
csr32(ctlr, Corblbase) = PADDR(ctlr->corb); pa = PCIWADDR(ctlr->corb);
csr32(ctlr, Corbubase) = 0; csr32(ctlr, Corblbase) = pa;
csr32(ctlr, Corbubase) = pa >> 32;
csr16(ctlr, Corbwp) = 0; csr16(ctlr, Corbwp) = 0;
csr16(ctlr, Corbrp) = Corbptrrst; csr16(ctlr, Corbrp) = Corbptrrst;
waitup16(ctlr, Corbrp, Corbptrrst, Corbptrrst); waitup16(ctlr, Corbrp, Corbptrrst, Corbptrrst);
@ -1723,8 +1728,9 @@ hdastart(Ctlr *ctlr)
waitup8(ctlr, Corbctl, Corbdma, Corbdma); waitup8(ctlr, Corbctl, Corbdma, Corbdma);
/* setup RIRB */ /* setup RIRB */
csr32(ctlr, Rirblbase) = PADDR(ctlr->rirb); pa = PCIWADDR(ctlr->rirb);
csr32(ctlr, Rirbubase) = 0; csr32(ctlr, Rirblbase) = pa;
csr32(ctlr, Rirbubase) = pa >> 32;
csr16(ctlr, Rirbwp) = Rirbptrrst; csr16(ctlr, Rirbwp) = Rirbptrrst;
csr8(ctlr, Rirbctl) = Rirbdma; csr8(ctlr, Rirbctl) = Rirbdma;
waitup8(ctlr, Rirbctl, Rirbdma, Rirbdma); waitup8(ctlr, Rirbctl, Rirbdma, Rirbdma);