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

[alsa-devel] [USB-Audio - PX USB, playback] snd-usb-audio: probe of 2-3:1.0 failed with error -22 after kernel upgrade
by Mutz Heuer 01 Nov '18

01 Nov '18

USB-Audio Connection on Bowers & Wilkens PX Bluetooth Headphones started working when upgrading kernel from 4.13 to 4.15 series. Then it suddenly stopped working again on newer kernels. The bug report has been generated on the latest working mainline kernel 4.15.7. All newer kernels have some usb quirks in place, which should fix the playback sample rates to 48 kHz. The quirk seems not to be working correctly - it seems to hinder the audio system to recognize the USB-device as a sound device. The Headphones work on kernels before 4,15.7 when manually configuring pulseaudio to a default samplerate of 48 kHz. PX Headphones are on the newest firmware level. See https://patchwork.kernel.org/patch/10265345/. Dropping that patch and recompiling the kernel leads to a situation where alsa and pulseaudio seem to to be working again. Adding default-sample-rate = 48000 to /etc/pulse/daemon.conf leads to working headphones. Maybe the patch has to be adjusted to newer firmware? A quirk seems to be really necessary to avoid the specific patch to daemon.conf. More details can be found in https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1773697 What would be the best way to proceed?

2 4

[alsa-devel] [PATCH 3/3] ALSA:hda: add support for Huawei WMI MicMute LED
by Ayman Bagabas 01 Nov '18

01 Nov '18

Some of Huawei laptops come with a LED in the mic mute key. This patch enables and disable this LED when the internal microphone status is changed. Signed-off-by: Ayman Bagabas <ayman.bagabas(a)gmail.com> --- include/linux/huawei_wmi.h | 7 ++++ sound/pci/hda/huawei_wmi_helper.c | 66 +++++++++++++++++++++++++++++++ sound/pci/hda/patch_realtek.c | 12 ++++++ 3 files changed, 85 insertions(+) create mode 100644 include/linux/huawei_wmi.h create mode 100644 sound/pci/hda/huawei_wmi_helper.c diff --git a/include/linux/huawei_wmi.h b/include/linux/huawei_wmi.h new file mode 100644 index 000000000000..69b656c5029b --- /dev/null +++ b/include/linux/huawei_wmi.h @@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __HUAWEI_WMI_H__ +#define __HUAWEI_WMI_H__ + +int huawei_wmi_micmute_led_set(bool on); + +#endif diff --git a/sound/pci/hda/huawei_wmi_helper.c b/sound/pci/hda/huawei_wmi_helper.c new file mode 100644 index 000000000000..57256f51fd88 --- /dev/null +++ b/sound/pci/hda/huawei_wmi_helper.c @@ -0,0 +1,66 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Helper functions for Huawei WMI Mic Mute LED; + * to be included from codec driver + */ + +#if IS_ENABLED(CONFIG_HUAWEI_LAPTOP) +#include <linux/huawei_wmi.h> + +static int (*huawei_wmi_micmute_led_set_func)(bool); + +static void update_huawei_wmi_micmute_led(struct hda_codec *codec, + struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + if (!ucontrol || !huawei_wmi_micmute_led_set_func) + return; + if (strcmp("Capture Switch", ucontrol->id.name) == 0 && ucontrol->id.index == 0) { + /* TODO: How do I verify if it's a mono or stereo here? */ + bool val = ucontrol->value.integer.value[0] || ucontrol->value.integer.value[1]; + huawei_wmi_micmute_led_set_func(!val); + } +} + +static void alc_fixup_huawei_wmi(struct hda_codec *codec, + const struct hda_fixup *fix, int action) +{ + struct hda_gen_spec *spec = codec->spec; + bool removefunc = false; + + codec_info(codec, "In alc_fixup_huawei_wmi\n"); + + if (action == HDA_FIXUP_ACT_PROBE) { + if (!huawei_wmi_micmute_led_set_func) + huawei_wmi_micmute_led_set_func = symbol_request(huawei_wmi_micmute_led_set); + if (!huawei_wmi_micmute_led_set_func) { + codec_warn(codec, "Failed to find huawei_wmi symbol huawei_wmi_micmute_led_set\n"); + return; + } + + removefunc = true; + if (huawei_wmi_micmute_led_set_func(false) >= 0) { + if (spec->num_adc_nids > 1 && !spec->dyn_adc_switch) + codec_dbg(codec, "Skipping micmute LED control due to several ADCs"); + else { + spec->cap_sync_hook = update_huawei_wmi_micmute_led; + removefunc = false; + } + } + codec_info(codec, "In alc_fixup_huawei_wmi IF\n"); + + } + + if (huawei_wmi_micmute_led_set_func && (action == HDA_FIXUP_ACT_FREE || removefunc)) { + symbol_put(huawei_wmi_micmute_led_set); + huawei_wmi_micmute_led_set_func = NULL; + } +} + +#else + +static void hda_fixup_huawei_wmi(struct hda_codec *codec, + const struct hda_fixup *fix, int action) +{ +} + +#endif diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 4f7a39c7883c..0dab00c0df50 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -5371,6 +5371,9 @@ static void alc_fixup_thinkpad_acpi(struct hda_codec *codec, /* for dell wmi mic mute led */ #include "dell_wmi_helper.c" +/* for huawei wmi mic mute led */ +#include "huawei_wmi_helper.c" + /* for alc295_fixup_hp_top_speakers */ #include "hp_x360_helper.c" @@ -5494,6 +5497,7 @@ enum { ALC255_FIXUP_DUMMY_LINEOUT_VERB, ALC255_FIXUP_DELL_HEADSET_MIC, ALC256_FIXUP_HUAWEI_MBXP_PINS, + ALC256_FIXUP_HUAWEI_WMI_MICMUTE_LED, ALC295_FIXUP_HP_X360, ALC221_FIXUP_HP_HEADSET_MIC, }; @@ -6348,6 +6352,10 @@ static const struct hda_fixup alc269_fixups[] = { .chained = true, .chain_id = ALC269_FIXUP_HEADSET_MIC }, + [ALC256_FIXUP_HUAWEI_WMI_MICMUTE_LED] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc_fixup_huawei_wmi, + }, [ALC256_FIXUP_HUAWEI_MBXP_PINS] = { .type = HDA_FIXUP_PINS, .v.pins = (const struct hda_pintbl[]) { @@ -6363,6 +6371,8 @@ static const struct hda_fixup alc269_fixups[] = { {0x21, 0x04211020}, { }, }, + .chained = true, + .chain_id = ALC256_FIXUP_HUAWEI_WMI_MICMUTE_LED }, [ALC295_FIXUP_HP_X360] = { .type = HDA_FIXUP_FUNC, @@ -6610,6 +6620,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x17aa, 0x511e, "Thinkpad", ALC298_FIXUP_TPT470_DOCK), SND_PCI_QUIRK(0x17aa, 0x511f, "Thinkpad", ALC298_FIXUP_TPT470_DOCK), SND_PCI_QUIRK(0x19e5, 0x3204, "Huawei MBXP", ALC256_FIXUP_HUAWEI_MBXP_PINS), + SND_PCI_QUIRK(0x19e5, 0x3204, "Huawei MBXP", ALC256_FIXUP_HUAWEI_WMI_MICMUTE_LED), SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_FIXUP_PCM_44K), SND_PCI_QUIRK(0x17aa, 0x9e54, "LENOVO NB", ALC269_FIXUP_LENOVO_EAPD), SND_PCI_QUIRK(0x1b7d, 0xa831, "Ordissimo EVE2 ", ALC269VB_FIXUP_ORDISSIMO_EVE2), /* Also known as Malata PC-B1303 */ @@ -6775,6 +6786,7 @@ static const struct hda_model_fixup alc269_fixup_models[] = { {.id = ALC274_FIXUP_DELL_AIO_LINEOUT_VERB, .name = "alc274-dell-aio"}, {.id = ALC255_FIXUP_DUMMY_LINEOUT_VERB, .name = "alc255-dummy-lineout"}, {.id = ALC255_FIXUP_DELL_HEADSET_MIC, .name = "alc255-dell-headset"}, + {.id = ALC256_FIXUP_HUAWEI_WMI_MICMUTE_LED, .name = "alc256-huawei-micmute"}, {.id = ALC295_FIXUP_HP_X360, .name = "alc295-hp-x360"}, {} }; -- 2.17.2

2 2

[alsa-devel] [PATCH 2/3] ALSA:hda: fix front speakers on Huawei MBXP.
by Ayman Bagabas 01 Nov '18

01 Nov '18

This patch enables the front speakers on Huawei Matebook X Pro laptops. These laptops come with Dolby Atmos sound system and these pins configuration enables the front speakers. Signed-off-by: Ayman Bagabas <ayman.bagabas(a)gmail.com> --- sound/pci/hda/patch_realtek.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 3ac7ba9b342d..4f7a39c7883c 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -5493,6 +5493,7 @@ enum { ALC298_FIXUP_TPT470_DOCK, ALC255_FIXUP_DUMMY_LINEOUT_VERB, ALC255_FIXUP_DELL_HEADSET_MIC, + ALC256_FIXUP_HUAWEI_MBXP_PINS, ALC295_FIXUP_HP_X360, ALC221_FIXUP_HP_HEADSET_MIC, }; @@ -6347,6 +6348,22 @@ static const struct hda_fixup alc269_fixups[] = { .chained = true, .chain_id = ALC269_FIXUP_HEADSET_MIC }, + [ALC256_FIXUP_HUAWEI_MBXP_PINS] = { + .type = HDA_FIXUP_PINS, + .v.pins = (const struct hda_pintbl[]) { + {0x12, 0x90a60130}, + {0x13, 0x40000000}, + {0x14, 0x90170110}, + {0x18, 0x411111f0}, + {0x19, 0x04a11040}, + {0x1a, 0x411111f0}, + {0x1b, 0x90170112}, + {0x1d, 0x40759a05}, + {0x1e, 0x411111f0}, + {0x21, 0x04211020}, + { }, + }, + }, [ALC295_FIXUP_HP_X360] = { .type = HDA_FIXUP_FUNC, .v.func = alc295_fixup_hp_top_speakers, @@ -6592,6 +6609,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x17aa, 0x5109, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), SND_PCI_QUIRK(0x17aa, 0x511e, "Thinkpad", ALC298_FIXUP_TPT470_DOCK), SND_PCI_QUIRK(0x17aa, 0x511f, "Thinkpad", ALC298_FIXUP_TPT470_DOCK), + SND_PCI_QUIRK(0x19e5, 0x3204, "Huawei MBXP", ALC256_FIXUP_HUAWEI_MBXP_PINS), SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_FIXUP_PCM_44K), SND_PCI_QUIRK(0x17aa, 0x9e54, "LENOVO NB", ALC269_FIXUP_LENOVO_EAPD), SND_PCI_QUIRK(0x1b7d, 0xa831, "Ordissimo EVE2 ", ALC269VB_FIXUP_ORDISSIMO_EVE2), /* Also known as Malata PC-B1303 */ -- 2.17.2

3 2

[alsa-devel] Bug report - snd_hda_intel - snd_pcm_delay() returned a value that is exceptionally large -
by Sergey Popol 31 Oct '18

31 Oct '18

Hello, After a few hours my ubuntu workstation becomes unresponsive (requiring a Sysreq reisub to reboot): ================================================================= $ cat /var/log/syslog | grep 20:25 Oct 31 20:25:01 soulwax CRON[1587]: (root) CMD (command -v debian-sa1 > /dev/null && debian-sa1 1 1) Oct 31 20:25:28 soulwax pulseaudio[1824]: [alsa-sink-ALC283 Analog] alsa-util.c: snd_pcm_delay() returned a value that is exceptionally large: -417964 bytes (-2369 ms). Oct 31 20:25:28 soulwax pulseaudio[1824]: [alsa-sink-ALC283 Analog] alsa-util.c: Most likely this is a bug in the ALSA driver 'snd_hda_intel'. Please report this issue to the ALSA developers. Oct 31 20:25:29 soulwax /usr/lib/gdm3/gdm-x-session[1673]: (II) event3 - Logitech USB Optical Mouse: SYN_DROPPED event - some input events have been lost. Oct 31 20:25:31 soulwax pulseaudio[1824]: [alsa-sink-ALC283 Analog] alsa-util.c: snd_pcm_dump(): Oct 31 20:25:32 soulwax pulseaudio[1824]: [alsa-sink-ALC283 Analog] alsa-util.c: Soft volume PCM Oct 31 20:25:34 soulwax pulseaudio[1824]: [alsa-sink-ALC283 Analog] alsa-util.c: Control: PCM Playback Volume Oct 31 20:25:34 soulwax pulseaudio[1824]: [alsa-sink-ALC283 Analog] alsa-util.c: min_dB: -51 Oct 31 20:25:35 soulwax pulseaudio[1824]: [alsa-sink-ALC283 Analog] alsa-util.c: max_dB: 0 Oct 31 20:25:36 soulwax /usr/lib/gdm3/gdm-x-session[1673]: (II) event4 - Logitech USB Keyboard: SYN_DROPPED event - some input events have been lost. Oct 31 20:25:36 soulwax pulseaudio[1824]: [alsa-sink-ALC283 Analog] alsa-util.c: resolution: 256 Oct 31 20:25:37 soulwax pulseaudio[1824]: [alsa-sink-ALC283 Analog] alsa-util.c: Its setup is: Oct 31 20:25:37 soulwax pulseaudio[1824]: [alsa-sink-ALC283 Analog] alsa-util.c: stream : PLAYBACK Oct 31 20:25:37 soulwax /usr/lib/gdm3/gdm-x-session[1673]: (**) Option "fd" "21" Oct 31 20:25:37 soulwax /usr/lib/gdm3/gdm-x-session[1673]: (II) event2 - Power Button: device removed Oct 31 20:25:38 soulwax pulseaudio[1824]: [alsa-sink-ALC283 Analog] alsa-util.c: access : MMAP_INTERLEAVED Oct 31 20:25:38 soulwax /usr/lib/gdm3/gdm-x-session[1673]: (**) Option "fd" "24" Oct 31 20:25:39 soulwax /usr/lib/gdm3/gdm-x-session[1673]: (II) event5 - Video Bus: device removed Oct 31 20:25:39 soulwax /usr/lib/gdm3/gdm-x-session[1673]: (**) Option "fd" "25" Oct 31 20:25:39 soulwax /usr/lib/gdm3/gdm-x-session[1673]: (II) event1 - Power Button: device removed Oct 31 20:25:40 soulwax /usr/lib/gdm3/gdm-x-session[1673]: (**) Option "fd" "26" Oct 31 20:25:40 soulwax kernel: [35165.869886] rfkill: input handler enabled Oct 31 20:25:40 soulwax /usr/lib/gdm3/gdm-x-session[1673]: (II) event0 - Sleep Button: device removed Oct 31 20:25:40 soulwax /usr/lib/gdm3/gdm-x-session[1673]: (**) Option "fd" "27" Oct 31 20:25:40 soulwax /usr/lib/gdm3/gdm-x-session[1673]: (II) event3 - Logitech USB Optical Mouse: device removed Oct 31 20:25:41 soulwax /usr/lib/gdm3/gdm-x-session[1673]: (**) Option "fd" "28" Oct 31 20:25:41 soulwax /usr/lib/gdm3/gdm-x-session[1673]: (II) event4 - Logitech USB Keyboard: device removed Oct 31 20:25:41 soulwax pulseaudio[1824]: [alsa-sink-ALC283 Analog] alsa-util.c: format : S16_LE Oct 31 20:25:42 soulwax /usr/lib/gdm3/gdm-x-session[1673]: (**) Option "fd" "29" Oct 31 20:25:42 soulwax /usr/lib/gdm3/gdm-x-session[1673]: (II) event6 - Logitech USB Keyboard: device removed Oct 31 20:25:43 soulwax /usr/lib/gdm3/gdm-x-session[1673]: (**) Option "fd" "30" Oct 31 20:25:54 soulwax /usr/lib/gdm3/gdm-x-session[1673]: (II) event7 - ITE8713 CIR transceiver: device removed ================================================================= http://www.alsa-project.org/db/?f=d5e5889f64b41a208f4dad2c1ac4b49a9b9ec558 Hope that can help. Sergei

1 0

[alsa-devel] [PATCH 3/3] ALSA:hda: add support for Huawei WMI MicMute LED
by ayman.bagabas＠gmail.com 31 Oct '18

31 Oct '18

1 0

[alsa-devel] [PATCH] ALSA:hda: fix front speakers on Huawei MBXP.
by ayman.bagabas＠gmail.com 31 Oct '18

31 Oct '18

1 0

[alsa-devel] [PATCH] ASoC: rsnd: fixup clock start checker
by Kuninori Morimoto 31 Oct '18

31 Oct '18

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> commit 4d230d12710646 ("ASoC: rsnd: fixup not to call clk_get/set under non-atomic") fixuped clock start timing. But it exchanged clock start checker from ssi->usrcnt to ssi->rate. Current rsnd_ssi_master_clk_start() is called from .prepare, but some player (for example GStreamer) might calls it many times. In such case, the checker might returns error even though it was not error. It should check ssi->usrcnt instead of ssi->rate. This patch fixup it. Without this patch, GStreamer can't switch 48kHz / 44.1kHz. Reported-by: Yusuke Goda <yusuke.goda.sx(a)renesas.com> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Tested-by: Yusuke Goda <yusuke.goda.sx(a)renesas.com> --- sound/soc/sh/rcar/ssi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index 95acc8b..dc85fff 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -300,7 +300,7 @@ static int rsnd_ssi_master_clk_start(struct rsnd_mod *mod, if (rsnd_ssi_is_multi_slave(mod, io)) return 0; - if (ssi->rate) { + if (ssi->usrcnt > 1) { if (ssi->rate != rate) { dev_err(dev, "SSI parent/child should use same rate\n"); return -EINVAL; -- 2.7.4

2 1

[alsa-devel] Bug in hdmi codec driver in DPCM
by Rohit Kumar 31 Oct '18

31 Oct '18

Hi, We are facing crash in hdmi codec driver when we use DPCM based dai-links. Crash is happening in hdmi_codec_eld_chmap() while accessing chmap_info struct during hdmi_codec_startup(). However, chmap_info struct is allocated in hdmi_codec_pcm_new() which is only called in non-DPCM based dai-links. Below is the crash stack: [61.635493] Unable to handle kernel NULL pointer dereference at virtual address 00000018 ..... [61.666696]CM = 0, WnR = 1 [61.669778] user pgtable: 4k pages, 39-bit VAs, pgd = ffffffc0d6633000 [61.676526] [0000000000000018] *pgd=0000000153fc8003, *pud=0000000153fc8003, *pmd=0000000000000000 [61.685793] Internal error: Oops: 96000046 [#1] PREEMPT SMP [61.722955] CPU: 7 PID: 2238 Comm: aplay Not tainted 4.14.72 #21 .. [61.740269] PC is at hdmi_codec_startup+0x124/0x164 [61.745308] LR is at hdmi_codec_startup+0xe4/0x164 .. We would probably need to move the implementation on pcm_new() to some other function to make it compatible with DPCM. Can you please provide suggestions in solving the issue. Thanks, Rohit

2 2

[alsa-devel] [PATCH] ASoC: stm32: sai: fix invalid use of sizeof in stm32_sai_add_mclk_provider()
by Wei Yongjun 30 Oct '18

30 Oct '18

sizeof() when applied to a pointer typed expression gives the size of the pointer, not that of the pointed data. Fixes: 8307b2afd386 ("ASoC: stm32: sai: set sai as mclk clock provider") Signed-off-by: Wei Yongjun <weiyongjun1(a)huawei.com> --- sound/soc/stm/stm32_sai_sub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/stm/stm32_sai_sub.c b/sound/soc/stm/stm32_sai_sub.c index ea05cc9..211589b 100644 --- a/sound/soc/stm/stm32_sai_sub.c +++ b/sound/soc/stm/stm32_sai_sub.c @@ -390,7 +390,7 @@ static int stm32_sai_add_mclk_provider(struct stm32_sai_sub_data *sai) char *mclk_name, *p, *s = (char *)pname; int ret, i = 0; - mclk = devm_kzalloc(dev, sizeof(mclk), GFP_KERNEL); + mclk = devm_kzalloc(dev, sizeof(*mclk), GFP_KERNEL); if (!mclk) return -ENOMEM;

2 1

[alsa-devel] [PATCH v2] ASoC: AMD: Fix race condition between register access
by Agrawal, Akshu 30 Oct '18

30 Oct '18

During simultaneous running of playback and capture, we got hit by incorrect value write on common register. This was due to race condition between 2 streams. Fixing this by locking the common register access. Signed-off-by: Akshu Agrawal <akshu.agrawal(a)amd.com> --- v2: Added 2 helper functions, removed locking in ch enable/disable as they are separate registers. sound/soc/amd/acp-pcm-dma.c | 63 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 48 insertions(+), 15 deletions(-) diff --git a/sound/soc/amd/acp-pcm-dma.c b/sound/soc/amd/acp-pcm-dma.c index 0ac4b5b..5be9c2d 100644 --- a/sound/soc/amd/acp-pcm-dma.c +++ b/sound/soc/amd/acp-pcm-dma.c @@ -121,6 +121,9 @@ .periods_max = CAPTURE_MAX_NUM_PERIODS, }; +/* Lock to protect access to registers */ +static DEFINE_SPINLOCK(lock); + static u32 acp_reg_read(void __iomem *acp_mmio, u32 reg) { return readl(acp_mmio + (reg * 4)); @@ -131,6 +134,33 @@ static void acp_reg_write(u32 val, void __iomem *acp_mmio, u32 reg) writel(val, acp_mmio + (reg * 4)); } +static void acp_reg_write_srbm_targ(void __iomem *acp_mmio, + u32 addr, u32 data) +{ + unsigned long flags; + + spin_lock_irqsave(&lock, flags); + acp_reg_write(addr, acp_mmio, mmACP_SRBM_Targ_Idx_Addr); + acp_reg_write(data, acp_mmio, mmACP_SRBM_Targ_Idx_Data); + spin_unlock_irqrestore(&lock, flags); +} + +static void acp_reg_read_mod_write(void __iomem *acp_mmio, u32 addr, + u32 mask, bool set) +{ + u32 val; + unsigned long flags; + + spin_lock_irqsave(&lock, flags); + val = acp_reg_read(acp_mmio, addr); + if (set) + val |= mask; + else + val &= ~mask; + acp_reg_write(val, acp_mmio, addr); + spin_unlock_irqrestore(&lock, flags); +} + /* * Configure a given dma channel parameters - enable/disable, * number of descriptors, priority @@ -172,15 +202,12 @@ static void config_dma_descriptor_in_sram(void __iomem *acp_mmio, sram_offset = (descr_idx * sizeof(acp_dma_dscr_transfer_t)); /* program the source base address. */ - acp_reg_write(sram_offset, acp_mmio, mmACP_SRBM_Targ_Idx_Addr); - acp_reg_write(descr_info->src, acp_mmio, mmACP_SRBM_Targ_Idx_Data); + acp_reg_write_srbm_targ(acp_mmio, sram_offset, descr_info->src); /* program the destination base address. */ - acp_reg_write(sram_offset + 4, acp_mmio, mmACP_SRBM_Targ_Idx_Addr); - acp_reg_write(descr_info->dest, acp_mmio, mmACP_SRBM_Targ_Idx_Data); - + acp_reg_write_srbm_targ(acp_mmio, sram_offset + 4, descr_info->dest); /* program the number of bytes to be transferred for this descriptor. */ - acp_reg_write(sram_offset + 8, acp_mmio, mmACP_SRBM_Targ_Idx_Addr); - acp_reg_write(descr_info->xfer_val, acp_mmio, mmACP_SRBM_Targ_Idx_Data); + acp_reg_write_srbm_targ(acp_mmio, sram_offset + 8, + descr_info->xfer_val); } static void pre_config_reset(void __iomem *acp_mmio, u16 ch_num) @@ -309,8 +336,12 @@ static void acp_pte_config(void __iomem *acp_mmio, struct page *pg, u32 low; u32 high; u32 offset; + unsigned long flags; offset = ACP_DAGB_GRP_SRBM_SRAM_BASE_OFFSET + (pte_offset * 8); + + spin_lock_irqsave(&lock, flags); + for (page_idx = 0; page_idx < (num_of_pages); page_idx++) { /* Load the low address of page int ACP SRAM through SRBM */ acp_reg_write((offset + (page_idx * 8)), @@ -333,6 +364,8 @@ static void acp_pte_config(void __iomem *acp_mmio, struct page *pg, /* Move to next physically contiguos page */ pg++; } + + spin_unlock_irqrestore(&lock, flags); } static void config_acp_dma(void __iomem *acp_mmio, @@ -870,29 +903,29 @@ static int acp_dma_hw_params(struct snd_pcm_substream *substream, } } if (adata->asic_type == CHIP_STONEY) { - val = acp_reg_read(adata->acp_mmio, - mmACP_I2S_16BIT_RESOLUTION_EN); if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { switch (rtd->i2s_instance) { case I2S_BT_INSTANCE: - val |= ACP_I2S_BT_16BIT_RESOLUTION_EN; + val = ACP_I2S_BT_16BIT_RESOLUTION_EN; break; case I2S_SP_INSTANCE: default: - val |= ACP_I2S_SP_16BIT_RESOLUTION_EN; + val = ACP_I2S_SP_16BIT_RESOLUTION_EN; } } else { switch (rtd->i2s_instance) { case I2S_BT_INSTANCE: - val |= ACP_I2S_BT_16BIT_RESOLUTION_EN; + val = ACP_I2S_BT_16BIT_RESOLUTION_EN; break; case I2S_SP_INSTANCE: default: - val |= ACP_I2S_MIC_16BIT_RESOLUTION_EN; + val = ACP_I2S_MIC_16BIT_RESOLUTION_EN; } } - acp_reg_write(val, adata->acp_mmio, - mmACP_I2S_16BIT_RESOLUTION_EN); + acp_reg_read_mod_write(adata->acp_mmio, + mmACP_I2S_16BIT_RESOLUTION_EN, + val, + true); } if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { -- 1.9.1

1 0