]> git.lizzy.rs Git - plan9front.git/blobdiff - sys/src/9/pc/audioac97.c
devkbd: bits bad! revert repeat/delay, better patches welcome
[plan9front.git] / sys / src / 9 / pc / audioac97.c
index 482986696c65701f7aff080722cdee52dda9ec99..6d11f627934060959f4c64646ca3352e86b9f73c 100644 (file)
@@ -7,6 +7,7 @@
 #include "../port/error.h"
 #include "../port/audioif.h"
 
+typedef struct Ring Ring;
 typedef struct Hwdesc Hwdesc;
 typedef struct Ctlr Ctlr;
 
@@ -22,12 +23,23 @@ struct Hwdesc {
 
 enum {
        Ndesc = 32,
-       Nts = 33,
        Bufsize = 32768,        /* bytes, must be divisible by ndesc */
+       Blocksize = Bufsize/Ndesc,
        Maxbusywait = 500000, /* microseconds, roughly */
        BytesPerSample = 4,
 };
 
+struct Ring
+{
+       Rendez r;
+
+       uchar   *buf;
+       ulong   nbuf;
+
+       ulong   ri;
+       ulong   wi;
+};
+
 struct Ctlr {
        /* keep these first, they want to be 8-aligned */
        Hwdesc indesc[Ndesc];
@@ -35,47 +47,23 @@ struct Ctlr {
        Hwdesc micdesc[Ndesc];
 
        Lock;
-       Rendez outr;
 
        ulong port;
        ulong mixport;
+       uchar *mmreg;
+       uchar *mmmix;
+       int ismmio;
 
-       char *out;
-       char *in;
-       char *mic;
-
-       char *outp;
-       char *inp;
-       char *micp;
-
-       /* shared variables, ilock to access */
-       int outavail;
-       int inavail;
-       int micavail;
-
-       /* interrupt handler alone */
-       int outciv;
-       int inciv;
-       int micciv;
-
-       int tsouti;
-       uvlong tsoutp;
-       ulong tsout[Nts];
-       int tsoutb[Nts];
-
-       ulong civstat[Ndesc];
-       ulong lvistat[Ndesc];
+       Ring inring, micring, outring;
 
        int sis7012;
 
        /* for probe */
+       Audio *adev;
        Pcidev *pcidev;
        Ctlr *next;
 };
 
-#define iorl(c, r)     (inl((c)->port+(r)))
-#define iowl(c, r, l)  (outl((c)->port+(r), (ulong)(l)))
-
 enum {
        In = 0x00,
        Out = 0x10,
@@ -134,12 +122,120 @@ enum {
                Casp = 1<<0,    /* set to 1 on read if zero, cleared by hardware */
 };
 
-#define csr8r(c, r)    (inb((c)->port+(r)))
-#define csr16r(c, r)   (ins((c)->port+(r)))
-#define csr32r(c, r)   (inl((c)->port+(r)))
-#define csr8w(c, r, b) (outb((c)->port+(r), (int)(b)))
-#define csr16w(c, r, w)        (outs((c)->port+(r), (ushort)(w)))
-#define csr32w(c, r, w)        (outl((c)->port+(r), (ulong)(w)))
+static long
+buffered(Ring *r)
+{
+       ulong ri, wi;
+
+       ri = r->ri;
+       wi = r->wi;
+       if(wi >= ri)
+               return wi - ri;
+       else
+               return r->nbuf - (ri - wi);
+}
+
+static long
+available(Ring *r)
+{
+       long m;
+
+       m = (r->nbuf - BytesPerSample) - buffered(r);
+       if(m < 0)
+               m = 0;
+       return m;
+}
+
+static long
+readring(Ring *r, uchar *p, long n)
+{
+       long n0, m;
+
+       n0 = n;
+       while(n > 0){
+               if((m = buffered(r)) <= 0)
+                       break;
+               if(m > n)
+                       m = n;
+               if(p){
+                       if(r->ri + m > r->nbuf)
+                               m = r->nbuf - r->ri;
+                       memmove(p, r->buf + r->ri, m);
+                       p += m;
+               }
+               r->ri = (r->ri + m) % r->nbuf;
+               n -= m;
+       }
+       return n0 - n;
+}
+
+static long
+writering(Ring *r, uchar *p, long n)
+{
+       long n0, m;
+
+       n0 = n;
+       while(n > 0){
+               if((m = available(r)) <= 0)
+                       break;
+               if(m > n)
+                       m = n;
+               if(p){
+                       if(r->wi + m > r->nbuf)
+                               m = r->nbuf - r->wi;
+                       memmove(r->buf + r->wi, p, m);
+                       p += m;
+               }
+               r->wi = (r->wi + m) % r->nbuf;
+               n -= m;
+       }
+       return n0 - n;
+}
+
+static uchar
+csr8r(Ctlr *c, int r){
+       if(c->ismmio)
+               return *(uchar*)(c->mmreg+r);           
+       return inb(c->port+r);
+}
+
+static ushort
+csr16r(Ctlr *c, int r){
+       if(c->ismmio)
+               return *(ushort*)(c->mmreg+r);          
+       return ins(c->port+r);
+}
+
+static ulong
+csr32r(Ctlr *c, int r){
+       if(c->ismmio)
+               return *(ulong*)(c->mmreg+r);           
+       return inl(c->port+r);
+}
+
+static void
+csr8w(Ctlr *c, int r, uchar v){
+       if(c->ismmio)
+               *(uchar*)(c->mmreg+r) = v;
+       else
+               outb(c->port+r, (int)v);
+}
+
+static void
+csr16w(Ctlr *c, int r, ushort v){
+       if(c->ismmio)
+               *(ushort*)(c->mmreg+r) = v;
+       else
+               outs(c->port+r, v);
+}
+
+static void
+csr32w(Ctlr *c, int r, ulong v){
+       if(c->ismmio)
+               *(ulong*)(c->mmreg+r) = v;
+       else
+               outl(c->port+r, v);
+}
 
 /* audioac97mix */
 extern void ac97mixreset(Audio *,
@@ -152,13 +248,12 @@ ac97waitcodec(Audio *adev)
        Ctlr *ctlr;
        int i;
        ctlr = adev->ctlr;
-       for(i = 0; i < Maxbusywait/10; i++){
+       for(i = 0; i <= Maxbusywait/10; i++){
                if((csr8r(ctlr, Cas) & Casp) == 0)
-                       break;
+                       return;
                microdelay(10);
        }
-       if(i == Maxbusywait)
-               print("#A%d: ac97 exhausted waiting codec access\n", adev->ctlrno);
+       print("#A%d: ac97 exhausted waiting codec access\n", adev->ctlrno);
 }
 
 static void
@@ -167,7 +262,10 @@ ac97mixw(Audio *adev, int port, ushort val)
        Ctlr *ctlr;
        ac97waitcodec(adev);
        ctlr = adev->ctlr;
-       outs(ctlr->mixport+port, val);
+       if(ctlr->ismmio)
+               *(ushort*)(ctlr->mmmix+port) = val;
+       else
+               outs(ctlr->mixport+port, val);
 }
 
 static ushort
@@ -176,57 +274,54 @@ ac97mixr(Audio *adev, int port)
        Ctlr *ctlr;
        ac97waitcodec(adev);
        ctlr = adev->ctlr;
+       if(ctlr->ismmio)
+               return *(ushort*)(ctlr->mmmix+port);
        return ins(ctlr->mixport+port);
 }
 
-static int
-outavail(void *arg)
-{
-       Ctlr *ctlr;
-       ctlr = arg;
-       return ctlr->outavail > 0;
-}
-
 static void
 ac97interrupt(Ureg *, void *arg)
 {
        Audio *adev;
        Ctlr *ctlr;
-       int civ, n, i;
        ulong stat;
-       uvlong now;
 
        adev = arg;
        ctlr = adev->ctlr;
        stat = csr32r(ctlr, Sta);
        stat &= S2ri | Sri | Pri | Mint | Point | Piint | Moint | Miint | Gsci;
-       if(stat & Point){
+       if(stat & (Point|Piint|Mint)){
                ilock(ctlr);
-               if(ctlr->sis7012)
-                       csr16w(ctlr, Out + Picb, csr16r(ctlr, Out + Picb) & ~Dch);
-               else
-                       csr16w(ctlr, Out + Sr, csr16r(ctlr, Out + Sr) & ~Dch);
-               
-               civ = csr8r(ctlr, Out + Civ);
-               n = 0;
-               while(ctlr->outciv != civ){
-                       ctlr->civstat[ctlr->outciv++]++;
-                       if(ctlr->outciv == Ndesc)
-                               ctlr->outciv = 0;
-                       n += Bufsize/Ndesc;
+               if(stat & Point){
+                       ctlr->outring.ri = csr8r(ctlr, Out + Civ) * Blocksize;
+                       wakeup(&ctlr->outring.r);
+
+                       if(ctlr->sis7012)
+                               csr16w(ctlr, Out + Picb, csr16r(ctlr, Out + Picb) & ~Dch);
+                       else
+                               csr16w(ctlr, Out + Sr, csr16r(ctlr, Out + Sr) & ~Dch);
+                       stat &= ~Point;
+               }
+               if(stat & Piint){
+                       ctlr->inring.wi = csr8r(ctlr, In + Civ) * Blocksize;
+                       wakeup(&ctlr->inring.r);
+
+                       if(ctlr->sis7012)
+                               csr16w(ctlr, In + Picb, csr16r(ctlr, In + Picb) & ~Dch);
+                       else
+                               csr16w(ctlr, In + Sr, csr16r(ctlr, In + Sr) & ~Dch);
+                       stat &= ~Piint;
+               }
+               if(stat & Mint){
+                       ctlr->micring.wi = csr8r(ctlr, Mic + Civ) * Blocksize;
+                       wakeup(&ctlr->micring.r);
+
+                       if(ctlr->sis7012)
+                               csr16w(ctlr, Mic + Picb, csr16r(ctlr, Mic + Picb) & ~Dch);
+                       else
+                               csr16w(ctlr, Mic + Sr, csr16r(ctlr, Mic + Sr) & ~Dch);
+                       stat &= ~Mint;
                }
-
-               now = fastticks(0);
-               i = ctlr->tsouti;
-               ctlr->tsoutb[i] = n;
-               ctlr->tsout[i] = now - ctlr->tsoutp;
-               ctlr->tsouti = (i + 1) % Nts;
-               ctlr->tsoutp = now;
-               ctlr->outavail += n;
-               
-               if(ctlr->outavail > Bufsize/2)
-                       wakeup(&ctlr->outr);
-               stat &= ~Point; 
                iunlock(ctlr);
        }
        if(stat) /* have seen 0x400, which is sdin0 resume */
@@ -234,132 +329,119 @@ ac97interrupt(Ureg *, void *arg)
                        adev->ctlrno, stat);
 }
 
-static int
-off2lvi(char *base, char *p)
-{
-       int lvi;
-       lvi = p - base;
-       return lvi / (Bufsize/Ndesc);
-}
-
 static long
-ac97medianoutrate(Audio *adev)
+ac97buffered(Audio *adev)
 {
-       ulong ts[Nts], t;
-       uvlong hz;
-       int i, j;
-       Ctlr *ctlr;
-       ctlr = adev->ctlr;
-       fastticks(&hz);
-       for(i = 0; i < Nts; i++)
-               if(ctlr->tsout[i] > 0)
-                       ts[i] = (ctlr->tsoutb[i] * hz) / ctlr->tsout[i];
-               else
-                       ts[i] = 0;
-       for(i = 1; i < Nts; i++){
-               t = ts[i];
-               j = i;
-               while(j > 0 && ts[j-1] > t){
-                       ts[j] = ts[j-1];
-                       j--;
-               }
-               ts[j] = t;
-       }
-       return ts[Nts/2] / BytesPerSample;
+       Ctlr *ctlr = adev->ctlr;
+       return buffered(&ctlr->outring);
 }
 
 static long
 ac97status(Audio *adev, void *a, long n, vlong)
 {
-       char *p, *e;
-       Ctlr *ctlr;
-       int i;
-
-       ctlr = adev->ctlr;
-
-       p = a;
-       e = p + n;
+       Ctlr *ctlr = adev->ctlr;
+       return snprint((char*)a, n, "bufsize %6d buffered %6ld\n",
+               Blocksize, buffered(&ctlr->outring));
+}
 
-       p += snprint(p, e - p, "median rate %lud\n", ac97medianoutrate(adev));
-       p += snprint(p, e - p, "civ stats");
-       for(i = 0; i < Ndesc; i++)
-               p += snprint(p, e - p, " %lud", ctlr->civstat[i]);
-       p += snprint(p, e - p, "\n");
+static int
+inavail(void *arg)
+{
+       Ring *r = arg;
+       return buffered(r) > 0;
+}
 
-       p += snprint(p, e - p, "lvi stats");
-       for(i = 0; i < Ndesc; i++)
-               p += snprint(p, e - p, " %lud", ctlr->lvistat[i]);
-       p += snprint(p, e - p, "\n");
+static int
+outavail(void *arg)
+{
+       Ring *r = arg;
+       return available(r) > 0;
+}
 
-       return p - (char*)a;
+static int
+outrate(void *arg)
+{
+       Ctlr *ctlr = arg;
+       int delay = ctlr->adev->delay*BytesPerSample;
+       return (delay <= 0) || (buffered(&ctlr->outring) <= delay);
 }
 
 static long
-ac97buffered(Audio *adev)
+ac97read(Audio *adev, void *vp, long n, vlong)
 {
+       uchar *p, *e;
        Ctlr *ctlr;
-       ctlr = adev->ctlr;
-       return Bufsize - Bufsize/Ndesc - ctlr->outavail;
-}
+       Ring *ring;
+       ulong oi, ni;
 
-static void
-ac97kick(Ctlr *ctlr, long reg)
-{
-       csr8w(ctlr, reg+Cr, Ioce | Rpbm);
+       p = vp;
+       e = p + n;
+       ctlr = adev->ctlr;
+       ring = &ctlr->inring;
+       while(p < e) {
+               oi = ring->ri / Blocksize;
+               if((n = readring(ring, p, e - p)) <= 0){
+                       csr8w(ctlr, In + Lvi, (oi - 1) % Ndesc);
+                       csr8w(ctlr, In + Cr, Ioce | Rpbm);
+                       sleep(&ring->r, inavail, ring);
+                       continue;
+               }
+               ni = ring->ri / Blocksize;
+               while(oi != ni){
+                       csr8w(ctlr, In + Lvi, (oi - 1) % Ndesc);
+                       csr8w(ctlr, In + Cr, Ioce | Rpbm);
+                       oi = (oi + 1) % Ndesc;
+               }
+               p += n;
+       }
+       return p - (uchar*)vp;
 }
 
 static long
-ac97write(Audio *adev, void *a, long nwr, vlong)
+ac97write(Audio *adev, void *vp, long n, vlong)
 {
+       uchar *p, *e;
        Ctlr *ctlr;
-       char *p, *sp, *ep;
-       int len, lvi, olvi;
-       int t;
-       long n;
+       Ring *ring;
+       ulong oi, ni;
 
+       p = vp;
+       e = p + n;
        ctlr = adev->ctlr;
-       ilock(ctlr);
-       p = ctlr->outp;
-       sp = a;
-       ep = ctlr->out + Bufsize;
-       olvi = off2lvi(ctlr->out, p);
-       n = nwr;
-       while(n > 0){
-               len = ep - p;
-               if(ctlr->outavail < len)
-                       len = ctlr->outavail;
-               if(n < len)
-                       len = n;
-               ctlr->outavail -= len;
-               iunlock(ctlr);
-               memmove(p, sp, len);
-               ilock(ctlr);
-               p += len;
-               sp += len;
-               n -= len;
-               if(p == ep)
-                       p = ctlr->out;
-               lvi = off2lvi(ctlr->out, p);
-               if(olvi != lvi){
-                       t = olvi;
-                       while(t != lvi){
-                               t = (t + 1) % Ndesc;
-                               ctlr->lvistat[t]++;
-                               csr8w(ctlr, Out+Lvi, t);
-                               ac97kick(ctlr, Out);
-                       }
-                       olvi = lvi;
+       ring = &ctlr->outring;
+       while(p < e) {
+               oi = ring->wi / Blocksize;
+               if((n = writering(ring, p, e - p)) <= 0){
+                       sleep(&ring->r, outavail, ring);
+                       continue;
                }
-               if(ctlr->outavail == 0){
-                       ctlr->outp = p;
-                       iunlock(ctlr);
-                       sleep(&ctlr->outr, outavail, ctlr);
-                       ilock(ctlr);
+               ni = ring->wi / Blocksize;
+               while(oi != ni){
+                       csr8w(ctlr, Out+Lvi, oi);
+                       csr8w(ctlr, Out+Cr, Ioce | Rpbm);
+                       oi = (oi + 1) % Ndesc;
                }
+               p += n;
        }
-       ctlr->outp = p;
-       iunlock(ctlr);
-       return nwr;
+       while(outrate(ctlr) == 0)
+               sleep(&ring->r, outrate, ctlr);
+       return p - (uchar*)vp;
+}
+
+static void
+ac97close(Audio *adev, int mode)
+{
+       Ctlr *ctlr;
+       Ring *ring;
+
+       if(mode == OREAD)
+               return;
+
+       ctlr = adev->ctlr;
+       ring = &ctlr->outring;
+       while(ring->wi % Blocksize)
+               if(writering(ring, (uchar*)"", 1) <= 0)
+                       break;
 }
 
 static Pcidev*
@@ -429,21 +511,46 @@ ac97reset(Audio *adev)
 
 Found:
        adev->ctlr = ctlr;
-       if(p->vid == 0x1039 && p->did == 0x7012)
-               ctlr->sis7012 = 1;
+       ctlr->adev = adev;
+
+       /* ICH4 through ICH7 may use memory-type base address registers */
+       if(p->vid == 0x8086 &&
+         (p->did == 0x24c5 || p->did == 0x24d5 || p->did == 0x266e || p->did == 0x27de) &&
+         (p->mem[2].bar != 0 && p->mem[3].bar != 0) &&
+         ((p->mem[2].bar & 1) == 0 && (p->mem[3].bar & 1) == 0)){
+               ctlr->mmmix = vmap(p->mem[2].bar & ~0xf, p->mem[2].size);
+               if(ctlr->mmmix == nil){
+                       print("ac97: vmap failed for mmmix 0x%08lux\n", p->mem[2].bar);
+                       return -1;
+               }
+               ctlr->mmreg = vmap(p->mem[3].bar & ~0xf, p->mem[3].size);
+               if(ctlr->mmreg == nil){
+                       print("ac97: vmap failed for mmreg 0x%08lux\n", p->mem[3].bar);
+                       vunmap(ctlr->mmmix, p->mem[2].size);
+                       return -1;
+               }
+               ctlr->ismmio = 1;
+       }else{
+               if((p->mem[0].bar & 1) == 0 || (p->mem[1].bar & 1) == 0){
+                       print("ac97: not i/o regions 0x%04lux 0x%04lux\n", p->mem[0].bar, p->mem[1].bar);
+                       return -1;
+               }
+
+               if(p->vid == 0x1039 && p->did == 0x7012){
+                       ctlr->sis7012 = 1;      /* i/o bars swapped? */
+               }
 
-       if(p->mem[0].size == 64){
-               ctlr->port = p->mem[0].bar & ~3;
-               ctlr->mixport = p->mem[1].bar & ~3;
-       } else if(p->mem[1].size == 64){
-               ctlr->port = p->mem[1].bar & ~3;
-               ctlr->mixport = p->mem[0].bar & ~3;
-       } else if(p->mem[0].size == 256){                       /* sis7012 */
                ctlr->port = p->mem[1].bar & ~3;
+               if(ioalloc(ctlr->port, p->mem[1].size, 0, "ac97") < 0){
+                       print("ac97: ioalloc failed for port 0x%04lux\n", ctlr->port);
+                       return -1;
+               }
                ctlr->mixport = p->mem[0].bar & ~3;
-       } else if(p->mem[1].size == 256){
-               ctlr->port = p->mem[0].bar & ~3;
-               ctlr->mixport = p->mem[1].bar & ~3;
+               if(ioalloc(ctlr->mixport, p->mem[0].size, 0, "ac97mix") < 0){
+                       print("ac97: ioalloc failed for mixport 0x%04lux\n", ctlr->mixport);
+                       iofree(ctlr->port);
+                       return -1;
+               }
        }
 
        irq = p->intl;
@@ -455,29 +562,36 @@ Found:
        pcisetbme(p);
        pcisetioe(p);
 
-       ctlr->mic = xspanalloc(Bufsize, 8, 0);
-       ctlr->in = xspanalloc(Bufsize, 8, 0);
-       ctlr->out = xspanalloc(Bufsize, 8, 0);
+       ctlr->micring.buf = xspanalloc(Bufsize, 8, 0);
+       ctlr->micring.nbuf = Bufsize;
+       ctlr->micring.ri = 0;
+       ctlr->micring.wi = 0;
+
+       ctlr->inring.buf = xspanalloc(Bufsize, 8, 0);
+       ctlr->inring.nbuf = Bufsize;
+       ctlr->inring.ri = 0;
+       ctlr->inring.wi = 0;
+
+       ctlr->outring.buf = xspanalloc(Bufsize, 8, 0);
+       ctlr->outring.nbuf = Bufsize;
+       ctlr->outring.ri = 0;
+       ctlr->outring.wi = 0;
 
        for(i = 0; i < Ndesc; i++){
-               int size, off = i * (Bufsize/Ndesc);
+               int size, off = i * Blocksize;
                
                if(ctlr->sis7012)
-                       size = (Bufsize/Ndesc);
+                       size = Blocksize;
                else
-                       size = (Bufsize/Ndesc) / 2;
-               
-               ctlr->micdesc[i].addr = PCIWADDR(ctlr->mic + off);
+                       size = Blocksize / 2;
+               ctlr->micdesc[i].addr = PCIWADDR(ctlr->micring.buf + off);
                ctlr->micdesc[i].size = Ioc | size;
-               ctlr->indesc[i].addr = PCIWADDR(ctlr->in + off);
+               ctlr->indesc[i].addr = PCIWADDR(ctlr->inring.buf + off);
                ctlr->indesc[i].size = Ioc | size;
-               ctlr->outdesc[i].addr = PCIWADDR(ctlr->out + off);
+               ctlr->outdesc[i].addr = PCIWADDR(ctlr->outring.buf + off);
                ctlr->outdesc[i].size = Ioc | size;
        }
 
-       ctlr->outavail = Bufsize - Bufsize/Ndesc;
-       ctlr->outp = ctlr->out;
-
        ctl = csr32r(ctlr, Cnt);
        ctl &= ~(EnaRESER | Aclso);
 
@@ -526,9 +640,11 @@ Found:
 
        ac97mixreset(adev, ac97mixw, ac97mixr);
 
+       adev->read = ac97read;
        adev->write = ac97write;
-       adev->status = ac97status;
+       adev->close = ac97close;
        adev->buffered = ac97buffered;
+       adev->status = ac97status;
 
        intrenable(irq, ac97interrupt, adev, tbdf, adev->name);