12e524a290
panic() so that the buffer overflow just beyond this point is always caught, even when the code is not compiled with INVARIANTS. Change chn_setblocksize() buffer reallocation code to attempt to avoid the feed_vchan16() buffer overflow by attempting to always keep the bufsoft buffer at least as large as the bufhard buffer. Print a diagnositic message Danger! %s bufsoft size increasing from %d to %d after CHANNEL_SETBLOCKSIZE() if our best attempts fail. If feed_vchan16() were to be called by the interrupt handler while locks are dropped in chn_setblocksize() to increase the size bufsoft to match the size of bufhard, the panic() code in feed_vchan16() will be triggered. If the diagnostic message is printed, it is a warning that a panic is possible if the system were to see events in an "unlucky" order. Change the locking code to avoid the need for MTX_RECURSIVE mutexes. Add the MTX_DUPOK option to the channel mutexes and change the locking sequence to always lock the parent channel before its children to avoid the possibility of deadlock. Actually implement locking assertions for the channel mutexes and fix the problems found by the resulting assertion violations. Clean up the locking code in dsp_ioctl(). Allocate the channel buffers using the malloc() M_WAITOK option instead of M_NOWAIT so that buffer allocation won't fail. Drop locks across the malloc() calls. Add/modify KASSERTS() in attempt to detect problems early. Abuse layering by adding a pointer to the snd_dbuf structure that points back to the pcm_channel that owns it. This allows sndbuf_resize() to do proper locking without having to change the its API, which is used by the hardware drivers. Don't dereference a NULL pointer when setting hw.snd.maxautovchans if a hardware driver is not loaded. Noticed by Ryan Sommers <ryans at gamersimpact.com>. Tested by: Stefan Ehmann <shoesoft AT gmx.net> Tested by: matk (Mathew Kanner) Tested by: Gordon Bergling <gbergling AT 0xfce3.net>
120 lines
4.9 KiB
C
120 lines
4.9 KiB
C
/*
|
|
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#define SND_DMA(b) (sndbuf_getflags((b)) & SNDBUF_F_DMA)
|
|
#define SNDBUF_LOCKASSERT(b)
|
|
|
|
#define SNDBUF_F_DMA 0x00000001
|
|
#define SNDBUF_F_XRUN 0x00000002
|
|
#define SNDBUF_F_RUNNING 0x00000004
|
|
|
|
#define SNDBUF_NAMELEN 48
|
|
|
|
struct snd_dbuf {
|
|
device_t dev;
|
|
u_int8_t *buf, *tmpbuf;
|
|
unsigned int bufsize, maxsize;
|
|
volatile int dl; /* transfer size */
|
|
volatile int rp; /* pointers to the ready area */
|
|
volatile int rl; /* length of ready area */
|
|
volatile int hp;
|
|
volatile u_int32_t total, prev_total;
|
|
int dmachan, dir; /* dma channel */
|
|
u_int32_t fmt, spd, bps;
|
|
unsigned int blksz, blkcnt;
|
|
int xrun;
|
|
u_int32_t flags;
|
|
bus_dmamap_t dmamap;
|
|
bus_dma_tag_t dmatag;
|
|
u_int32_t buf_addr;
|
|
struct selinfo sel;
|
|
struct pcm_channel *channel;
|
|
char name[SNDBUF_NAMELEN];
|
|
};
|
|
|
|
struct snd_dbuf *sndbuf_create(device_t dev, char *drv, char *desc, struct pcm_channel *channel);
|
|
void sndbuf_destroy(struct snd_dbuf *b);
|
|
|
|
void sndbuf_dump(struct snd_dbuf *b, char *s, u_int32_t what);
|
|
|
|
int sndbuf_alloc(struct snd_dbuf *b, bus_dma_tag_t dmatag, unsigned int size);
|
|
int sndbuf_setup(struct snd_dbuf *b, void *buf, unsigned int size);
|
|
void sndbuf_free(struct snd_dbuf *b);
|
|
int sndbuf_resize(struct snd_dbuf *b, unsigned int blkcnt, unsigned int blksz);
|
|
int sndbuf_remalloc(struct snd_dbuf *b, unsigned int blkcnt, unsigned int blksz);
|
|
void sndbuf_reset(struct snd_dbuf *b);
|
|
void sndbuf_clear(struct snd_dbuf *b, unsigned int length);
|
|
void sndbuf_fillsilence(struct snd_dbuf *b);
|
|
|
|
u_int32_t sndbuf_getfmt(struct snd_dbuf *b);
|
|
int sndbuf_setfmt(struct snd_dbuf *b, u_int32_t fmt);
|
|
unsigned int sndbuf_getspd(struct snd_dbuf *b);
|
|
void sndbuf_setspd(struct snd_dbuf *b, unsigned int spd);
|
|
unsigned int sndbuf_getbps(struct snd_dbuf *b);
|
|
|
|
bus_addr_t sndbuf_getbufaddr(struct snd_dbuf *buf);
|
|
|
|
void *sndbuf_getbuf(struct snd_dbuf *b);
|
|
void *sndbuf_getbufofs(struct snd_dbuf *b, unsigned int ofs);
|
|
unsigned int sndbuf_getsize(struct snd_dbuf *b);
|
|
unsigned int sndbuf_getmaxsize(struct snd_dbuf *b);
|
|
unsigned int sndbuf_getalign(struct snd_dbuf *b);
|
|
unsigned int sndbuf_getblkcnt(struct snd_dbuf *b);
|
|
void sndbuf_setblkcnt(struct snd_dbuf *b, unsigned int blkcnt);
|
|
unsigned int sndbuf_getblksz(struct snd_dbuf *b);
|
|
void sndbuf_setblksz(struct snd_dbuf *b, unsigned int blksz);
|
|
unsigned int sndbuf_runsz(struct snd_dbuf *b);
|
|
void sndbuf_setrun(struct snd_dbuf *b, int go);
|
|
struct selinfo *sndbuf_getsel(struct snd_dbuf *b);
|
|
|
|
unsigned int sndbuf_getxrun(struct snd_dbuf *b);
|
|
void sndbuf_setxrun(struct snd_dbuf *b, unsigned int cnt);
|
|
unsigned int sndbuf_gethwptr(struct snd_dbuf *b);
|
|
void sndbuf_sethwptr(struct snd_dbuf *b, unsigned int ptr);
|
|
unsigned int sndbuf_getfree(struct snd_dbuf *b);
|
|
unsigned int sndbuf_getfreeptr(struct snd_dbuf *b);
|
|
unsigned int sndbuf_getready(struct snd_dbuf *b);
|
|
unsigned int sndbuf_getreadyptr(struct snd_dbuf *b);
|
|
unsigned int sndbuf_getblocks(struct snd_dbuf *b);
|
|
unsigned int sndbuf_getprevblocks(struct snd_dbuf *b);
|
|
unsigned int sndbuf_gettotal(struct snd_dbuf *b);
|
|
void sndbuf_updateprevtotal(struct snd_dbuf *b);
|
|
|
|
int sndbuf_acquire(struct snd_dbuf *b, u_int8_t *from, unsigned int count);
|
|
int sndbuf_dispose(struct snd_dbuf *b, u_int8_t *to, unsigned int count);
|
|
int sndbuf_feed(struct snd_dbuf *from, struct snd_dbuf *to, struct pcm_channel *channel, struct pcm_feeder *feeder, unsigned int count);
|
|
|
|
u_int32_t sndbuf_getflags(struct snd_dbuf *b);
|
|
void sndbuf_setflags(struct snd_dbuf *b, u_int32_t flags, int on);
|
|
|
|
int sndbuf_dmasetup(struct snd_dbuf *b, struct resource *drq);
|
|
int sndbuf_dmasetdir(struct snd_dbuf *b, int dir);
|
|
void sndbuf_dma(struct snd_dbuf *b, int go);
|
|
int sndbuf_dmaptr(struct snd_dbuf *b);
|
|
void sndbuf_dmabounce(struct snd_dbuf *b);
|