January 2019 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH v2] staging: bcm2835-audio: interpolate audio delay
by Mike Brady 01 Jan '19

01 Jan '19

When the BCM2835 audio output is used, userspace sees a jitter up to 10ms in the audio position, aka "delay" -- the number of frames that must be output before a new frame would be played. Make this a bit nicer for userspace by interpolating the position using the CPU clock. The overhead is small -- an extra ktime_get() every time a GPU message is sent -- and another call and a few calculations whenever the delay is sought from userland. At 48,000 frames per second, i.e. approximately 20 microseconds per frame, it would take a clock inaccuracy of 20 microseconds in 10 milliseconds -- 2,000 parts per million -- to result in an inaccurate estimate, whereas crystal- or resonator-based clocks typically have an inaccuracy of 10s to 100s of parts per million. Signed-off-by: Mike Brady <mikebrady(a)eircom.net> --- Changes in v2 -- remove inappropriate addition of SNDRV_PCM_INFO_BATCH flag .../vc04_services/bcm2835-audio/bcm2835-pcm.c | 20 +++++++++++++++++++ .../vc04_services/bcm2835-audio/bcm2835.h | 1 + 2 files changed, 21 insertions(+) diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c index e66da11af5cf..9053b996cada 100644 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c @@ -74,6 +74,7 @@ void bcm2835_playback_fifo(struct bcm2835_alsa_stream *alsa_stream, atomic_set(&alsa_stream->pos, pos); alsa_stream->period_offset += bytes; + alsa_stream->interpolate_start = ktime_get(); if (alsa_stream->period_offset >= alsa_stream->period_size) { alsa_stream->period_offset %= alsa_stream->period_size; snd_pcm_period_elapsed(substream); @@ -243,6 +244,7 @@ static int snd_bcm2835_pcm_prepare(struct snd_pcm_substream *substream) atomic_set(&alsa_stream->pos, 0); alsa_stream->period_offset = 0; alsa_stream->draining = false; + alsa_stream->interpolate_start = ktime_get(); return 0; } @@ -292,6 +294,24 @@ snd_bcm2835_pcm_pointer(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; struct bcm2835_alsa_stream *alsa_stream = runtime->private_data; + ktime_t now = ktime_get(); + + /* Give userspace better delay reporting by interpolating between GPU + * notifications, assuming audio speed is close enough to the clock + * used for ktime + */ + + if ((ktime_to_ns(alsa_stream->interpolate_start)) && + (ktime_compare(alsa_stream->interpolate_start, now) < 0)) { + u64 interval = + (ktime_to_ns(ktime_sub(now, + alsa_stream->interpolate_start))); + u64 frames_output_in_interval = + div_u64((interval * runtime->rate), 1000000000); + snd_pcm_sframes_t frames_output_in_interval_sized = + -frames_output_in_interval; + runtime->delay = frames_output_in_interval_sized; + } return snd_pcm_indirect_playback_pointer(substream, &alsa_stream->pcm_indirect, diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h index e13435d1c205..595ad584243f 100644 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h @@ -78,6 +78,7 @@ struct bcm2835_alsa_stream { unsigned int period_offset; unsigned int buffer_size; unsigned int period_size; + ktime_t interpolate_start; struct bcm2835_audio_instance *instance; int idx; -- 2.17.1

4 17

[alsa-devel] [PATCH] aplay: support no period wakeup option in argument
by S.j. Wang 01 Jan '19

01 Jan '19

In the case that alsa driver can't support period wakeup, we need to set the no period wakeup flag Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> --- aplay/aplay.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/aplay/aplay.c b/aplay/aplay.c index efc1eb4cae3a..4f562bfe2884 100644 --- a/aplay/aplay.c +++ b/aplay/aplay.c @@ -137,6 +137,7 @@ static int use_strftime = 0; volatile static int recycle_capture_file = 0; static long term_c_lflag = -1; static int dump_hw_params = 0; +static int no_period_wakeup = 0; static int fd = -1; static off64_t pbrec_count = LLONG_MAX, fdcount; @@ -243,6 +244,7 @@ _("Usage: %s [OPTION]... [FILE]...\n" " --use-strftime apply the strftime facility to the output file name\n" " --dump-hw-params dump hw_params of the device\n" " --fatal-errors treat all errors as fatal\n" +" --no-period-wakeup set no period wakeup flag if necessary\n" ) , command); printf(_("Recognized sample formats are:")); @@ -429,6 +431,7 @@ enum { OPT_USE_STRFTIME, OPT_DUMP_HWPARAMS, OPT_FATAL_ERRORS, + OPT_NO_PERIOD_WAKEUP, }; /* @@ -516,6 +519,7 @@ int main(int argc, char *argv[]) {"interactive", 0, 0, 'i'}, {"dump-hw-params", 0, 0, OPT_DUMP_HWPARAMS}, {"fatal-errors", 0, 0, OPT_FATAL_ERRORS}, + {"no-period-wakeup", 0, 0, OPT_NO_PERIOD_WAKEUP}, #ifdef CONFIG_SUPPORT_CHMAP {"chmap", 1, 0, 'm'}, #endif @@ -799,6 +803,9 @@ int main(int argc, char *argv[]) case OPT_FATAL_ERRORS: fatal_errors = 1; break; + case OPT_NO_PERIOD_WAKEUP: + no_period_wakeup = 1; + break; #ifdef CONFIG_SUPPORT_CHMAP case 'm': channel_map = snd_pcm_chmap_parse_string(optarg); @@ -1396,6 +1403,12 @@ static void set_params(void) &buffer_frames); } assert(err >= 0); + + if (no_period_wakeup) { + err = snd_pcm_hw_params_set_period_wakeup(handle, params, 0); + assert(err >= 0); + } + monotonic = snd_pcm_hw_params_is_monotonic(params); can_pause = snd_pcm_hw_params_can_pause(params); err = snd_pcm_hw_params(handle, params); -- 1.9.1

3 6

Re: [alsa-devel] [PATCH] pci: fix a missing check of snd_i2c_sendbytes
by Takashi Iwai 01 Jan '19

01 Jan '19

On Wed, 26 Dec 2018 06:12:04 +0100, Kangjie Lu wrote: > > snd_i2c_sendbytes could fail. The fix checks its return value: if it > fails, issues an error message and returns with its error code. > > Signed-off-by: Kangjie Lu <kjlu(a)umn.edu> > --- > sound/pci/ice1712/ews.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/sound/pci/ice1712/ews.c b/sound/pci/ice1712/ews.c > index b8af747ecb43..b978cdb0fc20 100644 > --- a/sound/pci/ice1712/ews.c > +++ b/sound/pci/ice1712/ews.c > @@ -826,7 +826,10 @@ static int snd_ice1712_6fire_read_pca(struct snd_ice1712 *ice, unsigned char reg > > snd_i2c_lock(ice->i2c); > byte = reg; > - snd_i2c_sendbytes(spec->i2cdevs[EWS_I2C_6FIRE], &byte, 1); > + if (snd_i2c_sendbytes(spec->i2cdevs[EWS_I2C_6FIRE], &byte, 1)) { > + dev_err(ice->card->dev, "cannot send pca\n"); > + return -EIO; You forgot to unlock before returning. thanks, Takashi

1 0

Re: [alsa-devel] [PATCH] line6: add a check for snd_card_register
by Takashi Iwai 01 Jan '19

01 Jan '19

On Wed, 26 Dec 2018 04:39:31 +0100, Kangjie Lu wrote: > > The fix checks if snd_card_register() fails, and if so, issues a > warning. > > Signed-off-by: Kangjie Lu <kjlu(a)umn.edu> Hmm, you submitted multiple patches doing the similar things but the error messages are handled completely differently in both cases. Please make them consistent. ... and above all: > - snd_card_register(line6->card); > + if (snd_card_register(line6->card)) > + pr_warn("Failed to register ALSA card.\n"); This error message is almost useless. Better to use dev_*() variant. thanks, Takashi

1 0

Re: [alsa-devel] [PATCH] sound: sb: fix a missing check of snd_ctl_add
by Takashi Iwai 01 Jan '19

01 Jan '19

On Wed, 26 Dec 2018 02:45:32 +0100, Kangjie Lu wrote: > > snd_ctl_add() could fail, so let's check its return value and return its > error code upstream upon failure. > > Signed-off-by: Kangjie Lu <kjlu(a)umn.edu> > --- > sound/isa/sb/sb16_main.c | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/sound/isa/sb/sb16_main.c b/sound/isa/sb/sb16_main.c > index 37e6ce7b0b13..c9b25dc1f78e 100644 > --- a/sound/isa/sb/sb16_main.c > +++ b/sound/isa/sb/sb16_main.c > @@ -879,8 +879,14 @@ int snd_sb16dsp_pcm(struct snd_sb *chip, int device) > snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_sb16_playback_ops); > snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_sb16_capture_ops); > > - if (chip->dma16 >= 0 && chip->dma8 != chip->dma16) > - snd_ctl_add(card, snd_ctl_new1(&snd_sb16_dma_control, chip)); > + if (chip->dma16 >= 0 && chip->dma8 != chip->dma16) { > + err = > + snd_ctl_add(card, > + snd_ctl_new1(&snd_sb16_dma_control, > + chip)); > + if (err < 0) > + return err; > + } > else > pcm->info_flags = SNDRV_PCM_INFO_HALF_DUPLEX; The code change looks OK, but could you fix the indentation and avoid unneeded line breaks, as well as the missing braces for else-block? Also, we keep "ALSA:" prefix for the subject line (except for ASoC ones). Please align with it. thanks, Takashi

1 0

Re: [alsa-devel] [PATCH] gus: add a check of the status of snd_ctl_add
by Takashi Iwai 01 Jan '19

01 Jan '19

On Wed, 26 Dec 2018 02:40:51 +0100, Kangjie Lu wrote: > > snd_ctl_add() could fail, so let's check its status and issue an error > message if it indeed fails. > > Signed-off-by: Kangjie Lu <kjlu(a)umn.edu> The function itself prints the error in most of useful cases, so the extra error here would be superfluous. thanks, Takashi

1 0

Re: [alsa-devel] [PATCH] sound:emu10k1:Use kmemdup instead of duplicating its function
by Takashi Iwai 01 Jan '19

01 Jan '19

On Mon, 24 Dec 2018 09:42:48 +0100, huang.zijiang wrote: > > From: "huang.zijiang" <huang.zijiang(a)zte.com.cn> > > kmemdup has implemented the function that kmalloc() and memcpy(). > > Signed-off-by: huang.zijiang <huang.zijiang(a)zte.com.cn> > --- > sound/pci/emu10k1/emufx.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/sound/pci/emu10k1/emufx.c b/sound/pci/emu10k1/emufx.c > index 6ebe817..b4fe4c5 100644 > --- a/sound/pci/emu10k1/emufx.c > +++ b/sound/pci/emu10k1/emufx.c > @@ -671,10 +671,9 @@ static unsigned int *copy_tlv(const unsigned int __user *_tlv, bool in_kernel) > return NULL; > if (data[1] >= MAX_TLV_SIZE) > return NULL; > - tlv = kmalloc(data[1] + sizeof(data), GFP_KERNEL); > + tlv = kmemdup(data, data[1] + sizeof(data), GFP_KERNEL); > if (!tlv) > return NULL; > - memcpy(tlv, data, sizeof(data)); These changes are not equivalent, and rather dangerous, unfortunately. The memcpy() performs only for sizeof(data), and in this case, it's not the same size as the allocation above. thanks, Takashi

1 0

[alsa-devel] [alsa-lib][PATCH] conf/ucm: kblrt5660: Add ucm setting for Dell Edge IoT platform
by Hui Wang 01 Jan '19

01 Jan '19

The new generation of Dell Edge IoT platform is based on Intel Kabylake platform, and the audio codec is ALC3277 which is 100% compatible with RT5660 in I2S mode. The audio design on this IoT platform is as below: - Intel kabylake platform - connect the codec ALC3277 via SSP0 - line-out and line-in with Micbias jacks - line-out mute control and jack detection of line-out and line-in - two HDMI ports with audio capability Signed-off-by: Hui Wang <hui.wang(a)canonical.com> --- configure.ac | 1 + src/conf/ucm/Makefile.am | 1 + src/conf/ucm/kblrt5660/Hdmi1 | 20 +++++++ src/conf/ucm/kblrt5660/Hdmi2 | 20 +++++++ src/conf/ucm/kblrt5660/HiFi | 85 +++++++++++++++++++++++++++ src/conf/ucm/kblrt5660/Makefile.am | 4 ++ src/conf/ucm/kblrt5660/kblrt5660.conf | 18 ++++++ 7 files changed, 149 insertions(+) create mode 100755 src/conf/ucm/kblrt5660/Hdmi1 create mode 100755 src/conf/ucm/kblrt5660/Hdmi2 create mode 100755 src/conf/ucm/kblrt5660/HiFi create mode 100755 src/conf/ucm/kblrt5660/Makefile.am create mode 100755 src/conf/ucm/kblrt5660/kblrt5660.conf diff --git a/configure.ac b/configure.ac index d0cab2d6..6185a7eb 100644 --- a/configure.ac +++ b/configure.ac @@ -745,6 +745,7 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \ src/conf/ucm/gpd-win-pocket-rt5645/Makefile \ src/conf/ucm/HDAudio-Gigabyte-ALC1220DualCodecs/Makefile \ src/conf/ucm/HDAudio-Lenovo-DualCodecs/Makefile \ + src/conf/ucm/kblrt5660/Makefile \ src/conf/ucm/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/Makefile \ src/conf/ucm/PandaBoard/Makefile \ src/conf/ucm/PandaBoardES/Makefile \ diff --git a/src/conf/ucm/Makefile.am b/src/conf/ucm/Makefile.am index 85c15090..993d02bb 100644 --- a/src/conf/ucm/Makefile.am +++ b/src/conf/ucm/Makefile.am @@ -29,6 +29,7 @@ GoogleNyan \ gpd-win-pocket-rt5645 \ HDAudio-Gigabyte-ALC1220DualCodecs \ HDAudio-Lenovo-DualCodecs \ +kblrt5660 \ LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216 \ PandaBoard \ PandaBoardES \ diff --git a/src/conf/ucm/kblrt5660/Hdmi1 b/src/conf/ucm/kblrt5660/Hdmi1 new file mode 100755 index 00000000..95e6187a --- /dev/null +++ b/src/conf/ucm/kblrt5660/Hdmi1 @@ -0,0 +1,20 @@ +# Usecase for device HDMI1/Display Port stereo playback on Intel KABYLAKE platforms +# For Audio in I2S mode + +SectionDevice."Hdmi1" { + Comment "HDMI/Display Port 1 Stereo" + + EnableSequence [ + ] + + DisableSequence [ + ] + + Value { + PlaybackPCM "hw:kblrt5660,2" + PlaybackChannels "2" + PlaybackPriority "2" + JackControl "HDMI/DP, pcm=4 Jack" + } +} + diff --git a/src/conf/ucm/kblrt5660/Hdmi2 b/src/conf/ucm/kblrt5660/Hdmi2 new file mode 100755 index 00000000..f6d2feee --- /dev/null +++ b/src/conf/ucm/kblrt5660/Hdmi2 @@ -0,0 +1,20 @@ +# Usecase for device HDMI2/Display Port stereo playback on Intel KABYLAKE platforms +# For Audio in I2S mode + +SectionDevice."Hdmi2" { + Comment "HDMI/Display Port 2 Stereo" + + EnableSequence [ + ] + + DisableSequence [ + ] + + Value { + PlaybackPCM "hw:kblrt5660,3" + PlaybackChannels "2" + PlaybackPriority "3" + JackControl "HDMI/DP, pcm=5 Jack" + } +} + diff --git a/src/conf/ucm/kblrt5660/HiFi b/src/conf/ucm/kblrt5660/HiFi new file mode 100755 index 00000000..dbdb9006 --- /dev/null +++ b/src/conf/ucm/kblrt5660/HiFi @@ -0,0 +1,85 @@ +# UCM for Intel Kabylake platforms with RT5660 +# For Audio in I2S mode + +SectionVerb { + + EnableSequence [ + ] + + DisableSequence [ + ] + + # ALSA PCM + Value { + # ALSA PCM device for HiFi + PlaybackPCM "hw:kblrt5660,0" + CapturePCM "hw:kblrt5660,1" + } +} + +SectionDevice."LineOut" { + Comment "LineOut playback" + + EnableSequence [ + cdev "hw:kblrt5660" + cset "name='DAC1 Playback Volume' 30" + cset "name='OUT Playback Volume' 19" + cset "name='OUT Playback Switch' on" + cset "name='codec0_out mo media0_in mi Switch' on" + cset "name='DAC1 MIXL DAC1 Switch' on" + cset "name='DAC1 MIXR DAC1 Switch' on" + cset "name='Stereo DAC MIXL DAC L1 Switch' on" + cset "name='Stereo DAC MIXR DAC L1 Switch' off" + cset "name='Stereo DAC MIXR DAC R1 Switch' on" + cset "name='Stereo DAC MIXL DAC R1 Switch' off" + cset "name='LOUT MIX DAC Switch' on" + cset "name='Line Out Switch' on" + ] + + DisableSequence [ + cdev "hw:kblrt5660" + cset "name='Line Out Switch' off" + cset "name='DAC1 MIXL DAC1' off" + cset "name='DAC1 MIXR DAC1' off" + ] + + Value { + PlaybackChannels "2" + JackDev "rt5660-jack" + JackControl "Line Out Jack" + } +} + +SectionDevice."LineIn" { + Comment "LineIn capture" + + EnableSequence [ + cdev "hw:kblrt5660" + + cset "name='ADC Capture Volume' 30" + cset "name='IN1 Boost Volume' 30" + cset "name='IN2 Boost Volume' 30" + cset "name='STO1 ADC Boost Gain Volume' 1" + cset "name='RECMIXL BST1 Switch' off" + cset "name='RECMIXR BST1 Switch' on" + cset "name='RECMIXL BST2 Switch' on" + cset "name='RECMIXR BST2 Switch' off" + cset "name='Line In Switch' on" + cset "name='Sto1 ADC MIXR ADC1 Switch' on" + cset "name='Sto1 ADC MIXL ADC1 Switch' on" + cset "name='media0_out mo codec0_in mi Switch' on" + ] + + DisableSequence [ + cdev "hw:kblrt5660" + cset "name='Line In Switch' off" + cset "name='Sto1 ADC MIXR ADC1 Switch' off" + cset "name='Sto1 ADC MIXL ADC1 Switch' off" + ] + + Value { + CaptureChannels "2" + JackDev "rt5660-jack" + JackControl "Line In Jack" + } +} diff --git a/src/conf/ucm/kblrt5660/Makefile.am b/src/conf/ucm/kblrt5660/Makefile.am new file mode 100755 index 00000000..83c3743a --- /dev/null +++ b/src/conf/ucm/kblrt5660/Makefile.am @@ -0,0 +1,4 @@ +alsaconfigdir = @ALSA_CONFIG_DIR@ +ucmdir = $(alsaconfigdir)/ucm/kblrt5660 +ucm_DATA = kblrt5660.conf HiFi Hdmi1 Hdmi2 +EXTRA_DIST = $(ucm_DATA) diff --git a/src/conf/ucm/kblrt5660/kblrt5660.conf b/src/conf/ucm/kblrt5660/kblrt5660.conf new file mode 100755 index 00000000..c5e9420e --- /dev/null +++ b/src/conf/ucm/kblrt5660/kblrt5660.conf @@ -0,0 +1,18 @@ +SectionUseCase."HiFi" { + File "HiFi" + Comment "Play HiFi quality Music" +} + +SectionUseCase."Hdmi1" { + File "Hdmi1" + Comment "Play on Hdmi/DP 1" +} + +SectionUseCase."Hdmi2" { + File "Hdmi2" + Comment "Play on Hdmi/DP 2" +} + +SectionDefaults [ + cdev "hw:kblrt5660" +] -- 2.17.1

2 1

Re: [alsa-devel] [PATCH] sound: atom: fix a missing check of snd_pcm_lib_malloc_pages
by Pierre-Louis Bossart 01 Jan '19

01 Jan '19

On 12/25/18 8:29 PM, Kangjie Lu wrote: > snd_pcm_lib_malloc_pages() may fail, so let's check its status and > return its error code upstream. Acked-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> > > Signed-off-by: Kangjie Lu <kjlu(a)umn.edu> > --- > sound/soc/intel/atom/sst-mfld-platform-pcm.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/sound/soc/intel/atom/sst-mfld-platform-pcm.c b/sound/soc/intel/atom/sst-mfld-platform-pcm.c > index afc559866095..91a2436ce952 100644 > --- a/sound/soc/intel/atom/sst-mfld-platform-pcm.c > +++ b/sound/soc/intel/atom/sst-mfld-platform-pcm.c > @@ -399,7 +399,13 @@ static int sst_media_hw_params(struct snd_pcm_substream *substream, > struct snd_pcm_hw_params *params, > struct snd_soc_dai *dai) > { > - snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params)); > + int ret; > + > + ret = > + snd_pcm_lib_malloc_pages(substream, > + params_buffer_bytes(params)); > + if (ret) > + return ret; > memset(substream->runtime->dma_area, 0, params_buffer_bytes(params)); > return 0; > }

2 1

[alsa-devel] [PATCH] ALSA: hda/tegra: clear pending irq handlers
by Sameer Pujar 01 Jan '19

01 Jan '19

Even after disabling interrupts on the module, it could be possible that irq handlers are still running. System hang is seen during suspend path. It was found that, there were pending writes on the HDA bus and clock was disabled by that time. Above mentioned issue is fixed by clearing any pending irq handlers before disabling clocks and returning from hda suspend. Suggested-by: Mohan Kumar <mkumard(a)nvidia.com> Suggested-by: Dara Ramesh <dramesh(a)nvidia.com> Signed-off-by: Sameer Pujar <spujar(a)nvidia.com> --- sound/pci/hda/hda_tegra.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/pci/hda/hda_tegra.c b/sound/pci/hda/hda_tegra.c index 83befd8..97a176d 100644 --- a/sound/pci/hda/hda_tegra.c +++ b/sound/pci/hda/hda_tegra.c @@ -234,10 +234,12 @@ static int hda_tegra_suspend(struct device *dev) struct snd_card *card = dev_get_drvdata(dev); struct azx *chip = card->private_data; struct hda_tegra *hda = container_of(chip, struct hda_tegra, chip); + struct hdac_bus *bus = azx_bus(chip); snd_power_change_state(card, SNDRV_CTL_POWER_D3hot); azx_stop_chip(chip); + synchronize_irq(bus->irq); azx_enter_link_reset(chip); hda_tegra_disable_clocks(hda); -- 2.7.4

2 1