Skip to content

L
linux
Commit 7833c3f8 authored by Takashi Iwai's avatar Takashi Iwai
Browse files
Options

ALSA: hda - Migrate hdac_stream into legacy driver 

Embed hdac_stream object into azx_dev, and use a few basic helper
functions.  The most of helper codes for hdac_stream aren't still used
yet.

Also this commit disables the tracepoints temporarily due to build
problems.  It'll be enabled again later.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent a43ff5ba
Hide whitespace changes
Inline Side-by-side
Showing with 211 additions and 359 deletions
sound/pci/hda/hda_controller.c
View file @ 7833c3f8
...@@ -31,92 +31,15 @@ ...@@ -31,92 +31,15 @@
#include <sound/initval.h> #include <sound/initval.h>
#include "hda_controller.h" #include "hda_controller.h"
#define CREATE_TRACE_POINTS
#include "hda_intel_trace.h"
/* DSP lock helpers */ /* DSP lock helpers */
#ifdef CONFIG_SND_HDA_DSP_LOADER #define dsp_lock(dev) snd_hdac_dsp_lock(azx_stream(dev))
#define dsp_lock_init(dev) mutex_init(&(dev)->dsp_mutex) #define dsp_unlock(dev) snd_hdac_dsp_unlock(azx_stream(dev))
#define dsp_lock(dev) mutex_lock(&(dev)->dsp_mutex) #define dsp_is_locked(dev) snd_hdac_stream_is_locked(azx_stream(dev))
#define dsp_unlock(dev) mutex_unlock(&(dev)->dsp_mutex)
#define dsp_is_locked(dev) ((dev)->locked)
#else
#define dsp_lock_init(dev) do {} while (0)
#define dsp_lock(dev) do {} while (0)
#define dsp_unlock(dev) do {} while (0)
#define dsp_is_locked(dev) 0
#endif
/* /*
* AZX stream operations. * AZX stream operations.
*/ */
/* start a stream */
static void azx_stream_start(struct azx *chip, struct azx_dev *azx_dev)
{
/*
* Before stream start, initialize parameter
*/
azx_dev->insufficient = 1;
/* enable SIE */
azx_writel(chip, INTCTL,
azx_readl(chip, INTCTL) | (1 << azx_dev->index));
/* set DMA start and interrupt mask */
azx_sd_writeb(chip, azx_dev, SD_CTL,
azx_sd_readb(chip, azx_dev, SD_CTL) |
SD_CTL_DMA_START | SD_INT_MASK);
}
/* stop DMA */
static void azx_stream_clear(struct azx *chip, struct azx_dev *azx_dev)
{
azx_sd_writeb(chip, azx_dev, SD_CTL,
azx_sd_readb(chip, azx_dev, SD_CTL) &
~(SD_CTL_DMA_START | SD_INT_MASK));
azx_sd_writeb(chip, azx_dev, SD_STS, SD_INT_MASK); /* to be sure */
}
/* stop a stream */
void azx_stream_stop(struct azx *chip, struct azx_dev *azx_dev)
{
azx_stream_clear(chip, azx_dev);
/* disable SIE */
azx_writel(chip, INTCTL,
azx_readl(chip, INTCTL) & ~(1 << azx_dev->index));
}
EXPORT_SYMBOL_GPL(azx_stream_stop);
/* reset stream */
static void azx_stream_reset(struct azx *chip, struct azx_dev *azx_dev)
{
unsigned char val;
int timeout;
azx_stream_clear(chip, azx_dev);
azx_sd_writeb(chip, azx_dev, SD_CTL,
azx_sd_readb(chip, azx_dev, SD_CTL) |
SD_CTL_STREAM_RESET);
udelay(3);
timeout = 300;
while (!((val = azx_sd_readb(chip, azx_dev, SD_CTL)) &
SD_CTL_STREAM_RESET) && --timeout)
;
val &= ~SD_CTL_STREAM_RESET;
azx_sd_writeb(chip, azx_dev, SD_CTL, val);
udelay(3);
timeout = 300;
/* waiting for hardware to report that the stream is out of reset */
while (((val = azx_sd_readb(chip, azx_dev, SD_CTL)) &
SD_CTL_STREAM_RESET) && --timeout)
;
/* reset first position - may not be synced with hw at this time */
*azx_dev->posbuf = 0;
}
/* /*
* set up the SD for streaming * set up the SD for streaming
*/ */
...@@ -124,31 +47,31 @@ static int azx_setup_controller(struct azx *chip, struct azx_dev *azx_dev) ...@@ -124,31 +47,31 @@ static int azx_setup_controller(struct azx *chip, struct azx_dev *azx_dev)
{ {
unsigned int val; unsigned int val;
/* make sure the run bit is zero for SD */ /* make sure the run bit is zero for SD */
azx_stream_clear(chip, azx_dev); snd_hdac_stream_clear(azx_stream(azx_dev));
/* program the stream_tag */ /* program the stream_tag */
val = azx_sd_readl(chip, azx_dev, SD_CTL); val = azx_sd_readl(chip, azx_dev, SD_CTL);
val = (val & ~SD_CTL_STREAM_TAG_MASK) | val = (val & ~SD_CTL_STREAM_TAG_MASK) |
(azx_dev->stream_tag << SD_CTL_STREAM_TAG_SHIFT); (azx_dev->core.stream_tag << SD_CTL_STREAM_TAG_SHIFT);
if (!azx_snoop(chip)) if (!azx_snoop(chip))
val |= SD_CTL_TRAFFIC_PRIO; val |= SD_CTL_TRAFFIC_PRIO;
azx_sd_writel(chip, azx_dev, SD_CTL, val); azx_sd_writel(chip, azx_dev, SD_CTL, val);
/* program the length of samples in cyclic buffer */ /* program the length of samples in cyclic buffer */
azx_sd_writel(chip, azx_dev, SD_CBL, azx_dev->bufsize); azx_sd_writel(chip, azx_dev, SD_CBL, azx_dev->core.bufsize);
/* program the stream format */ /* program the stream format */
/* this value needs to be the same as the one programmed */ /* this value needs to be the same as the one programmed */
azx_sd_writew(chip, azx_dev, SD_FORMAT, azx_dev->format_val); azx_sd_writew(chip, azx_dev, SD_FORMAT, azx_dev->core.format_val);
/* program the stream LVI (last valid index) of the BDL */ /* program the stream LVI (last valid index) of the BDL */
azx_sd_writew(chip, azx_dev, SD_LVI, azx_dev->frags - 1); azx_sd_writew(chip, azx_dev, SD_LVI, azx_dev->core.frags - 1);
/* program the BDL address */ /* program the BDL address */
/* lower BDL address */ /* lower BDL address */
azx_sd_writel(chip, azx_dev, SD_BDLPL, (u32)azx_dev->bdl.addr); azx_sd_writel(chip, azx_dev, SD_BDLPL, (u32)azx_dev->core.bdl.addr);
/* upper BDL address */ /* upper BDL address */
azx_sd_writel(chip, azx_dev, SD_BDLPU, azx_sd_writel(chip, azx_dev, SD_BDLPU,
upper_32_bits(azx_dev->bdl.addr)); upper_32_bits(azx_dev->core.bdl.addr));
/* enable the position buffer */ /* enable the position buffer */
if (chip->get_position[0] != azx_get_pos_lpib || if (chip->get_position[0] != azx_get_pos_lpib ||
...@@ -169,54 +92,24 @@ static int azx_setup_controller(struct azx *chip, struct azx_dev *azx_dev) ...@@ -169,54 +92,24 @@ static int azx_setup_controller(struct azx *chip, struct azx_dev *azx_dev)
static inline struct azx_dev * static inline struct azx_dev *
azx_assign_device(struct azx *chip, struct snd_pcm_substream *substream) azx_assign_device(struct azx *chip, struct snd_pcm_substream *substream)
{ {
int dev, i, nums; struct hdac_stream *s;
struct azx_dev *res = NULL;
/* make a non-zero unique key for the substream */ s = snd_hdac_stream_assign(azx_bus(chip), substream);
int key = (substream->pcm->device << 16) | (substream->number << 2) | if (!s)
(substream->stream + 1); return NULL;
return stream_to_azx_dev(s);
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
dev = chip->playback_index_offset;
nums = chip->playback_streams;
} else {
dev = chip->capture_index_offset;
nums = chip->capture_streams;
}
for (i = 0; i < nums; i++, dev++) {
struct azx_dev *azx_dev = &chip->azx_dev[dev];
dsp_lock(azx_dev);
if (!azx_dev->opened && !dsp_is_locked(azx_dev)) {
if (azx_dev->assigned_key == key) {
azx_dev->opened = 1;
azx_dev->assigned_key = key;
dsp_unlock(azx_dev);
return azx_dev;
}
if (!res ||
(chip->driver_caps & AZX_DCAPS_REVERSE_ASSIGN))
res = azx_dev;
}
dsp_unlock(azx_dev);
}
if (res) {
dsp_lock(res);
res->opened = 1;
res->assigned_key = key;
dsp_unlock(res);
}
return res;
} }
/* release the assigned stream */ /* release the assigned stream */
static inline void azx_release_device(struct azx_dev *azx_dev) static inline void azx_release_device(struct azx_dev *azx_dev)
{ {
azx_dev->opened = 0; snd_hdac_stream_release(azx_stream(azx_dev));
} }
static cycle_t azx_cc_read(const struct cyclecounter *cc) static cycle_t azx_cc_read(const struct cyclecounter *cc)
{ {
struct azx_dev *azx_dev = container_of(cc, struct azx_dev, azx_cc); struct azx_dev *azx_dev = container_of(cc, struct azx_dev, core.cc);
struct snd_pcm_substream *substream = azx_dev->substream; struct snd_pcm_substream *substream = azx_dev->core.substream;
struct azx_pcm *apcm = snd_pcm_substream_chip(substream); struct azx_pcm *apcm = snd_pcm_substream_chip(substream);
struct azx *chip = apcm->chip; struct azx *chip = apcm->chip;
...@@ -227,8 +120,8 @@ static void azx_timecounter_init(struct snd_pcm_substream *substream, ...@@ -227,8 +120,8 @@ static void azx_timecounter_init(struct snd_pcm_substream *substream,
bool force, cycle_t last) bool force, cycle_t last)
{ {
struct azx_dev *azx_dev = get_azx_dev(substream); struct azx_dev *azx_dev = get_azx_dev(substream);
struct timecounter *tc = &azx_dev->azx_tc; struct timecounter *tc = &azx_dev->core.tc;
struct cyclecounter *cc = &azx_dev->azx_cc; struct cyclecounter *cc = &azx_dev->core.cc;
u64 nsec; u64 nsec;
cc->read = azx_cc_read; cc->read = azx_cc_read;
...@@ -298,7 +191,7 @@ static int setup_bdle(struct azx *chip, ...@@ -298,7 +191,7 @@ static int setup_bdle(struct azx *chip,
dma_addr_t addr; dma_addr_t addr;
int chunk; int chunk;
if (azx_dev->frags >= AZX_MAX_BDL_ENTRIES) if (azx_dev->core.frags >= AZX_MAX_BDL_ENTRIES)
return -EINVAL; return -EINVAL;
addr = snd_sgbuf_get_addr(dmab, ofs); addr = snd_sgbuf_get_addr(dmab, ofs);
...@@ -320,7 +213,7 @@ static int setup_bdle(struct azx *chip, ...@@ -320,7 +213,7 @@ static int setup_bdle(struct azx *chip,
size -= chunk; size -= chunk;
bdl[3] = (size || !with_ioc) ? 0 : cpu_to_le32(0x01); bdl[3] = (size || !with_ioc) ? 0 : cpu_to_le32(0x01);
bdl += 4; bdl += 4;
azx_dev->frags++; azx_dev->core.frags++;
ofs += chunk; ofs += chunk;
} }
*bdlp = bdl; *bdlp = bdl;
...@@ -342,17 +235,17 @@ static int azx_setup_periods(struct azx *chip, ...@@ -342,17 +235,17 @@ static int azx_setup_periods(struct azx *chip,
azx_sd_writel(chip, azx_dev, SD_BDLPL, 0); azx_sd_writel(chip, azx_dev, SD_BDLPL, 0);
azx_sd_writel(chip, azx_dev, SD_BDLPU, 0); azx_sd_writel(chip, azx_dev, SD_BDLPU, 0);
period_bytes = azx_dev->period_bytes; period_bytes = azx_dev->core.period_bytes;
periods = azx_dev->bufsize / period_bytes; periods = azx_dev->core.bufsize / period_bytes;
/* program the initial BDL entries */ /* program the initial BDL entries */
bdl = (u32 *)azx_dev->bdl.area; bdl = (u32 *)azx_dev->core.bdl.area;
ofs = 0; ofs = 0;
azx_dev->frags = 0; azx_dev->core.frags = 0;
if (chip->bdl_pos_adj) if (chip->bdl_pos_adj)
pos_adj = chip->bdl_pos_adj[chip->dev_index]; pos_adj = chip->bdl_pos_adj[chip->dev_index];
if (!azx_dev->no_period_wakeup && pos_adj > 0) { if (!azx_dev->core.no_period_wakeup && pos_adj > 0) {
struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
int pos_align = pos_adj; int pos_align = pos_adj;
pos_adj = (pos_adj * runtime->rate + 47999) / 48000; pos_adj = (pos_adj * runtime->rate + 47999) / 48000;
...@@ -385,7 +278,7 @@ static int azx_setup_periods(struct azx *chip, ...@@ -385,7 +278,7 @@ static int azx_setup_periods(struct azx *chip,
ofs = setup_bdle(chip, snd_pcm_get_dma_buf(substream), ofs = setup_bdle(chip, snd_pcm_get_dma_buf(substream),
azx_dev, &bdl, ofs, azx_dev, &bdl, ofs,
period_bytes, period_bytes,
!azx_dev->no_period_wakeup); !azx_dev->core.no_period_wakeup);
if (ofs < 0) if (ofs < 0)
goto error; goto error;
} }
...@@ -393,7 +286,7 @@ static int azx_setup_periods(struct azx *chip, ...@@ -393,7 +286,7 @@ static int azx_setup_periods(struct azx *chip,
error: error:
dev_err(chip->card->dev, "Too many BDL entries: buffer=%d, period=%d\n", dev_err(chip->card->dev, "Too many BDL entries: buffer=%d, period=%d\n",
azx_dev->bufsize, period_bytes); azx_dev->core.bufsize, period_bytes);
return -EINVAL; return -EINVAL;
} }
...@@ -411,8 +304,8 @@ static int azx_pcm_close(struct snd_pcm_substream *substream) ...@@ -411,8 +304,8 @@ static int azx_pcm_close(struct snd_pcm_substream *substream)
mutex_lock(&chip->open_mutex); mutex_lock(&chip->open_mutex);
spin_lock_irqsave(&chip->reg_lock, flags); spin_lock_irqsave(&chip->reg_lock, flags);
azx_dev->substream = NULL; azx_dev->core.substream = NULL;
azx_dev->running = 0; azx_dev->core.running = 0;
spin_unlock_irqrestore(&chip->reg_lock, flags); spin_unlock_irqrestore(&chip->reg_lock, flags);
azx_release_device(azx_dev); azx_release_device(azx_dev);
if (hinfo->ops.close) if (hinfo->ops.close)
...@@ -457,9 +350,9 @@ static int azx_pcm_hw_free(struct snd_pcm_substream *substream) ...@@ -457,9 +350,9 @@ static int azx_pcm_hw_free(struct snd_pcm_substream *substream)
azx_sd_writel(chip, azx_dev, SD_BDLPL, 0); azx_sd_writel(chip, azx_dev, SD_BDLPL, 0);
azx_sd_writel(chip, azx_dev, SD_BDLPU, 0); azx_sd_writel(chip, azx_dev, SD_BDLPU, 0);
azx_sd_writel(chip, azx_dev, SD_CTL, 0); azx_sd_writel(chip, azx_dev, SD_CTL, 0);
azx_dev->bufsize = 0; azx_dev->core.bufsize = 0;
azx_dev->period_bytes = 0; azx_dev->core.period_bytes = 0;
azx_dev->format_val = 0; azx_dev->core.format_val = 0;
} }
snd_hda_codec_cleanup(apcm->codec, hinfo, substream); snd_hda_codec_cleanup(apcm->codec, hinfo, substream);
...@@ -489,7 +382,7 @@ static int azx_pcm_prepare(struct snd_pcm_substream *substream) ...@@ -489,7 +382,7 @@ static int azx_pcm_prepare(struct snd_pcm_substream *substream)
goto unlock; goto unlock;
} }
azx_stream_reset(chip, azx_dev); snd_hdac_stream_reset(azx_stream(azx_dev));
format_val = snd_hda_calc_stream_format(apcm->codec, format_val = snd_hda_calc_stream_format(apcm->codec,
runtime->rate, runtime->rate,
runtime->channels, runtime->channels,
...@@ -510,14 +403,14 @@ static int azx_pcm_prepare(struct snd_pcm_substream *substream) ...@@ -510,14 +403,14 @@ static int azx_pcm_prepare(struct snd_pcm_substream *substream)
dev_dbg(chip->card->dev, "azx_pcm_prepare: bufsize=0x%x, format=0x%x\n", dev_dbg(chip->card->dev, "azx_pcm_prepare: bufsize=0x%x, format=0x%x\n",
bufsize, format_val); bufsize, format_val);
if (bufsize != azx_dev->bufsize || if (bufsize != azx_dev->core.bufsize ||
period_bytes != azx_dev->period_bytes || period_bytes != azx_dev->core.period_bytes ||
format_val != azx_dev->format_val || format_val != azx_dev->core.format_val ||
runtime->no_period_wakeup != azx_dev->no_period_wakeup) { runtime->no_period_wakeup != azx_dev->core.no_period_wakeup) {
azx_dev->bufsize = bufsize; azx_dev->core.bufsize = bufsize;
azx_dev->period_bytes = period_bytes; azx_dev->core.period_bytes = period_bytes;
azx_dev->format_val = format_val; azx_dev->core.format_val = format_val;
azx_dev->no_period_wakeup = runtime->no_period_wakeup; azx_dev->core.no_period_wakeup = runtime->no_period_wakeup;
err = azx_setup_periods(chip, substream, azx_dev); err = azx_setup_periods(chip, substream, azx_dev);
if (err < 0) if (err < 0)
goto unlock; goto unlock;
...@@ -528,27 +421,27 @@ static int azx_pcm_prepare(struct snd_pcm_substream *substream) ...@@ -528,27 +421,27 @@ static int azx_pcm_prepare(struct snd_pcm_substream *substream)
* 64 frames * 64 frames
*/ */
if (runtime->period_size > 64) if (runtime->period_size > 64)
azx_dev->delay_negative_threshold = -frames_to_bytes(runtime, 64); azx_dev->core.delay_negative_threshold = -frames_to_bytes(runtime, 64);
else else
azx_dev->delay_negative_threshold = 0; azx_dev->core.delay_negative_threshold = 0;
/* wallclk has 24Mhz clock source */ /* wallclk has 24Mhz clock source */
azx_dev->period_wallclk = (((runtime->period_size * 24000) / azx_dev->core.period_wallclk = (((runtime->period_size * 24000) /
runtime->rate) * 1000); runtime->rate) * 1000);
azx_setup_controller(chip, azx_dev); azx_setup_controller(chip, azx_dev);
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
azx_dev->fifo_size = azx_dev->core.fifo_size =
azx_sd_readw(chip, azx_dev, SD_FIFOSIZE) + 1; azx_sd_readw(chip, azx_dev, SD_FIFOSIZE) + 1;
else else
azx_dev->fifo_size = 0; azx_dev->core.fifo_size = 0;
stream_tag = azx_dev->stream_tag; stream_tag = azx_dev->core.stream_tag;
/* CA-IBG chips need the playback stream starting from 1 */ /* CA-IBG chips need the playback stream starting from 1 */
if ((chip->driver_caps & AZX_DCAPS_CTX_WORKAROUND) && if ((chip->driver_caps & AZX_DCAPS_CTX_WORKAROUND) &&
stream_tag > chip->capture_streams) stream_tag > chip->capture_streams)
stream_tag -= chip->capture_streams; stream_tag -= chip->capture_streams;
err = snd_hda_codec_prepare(apcm->codec, hinfo, stream_tag, err = snd_hda_codec_prepare(apcm->codec, hinfo, stream_tag,
azx_dev->format_val, substream); azx_dev->core.format_val, substream);
unlock: unlock:
if (!err) if (!err)
...@@ -567,7 +460,6 @@ static int azx_pcm_trigger(struct snd_pcm_substream *substream, int cmd) ...@@ -567,7 +460,6 @@ static int azx_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
int nwait, timeout; int nwait, timeout;
azx_dev = get_azx_dev(substream); azx_dev = get_azx_dev(substream);
trace_azx_pcm_trigger(chip, azx_dev, cmd);
if (dsp_is_locked(azx_dev) || !azx_dev->prepared) if (dsp_is_locked(azx_dev) || !azx_dev->prepared)
return -EPIPE; return -EPIPE;
...@@ -592,7 +484,7 @@ static int azx_pcm_trigger(struct snd_pcm_substream *substream, int cmd) ...@@ -592,7 +484,7 @@ static int azx_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
if (s->pcm->card != substream->pcm->card) if (s->pcm->card != substream->pcm->card)
continue; continue;
azx_dev = get_azx_dev(s); azx_dev = get_azx_dev(s);
sbits |= 1 << azx_dev->index; sbits |= 1 << azx_dev->core.index;
nsync++; nsync++;
snd_pcm_trigger_done(s, substream); snd_pcm_trigger_done(s, substream);
} }
...@@ -611,15 +503,11 @@ static int azx_pcm_trigger(struct snd_pcm_substream *substream, int cmd) ...@@ -611,15 +503,11 @@ static int azx_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
continue; continue;
azx_dev = get_azx_dev(s); azx_dev = get_azx_dev(s);
if (start) { if (start) {
azx_dev->start_wallclk = azx_readl(chip, WALLCLK); azx_dev->insufficient = 1;
if (!rstart) snd_hdac_stream_start(azx_stream(azx_dev), true);
azx_dev->start_wallclk -=
azx_dev->period_wallclk;
azx_stream_start(chip, azx_dev);
} else { } else {
azx_stream_stop(chip, azx_dev); snd_hdac_stream_stop(azx_stream(azx_dev));
} }
azx_dev->running = start;
} }
spin_unlock(&chip->reg_lock); spin_unlock(&chip->reg_lock);
if (start) { if (start) {
...@@ -672,7 +560,7 @@ static int azx_pcm_trigger(struct snd_pcm_substream *substream, int cmd) ...@@ -672,7 +560,7 @@ static int azx_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
/* same start cycle for master and group */ /* same start cycle for master and group */
azx_dev = get_azx_dev(substream); azx_dev = get_azx_dev(substream);
cycle_last = azx_dev->azx_tc.cycle_last; cycle_last = azx_dev->core.tc.cycle_last;
snd_pcm_group_for_each_entry(s, substream) { snd_pcm_group_for_each_entry(s, substream) {
if (s->pcm->card != substream->pcm->card) if (s->pcm->card != substream->pcm->card)
...@@ -687,20 +575,20 @@ static int azx_pcm_trigger(struct snd_pcm_substream *substream, int cmd) ...@@ -687,20 +575,20 @@ static int azx_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
unsigned int azx_get_pos_lpib(struct azx *chip, struct azx_dev *azx_dev) unsigned int azx_get_pos_lpib(struct azx *chip, struct azx_dev *azx_dev)
{ {
return azx_sd_readl(chip, azx_dev, SD_LPIB); return snd_hdac_stream_get_pos_lpib(azx_stream(azx_dev));
} }
EXPORT_SYMBOL_GPL(azx_get_pos_lpib); EXPORT_SYMBOL_GPL(azx_get_pos_lpib);
unsigned int azx_get_pos_posbuf(struct azx *chip, struct azx_dev *azx_dev) unsigned int azx_get_pos_posbuf(struct azx *chip, struct azx_dev *azx_dev)
{ {
return le32_to_cpu(*azx_dev->posbuf); return snd_hdac_stream_get_pos_posbuf(azx_stream(azx_dev));
} }
EXPORT_SYMBOL_GPL(azx_get_pos_posbuf); EXPORT_SYMBOL_GPL(azx_get_pos_posbuf);
unsigned int azx_get_position(struct azx *chip, unsigned int azx_get_position(struct azx *chip,
struct azx_dev *azx_dev) struct azx_dev *azx_dev)
{ {
struct snd_pcm_substream *substream = azx_dev->substream; struct snd_pcm_substream *substream = azx_dev->core.substream;
unsigned int pos; unsigned int pos;
int stream = substream->stream; int stream = substream->stream;
int delay = 0; int delay = 0;
...@@ -710,7 +598,7 @@ unsigned int azx_get_position(struct azx *chip, ...@@ -710,7 +598,7 @@ unsigned int azx_get_position(struct azx *chip,
else /* use the position buffer as default */ else /* use the position buffer as default */
pos = azx_get_pos_posbuf(chip, azx_dev); pos = azx_get_pos_posbuf(chip, azx_dev);
if (pos >= azx_dev->bufsize) if (pos >= azx_dev->core.bufsize)
pos = 0; pos = 0;
if (substream->runtime) { if (substream->runtime) {
...@@ -725,7 +613,6 @@ unsigned int azx_get_position(struct azx *chip, ...@@ -725,7 +613,6 @@ unsigned int azx_get_position(struct azx *chip,
substream->runtime->delay = delay; substream->runtime->delay = delay;
} }
trace_azx_get_position(chip, azx_dev, pos, delay);
return pos; return pos;
} }
EXPORT_SYMBOL_GPL(azx_get_position); EXPORT_SYMBOL_GPL(azx_get_position);
...@@ -752,7 +639,7 @@ static int azx_get_time_info(struct snd_pcm_substream *substream, ...@@ -752,7 +639,7 @@ static int azx_get_time_info(struct snd_pcm_substream *substream,
snd_pcm_gettime(substream->runtime, system_ts); snd_pcm_gettime(substream->runtime, system_ts);
nsec = timecounter_read(&azx_dev->azx_tc); nsec = timecounter_read(&azx_dev->core.tc);
nsec = div_u64(nsec, 3); /* can be optimized */ nsec = div_u64(nsec, 3); /* can be optimized */
if (audio_tstamp_config->report_delay) if (audio_tstamp_config->report_delay)
nsec = azx_adjust_codec_delay(substream, nsec); nsec = azx_adjust_codec_delay(substream, nsec);
...@@ -875,8 +762,8 @@ static int azx_pcm_open(struct snd_pcm_substream *substream) ...@@ -875,8 +762,8 @@ static int azx_pcm_open(struct snd_pcm_substream *substream)
} }
spin_lock_irqsave(&chip->reg_lock, flags); spin_lock_irqsave(&chip->reg_lock, flags);
azx_dev->substream = substream; azx_dev->core.substream = substream;
azx_dev->running = 0; azx_dev->core.running = 0;
spin_unlock_irqrestore(&chip->reg_lock, flags); spin_unlock_irqrestore(&chip->reg_lock, flags);
runtime->private_data = azx_dev; runtime->private_data = azx_dev;
...@@ -1370,7 +1257,14 @@ static const struct hdac_bus_ops bus_core_ops = { ...@@ -1370,7 +1257,14 @@ static const struct hdac_bus_ops bus_core_ops = {
static struct azx_dev * static struct azx_dev *
azx_get_dsp_loader_dev(struct azx *chip) azx_get_dsp_loader_dev(struct azx *chip)
{ {
return &chip->azx_dev[chip->playback_index_offset]; struct hdac_bus *bus = azx_bus(chip);
struct hdac_stream *s;
list_for_each_entry(s, &bus->stream_list, list)
if (s->index == chip->playback_index_offset)
return stream_to_azx_dev(s);
return NULL;
} }
static int azx_load_dsp_prepare(struct hda_bus *bus, unsigned int format, static int azx_load_dsp_prepare(struct hda_bus *bus, unsigned int format,
...@@ -1386,14 +1280,14 @@ static int azx_load_dsp_prepare(struct hda_bus *bus, unsigned int format, ...@@ -1386,14 +1280,14 @@ static int azx_load_dsp_prepare(struct hda_bus *bus, unsigned int format,
dsp_lock(azx_dev); dsp_lock(azx_dev);
spin_lock_irq(&chip->reg_lock); spin_lock_irq(&chip->reg_lock);
if (azx_dev->running || azx_dev->locked) { if (azx_dev->core.running || azx_dev->core.locked) {
spin_unlock_irq(&chip->reg_lock); spin_unlock_irq(&chip->reg_lock);
err = -EBUSY; err = -EBUSY;
goto unlock; goto unlock;
} }
azx_dev->prepared = 0; azx_dev->prepared = 0;
chip->saved_azx_dev = *azx_dev; chip->saved_azx_dev = *azx_dev;
azx_dev->locked = 1; azx_dev->core.locked = 1;
spin_unlock_irq(&chip->reg_lock); spin_unlock_irq(&chip->reg_lock);
err = chip->io_ops->dma_alloc_pages(&bus->core, SNDRV_DMA_TYPE_DEV_SG, err = chip->io_ops->dma_alloc_pages(&bus->core, SNDRV_DMA_TYPE_DEV_SG,
...@@ -1401,33 +1295,33 @@ static int azx_load_dsp_prepare(struct hda_bus *bus, unsigned int format, ...@@ -1401,33 +1295,33 @@ static int azx_load_dsp_prepare(struct hda_bus *bus, unsigned int format,
if (err < 0) if (err < 0)
goto err_alloc; goto err_alloc;
azx_dev->bufsize = byte_size; azx_dev->core.bufsize = byte_size;
azx_dev->period_bytes = byte_size; azx_dev->core.period_bytes = byte_size;
azx_dev->format_val = format; azx_dev->core.format_val = format;
azx_stream_reset(chip, azx_dev); snd_hdac_stream_reset(azx_stream(azx_dev));
/* reset BDL address */ /* reset BDL address */
azx_sd_writel(chip, azx_dev, SD_BDLPL, 0); azx_sd_writel(chip, azx_dev, SD_BDLPL, 0);
azx_sd_writel(chip, azx_dev, SD_BDLPU, 0); azx_sd_writel(chip, azx_dev, SD_BDLPU, 0);
azx_dev->frags = 0; azx_dev->core.frags = 0;
bdl = (u32 *)azx_dev->bdl.area; bdl = (u32 *)azx_dev->core.bdl.area;
err = setup_bdle(chip, bufp, azx_dev, &bdl, 0, byte_size, 0); err = setup_bdle(chip, bufp, azx_dev, &bdl, 0, byte_size, 0);
if (err < 0) if (err < 0)
goto error; goto error;
azx_setup_controller(chip, azx_dev); azx_setup_controller(chip, azx_dev);
dsp_unlock(azx_dev); dsp_unlock(azx_dev);
return azx_dev->stream_tag; return azx_dev->core.stream_tag;
error: error:
chip->io_ops->dma_free_pages(&bus->core, bufp); chip->io_ops->dma_free_pages(&bus->core, bufp);
err_alloc: err_alloc:
spin_lock_irq(&chip->reg_lock); spin_lock_irq(&chip->reg_lock);
if (azx_dev->opened) if (azx_dev->core.opened)
*azx_dev = chip->saved_azx_dev; *azx_dev = chip->saved_azx_dev;
azx_dev->locked = 0; azx_dev->core.locked = 0;
spin_unlock_irq(&chip->reg_lock); spin_unlock_irq(&chip->reg_lock);
unlock: unlock:
dsp_unlock(azx_dev); dsp_unlock(azx_dev);
...@@ -1440,10 +1334,9 @@ static void azx_load_dsp_trigger(struct hda_bus *bus, bool start) ...@@ -1440,10 +1334,9 @@ static void azx_load_dsp_trigger(struct hda_bus *bus, bool start)
struct azx_dev *azx_dev = azx_get_dsp_loader_dev(chip); struct azx_dev *azx_dev = azx_get_dsp_loader_dev(chip);
if (start) if (start)
azx_stream_start(chip, azx_dev); snd_hdac_stream_start(azx_stream(azx_dev), false);
else else
azx_stream_stop(chip, azx_dev); snd_hdac_stream_stop(azx_stream(azx_dev));
azx_dev->running = start;
} }
static void azx_load_dsp_cleanup(struct hda_bus *bus, static void azx_load_dsp_cleanup(struct hda_bus *bus,
...@@ -1452,7 +1345,7 @@ static void azx_load_dsp_cleanup(struct hda_bus *bus, ...@@ -1452,7 +1345,7 @@ static void azx_load_dsp_cleanup(struct hda_bus *bus,
struct azx *chip = bus->private_data; struct azx *chip = bus->private_data;
struct azx_dev *azx_dev = azx_get_dsp_loader_dev(chip); struct azx_dev *azx_dev = azx_get_dsp_loader_dev(chip);
if (!dmab->area || !azx_dev->locked) if (!dmab->area || !azx_dev->core.locked)
return; return;
dsp_lock(azx_dev); dsp_lock(azx_dev);
...@@ -1460,17 +1353,17 @@ static void azx_load_dsp_cleanup(struct hda_bus *bus, ...@@ -1460,17 +1353,17 @@ static void azx_load_dsp_cleanup(struct hda_bus *bus,
azx_sd_writel(chip, azx_dev, SD_BDLPL, 0); azx_sd_writel(chip, azx_dev, SD_BDLPL, 0);
azx_sd_writel(chip, azx_dev, SD_BDLPU, 0); azx_sd_writel(chip, azx_dev, SD_BDLPU, 0);
azx_sd_writel(chip, azx_dev, SD_CTL, 0); azx_sd_writel(chip, azx_dev, SD_CTL, 0);
azx_dev->bufsize = 0; azx_dev->core.bufsize = 0;
azx_dev->period_bytes = 0; azx_dev->core.period_bytes = 0;
azx_dev->format_val = 0; azx_dev->core.format_val = 0;
chip->io_ops->dma_free_pages(&bus->core, dmab); chip->io_ops->dma_free_pages(&bus->core, dmab);
dmab->area = NULL; dmab->area = NULL;
spin_lock_irq(&chip->reg_lock); spin_lock_irq(&chip->reg_lock);
if (azx_dev->opened) if (azx_dev->core.opened)
*azx_dev = chip->saved_azx_dev; *azx_dev = chip->saved_azx_dev;
azx_dev->locked = 0; azx_dev->core.locked = 0;
spin_unlock_irq(&chip->reg_lock); spin_unlock_irq(&chip->reg_lock);
dsp_unlock(azx_dev); dsp_unlock(azx_dev);
} }
...@@ -1478,17 +1371,18 @@ static void azx_load_dsp_cleanup(struct hda_bus *bus, ...@@ -1478,17 +1371,18 @@ static void azx_load_dsp_cleanup(struct hda_bus *bus,
int azx_alloc_stream_pages(struct azx *chip) int azx_alloc_stream_pages(struct azx *chip)
{ {
int i, err; struct hdac_bus *bus = azx_bus(chip);
struct hdac_stream *s;
int err;
for (i = 0; i < chip->num_streams; i++) { list_for_each_entry(s, &bus->stream_list, list) {
dsp_lock_init(&chip->azx_dev[i]);
/* allocate memory for the BDL for each stream */ /* allocate memory for the BDL for each stream */
err = chip->io_ops->dma_alloc_pages(azx_bus(chip), SNDRV_DMA_TYPE_DEV, err = chip->io_ops->dma_alloc_pages(azx_bus(chip), SNDRV_DMA_TYPE_DEV,
BDL_SIZE, BDL_SIZE, &s->bdl);
&chip->azx_dev[i].bdl);
if (err < 0) if (err < 0)
return -ENOMEM; return -ENOMEM;
} }
/* allocate memory for the position buffer */ /* allocate memory for the position buffer */
err = chip->io_ops->dma_alloc_pages(azx_bus(chip), SNDRV_DMA_TYPE_DEV, err = chip->io_ops->dma_alloc_pages(azx_bus(chip), SNDRV_DMA_TYPE_DEV,
chip->num_streams * 8, &chip->posbuf); chip->num_streams * 8, &chip->posbuf);
...@@ -1505,13 +1399,15 @@ EXPORT_SYMBOL_GPL(azx_alloc_stream_pages); ...@@ -1505,13 +1399,15 @@ EXPORT_SYMBOL_GPL(azx_alloc_stream_pages);
void azx_free_stream_pages(struct azx *chip) void azx_free_stream_pages(struct azx *chip)
{ {
int i; struct hdac_bus *bus = azx_bus(chip);
if (chip->azx_dev) { struct hdac_stream *s, *next;
for (i = 0; i < chip->num_streams; i++)
if (chip->azx_dev[i].bdl.area) list_for_each_entry_safe(s, next, &bus->stream_list, list) {
chip->io_ops->dma_free_pages(azx_bus(chip), if (s->bdl.area)
&chip->azx_dev[i].bdl); chip->io_ops->dma_free_pages(azx_bus(chip), &s->bdl);
kfree(s);
} }
if (chip->rb.area) if (chip->rb.area)
chip->io_ops->dma_free_pages(azx_bus(chip), &chip->rb); chip->io_ops->dma_free_pages(azx_bus(chip), &chip->rb);
if (chip->posbuf.area) if (chip->posbuf.area)
...@@ -1607,15 +1503,12 @@ static void azx_int_enable(struct azx *chip) ...@@ -1607,15 +1503,12 @@ static void azx_int_enable(struct azx *chip)
/* disable interrupts */ /* disable interrupts */
static void azx_int_disable(struct azx *chip) static void azx_int_disable(struct azx *chip)
{ {
int i; struct hdac_bus *bus = azx_bus(chip);
struct hdac_stream *s;
/* disable interrupts in stream descriptor */ /* disable interrupts in stream descriptor */
for (i = 0; i < chip->num_streams; i++) { list_for_each_entry(s, &bus->stream_list, list)
struct azx_dev *azx_dev = &chip->azx_dev[i]; snd_hdac_stream_updateb(s, SD_CTL, SD_INT_MASK, 0);
azx_sd_writeb(chip, azx_dev, SD_CTL,
azx_sd_readb(chip, azx_dev, SD_CTL) &
~SD_INT_MASK);
}
/* disable SIE for all streams */ /* disable SIE for all streams */
azx_writeb(chip, INTCTL, 0); azx_writeb(chip, INTCTL, 0);
...@@ -1628,13 +1521,12 @@ static void azx_int_disable(struct azx *chip) ...@@ -1628,13 +1521,12 @@ static void azx_int_disable(struct azx *chip)
/* clear interrupts */ /* clear interrupts */
static void azx_int_clear(struct azx *chip) static void azx_int_clear(struct azx *chip)
{ {
int i; struct hdac_bus *bus = azx_bus(chip);
struct hdac_stream *s;
/* clear stream status */ /* clear stream status */
for (i = 0; i < chip->num_streams; i++) { list_for_each_entry(s, &bus->stream_list, list)
struct azx_dev *azx_dev = &chip->azx_dev[i]; snd_hdac_stream_writeb(s, SD_STS, SD_INT_MASK);
azx_sd_writeb(chip, azx_dev, SD_STS, SD_INT_MASK);
}
/* clear STATESTS */ /* clear STATESTS */
azx_writew(chip, STATESTS, STATESTS_INT_MASK); azx_writew(chip, STATESTS, STATESTS_INT_MASK);
...@@ -1673,6 +1565,16 @@ void azx_init_chip(struct azx *chip, bool full_reset) ...@@ -1673,6 +1565,16 @@ void azx_init_chip(struct azx *chip, bool full_reset)
} }
EXPORT_SYMBOL_GPL(azx_init_chip); EXPORT_SYMBOL_GPL(azx_init_chip);
void azx_stop_all_streams(struct azx *chip)
{
struct hdac_bus *bus = azx_bus(chip);
struct hdac_stream *s;
list_for_each_entry(s, &bus->stream_list, list)
snd_hdac_stream_stop(s);
}
EXPORT_SYMBOL_GPL(azx_stop_all_streams);
void azx_stop_chip(struct azx *chip) void azx_stop_chip(struct azx *chip)
{ {
if (!chip->initialized) if (!chip->initialized)
...@@ -1696,13 +1598,26 @@ EXPORT_SYMBOL_GPL(azx_stop_chip); ...@@ -1696,13 +1598,26 @@ EXPORT_SYMBOL_GPL(azx_stop_chip);
/* /*
* interrupt handler * interrupt handler
*/ */
static void stream_update(struct hdac_bus *bus, struct hdac_stream *s)
{
struct hda_bus *hbus = container_of(bus, struct hda_bus, core);
struct azx *chip = hbus->private_data;
struct azx_dev *azx_dev = stream_to_azx_dev(s);
/* check whether this IRQ is really acceptable */
if (!chip->ops->position_check ||
chip->ops->position_check(chip, azx_dev)) {
spin_unlock(&chip->reg_lock);
snd_pcm_period_elapsed(azx_dev->core.substream);
spin_lock(&chip->reg_lock);
}
}
irqreturn_t azx_interrupt(int irq, void *dev_id) irqreturn_t azx_interrupt(int irq, void *dev_id)
{ {
struct azx *chip = dev_id; struct azx *chip = dev_id;
struct azx_dev *azx_dev; struct hdac_bus *bus = azx_bus(chip);
u32 status; u32 status;
u8 sd_status;
int i;
#ifdef CONFIG_PM #ifdef CONFIG_PM
if (azx_has_pm_runtime(chip)) if (azx_has_pm_runtime(chip))
...@@ -1723,23 +1638,7 @@ irqreturn_t azx_interrupt(int irq, void *dev_id) ...@@ -1723,23 +1638,7 @@ irqreturn_t azx_interrupt(int irq, void *dev_id)
return IRQ_NONE; return IRQ_NONE;
} }
for (i = 0; i < chip->num_streams; i++) { snd_hdac_bus_handle_stream_irq(bus, status, stream_update);
azx_dev = &chip->azx_dev[i];
if (status & azx_dev->sd_int_sta_mask) {
sd_status = azx_sd_readb(chip, azx_dev, SD_STS);
azx_sd_writeb(chip, azx_dev, SD_STS, SD_INT_MASK);
if (!azx_dev->substream || !azx_dev->running ||
!(sd_status & SD_INT_COMPLETE))
continue;
/* check whether this IRQ is really acceptable */
if (!chip->ops->position_check ||
chip->ops->position_check(chip, azx_dev)) {
spin_unlock(&chip->reg_lock);
snd_pcm_period_elapsed(azx_dev->substream);
spin_lock(&chip->reg_lock);
}
}
}
/* clear rirb int */ /* clear rirb int */
status = azx_readb(chip, RIRBSTS); status = azx_readb(chip, RIRBSTS);
...@@ -1769,7 +1668,7 @@ static int probe_codec(struct azx *chip, int addr) ...@@ -1769,7 +1668,7 @@ static int probe_codec(struct azx *chip, int addr)
{ {
unsigned int cmd = (addr << 28) | (AC_NODE_ROOT << 20) | unsigned int cmd = (addr << 28) | (AC_NODE_ROOT << 20) |
(AC_VERB_PARAMETERS << 8) | AC_PAR_VENDOR_ID; (AC_VERB_PARAMETERS << 8) | AC_PAR_VENDOR_ID;
struct hdac_bus *bus = &chip->bus->core; struct hdac_bus *bus = azx_bus(chip);
int err; int err;
unsigned int res; unsigned int res;
...@@ -1927,33 +1826,32 @@ int azx_codec_configure(struct azx *chip) ...@@ -1927,33 +1826,32 @@ int azx_codec_configure(struct azx *chip)
} }
EXPORT_SYMBOL_GPL(azx_codec_configure); EXPORT_SYMBOL_GPL(azx_codec_configure);
static int stream_direction(struct azx *chip, unsigned char index)
static bool is_input_stream(struct azx *chip, unsigned char index)
{ {
return (index >= chip->capture_index_offset && if (index >= chip->capture_index_offset &&
index < chip->capture_index_offset + chip->capture_streams); index < chip->capture_index_offset + chip->capture_streams)
return SNDRV_PCM_STREAM_CAPTURE;
return SNDRV_PCM_STREAM_PLAYBACK;
} }
/* initialize SD streams */ /* initialize SD streams */
int azx_init_stream(struct azx *chip) int azx_init_stream(struct azx *chip)
{ {
int i; int i;
int in_stream_tag = 0; int stream_tags[2] = { 0, 0 };
int out_stream_tag = 0;
/* initialize each stream (aka device) /* initialize each stream (aka device)
* assign the starting bdl address to each stream (device) * assign the starting bdl address to each stream (device)
* and initialize * and initialize
*/ */
for (i = 0; i < chip->num_streams; i++) { for (i = 0; i < chip->num_streams; i++) {
struct azx_dev *azx_dev = &chip->azx_dev[i]; struct azx_dev *azx_dev = kzalloc(sizeof(*azx_dev), GFP_KERNEL);
azx_dev->posbuf = (u32 __iomem *)(chip->posbuf.area + i * 8); int dir, tag;
/* offset: SDI0=0x80, SDI1=0xa0, ... SDO3=0x160 */
azx_dev->sd_addr = chip->remap_addr + (0x20 * i + 0x80); if (!azx_dev)
/* int mask: SDI0=0x01, SDI1=0x02, ... SDO3=0x80 */ return -ENOMEM;
azx_dev->sd_int_sta_mask = 1 << i;
azx_dev->index = i;
dir = stream_direction(chip, i);
/* stream tag must be unique throughout /* stream tag must be unique throughout
* the stream direction group, * the stream direction group,
* valid values 1...15 * valid values 1...15
...@@ -1961,12 +1859,11 @@ int azx_init_stream(struct azx *chip) ...@@ -1961,12 +1859,11 @@ int azx_init_stream(struct azx *chip)
* AZX_DCAPS_SEPARATE_STREAM_TAG is used * AZX_DCAPS_SEPARATE_STREAM_TAG is used
*/ */
if (chip->driver_caps & AZX_DCAPS_SEPARATE_STREAM_TAG) if (chip->driver_caps & AZX_DCAPS_SEPARATE_STREAM_TAG)
azx_dev->stream_tag = tag = ++stream_tags[dir];
is_input_stream(chip, i) ?
++in_stream_tag :
++out_stream_tag;
else else
azx_dev->stream_tag = i + 1; tag = i + 1;
snd_hdac_stream_init(azx_bus(chip), azx_stream(azx_dev),
i, dir, tag);
} }
return 0; return 0;
......
sound/pci/hda/hda_controller.h
View file @ 7833c3f8
...@@ -59,36 +59,10 @@ enum { ...@@ -59,36 +59,10 @@ enum {
}; };
struct azx_dev { struct azx_dev {
struct snd_dma_buffer bdl; /* BDL buffer */ struct hdac_stream core;
u32 *posbuf; /* position buffer pointer */
unsigned int bufsize; /* size of the play buffer in bytes */
unsigned int period_bytes; /* size of the period in bytes */
unsigned int frags; /* number for period in the play buffer */
unsigned int fifo_size; /* FIFO size */
unsigned long start_wallclk; /* start + minimum wallclk */
unsigned long period_wallclk; /* wallclk for period */
void __iomem *sd_addr; /* stream descriptor pointer */
u32 sd_int_sta_mask; /* stream int status mask */
/* pcm support */
struct snd_pcm_substream *substream; /* assigned substream,
* set in PCM open
*/
unsigned int format_val; /* format value to be set in the
* controller and the codec
*/
unsigned char stream_tag; /* assigned stream */
unsigned char index; /* stream index */
int assigned_key; /* last device# key assigned to */
unsigned int opened:1;
unsigned int running:1;
unsigned int irq_pending:1; unsigned int irq_pending:1;
unsigned int prepared:1; unsigned int prepared:1;
unsigned int locked:1;
/* /*
* For VIA: * For VIA:
* A flag to ensure DMA position is 0 * A flag to ensure DMA position is 0
...@@ -96,19 +70,11 @@ struct azx_dev { ...@@ -96,19 +70,11 @@ struct azx_dev {
*/ */
unsigned int insufficient:1; unsigned int insufficient:1;
unsigned int wc_marked:1; unsigned int wc_marked:1;
unsigned int no_period_wakeup:1;
struct timecounter azx_tc;
struct cyclecounter azx_cc;
int delay_negative_threshold;
#ifdef CONFIG_SND_HDA_DSP_LOADER
/* Allows dsp load to have sole access to the playback stream. */
struct mutex dsp_mutex;
#endif
}; };
#define azx_stream(dev) (&(dev)->core)
#define stream_to_azx_dev(s) container_of(s, struct azx_dev, core)
/* CORB/RIRB */ /* CORB/RIRB */
struct azx_rb { struct azx_rb {
u32 *buf; /* CORB/RIRB buffer u32 *buf; /* CORB/RIRB buffer
...@@ -181,9 +147,6 @@ struct azx { ...@@ -181,9 +147,6 @@ struct azx {
spinlock_t reg_lock; spinlock_t reg_lock;
struct mutex open_mutex; /* Prevents concurrent open/close operations */ struct mutex open_mutex; /* Prevents concurrent open/close operations */
/* streams (x num_streams) */
struct azx_dev *azx_dev;
/* PCM */ /* PCM */
struct list_head pcm_list; /* azx_pcm list */ struct list_head pcm_list; /* azx_pcm list */
...@@ -253,17 +216,17 @@ struct azx { ...@@ -253,17 +216,17 @@ struct azx {
((chip)->io_ops->reg_readb((chip)->remap_addr + AZX_REG_##reg)) ((chip)->io_ops->reg_readb((chip)->remap_addr + AZX_REG_##reg))
#define azx_sd_writel(chip, dev, reg, value) \ #define azx_sd_writel(chip, dev, reg, value) \
((chip)->io_ops->reg_writel(value, (dev)->sd_addr + AZX_REG_##reg)) snd_hdac_stream_writel(&(dev)->core, reg, value)
#define azx_sd_readl(chip, dev, reg) \ #define azx_sd_readl(chip, dev, reg) \
((chip)->io_ops->reg_readl((dev)->sd_addr + AZX_REG_##reg)) snd_hdac_stream_readl(&(dev)->core, reg)
#define azx_sd_writew(chip, dev, reg, value) \ #define azx_sd_writew(chip, dev, reg, value) \
((chip)->io_ops->reg_writew(value, (dev)->sd_addr + AZX_REG_##reg)) snd_hdac_stream_writew(&(dev)->core, reg, value)
#define azx_sd_readw(chip, dev, reg) \ #define azx_sd_readw(chip, dev, reg) \
((chip)->io_ops->reg_readw((dev)->sd_addr + AZX_REG_##reg)) snd_hdac_stream_readw(&(dev)->core, reg)
#define azx_sd_writeb(chip, dev, reg, value) \ #define azx_sd_writeb(chip, dev, reg, value) \
((chip)->io_ops->reg_writeb(value, (dev)->sd_addr + AZX_REG_##reg)) snd_hdac_stream_writeb(&(dev)->core, reg, value)
#define azx_sd_readb(chip, dev, reg) \ #define azx_sd_readb(chip, dev, reg) \
((chip)->io_ops->reg_readb((dev)->sd_addr + AZX_REG_##reg)) snd_hdac_stream_readb(&(dev)->core, reg)
#define azx_has_pm_runtime(chip) \ #define azx_has_pm_runtime(chip) \
(!AZX_DCAPS_PM_RUNTIME || ((chip)->driver_caps & AZX_DCAPS_PM_RUNTIME)) (!AZX_DCAPS_PM_RUNTIME || ((chip)->driver_caps & AZX_DCAPS_PM_RUNTIME))
...@@ -278,7 +241,7 @@ unsigned int azx_get_pos_lpib(struct azx *chip, struct azx_dev *azx_dev); ...@@ -278,7 +241,7 @@ unsigned int azx_get_pos_lpib(struct azx *chip, struct azx_dev *azx_dev);
unsigned int azx_get_pos_posbuf(struct azx *chip, struct azx_dev *azx_dev); unsigned int azx_get_pos_posbuf(struct azx *chip, struct azx_dev *azx_dev);
/* Stream control. */ /* Stream control. */
void azx_stream_stop(struct azx *chip, struct azx_dev *azx_dev); void azx_stop_all_streams(struct azx *chip);
/* Allocation functions. */ /* Allocation functions. */
int azx_alloc_stream_pages(struct azx *chip); int azx_alloc_stream_pages(struct azx *chip);
......
sound/pci/hda/hda_intel.c
View file @ 7833c3f8
...@@ -492,7 +492,7 @@ static void azx_init_pci(struct azx *chip) ...@@ -492,7 +492,7 @@ static void azx_init_pci(struct azx *chip)
static int azx_get_delay_from_lpib(struct azx *chip, struct azx_dev *azx_dev, static int azx_get_delay_from_lpib(struct azx *chip, struct azx_dev *azx_dev,
unsigned int pos) unsigned int pos)
{ {
struct snd_pcm_substream *substream = azx_dev->substream; struct snd_pcm_substream *substream = azx_dev->core.substream;
int stream = substream->stream; int stream = substream->stream;
unsigned int lpib_pos = azx_get_pos_lpib(chip, azx_dev); unsigned int lpib_pos = azx_get_pos_lpib(chip, azx_dev);
int delay; int delay;
...@@ -502,16 +502,16 @@ static int azx_get_delay_from_lpib(struct azx *chip, struct azx_dev *azx_dev, ...@@ -502,16 +502,16 @@ static int azx_get_delay_from_lpib(struct azx *chip, struct azx_dev *azx_dev,
else else
delay = lpib_pos - pos; delay = lpib_pos - pos;
if (delay < 0) { if (delay < 0) {
if (delay >= azx_dev->delay_negative_threshold) if (delay >= azx_dev->core.delay_negative_threshold)
delay = 0; delay = 0;
else else
delay += azx_dev->bufsize; delay += azx_dev->core.bufsize;
} }
if (delay >= azx_dev->period_bytes) { if (delay >= azx_dev->core.period_bytes) {
dev_info(chip->card->dev, dev_info(chip->card->dev,
"Unstable LPIB (%d >= %d); disabling LPIB delay counting\n", "Unstable LPIB (%d >= %d); disabling LPIB delay counting\n",
delay, azx_dev->period_bytes); delay, azx_dev->core.period_bytes);
delay = 0; delay = 0;
chip->driver_caps &= ~AZX_DCAPS_COUNT_LPIB_DELAY; chip->driver_caps &= ~AZX_DCAPS_COUNT_LPIB_DELAY;
chip->get_delay[stream] = NULL; chip->get_delay[stream] = NULL;
...@@ -551,13 +551,13 @@ static int azx_position_check(struct azx *chip, struct azx_dev *azx_dev) ...@@ -551,13 +551,13 @@ static int azx_position_check(struct azx *chip, struct azx_dev *azx_dev)
*/ */
static int azx_position_ok(struct azx *chip, struct azx_dev *azx_dev) static int azx_position_ok(struct azx *chip, struct azx_dev *azx_dev)
{ {
struct snd_pcm_substream *substream = azx_dev->substream; struct snd_pcm_substream *substream = azx_dev->core.substream;
int stream = substream->stream; int stream = substream->stream;
u32 wallclk; u32 wallclk;
unsigned int pos; unsigned int pos;
wallclk = azx_readl(chip, WALLCLK) - azx_dev->start_wallclk; wallclk = azx_readl(chip, WALLCLK) - azx_dev->core.start_wallclk;
if (wallclk < (azx_dev->period_wallclk * 2) / 3) if (wallclk < (azx_dev->core.period_wallclk * 2) / 3)
return -1; /* bogus (too early) interrupt */ return -1; /* bogus (too early) interrupt */
if (chip->get_position[stream]) if (chip->get_position[stream])
...@@ -577,17 +577,17 @@ static int azx_position_ok(struct azx *chip, struct azx_dev *azx_dev) ...@@ -577,17 +577,17 @@ static int azx_position_ok(struct azx *chip, struct azx_dev *azx_dev)
} }
} }
if (pos >= azx_dev->bufsize) if (pos >= azx_dev->core.bufsize)
pos = 0; pos = 0;
if (WARN_ONCE(!azx_dev->period_bytes, if (WARN_ONCE(!azx_dev->core.period_bytes,
"hda-intel: zero azx_dev->period_bytes")) "hda-intel: zero azx_dev->period_bytes"))
return -1; /* this shouldn't happen! */ return -1; /* this shouldn't happen! */
if (wallclk < (azx_dev->period_wallclk * 5) / 4 && if (wallclk < (azx_dev->core.period_wallclk * 5) / 4 &&
pos % azx_dev->period_bytes > azx_dev->period_bytes / 2) pos % azx_dev->core.period_bytes > azx_dev->core.period_bytes / 2)
/* NG - it's below the first next period boundary */ /* NG - it's below the first next period boundary */
return chip->bdl_pos_adj[chip->dev_index] ? 0 : -1; return chip->bdl_pos_adj[chip->dev_index] ? 0 : -1;
azx_dev->start_wallclk += wallclk; azx_dev->core.start_wallclk += wallclk;
return 1; /* OK, it's fine */ return 1; /* OK, it's fine */
} }
...@@ -598,7 +598,9 @@ static void azx_irq_pending_work(struct work_struct *work) ...@@ -598,7 +598,9 @@ static void azx_irq_pending_work(struct work_struct *work)
{ {
struct hda_intel *hda = container_of(work, struct hda_intel, irq_pending_work); struct hda_intel *hda = container_of(work, struct hda_intel, irq_pending_work);
struct azx *chip = &hda->chip; struct azx *chip = &hda->chip;
int i, pending, ok; struct hdac_bus *bus = azx_bus(chip);
struct hdac_stream *s;
int pending, ok;
if (!hda->irq_pending_warned) { if (!hda->irq_pending_warned) {
dev_info(chip->card->dev, dev_info(chip->card->dev,
...@@ -610,17 +612,17 @@ static void azx_irq_pending_work(struct work_struct *work) ...@@ -610,17 +612,17 @@ static void azx_irq_pending_work(struct work_struct *work)
for (;;) { for (;;) {
pending = 0; pending = 0;
spin_lock_irq(&chip->reg_lock); spin_lock_irq(&chip->reg_lock);
for (i = 0; i < chip->num_streams; i++) { list_for_each_entry(s, &bus->stream_list, list) {
struct azx_dev *azx_dev = &chip->azx_dev[i]; struct azx_dev *azx_dev = stream_to_azx_dev(s);
if (!azx_dev->irq_pending || if (!azx_dev->irq_pending ||
!azx_dev->substream || !s->substream ||
!azx_dev->running) !s->running)
continue; continue;
ok = azx_position_ok(chip, azx_dev); ok = azx_position_ok(chip, azx_dev);
if (ok > 0) { if (ok > 0) {
azx_dev->irq_pending = 0; azx_dev->irq_pending = 0;
spin_unlock(&chip->reg_lock); spin_unlock(&chip->reg_lock);
snd_pcm_period_elapsed(azx_dev->substream); snd_pcm_period_elapsed(s->substream);
spin_lock(&chip->reg_lock); spin_lock(&chip->reg_lock);
} else if (ok < 0) { } else if (ok < 0) {
pending = 0; /* too early */ pending = 0; /* too early */
...@@ -637,11 +639,14 @@ static void azx_irq_pending_work(struct work_struct *work) ...@@ -637,11 +639,14 @@ static void azx_irq_pending_work(struct work_struct *work)
/* clear irq_pending flags and assure no on-going workq */ /* clear irq_pending flags and assure no on-going workq */
static void azx_clear_irq_pending(struct azx *chip) static void azx_clear_irq_pending(struct azx *chip)
{ {
int i; struct hdac_bus *bus = azx_bus(chip);
struct hdac_stream *s;
spin_lock_irq(&chip->reg_lock); spin_lock_irq(&chip->reg_lock);
for (i = 0; i < chip->num_streams; i++) list_for_each_entry(s, &bus->stream_list, list) {
chip->azx_dev[i].irq_pending = 0; struct azx_dev *azx_dev = stream_to_azx_dev(s);
azx_dev->irq_pending = 0;
}
spin_unlock_irq(&chip->reg_lock); spin_unlock_irq(&chip->reg_lock);
} }
...@@ -671,7 +676,7 @@ static unsigned int azx_via_get_position(struct azx *chip, ...@@ -671,7 +676,7 @@ static unsigned int azx_via_get_position(struct azx *chip,
unsigned int fifo_size; unsigned int fifo_size;
link_pos = azx_sd_readl(chip, azx_dev, SD_LPIB); link_pos = azx_sd_readl(chip, azx_dev, SD_LPIB);
if (azx_dev->substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { if (azx_dev->core.substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
/* Playback, no problem using link position */ /* Playback, no problem using link position */
return link_pos; return link_pos;
} }
...@@ -680,8 +685,8 @@ static unsigned int azx_via_get_position(struct azx *chip, ...@@ -680,8 +685,8 @@ static unsigned int azx_via_get_position(struct azx *chip,
/* For new chipset, /* For new chipset,
* use mod to get the DMA position just like old chipset * use mod to get the DMA position just like old chipset
*/ */
mod_dma_pos = le32_to_cpu(*azx_dev->posbuf); mod_dma_pos = le32_to_cpu(*azx_dev->core.posbuf);
mod_dma_pos %= azx_dev->period_bytes; mod_dma_pos %= azx_dev->core.period_bytes;
/* azx_dev->fifo_size can't get FIFO size of in stream. /* azx_dev->fifo_size can't get FIFO size of in stream.
* Get from base address + offset. * Get from base address + offset.
...@@ -697,20 +702,20 @@ static unsigned int azx_via_get_position(struct azx *chip, ...@@ -697,20 +702,20 @@ static unsigned int azx_via_get_position(struct azx *chip,
} }
if (link_pos <= fifo_size) if (link_pos <= fifo_size)
mini_pos = azx_dev->bufsize + link_pos - fifo_size; mini_pos = azx_dev->core.bufsize + link_pos - fifo_size;
else else
mini_pos = link_pos - fifo_size; mini_pos = link_pos - fifo_size;
/* Find nearest previous boudary */ /* Find nearest previous boudary */
mod_mini_pos = mini_pos % azx_dev->period_bytes; mod_mini_pos = mini_pos % azx_dev->core.period_bytes;
mod_link_pos = link_pos % azx_dev->period_bytes; mod_link_pos = link_pos % azx_dev->core.period_bytes;
if (mod_link_pos >= fifo_size) if (mod_link_pos >= fifo_size)
bound_pos = link_pos - mod_link_pos; bound_pos = link_pos - mod_link_pos;
else if (mod_dma_pos >= mod_mini_pos) else if (mod_dma_pos >= mod_mini_pos)
bound_pos = mini_pos - mod_mini_pos; bound_pos = mini_pos - mod_mini_pos;
else { else {
bound_pos = mini_pos - mod_mini_pos + azx_dev->period_bytes; bound_pos = mini_pos - mod_mini_pos + azx_dev->core.period_bytes;
if (bound_pos >= azx_dev->bufsize) if (bound_pos >= azx_dev->core.bufsize)
bound_pos = 0; bound_pos = 0;
} }
...@@ -1063,7 +1068,6 @@ static int azx_free(struct azx *chip) ...@@ -1063,7 +1068,6 @@ static int azx_free(struct azx *chip)
{ {
struct pci_dev *pci = chip->pci; struct pci_dev *pci = chip->pci;
struct hda_intel *hda = container_of(chip, struct hda_intel, chip); struct hda_intel *hda = container_of(chip, struct hda_intel, chip);
int i;
if (azx_has_pm_runtime(chip) && chip->running) if (azx_has_pm_runtime(chip) && chip->running)
pm_runtime_get_noresume(&pci->dev); pm_runtime_get_noresume(&pci->dev);
...@@ -1082,8 +1086,7 @@ static int azx_free(struct azx *chip) ...@@ -1082,8 +1086,7 @@ static int azx_free(struct azx *chip)
if (chip->initialized) { if (chip->initialized) {
azx_clear_irq_pending(chip); azx_clear_irq_pending(chip);
for (i = 0; i < chip->num_streams; i++) azx_stop_all_streams(chip);
azx_stream_stop(chip, &chip->azx_dev[i]);
azx_stop_chip(chip); azx_stop_chip(chip);
} }
...@@ -1097,7 +1100,6 @@ static int azx_free(struct azx *chip) ...@@ -1097,7 +1100,6 @@ static int azx_free(struct azx *chip)
if (chip->region_requested) if (chip->region_requested)
pci_release_regions(chip->pci); pci_release_regions(chip->pci);
pci_disable_device(chip->pci); pci_disable_device(chip->pci);
kfree(chip->azx_dev);
#ifdef CONFIG_SND_HDA_PATCH_LOADER #ifdef CONFIG_SND_HDA_PATCH_LOADER
release_firmware(chip->fw); release_firmware(chip->fw);
#endif #endif
...@@ -1566,10 +1568,6 @@ static int azx_first_init(struct azx *chip) ...@@ -1566,10 +1568,6 @@ static int azx_first_init(struct azx *chip)
chip->capture_index_offset = 0; chip->capture_index_offset = 0;
chip->playback_index_offset = chip->capture_streams; chip->playback_index_offset = chip->capture_streams;
chip->num_streams = chip->playback_streams + chip->capture_streams; chip->num_streams = chip->playback_streams + chip->capture_streams;
chip->azx_dev = kcalloc(chip->num_streams, sizeof(*chip->azx_dev),
GFP_KERNEL);
if (!chip->azx_dev)
return -ENOMEM;
err = azx_alloc_stream_pages(chip); err = azx_alloc_stream_pages(chip);
if (err < 0) if (err < 0)
...@@ -1717,9 +1715,9 @@ static int substream_alloc_pages(struct azx *chip, ...@@ -1717,9 +1715,9 @@ static int substream_alloc_pages(struct azx *chip,
int ret; int ret;
mark_runtime_wc(chip, azx_dev, substream, false); mark_runtime_wc(chip, azx_dev, substream, false);
azx_dev->bufsize = 0; azx_dev->core.bufsize = 0;
azx_dev->period_bytes = 0; azx_dev->core.period_bytes = 0;
azx_dev->format_val = 0; azx_dev->core.format_val = 0;
ret = snd_pcm_lib_malloc_pages(substream, size); ret = snd_pcm_lib_malloc_pages(substream, size);
if (ret < 0) if (ret < 0)
return ret; return ret;
......
sound/pci/hda/hda_tegra.c
View file @ 7833c3f8
...@@ -104,9 +104,9 @@ static int substream_alloc_pages(struct azx *chip, ...@@ -104,9 +104,9 @@ static int substream_alloc_pages(struct azx *chip,
{ {
struct azx_dev *azx_dev = get_azx_dev(substream); struct azx_dev *azx_dev = get_azx_dev(substream);
azx_dev->bufsize = 0; azx_dev->core.bufsize = 0;
azx_dev->period_bytes = 0; azx_dev->core.period_bytes = 0;
azx_dev->format_val = 0; azx_dev->core.format_val = 0;
return snd_pcm_lib_malloc_pages(substream, size); return snd_pcm_lib_malloc_pages(substream, size);
} }
...@@ -290,12 +290,10 @@ static const struct dev_pm_ops hda_tegra_pm = { ...@@ -290,12 +290,10 @@ static const struct dev_pm_ops hda_tegra_pm = {
*/ */
static int hda_tegra_dev_free(struct snd_device *device) static int hda_tegra_dev_free(struct snd_device *device)
{ {
int i;
struct azx *chip = device->device_data; struct azx *chip = device->device_data;
if (chip->initialized) { if (chip->initialized) {
for (i = 0; i < chip->num_streams; i++) azx_stop_all_streams(chip);
azx_stream_stop(chip, &chip->azx_dev[i]);
azx_stop_chip(chip); azx_stop_chip(chip);
} }
...@@ -377,10 +375,6 @@ static int hda_tegra_first_init(struct azx *chip, struct platform_device *pdev) ...@@ -377,10 +375,6 @@ static int hda_tegra_first_init(struct azx *chip, struct platform_device *pdev)
chip->capture_index_offset = 0; chip->capture_index_offset = 0;
chip->playback_index_offset = chip->capture_streams; chip->playback_index_offset = chip->capture_streams;
chip->num_streams = chip->playback_streams + chip->capture_streams; chip->num_streams = chip->playback_streams + chip->capture_streams;
chip->azx_dev = devm_kcalloc(card->dev, chip->num_streams,
sizeof(*chip->azx_dev), GFP_KERNEL);
if (!chip->azx_dev)
return -ENOMEM;
err = azx_alloc_stream_pages(chip); err = azx_alloc_stream_pages(chip);
if (err < 0) if (err < 0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7