February 2021 - Alsa-devel - mailman.alsa-project.org

[PATCH] ASoC: mediatek: mt8183-mt6358: set playback and capture constraints
by Jiaxin Yu 05 Feb '21

05 Feb '21

Sets playback and capture constraints to S16_LE, stereo, 48kHz. Signed-off-by: Jiaxin Yu <jiaxin.yu(a)mediatek.com> --- .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c index 3cf8aea..271413e 100644 --- a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c +++ b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c @@ -118,6 +118,45 @@ static int mt8183_rt1015_i2s_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, } static int +mt8183_mt6358_startup(struct snd_pcm_substream *substream) +{ + static const unsigned int rates[] = { + 48000, + }; + static const struct snd_pcm_hw_constraint_list constraints_rates = { + .count = ARRAY_SIZE(rates), + .list = rates, + .mask = 0, + }; + static const unsigned int channels[] = { + 2, + }; + static const struct snd_pcm_hw_constraint_list constraints_channels = { + .count = ARRAY_SIZE(channels), + .list = channels, + .mask = 0, + }; + + struct snd_pcm_runtime *runtime = substream->runtime; + + snd_pcm_hw_constraint_list(runtime, 0, + SNDRV_PCM_HW_PARAM_RATE, &constraints_rates); + runtime->hw.channels_max = 2; + snd_pcm_hw_constraint_list(runtime, 0, + SNDRV_PCM_HW_PARAM_CHANNELS, + &constraints_channels); + + runtime->hw.formats = SNDRV_PCM_FMTBIT_S16_LE; + snd_pcm_hw_constraint_msbits(runtime, 0, 16, 16); + + return 0; +} + +static const struct snd_soc_ops mt8183_mt6358_ops = { + .startup = mt8183_mt6358_startup, +}; + +static int mt8183_mt6358_ts3a227_max98357_bt_sco_startup( struct snd_pcm_substream *substream) { @@ -356,6 +395,7 @@ static void mt8183_mt6358_tdm_shutdown(struct snd_pcm_substream *substream) SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, .dpcm_playback = 1, + .ops = &mt8183_mt6358_ops, SND_SOC_DAILINK_REG(playback1), }, { @@ -403,6 +443,7 @@ static void mt8183_mt6358_tdm_shutdown(struct snd_pcm_substream *substream) SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, .dpcm_capture = 1, + .ops = &mt8183_mt6358_ops, SND_SOC_DAILINK_REG(capture3), }, { -- 1.8.1.1.dirty

2 1

[PATCH 0/4] ASoC: codecs: Realtek/SoundWire: fix remove/suspend issues
by Pierre-Louis Bossart 05 Feb '21

05 Feb '21

These issues and fixes were identified during our module load/unload and suspend/resume stress tests. Bard Liao (1): ASoC: rt5682: do nothing in rt5682_suspend/resume in sdw mode Pierre-Louis Bossart (3): ASoC: rt700-sdw: use cancel_work_sync() in .remove as well as .suspend ASoC: rt711-sdw: use cancel_work_sync() for .remove ASoC: rt5682-sdw: cancel_work_sync() in .remove and .suspend sound/soc/codecs/rt5682-sdw.c | 4 +++- sound/soc/codecs/rt5682.c | 6 ++++++ sound/soc/codecs/rt700-sdw.c | 4 ++-- sound/soc/codecs/rt711-sdw.c | 4 ++-- 4 files changed, 13 insertions(+), 5 deletions(-) -- 2.25.1

2 5

[PATCH] ALSA: usb-audio: Fix PCM buffer allocation in non-vmalloc mode
by Takashi Iwai 05 Feb '21

05 Feb '21

The commit f274baa49be6 ("ALSA: usb-audio: Allow non-vmalloc buffer for PCM buffers") introduced the mode to allocate coherent pages for PCM buffers, and it used bus->controller device as its DMA device. It turned out, however, that bus->sysdev is a more appropriate device to be used for DMA mapping in HCD code. This patch corrects the device reference accordingly. Note that, on most platforms, both point to the very same device, hence this patch doesn't change anything practically. But on platforms like xhcd-plat hcd, the change becomes effective. Fixes: f274baa49be6 ("ALSA: usb-audio: Allow non-vmalloc buffer for PCM buffers") Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/usb/pcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c index 078bb4c94033..dcadf8f164b2 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c @@ -1558,7 +1558,7 @@ void snd_usb_preallocate_buffer(struct snd_usb_substream *subs) { struct snd_pcm *pcm = subs->stream->pcm; struct snd_pcm_substream *s = pcm->streams[subs->direction].substream; - struct device *dev = subs->dev->bus->controller; + struct device *dev = subs->dev->bus->sysdev; if (snd_usb_use_vmalloc) snd_pcm_set_managed_buffer(s, SNDRV_DMA_TYPE_VMALLOC, -- 2.26.2

1 0

[PATCH] coresight: etm4x: Fix merge resolution for amba rework
by Uwe Kleine-König 05 Feb '21

05 Feb '21

This was non-trivial to get right because commits c23bc382ef0e ("coresight: etm4x: Refactor probing routine") and 5214b563588e ("coresight: etm4x: Add support for sysreg only devices") changed the code flow considerably. With this change the driver can be built again. Fixes: 0573d3fa4864 ("Merge branch 'devel-stable' of git://git.armlinux.org.uk/~rmk/linux-arm into char-misc-next") Signed-off-by: Uwe Kleine-König <uwe(a)kleine-koenig.org> --- On Fri, Feb 05, 2021 at 12:07:09PM +0100, Greg Kroah-Hartman wrote: > On Fri, Feb 05, 2021 at 11:56:15AM +0100, Uwe Kleine-König wrote: > > I didn't compile test, but I'm willing to bet your resolution is wrong. > > You have no return statement in etm4_remove_dev() but its return type is > > int and etm4_remove_amba() still returns int but should return void. > > Can you send a patch to fix this up? Sure, here it comes. As I'm unsure if you want to squash it into the merge or want to keep it separate I crafted a commit message. If you prefer squashing feel free to do so. This change corresponds to the merge resolution I suggested before. Best regards Uwe drivers/hwtracing/coresight/coresight-etm4x-core.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c index bc55b261af23..c8ecd91e289e 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c @@ -1906,15 +1906,16 @@ static int __exit etm4_remove_dev(struct etmv4_drvdata *drvdata) cpus_read_unlock(); coresight_unregister(drvdata->csdev); + + return 0; } -static int __exit etm4_remove_amba(struct amba_device *adev) +static void __exit etm4_remove_amba(struct amba_device *adev) { struct etmv4_drvdata *drvdata = dev_get_drvdata(&adev->dev); if (drvdata) - return etm4_remove_dev(drvdata); - return 0; + etm4_remove_dev(drvdata); } static int __exit etm4_remove_platform_dev(struct platform_device *pdev) -- 2.29.2

2 1

[PATCH v3 0/5] amba: minor fix and various cleanups
by Uwe Kleine-König 05 Feb '21

05 Feb '21

From: Uwe Kleine-König <u.kleine-koenig.org(a)pengutronix.de Hello, Changes since v2 sent with Message-Id: 20201124133139.3072124-1-uwe(a)kleine-koenig.org: - Rebase to v5.11-rc1 (which resulted in a few conflicts in drivers/hwtracing). - Add various Acks. - Send to more maintainers directly (which I think is one of the reasons why there are so few Acks). For my taste patch 4 needs some more acks (drivers/char/hw_random, drivers/dma, drivers/gpu/drm/pl111, drivers/i2c, drivers/mmc, drivers/vfio, drivers/watchdog and sound/arm have no maintainer feedback yet). My suggestion is to let this series go in via Russell King (who cares for amba). Once enough Acks are there I can also provide a tag for merging into different trees. Just tell me if you prefer this solution. Would be great if this could make it for v5.12, but I'm aware it's already late in the v5.11 cycle so it might have to wait for v5.13. Best regards Uwe Uwe Kleine-König (5): amba: Fix resource leak for drivers without .remove amba: reorder functions vfio: platform: simplify device removal amba: Make the remove callback return void amba: Make use of bus_type functions drivers/amba/bus.c | 234 +++++++++--------- drivers/char/hw_random/nomadik-rng.c | 3 +- drivers/dma/pl330.c | 3 +- drivers/gpu/drm/pl111/pl111_drv.c | 4 +- drivers/hwtracing/coresight/coresight-catu.c | 3 +- .../hwtracing/coresight/coresight-cpu-debug.c | 4 +- .../hwtracing/coresight/coresight-cti-core.c | 4 +- drivers/hwtracing/coresight/coresight-etb10.c | 4 +- .../coresight/coresight-etm3x-core.c | 4 +- .../coresight/coresight-etm4x-core.c | 4 +- .../hwtracing/coresight/coresight-funnel.c | 4 +- .../coresight/coresight-replicator.c | 4 +- drivers/hwtracing/coresight/coresight-stm.c | 4 +- .../hwtracing/coresight/coresight-tmc-core.c | 4 +- drivers/hwtracing/coresight/coresight-tpiu.c | 4 +- drivers/i2c/busses/i2c-nomadik.c | 4 +- drivers/input/serio/ambakmi.c | 3 +- drivers/memory/pl172.c | 4 +- drivers/memory/pl353-smc.c | 4 +- drivers/mmc/host/mmci.c | 4 +- drivers/rtc/rtc-pl030.c | 4 +- drivers/rtc/rtc-pl031.c | 4 +- drivers/spi/spi-pl022.c | 5 +- drivers/tty/serial/amba-pl010.c | 4 +- drivers/tty/serial/amba-pl011.c | 3 +- drivers/vfio/platform/vfio_amba.c | 15 +- drivers/video/fbdev/amba-clcd.c | 4 +- drivers/watchdog/sp805_wdt.c | 4 +- include/linux/amba/bus.h | 2 +- sound/arm/aaci.c | 4 +- 30 files changed, 157 insertions(+), 198 deletions(-) base-commit: 5c8fe583cce542aa0b84adc939ce85293de36e5e -- 2.29.2

11 26

[PATCH] sound: x86: Trivial spell fixes throughout the file intel_hdmi_audio.c
by Bhaskar Chowdhury 05 Feb '21

05 Feb '21

s/confgiuration/configuration/ s/Calculte/Calculate/ s/unreference/unreferenced/ Signed-off-by: Bhaskar Chowdhury <unixbhaskar(a)gmail.com> --- sound/x86/intel_hdmi_audio.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c index 9f9fcd2749f2..89ddd9dd8fde 100644 --- a/sound/x86/intel_hdmi_audio.c +++ b/sound/x86/intel_hdmi_audio.c @@ -342,7 +342,7 @@ static int had_prog_status_reg(struct snd_pcm_substream *substream, /* * function to initialize audio - * registers and buffer confgiuration registers + * registers and buffer configuration registers * This function is called in the prepare callback */ static int had_init_audio_ctrl(struct snd_pcm_substream *substream, @@ -611,7 +611,7 @@ static void had_prog_dip(struct snd_pcm_substream *substream, frame2.regx.chnl_cnt = substream->runtime->channels - 1; frame3.regx.chnl_alloc = ca; - /* Calculte the byte wide checksum for all valid DIP words */ + /* Calculate the byte wide checksum for all valid DIP words */ for (i = 0; i < BYTES_PER_WORD; i++) checksum += (info_frame >> (i * 8)) & 0xff; for (i = 0; i < BYTES_PER_WORD; i++) @@ -1109,7 +1109,7 @@ static int had_pcm_close(struct snd_pcm_substream *substream) intelhaddata = snd_pcm_substream_chip(substream); - /* unreference and sync with the pending PCM accesses */ + /* unreferenced and sync with the pending PCM accesses */ spin_lock_irq(&intelhaddata->had_spinlock); intelhaddata->stream_info.substream = NULL; intelhaddata->stream_info.substream_refcount--; -- 2.30.0

2 2

[PATCH] ALSA: usb-audio: Correct document for snd_usb_endpoint_free_all()
by Takashi Iwai 05 Feb '21

05 Feb '21

The kerndoc comment for the new function snd_usb_endpoint_free_all() had a typo wrt the argument name. Fix it. Fixes: 00272c61827e ("ALSA: usb-audio: Avoid unnecessary interface re-setup") Reported-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/usb/endpoint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c index 8e568823c992..4d1c678a0d80 100644 --- a/sound/usb/endpoint.c +++ b/sound/usb/endpoint.c @@ -1451,7 +1451,7 @@ void snd_usb_endpoint_release(struct snd_usb_endpoint *ep) /** * snd_usb_endpoint_free_all: Free the resources of an snd_usb_endpoint - * @card: The chip + * @chip: The chip * * This free all endpoints and those resources */ -- 2.26.2

1 0

[PATCH v5 0/5] ALSA: usb-audio: Fixes for Pioneer devices
by Takashi Iwai 05 Feb '21

05 Feb '21

Hi, here is the revised patches for addressing the regressions reported on the Pioneer USB-audio devices. Those have the special configuration where both playback and capture endpoints share the same interface with the vendor-spec descriptors. It required the extension of the endpoint management code and the setup of the implicit feedback mode. v4->v5: - Fix the implicit feedback detection - Correct the maxpacksize for ep_idx=1 case Takashi === Takashi Iwai (5): ALSA: usb-audio: Fix the missing endpoints creations for quirks ALSA: usb-audio: Choose audioformat of a counter-part substream ALSA: usb-audio: Avoid unnecessary interface re-setup ALSA: usb-audio: Annotate the endpoint index in audioformat ALSA: usb-audio: Fix implicit feedback sync setup for Pioneer devices sound/usb/card.c | 5 +-- sound/usb/card.h | 3 ++ sound/usb/endpoint.c | 84 ++++++++++++++++++++++++++++++++++------ sound/usb/endpoint.h | 2 +- sound/usb/implicit.c | 57 ++++++++++++++++++++------- sound/usb/quirks-table.h | 6 +++ sound/usb/quirks.c | 58 +++++++++++++++++++++------ sound/usb/usbaudio.h | 1 + 8 files changed, 173 insertions(+), 43 deletions(-) -- 2.26.2

2 7

ucm2: sof-hda-dsp: DMICS may not be present
by GitHub issues - opened 05 Feb '21

05 Feb '21

alsa-project/alsa-ucm-conf issue #80 was opened from plbossart: UCM files assume that when SOF is used, the number of DMICs is between 1 and 4. That's an invalid assumption in the following two cases: a) the user plays with kernel parameters to select SOF on a platform without DMIC options snd_intel_dspcfg dsp_driver=3 b) the user plays with kernel parameters to work-around invalid dmic information, e.g. for UpExtreme the NHLT information reports 4 microphones but none are attached to the connector by default options snd_sof_intel_hda_common dmic_num=0 In those two cases, the only solution is to comment out the entire 'Mic1' section in ucm2/sof-hda-dsp/HiFi.conf. It'd be nicer to detect this case with the component information The machine driver currently only provides the cfg-dmics component string when the real or overridden number of dmics is > 0. The component string is as follows ```` amixer -Dhw:0 info Card hw:0 'sofhdadsp'/'AAEON-UP_WHL01-V1.0' Mixer name : 'Realtek ALC892' Components : 'HDA:8086280b,80860101,00100000 HDA:10ec0892,160d0892,00100302' Controls : 40 Simple ctrls : 15 ```` Reported by @worldgeek and confirmed on my platform. @perexg @kv2019i @libinyang FYI Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/80 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH v3 0/3] ASoC: mediatek: mt8192: apply some cleanup
by Tzung-Bi Shih 04 Feb '21

04 Feb '21

The 1st and 2nd patch refactor to use asoc_substream_to_rtd(). The 3rd patch simplifies ops of Capture1 DAI link. Changes from v2[1]: - Fix typo in 3rd patch's title, s/simply/simplify/. Changes from v1[2]: - Separated from v1. [1]: https://patchwork.kernel.org/project/alsa-devel/list/?series=420919 [2]: https://patchwork.kernel.org/project/alsa-devel/list/?series=419769 Tzung-Bi Shih (3): ASoC: mediatek: mt8192-mt6359: use asoc_substream_to_rtd() ASoC: mediatek: mt8192: use asoc_substream_to_rtd() ASoC: mediatek: mt8192-mt6359: simplify ops for Capture1 DAI link sound/soc/mediatek/mt8192/mt8192-afe-pcm.c | 4 ++-- .../mt8192/mt8192-mt6359-rt1015-rt5682.c | 24 ++++++++----------- 2 files changed, 12 insertions(+), 16 deletions(-) -- 2.30.0.365.g02bc693789-goog

2 4