[src/trunk]: src/sys/dev/pci * azalia_attach_intr()

[kent <kent%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5ba7f2bf98c8
branches:  trunk
changeset: 584695:5ba7f2bf98c8
user:      kent <kent%NetBSD.org@localhost>
date:      Mon Sep 26 17:30:04 2005 +0000

description:
* azalia_attach_intr()
  ignore errors of codec initializations if at least one
codec is initialized successfully

* azalia_alloc_dmamem()
  fail if the HDA controller does not support 64 bit addressing
and buf_dmamap_* allocate a 64 bit address.

Pointed out by Brett Lymn

diffstat:

 sys/dev/pci/azalia.c |  40 +++++++++++++++++++++++++++-------------
 1 files changed, 27 insertions(+), 13 deletions(-)

diffs (141 lines):

diff -r 445caab1b124 -r 5ba7f2bf98c8 sys/dev/pci/azalia.c
--- a/sys/dev/pci/azalia.c      Mon Sep 26 16:24:57 2005 +0000
+++ b/sys/dev/pci/azalia.c      Mon Sep 26 17:30:04 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: azalia.c,v 1.11 2005/08/02 13:20:50 kent Exp $ */
+/*     $NetBSD: azalia.c,v 1.12 2005/09/26 17:30:04 kent Exp $ */
 
 /*-
  * Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: azalia.c,v 1.11 2005/08/02 13:20:50 kent Exp $");
+__KERNEL_RCSID(0, "$NetBSD: azalia.c,v 1.12 2005/09/26 17:30:04 kent Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -621,7 +621,8 @@
        bus_dma_tag_t dmat;
 
        codec_t codecs[15];
-       int ncodecs;
+       int ncodecs;            /* number of codecs */
+       int codecno;            /* index of the using codec */
 
        azalia_dma_t corb_dma;
        int corb_size;
@@ -629,6 +630,7 @@
        int rirb_size;
        int rirb_rp;
 
+       boolean_t ok64;
        int nistreams, nostreams, nbstreams;
        stream_t pstream;
        stream_t rstream;
@@ -950,6 +952,7 @@
        az->nistreams = HDA_GCAP_ISS(gcap);
        az->nostreams = HDA_GCAP_OSS(gcap);
        az->nbstreams = HDA_GCAP_BSS(gcap);
+       az->ok64 = (gcap & HDA_GCAP_64OK) != 0;
        DPRINTF(("%s: host: %d output, %d input, and %d bidi streams\n",
            XNAME(az), az->nostreams, az->nistreams, az->nbstreams));
 
@@ -1003,7 +1006,7 @@
 azalia_attach_intr(struct device *self)
 {
        azalia_t *az;
-       int err, i;
+       int err, i, c;
 
        az = (azalia_t*)self;
 
@@ -1021,11 +1024,17 @@
        AZ_WRITE_4(az, INTCTL,
            AZ_READ_4(az, INTCTL) | HDA_INTCTL_CIE | HDA_INTCTL_GIE);
 
+       c = -1;
        for (i = 0; i < az->ncodecs; i++) {
                err = azalia_codec_init(&az->codecs[i]);
-               if (err)
-                       goto err_exit;
+               if (!err && c < 0)
+                       c = i;
        }
+       if (c < 0)
+               goto err_exit;
+       /* Use the first audio codec */
+       az->codecno = c;
+       DPRINTF(("%s: using the #%d codec\n", XNAME(az), az->codecno));
 
        if (azalia_stream_init(&az->pstream, az, az->nistreams + 0,
            1, AUMODE_PLAY))
@@ -1350,6 +1359,11 @@
            NULL, BUS_DMA_NOWAIT);
        if (err)
                goto destroy;
+
+       if (!az->ok64 && PTR_UPPER32(AZALIA_DMA_DMAADDR(d)) != 0) {
+               azalia_free_dmamem(az, d);
+               return -1;
+       }
        return 0;
 
 destroy:
@@ -3194,8 +3208,8 @@
 
        STR_WRITE_2(this, FMT, fmt);
 
-       err = azalia_codec_connect_stream(&this->az->codecs[0], this->dir,
-           fmt, this->number);
+       err = azalia_codec_connect_stream(&this->az->codecs[this->az->codecno],
+           this->dir, fmt, this->number);
        if (err)
                return EINVAL;
 
@@ -3264,7 +3278,7 @@
        codec_t *codec;
 
        az = v;
-       codec = &az->codecs[0];
+       codec = &az->codecs[az->codecno];
        return auconv_query_encoding(codec->encodings, enc);
 }
 
@@ -3277,7 +3291,7 @@
        int index;
 
        az = v;
-       codec = &az->codecs[0];
+       codec = &az->codecs[az->codecno];
        if (smode & AUMODE_RECORD && r != NULL) {
                index = auconv_set_converter(codec->formats, codec->nformats,
                    AUMODE_RECORD, r, TRUE, rfil);
@@ -3360,7 +3374,7 @@
        codec_t *co;
 
        az = v;
-       co = &az->codecs[0];
+       co = &az->codecs[az->codecno];
        return azalia_mixer_set(co, mc);
 }
 
@@ -3371,7 +3385,7 @@
        codec_t *co;
 
        az = v;
-       co = &az->codecs[0];
+       co = &az->codecs[az->codecno];
        return azalia_mixer_get(co, mc);
 }
 
@@ -3382,7 +3396,7 @@
        codec_t *co;
 
        az = v;
-       co = &az->codecs[0];
+       co = &az->codecs[az->codecno];
        if (mdev->index >= co->nmixers)
                return ENXIO;
        *mdev = co->mixers[mdev->index].devinfo;