October 2017 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] snd_pcm_ioplug_avail_update() confusion
by Rob Duncan 24 Oct '17

24 Oct '17

I'm working on an external IO plugin based on ioplug and I'm confused about the behavior of snd_pcm_ioplug_avail_update(). Specifically this call (src/pcm/pcm_ioplug.c:657): result = io->data->callback->transfer(io->data, areas, offset, size); Why isn't there a subsequent call to snd_pcm_mmap_appl_forward() like there is in ioplug_priv_transfer_areas()? It seems that without such a call the captured data will be lost, or have I missed something? Thanks, Rob.

2 1

[alsa-devel] [PATCH] ALSA: sb: Convert timers to use timer_setup()
by Kees Cook 24 Oct '17

24 Oct '17

In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly. Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> Cc: alsa-devel(a)alsa-project.org Signed-off-by: Kees Cook <keescook(a)chromium.org> --- include/sound/sb.h | 1 + sound/isa/sb/emu8000_pcm.c | 6 +++--- sound/isa/sb/sb8_midi.c | 12 ++++++------ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/include/sound/sb.h b/include/sound/sb.h index bacefaee411a..4aef395189ec 100644 --- a/include/sound/sb.h +++ b/include/sound/sb.h @@ -83,6 +83,7 @@ struct snd_sb { unsigned int playback_format; unsigned int capture_format; struct timer_list midi_timer; + struct snd_rawmidi_substream *timer_substream; unsigned int p_dma_size; unsigned int p_period_size; unsigned int c_dma_size; diff --git a/sound/isa/sb/emu8000_pcm.c b/sound/isa/sb/emu8000_pcm.c index 8f34551abd8d..bc5af71d3bdb 100644 --- a/sound/isa/sb/emu8000_pcm.c +++ b/sound/isa/sb/emu8000_pcm.c @@ -193,9 +193,9 @@ static inline int emu8k_get_curpos(struct snd_emu8k_pcm *rec, int ch) * timer interrupt handler * check the current position and update the period if necessary. */ -static void emu8k_pcm_timer_func(unsigned long data) +static void emu8k_pcm_timer_func(struct timer_list *t) { - struct snd_emu8k_pcm *rec = (struct snd_emu8k_pcm *)data; + struct snd_emu8k_pcm *rec = from_timer(rec, t, timer); int ptr, delta; spin_lock(&rec->timer_lock); @@ -241,7 +241,7 @@ static int emu8k_pcm_open(struct snd_pcm_substream *subs) runtime->private_data = rec; spin_lock_init(&rec->timer_lock); - setup_timer(&rec->timer, emu8k_pcm_timer_func, (unsigned long)rec); + timer_setup(&rec->timer, emu8k_pcm_timer_func, 0); runtime->hw = emu8k_pcm_hw; runtime->hw.buffer_bytes_max = emu->mem_size - LOOP_BLANK_SIZE * 3; diff --git a/sound/isa/sb/sb8_midi.c b/sound/isa/sb/sb8_midi.c index bd672abb4854..cf23dc5d0507 100644 --- a/sound/isa/sb/sb8_midi.c +++ b/sound/isa/sb/sb8_midi.c @@ -209,10 +209,10 @@ static void snd_sb8dsp_midi_output_write(struct snd_rawmidi_substream *substream } } -static void snd_sb8dsp_midi_output_timer(unsigned long data) +static void snd_sb8dsp_midi_output_timer(struct timer_list *t) { - struct snd_rawmidi_substream *substream = (struct snd_rawmidi_substream *) data; - struct snd_sb * chip = substream->rmidi->private_data; + struct snd_sb *chip = from_timer(chip, t, midi_timer); + struct snd_rawmidi_substream *substream = chip->timer_substream; unsigned long flags; spin_lock_irqsave(&chip->open_lock, flags); @@ -230,9 +230,9 @@ static void snd_sb8dsp_midi_output_trigger(struct snd_rawmidi_substream *substre spin_lock_irqsave(&chip->open_lock, flags); if (up) { if (!(chip->open & SB_OPEN_MIDI_OUTPUT_TRIGGER)) { - setup_timer(&chip->midi_timer, - snd_sb8dsp_midi_output_timer, - (unsigned long) substream); + chip->timer_substream = substream; + timer_setup(&chip->midi_timer, + snd_sb8dsp_midi_output_timer, 0); mod_timer(&chip->midi_timer, 1 + jiffies); chip->open |= SB_OPEN_MIDI_OUTPUT_TRIGGER; } -- 2.7.4 -- Kees Cook Pixel Security

2 2

[alsa-devel] [PATCH] ALSA: emux: Convert timers to use timer_setup()
by Kees Cook 24 Oct '17

24 Oct '17

In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly. Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: alsa-devel(a)alsa-project.org Signed-off-by: Kees Cook <keescook(a)chromium.org> --- sound/synth/emux/emux.c | 2 +- sound/synth/emux/emux_synth.c | 4 ++-- sound/synth/emux/emux_voice.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/synth/emux/emux.c b/sound/synth/emux/emux.c index b9981e8c0027..b840ff2dcfbb 100644 --- a/sound/synth/emux/emux.c +++ b/sound/synth/emux/emux.c @@ -53,7 +53,7 @@ int snd_emux_new(struct snd_emux **remu) emu->max_voices = 0; emu->use_time = 0; - setup_timer(&emu->tlist, snd_emux_timer_callback, (unsigned long)emu); + timer_setup(&emu->tlist, snd_emux_timer_callback, 0); emu->timer_active = 0; *remu = emu; diff --git a/sound/synth/emux/emux_synth.c b/sound/synth/emux/emux_synth.c index 599551b5af44..9fa696b0dbde 100644 --- a/sound/synth/emux/emux_synth.c +++ b/sound/synth/emux/emux_synth.c @@ -202,9 +202,9 @@ snd_emux_note_off(void *p, int note, int vel, struct snd_midi_channel *chan) * * release the pending note-offs */ -void snd_emux_timer_callback(unsigned long data) +void snd_emux_timer_callback(struct timer_list *t) { - struct snd_emux *emu = (struct snd_emux *) data; + struct snd_emux *emu = from_timer(emu, t, tlist); struct snd_emux_voice *vp; unsigned long flags; int ch, do_again = 0; diff --git a/sound/synth/emux/emux_voice.h b/sound/synth/emux/emux_voice.h index a7073c371bcc..326fa8993d7b 100644 --- a/sound/synth/emux/emux_voice.h +++ b/sound/synth/emux/emux_voice.h @@ -55,7 +55,7 @@ void snd_emux_update_channel(struct snd_emux_port *port, struct snd_midi_channel *chan, int update); void snd_emux_update_port(struct snd_emux_port *port, int update); -void snd_emux_timer_callback(unsigned long data); +void snd_emux_timer_callback(struct timer_list *t); /* emux_effect.c */ #ifdef SNDRV_EMUX_USE_RAW_EFFECT -- 2.7.4 -- Kees Cook Pixel Security

2 1

[alsa-devel] [PATCH] ALSA: drivers: Convert timers to use timer_setup()
by Kees Cook 24 Oct '17

24 Oct '17

In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly. Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: Arvind Yadav <arvind.yadav.cs(a)gmail.com> Cc: Bhumika Goyal <bhumirks(a)gmail.com> Cc: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> Cc: Markus Elfring <elfring(a)users.sourceforge.net> Cc: David Howells <dhowells(a)redhat.com> Cc: alsa-devel(a)alsa-project.org Signed-off-by: Kees Cook <keescook(a)chromium.org> --- sound/drivers/aloop.c | 7 +++---- sound/drivers/dummy.c | 7 +++---- sound/drivers/mpu401/mpu401_uart.c | 7 +++---- sound/drivers/mtpav.c | 7 +++---- sound/drivers/opl3/opl3_midi.c | 4 ++-- sound/drivers/opl3/opl3_seq.c | 2 +- sound/drivers/opl3/opl3_voice.h | 2 +- sound/drivers/serial-u16550.c | 7 +++---- 8 files changed, 19 insertions(+), 24 deletions(-) diff --git a/sound/drivers/aloop.c b/sound/drivers/aloop.c index 135adb17703c..afac886ffa28 100644 --- a/sound/drivers/aloop.c +++ b/sound/drivers/aloop.c @@ -529,9 +529,9 @@ static unsigned int loopback_pos_update(struct loopback_cable *cable) return running; } -static void loopback_timer_function(unsigned long data) +static void loopback_timer_function(struct timer_list *t) { - struct loopback_pcm *dpcm = (struct loopback_pcm *)data; + struct loopback_pcm *dpcm = from_timer(dpcm, t, timer); unsigned long flags; spin_lock_irqsave(&dpcm->cable->lock, flags); @@ -675,8 +675,7 @@ static int loopback_open(struct snd_pcm_substream *substream) } dpcm->loopback = loopback; dpcm->substream = substream; - setup_timer(&dpcm->timer, loopback_timer_function, - (unsigned long)dpcm); + timer_setup(&dpcm->timer, loopback_timer_function, 0); cable = loopback->cables[substream->number][dev]; if (!cable) { diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c index c0939a0164a6..7b2b1f766b00 100644 --- a/sound/drivers/dummy.c +++ b/sound/drivers/dummy.c @@ -306,9 +306,9 @@ static int dummy_systimer_prepare(struct snd_pcm_substream *substream) return 0; } -static void dummy_systimer_callback(unsigned long data) +static void dummy_systimer_callback(struct timer_list *t) { - struct dummy_systimer_pcm *dpcm = (struct dummy_systimer_pcm *)data; + struct dummy_systimer_pcm *dpcm = from_timer(dpcm, t, timer); unsigned long flags; int elapsed = 0; @@ -343,8 +343,7 @@ static int dummy_systimer_create(struct snd_pcm_substream *substream) if (!dpcm) return -ENOMEM; substream->runtime->private_data = dpcm; - setup_timer(&dpcm->timer, dummy_systimer_callback, - (unsigned long) dpcm); + timer_setup(&dpcm->timer, dummy_systimer_callback, 0); spin_lock_init(&dpcm->lock); dpcm->substream = substream; return 0; diff --git a/sound/drivers/mpu401/mpu401_uart.c b/sound/drivers/mpu401/mpu401_uart.c index b997222274bd..3e745f47dd2f 100644 --- a/sound/drivers/mpu401/mpu401_uart.c +++ b/sound/drivers/mpu401/mpu401_uart.c @@ -169,9 +169,9 @@ EXPORT_SYMBOL(snd_mpu401_uart_interrupt_tx); * timer callback * reprogram the timer and call the interrupt job */ -static void snd_mpu401_uart_timer(unsigned long data) +static void snd_mpu401_uart_timer(struct timer_list *t) { - struct snd_mpu401 *mpu = (struct snd_mpu401 *)data; + struct snd_mpu401 *mpu = from_timer(mpu, t, timer); unsigned long flags; spin_lock_irqsave(&mpu->timer_lock, flags); @@ -191,8 +191,7 @@ static void snd_mpu401_uart_add_timer (struct snd_mpu401 *mpu, int input) spin_lock_irqsave (&mpu->timer_lock, flags); if (mpu->timer_invoked == 0) { - setup_timer(&mpu->timer, snd_mpu401_uart_timer, - (unsigned long)mpu); + timer_setup(&mpu->timer, snd_mpu401_uart_timer, 0); mod_timer(&mpu->timer, 1 + jiffies); } mpu->timer_invoked |= input ? MPU401_MODE_INPUT_TIMER : diff --git a/sound/drivers/mtpav.c b/sound/drivers/mtpav.c index 0f6392001e30..547662e02fcc 100644 --- a/sound/drivers/mtpav.c +++ b/sound/drivers/mtpav.c @@ -406,10 +406,10 @@ static void snd_mtpav_input_trigger(struct snd_rawmidi_substream *substream, int * timer interrupt for outputs */ -static void snd_mtpav_output_timer(unsigned long data) +static void snd_mtpav_output_timer(struct timer_list *t) { unsigned long flags; - struct mtpav *chip = (struct mtpav *)data; + struct mtpav *chip = from_timer(chip, t, timer); int p; spin_lock_irqsave(&chip->spinlock, flags); @@ -707,8 +707,7 @@ static int snd_mtpav_probe(struct platform_device *dev) mtp_card->share_irq = 0; mtp_card->inmidistate = 0; mtp_card->outmidihwport = 0xffffffff; - setup_timer(&mtp_card->timer, snd_mtpav_output_timer, - (unsigned long) mtp_card); + timer_setup(&mtp_card->timer, snd_mtpav_output_timer, 0); card->private_free = snd_mtpav_free; diff --git a/sound/drivers/opl3/opl3_midi.c b/sound/drivers/opl3/opl3_midi.c index 13c0a7e1bc2b..bb3f3a5a6951 100644 --- a/sound/drivers/opl3/opl3_midi.c +++ b/sound/drivers/opl3/opl3_midi.c @@ -238,10 +238,10 @@ static int opl3_get_voice(struct snd_opl3 *opl3, int instr_4op, /* * System timer interrupt function */ -void snd_opl3_timer_func(unsigned long data) +void snd_opl3_timer_func(struct timer_list *t) { - struct snd_opl3 *opl3 = (struct snd_opl3 *)data; + struct snd_opl3 *opl3 = from_timer(opl3, t, tlist); unsigned long flags; int again = 0; int i; diff --git a/sound/drivers/opl3/opl3_seq.c b/sound/drivers/opl3/opl3_seq.c index d3e91be8b23a..5f881c4cdf1f 100644 --- a/sound/drivers/opl3/opl3_seq.c +++ b/sound/drivers/opl3/opl3_seq.c @@ -248,7 +248,7 @@ static int snd_opl3_seq_probe(struct device *_dev) } /* setup system timer */ - setup_timer(&opl3->tlist, snd_opl3_timer_func, (unsigned long) opl3); + timer_setup(&opl3->tlist, snd_opl3_timer_func, 0); spin_lock_init(&opl3->sys_timer_lock); opl3->sys_timer_status = 0; diff --git a/sound/drivers/opl3/opl3_voice.h b/sound/drivers/opl3/opl3_voice.h index eaef435e0528..a2445163008e 100644 --- a/sound/drivers/opl3/opl3_voice.h +++ b/sound/drivers/opl3/opl3_voice.h @@ -37,7 +37,7 @@ void snd_opl3_nrpn(void *p, struct snd_midi_channel *chan, struct snd_midi_chann void snd_opl3_sysex(void *p, unsigned char *buf, int len, int parsed, struct snd_midi_channel_set *chset); void snd_opl3_calc_volume(unsigned char *reg, int vel, struct snd_midi_channel *chan); -void snd_opl3_timer_func(unsigned long data); +void snd_opl3_timer_func(struct timer_list *t); /* Prototypes for opl3_drums.c */ void snd_opl3_load_drums(struct snd_opl3 *opl3); diff --git a/sound/drivers/serial-u16550.c b/sound/drivers/serial-u16550.c index 88e66ea0306d..0a67b8b9f176 100644 --- a/sound/drivers/serial-u16550.c +++ b/sound/drivers/serial-u16550.c @@ -309,12 +309,12 @@ static irqreturn_t snd_uart16550_interrupt(int irq, void *dev_id) } /* When the polling mode, this function calls snd_uart16550_io_loop. */ -static void snd_uart16550_buffer_timer(unsigned long data) +static void snd_uart16550_buffer_timer(struct timer_list *t) { unsigned long flags; struct snd_uart16550 *uart; - uart = (struct snd_uart16550 *)data; + uart = from_timer(uart, t, buffer_timer); spin_lock_irqsave(&uart->open_lock, flags); snd_uart16550_del_timer(uart); snd_uart16550_io_loop(uart); @@ -828,8 +828,7 @@ static int snd_uart16550_create(struct snd_card *card, uart->prev_in = 0; uart->rstatus = 0; memset(uart->prev_status, 0x80, sizeof(unsigned char) * SNDRV_SERIAL_MAX_OUTS); - setup_timer(&uart->buffer_timer, snd_uart16550_buffer_timer, - (unsigned long)uart); + timer_setup(&uart->buffer_timer, snd_uart16550_buffer_timer, 0); uart->timer_running = 0; /* Register device */ -- 2.7.4 -- Kees Cook Pixel Security

2 1

[alsa-devel] [PATCH] ALSA: hda controller - handle -1 value as error in snd_hdac_bus_parse_capabilities()
by Jaroslav Kysela 24 Oct '17

24 Oct '17

We have seen this value on a development platform. Signed-off-by: Jaroslav Kysela <perex(a)perex.cz> --- sound/hda/hdac_controller.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sound/hda/hdac_controller.c b/sound/hda/hdac_controller.c index 978dc1801b3a..4a1823290b2d 100644 --- a/sound/hda/hdac_controller.c +++ b/sound/hda/hdac_controller.c @@ -278,6 +278,11 @@ int snd_hdac_bus_parse_capabilities(struct hdac_bus *bus) do { cur_cap = _snd_hdac_chip_readl(bus, offset); + if (cur_cap == 0xffffffff) { + dev_dbg(bus->dev, "Wrong capability -1\n"); + break; + } + dev_dbg(bus->dev, "Capability version: 0x%x\n", (cur_cap & AZX_CAP_HDR_VER_MASK) >> AZX_CAP_HDR_VER_OFF); -- 2.13.6

2 1

[alsa-devel] conflict between alsa-lib and libasound2-data regarding alsa.conf file:
by arne 24 Oct '17

24 Oct '17

Hi, Debian conflicts between alsa-lib_1.1.4 and libasound2-data 1.1.3: in the source tree of alsa-lib I do: ./configure && make && sudo checkinstall and the result is: Unpacking alsa-lib (1.1.4.1-1) ... dpkg: error processing archive /home/temp/alsa-lib-1.1.4.1/alsa-lib_1.1.4.1-1_amd64.deb (--install): trying to overwrite '/usr/share/alsa/alsa.conf', which is also in package libasound2-data 1.1.3-5 This is on a Debian amd64 stable computer Thanks!

3 2

[alsa-devel] New to this list. Proposed patch to soc-utils.c
by Albin Stigö 24 Oct '17

24 Oct '17

Hello, I'm new to this list so please excuse my ignorance. I'm an anesthesiologist by profession so I might be a bit out of my depth here... I was doing some experimentation with custom i2s codecs (FPGAs) using the snd-soc-dummy codec (defined in soc-utils.c). I found this codec to be needlessly restrictive with sample rates allowed (SNDRV_PCM_RATE_8000_192000). I needed to use more "exotic" sample rates so I came up with a patch. I purpose using SNDRV_PCM_RATE_KNOT and setting some limits: .rate_min = 8000, .rate_max = 384000, It's my understanding that SNDRV_PCM_RATE_CONTINIOUS is used for "known" rates and SNDRV_PCM_RATE_KNOT for more or less arbitrary rates? I'm willing to submit my patch but might need some mentoring in the process. I don't think this simple patch could break anything..? --Albin

1 1

[alsa-devel] [PATCH 0/6] ASoC: Intel: Skylake: Add a clk driver to enable ssp clks early
by Subhransu S. Prusty 24 Oct '17

24 Oct '17

For certain platforms we require to start the clocks (mclk/sclk/fs) before the stream start. Example: for few systems, codec needs the mclk/sclk/fs to be enabled early for a successful clock synchronization and for some others, clock need to be enabled at boot and should be ON always. By sending set_dma_control IPC (with the i2s blobs queried from NHLT), these clocks can be enabled early after the firmware is downloaded. With this series, a virtual clock driver is created which provides interface to send the required IPCs from machine driver to enable the clocks. NHLT is parsed during probe and the clock information is populated. The pointer to blob is cached and sent along with the set_dma_control IPC structure during the clk prepare/unprepare callback. Clocks are created for a ssp if the nhlt table has endpoint configuration for that particular ssp. Skylake driver creates a platform driver with the clock information and register the clk ops callback. kabylake machine driver uses the clock interface to enable the clocks early as it is required by the rt5663 driver for clock synchronization. set_dma_control API can be used with different payload configuration. Modify the arguments to take configurable parameters. Harsha Priya (1): ASoC: Intel: kbl: Enable mclk and ssp sclk early Jaikrishna Nemallapudi (5): ASoC: Intel: Skylake: Modify skl_dsp_set_dma_control API arguments ASoC: Intel: Skylake: Parse nhlt to populate clock information ASoC: Intel: Skylake: Prepare DMA control IPC to enable/disable clock ASoC: Intel: Skylake: Register clock device and ops ASoC: Intel: Skylake: Add ssp clock driver sound/soc/intel/Kconfig | 8 + sound/soc/intel/boards/kbl_rt5663_max98927.c | 94 ++++++++- sound/soc/intel/skylake/Makefile | 5 + sound/soc/intel/skylake/skl-i2s.h | 56 ++++++ sound/soc/intel/skylake/skl-messages.c | 109 +++++++++- sound/soc/intel/skylake/skl-nhlt.c | 148 ++++++++++++++ sound/soc/intel/skylake/skl-ssp-clk.c | 287 +++++++++++++++++++++++++++ sound/soc/intel/skylake/skl-ssp-clk.h | 124 ++++++++++++ sound/soc/intel/skylake/skl-topology.h | 4 +- sound/soc/intel/skylake/skl.c | 235 ++++++++++++++++++++++ sound/soc/intel/skylake/skl.h | 12 ++ 11 files changed, 1070 insertions(+), 12 deletions(-) create mode 100644 sound/soc/intel/skylake/skl-i2s.h create mode 100644 sound/soc/intel/skylake/skl-ssp-clk.c create mode 100644 sound/soc/intel/skylake/skl-ssp-clk.h -- 1.9.1

5 17

[alsa-devel] ASoC: writing basic custom codecs?
by Albin Stigö 24 Oct '17

24 Oct '17

Hello, I have implemented a custom i2s codec on an FPGA. Because of how the FPGA is clocked I'm getting samples at 39ksps, which to my surprise worked great after some simple kernel patching (the codec is bit & frame master). For experimentation I used the snd-soc-dummy coded defined in soc-utils.c. Now I'm trying to write a very simple codec to "lock" the rate to 39000: https://github.com/ast/vfzfpga-codec The driver loads just fine but I just get "not registered" when I try to use the codec. I feel I'm missing something very obvious here. I've been through the documentation and tried to read the sources but I'm a bit stuck.. What am I missing? --Albin

1 0

[alsa-devel] Prague Audio miniconference - draft schedule
by Mark Brown 24 Oct '17

24 Oct '17

As previously announced[1] by Takashi our annual Linux audio miniconference will be held this year at the SuSE offices in Prague on Friday 27th October (the week of ELC-E). Thanks again to SuSE for sponsoring this. Following the earlier discussion I've pulled together a list of topics. I've put people's names against everything, mostly the people who suggested things but sometimes also other people who should probably be involved. I'm proposing that we work through things in roughly this order. Does this make sense to people? Any other topics? Summary - API status summary (tiwai) - Userspace release schedule - Docs - Dropping old drivers - Treble overview (Eric) - aplay rewrite (Sakamoto-san) ABI issues - USB PCM handling (tiwai) - mmap no IRQ (Eric) - TLV API issues (Sakamoto-san) - Obsolete dimen from struct snd_ctl_elem_info (Sakamoto-san) - Y2038 (tiwai) Future stuff/internals - Clock handling (Peter) - CCF, multi-clock selection - Digital domains (Charles/Lars/Morimoto-san) - Large regmaps (Charles) [1] http://mailman.alsa-project.org/pipermail/alsa-devel/2017-August/124623.html

3 6