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

Re: [PATCH] Add HP Stream 8 to bytcr_rt5640.c
by Pierre-Louis Bossart 14 Dec '22

14 Dec '22

On 12/13/22 11:35, Moises Cardona wrote: > The HP Stream 8 tablet is identical to the HP Stream 7 in terms of the PCB, > with the exception of the added SIM Card Slot. > Therefore, I'm submitting this patch which properly initializes the audio > and enables the headphone jack to work, just like it does in the > HP Stream 7. > > Signed-off-by: Moises Cardona <moisesmcardona(a)gmail.com> Acked-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> > --- > sound/soc/intel/boards/bytcr_rt5640.c | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c > index fb9d9e271845..1d964b1ceff4 100644 > --- a/sound/soc/intel/boards/bytcr_rt5640.c > +++ b/sound/soc/intel/boards/bytcr_rt5640.c > @@ -796,6 +796,17 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = { > BYT_RT5640_SSP0_AIF1 | > BYT_RT5640_MCLK_EN), > }, > + { /* HP Stream 8 */ > + .matches = { > + DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), > + DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "HP Stream 8 Tablet"), > + }, > + .driver_data = (void *)(BYTCR_INPUT_DEFAULTS | > + BYT_RT5640_MONO_SPEAKER | > + BYT_RT5640_JD_NOT_INV | > + BYT_RT5640_SSP0_AIF1 | > + BYT_RT5640_MCLK_EN), > + }, > { /* I.T.Works TW891 */ > .matches = { > DMI_EXACT_MATCH(DMI_SYS_VENDOR, "To be filled by O.E.M."),

3 2

Re: [PATCH] Add HP Stream 8 to bytcr_rt5640.c
by Hans de Goede 14 Dec '22

14 Dec '22

Hi, On 12/14/22 13:08, Moises Cardona wrote: > The bytcr_rt5640.c file already supports the HP Stream 7. > > The HP Stream 8 is almost identical in terms of the hardware > with the exception of it having stereo speakers, a SIM > card slot and the obvious size difference. > > > Signed-off-by Moises Cardona <moisesmcardona(a)gmail.com> Thanks, this new version (which should have been marked as v2) looks good to me: Reviewed-by: Hans de Goede <hdegoede(a)redhat.com> Regards, Hans > > --- > sound/soc/intel/boards/bytcr_rt5640.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c > index fb9d9e271845..569d039d680b 100644 > --- a/sound/soc/intel/boards/bytcr_rt5640.c > +++ b/sound/soc/intel/boards/bytcr_rt5640.c > @@ -796,6 +796,16 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = { > BYT_RT5640_SSP0_AIF1 | > BYT_RT5640_MCLK_EN), > }, > + { /* HP Stream 8 */ > + .matches = { > + DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), > + DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "HP Stream 8 Tablet"), > + }, > + .driver_data = (void *)(BYTCR_INPUT_DEFAULTS | > + BYT_RT5640_JD_NOT_INV | > + BYT_RT5640_SSP0_AIF1 | > + BYT_RT5640_MCLK_EN), > + }, > { /* I.T.Works TW891 */ > .matches = { > DMI_EXACT_MATCH(DMI_SYS_VENDOR, "To be filled by O.E.M."),

1 0

Re: [PATCH 2/2] ASoC: da7213: Add support for mono, set frame width to 32 when possible
by Mark Brown 14 Dec '22

14 Dec '22

On Wed, Dec 14, 2022 at 03:31:26PM +0100, Piotr Wojtaszczyk wrote: > It was a single patch, with no deps. > It's flagged as patch 2/2? > On Wed, Dec 14, 2022 at 3:21 PM Mark Brown <broonie(a)kernel.org> wrote: Please don't top post, reply in line with needed context. This allows readers to readily follow the flow of conversation and understand what you are talking about and also helps ensure that everything in the discussion is being addressed.

1 0

[PATCH] ASoC: SOF: mediatek: initialize panic_info to zero
by YC Hung 14 Dec '22

14 Dec '22

Coverity spotted that panic_info is not initialized to zero in mtk_adsp_dump. Using uninitialized value panic_info.linenum when calling snd_sof_get_status. Fix this coverity by initializing panic_info struct as zero. Signed-off-by: YC Hung <yc.hung(a)mediatek.com> --- sound/soc/sof/mediatek/mtk-adsp-common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sof/mediatek/mtk-adsp-common.c b/sound/soc/sof/mediatek/mtk-adsp-common.c index 1e0769c668a7..de8dbe27cd0d 100644 --- a/sound/soc/sof/mediatek/mtk-adsp-common.c +++ b/sound/soc/sof/mediatek/mtk-adsp-common.c @@ -60,7 +60,7 @@ void mtk_adsp_dump(struct snd_sof_dev *sdev, u32 flags) { char *level = (flags & SOF_DBG_DUMP_OPTIONAL) ? KERN_DEBUG : KERN_ERR; struct sof_ipc_dsp_oops_xtensa xoops; - struct sof_ipc_panic_info panic_info; + struct sof_ipc_panic_info panic_info = {}; u32 stack[MTK_ADSP_STACK_DUMP_SIZE]; u32 status; -- 2.18.0

3 2

[PATCH] ASoC: rt5670: Remove unbalanced pm_runtime_put()
by Hans de Goede 14 Dec '22

14 Dec '22

For some reason rt5670_i2c_probe() does a pm_runtime_put() at the end of a successful probe. But it has never done a pm_runtime_get() leading to the following error being logged into dmesg: rt5670 i2c-10EC5640:00: Runtime PM usage count underflow! Fix this by removing the unnecessary pm_runtime_put(). Fixes: 64e89e5f5548 ("ASoC: rt5670: Add runtime PM support") Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- sound/soc/codecs/rt5670.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sound/soc/codecs/rt5670.c b/sound/soc/codecs/rt5670.c index ebac6caeb40a..a230f441559a 100644 --- a/sound/soc/codecs/rt5670.c +++ b/sound/soc/codecs/rt5670.c @@ -3311,8 +3311,6 @@ static int rt5670_i2c_probe(struct i2c_client *i2c) if (ret < 0) goto err; - pm_runtime_put(&i2c->dev); - return 0; err: pm_runtime_disable(&i2c->dev); -- 2.38.1

3 5

[PATCH] ASoC: Intel: bytcr_rt5640: Add quirk for the Advantech MICA-071 tablet
by Hans de Goede 14 Dec '22

14 Dec '22

The Advantech MICA-071 tablet deviates from the defaults for a non CR Bay Trail based tablet in several ways: 1. It uses an analog MIC on IN3 rather then using DMIC1 2. It only has 1 speaker 3. It needs the OVCD current threshold to be set to 1500uA instead of the default 2000uA to reliable differentiate between headphones vs headsets Add a quirk with these settings for this tablet. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- sound/soc/intel/boards/bytcr_rt5640.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c index fb9d9e271845..ddd2625bed90 100644 --- a/sound/soc/intel/boards/bytcr_rt5640.c +++ b/sound/soc/intel/boards/bytcr_rt5640.c @@ -570,6 +570,21 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = { BYT_RT5640_SSP0_AIF1 | BYT_RT5640_MCLK_EN), }, + { + /* Advantech MICA-071 */ + .matches = { + DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Advantech"), + DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "MICA-071"), + }, + /* OVCD Th = 1500uA to reliable detect head-phones vs -set */ + .driver_data = (void *)(BYT_RT5640_IN3_MAP | + BYT_RT5640_JD_SRC_JD2_IN4N | + BYT_RT5640_OVCD_TH_1500UA | + BYT_RT5640_OVCD_SF_0P75 | + BYT_RT5640_MONO_SPEAKER | + BYT_RT5640_DIFF_MIC | + BYT_RT5640_MCLK_EN), + }, { .matches = { DMI_EXACT_MATCH(DMI_SYS_VENDOR, "ARCHOS"), -- 2.38.1

3 2

Re: [PATCH 2/2] ASoC: da7213: Add support for mono, set frame width to 32 when possible
by Mark Brown 14 Dec '22

14 Dec '22

On Wed, Dec 14, 2022 at 04:40:58AM +0000, David Rau wrote: > This adds the DAI mono mode support and set the frame width to 32 > > Signed-off-by: Piotr Wojtaszczyk <piotr.wojtaszczyk(a)timesys.com> > Tested-by: David Rau <David.Rau.opensource(a)dm.renesas.com> > Signed-off-by: David Rau <David.Rau.opensource(a)dm.renesas.com> I only have patch 2 here, what's the story with dependencies?

1 0

[PATCH] ASoC: Intel: soc-acpi: update codec addr on 0C11/0C4F product
by Bard Liao 14 Dec '22

14 Dec '22

From: Gongjun Song <gongjun.song(a)intel.com> The unique ID is determined by the ADR pin level of rt1318. ODM changed design, update codec addr to match new design. Fixes: 0050e3d3d43d ("ASoC: Intel: soc-acpi: add SKU 0C11 SoundWire configuration") Signed-off-by: Gongjun Song <gongjun.song(a)intel.com> Signed-off-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> --- sound/soc/intel/common/soc-acpi-intel-rpl-match.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/intel/common/soc-acpi-intel-rpl-match.c b/sound/soc/intel/common/soc-acpi-intel-rpl-match.c index 3c5229f41bb0..31b43116e3d8 100644 --- a/sound/soc/intel/common/soc-acpi-intel-rpl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-rpl-match.c @@ -112,7 +112,7 @@ static const struct snd_soc_acpi_adr_device rt1316_1_group2_adr[] = { static const struct snd_soc_acpi_adr_device rt1318_1_group1_adr[] = { { - .adr = 0x000131025D131801ull, + .adr = 0x000132025D131801ull, .num_endpoints = 1, .endpoints = &spk_l_endpoint, .name_prefix = "rt1318-1" -- 2.25.1

2 1

[PATCH] ASoC: mediatek: mt8195: add sof be ops to check audio active
by YC Hung 14 Dec '22

14 Dec '22

In MT8195 SOF design, both DSP and audio driver would access audio registers. Before DSP accesses audio registers, audio power and clock should be enabled. DSP will hang up if DSP access audio register but audio power and clock are disabled. Therefore, we add audio pm runtime active checking before accessing audio registers in SOF BE's callback hw_params function to avoid this situation. Signed-off-by: YC Hung <yc.hung(a)mediatek.com> --- sound/soc/mediatek/mt8195/mt8195-mt6359.c | 30 +++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/sound/soc/mediatek/mt8195/mt8195-mt6359.c b/sound/soc/mediatek/mt8195/mt8195-mt6359.c index 61be66f47723..4682748d82be 100644 --- a/sound/soc/mediatek/mt8195/mt8195-mt6359.c +++ b/sound/soc/mediatek/mt8195/mt8195-mt6359.c @@ -633,6 +633,32 @@ static const struct snd_soc_ops mt8195_rt1011_etdm_ops = { .hw_params = mt8195_rt1011_etdm_hw_params, }; +static int mt8195_sof_be_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_component *cmpnt_afe = NULL; + struct snd_soc_pcm_runtime *runtime; + + /* find afe component */ + for_each_card_rtds(rtd->card, runtime) { + cmpnt_afe = snd_soc_rtdcom_lookup(runtime, AFE_PCM_NAME); + if (cmpnt_afe) + break; + } + + if (cmpnt_afe && !pm_runtime_active(cmpnt_afe->dev)) { + dev_err(rtd->dev, "afe pm runtime is not active!!\n"); + return -EINVAL; + } + + return 0; +} + +static const struct snd_soc_ops mt8195_sof_be_ops = { + .hw_params = mt8195_sof_be_hw_params, +}; + static int mt8195_rt1011_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_card *card = rtd->card; @@ -1272,24 +1298,28 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { .name = "AFE_SOF_DL2", .no_pcm = 1, .dpcm_playback = 1, + .ops = &mt8195_sof_be_ops, SND_SOC_DAILINK_REG(AFE_SOF_DL2), }, [DAI_LINK_SOF_DL3_BE] = { .name = "AFE_SOF_DL3", .no_pcm = 1, .dpcm_playback = 1, + .ops = &mt8195_sof_be_ops, SND_SOC_DAILINK_REG(AFE_SOF_DL3), }, [DAI_LINK_SOF_UL4_BE] = { .name = "AFE_SOF_UL4", .no_pcm = 1, .dpcm_capture = 1, + .ops = &mt8195_sof_be_ops, SND_SOC_DAILINK_REG(AFE_SOF_UL4), }, [DAI_LINK_SOF_UL5_BE] = { .name = "AFE_SOF_UL5", .no_pcm = 1, .dpcm_capture = 1, + .ops = &mt8195_sof_be_ops, SND_SOC_DAILINK_REG(AFE_SOF_UL5), }, }; -- 2.18.0

4 3

[PATCH] ASoC: wm8994: Fix potential deadlock
by Marek Szyprowski 14 Dec '22

14 Dec '22

Commit c0feea594e05 ("workqueue: don't skip lockdep work dependency in cancel_work_sync()") revealed the following locking issue in the wm8994 codec: ====================================================== WARNING: possible circular locking dependency detected 6.0.0-rc1-00001-gc0feea594e05-dirty #13097 Not tainted ------------------------------------------------------ kworker/1:1/32 is trying to acquire lock: c2bd4300 (&wm8994->accdet_lock){+.+.}-{3:3}, at: wm1811_mic_work+0x38/0xdc but task is already holding lock: f08f5f28 ((work_completion)(&(&wm8994->mic_work)->work)){+.+.}-{0:0}, at: process_one_work+0x1e4/0x778 which lock already depends on the new lock. the existing dependency chain (in reverse order) is: -> #1 ((work_completion)(&(&wm8994->mic_work)->work)){+.+.}-{0:0}: __cancel_work_timer+0x198/0x22c wm1811_jackdet_irq+0x124/0x238 process_one_work+0x288/0x778 worker_thread+0x44/0x504 kthread+0xf0/0x124 ret_from_fork+0x14/0x2c 0x0 -> #0 (&wm8994->accdet_lock){+.+.}-{3:3}: lock_acquire+0x124/0x3e4 __mutex_lock+0x90/0x948 mutex_lock_nested+0x1c/0x24 wm1811_mic_work+0x38/0xdc process_one_work+0x288/0x778 worker_thread+0x44/0x504 kthread+0xf0/0x124 ret_from_fork+0x14/0x2c 0x0 other info that might help us debug this: Possible unsafe locking scenario: CPU0 CPU1 ---- ---- lock((work_completion)(&(&wm8994->mic_work)->work)); lock(&wm8994->accdet_lock); lock((work_completion)(&(&wm8994->mic_work)->work)); lock(&wm8994->accdet_lock); *** DEADLOCK *** 2 locks held by kworker/1:1/32: #0: c1c072a8 ((wq_completion)events_power_efficient){+.+.}-{0:0}, at: process_one_work+0x1e4/0x778 #1: f08f5f28 ((work_completion)(&(&wm8994->mic_work)->work)){+.+.}-{0:0}, at: process_one_work+0x1e4/0x778 stack backtrace: CPU: 1 PID: 32 Comm: kworker/1:1 Not tainted 6.0.0-rc1-00001-gc0feea594e05-dirty #13097 Hardware name: Samsung Exynos (Flattened Device Tree) Workqueue: events_power_efficient wm1811_mic_work unwind_backtrace from show_stack+0x10/0x14 show_stack from dump_stack_lvl+0x58/0x70 dump_stack_lvl from check_noncircular+0xf0/0x158 check_noncircular from __lock_acquire+0x15e8/0x2a7c __lock_acquire from lock_acquire+0x124/0x3e4 lock_acquire from __mutex_lock+0x90/0x948 __mutex_lock from mutex_lock_nested+0x1c/0x24 mutex_lock_nested from wm1811_mic_work+0x38/0xdc wm1811_mic_work from process_one_work+0x288/0x778 process_one_work from worker_thread+0x44/0x504 worker_thread from kthread+0xf0/0x124 kthread from ret_from_fork+0x14/0x2c Exception stack(0xf08f5fb0 to 0xf08f5ff8) ... --->8--- Fix this by dropping wm8994->accdet_lock while calling cancel_delayed_work_sync(&wm8994->mic_work) in wm1811_jackdet_irq(). Fixes: c0cc3f166525 ("ASoC: wm8994: Allow a delay between jack insertion and microphone detect") Signed-off-by: Marek Szyprowski <m.szyprowski(a)samsung.com> --- sound/soc/codecs/wm8994.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index d3cfd3788f2a..f810135e28d0 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -3853,7 +3853,12 @@ static irqreturn_t wm1811_jackdet_irq(int irq, void *data) } else { dev_dbg(component->dev, "Jack not detected\n"); + /* Release wm8994->accdet_lock to avoid deadlock: + * cancel_delayed_work_sync() takes wm8994->mic_work internal + * lock and wm1811_mic_work takes wm8994->accdet_lock */ + mutex_unlock(&wm8994->accdet_lock); cancel_delayed_work_sync(&wm8994->mic_work); + mutex_lock(&wm8994->accdet_lock); snd_soc_component_update_bits(component, WM8958_MICBIAS2, WM8958_MICB2_DISCH, WM8958_MICB2_DISCH); -- 2.38.1

3 2