1. 12 Sep, 2018 2 commits
    • Yu Zhao's avatar
      sound: enable interrupt after dma buffer initialization · b61749a8
      Yu Zhao authored
      In snd_hdac_bus_init_chip(), we enable interrupt before
      snd_hdac_bus_init_cmd_io() initializing dma buffers. If irq has
      been acquired and irq handler uses the dma buffer, kernel may crash
      when interrupt comes in.
      
      Fix the problem by postponing enabling irq after dma buffer
      initialization. And warn once on null dma buffer pointer during the
      initialization.
      Reviewed-by: default avatarTakashi Iwai <tiwai@suse.de>
      Signed-off-by: default avatarYu Zhao <yuzhao@google.com>
      Signed-off-by: default avatarMark Brown <broonie@kernel.org>
      b61749a8
    • Yu Zhao's avatar
      Revert "ASoC: Intel: Skylake: Acquire irq after RIRB allocation" · 542cedec
      Yu Zhao authored
      This reverts commit 12eeeb4f.
      
      The patch doesn't fix accessing memory with null pointer in
      skl_interrupt().
      
      There are two problems: 1) skl_init_chip() is called twice, before
      and after dma buffer is allocate. The first call sets bus->chip_init
      which prevents the second from initializing bus->corb.buf and
      rirb.buf from bus->rb.area. 2) snd_hdac_bus_init_chip() enables
      interrupt before snd_hdac_bus_init_cmd_io() initializing dma buffers.
      There is a small window which skl_interrupt() can be called if irq
      has been acquired. If so, it crashes when using null dma buffer
      pointers.
      
      Will fix the problems in the following patches. Also attaching the
      crash for future reference.
      
      [   16.949148] general protection fault: 0000 [#1] PREEMPT SMP KASAN PTI
      <snipped>
      [   16.950903] Call Trace:
      [   16.950906]  <IRQ>
      [   16.950918]  skl_interrupt+0x19e/0x2d6 [snd_soc_skl]
      [   16.950926]  ? dma_supported+0xb5/0xb5 [snd_soc_skl]
      [   16.950933]  __handle_irq_event_percpu+0x27a/0x6c8
      [   16.950937]  ? __irq_wake_thread+0x1d1/0x1d1
      [   16.950942]  ? __do_softirq+0x57a/0x69e
      [   16.950944]  handle_irq_event_percpu+0x95/0x1ba
      [   16.950948]  ? _raw_spin_unlock+0x65/0xdc
      [   16.950951]  ? __handle_irq_event_percpu+0x6c8/0x6c8
      [   16.950953]  ? _raw_spin_unlock+0x65/0xdc
      [   16.950957]  ? time_cpufreq_notifier+0x483/0x483
      [   16.950959]  handle_irq_event+0x89/0x123
      [   16.950962]  handle_fasteoi_irq+0x16f/0x425
      [   16.950965]  handle_irq+0x1fe/0x28e
      [   16.950969]  do_IRQ+0x6e/0x12e
      [   16.950972]  common_interrupt+0x7a/0x7a
      [   16.950974]  </IRQ>
      <snipped>
      [   16.951031] RIP: snd_hdac_bus_update_rirb+0x19b/0x4cf [snd_hda_core] RSP: ffff88015c807c08
      [   16.951036] ---[ end trace 58bf9ece1775bc92 ]---
      
      Fixes: 2eeeb4f4733b ("ASoC: Intel: Skylake: Acquire irq after RIRB allocation")
      Signed-off-by: default avatarYu Zhao <yuzhao@google.com>
      Signed-off-by: default avatarMark Brown <broonie@kernel.org>
      542cedec
  2. 10 Sep, 2018 2 commits
  3. 06 Sep, 2018 2 commits
  4. 05 Sep, 2018 1 commit
  5. 03 Sep, 2018 2 commits
    • Jiada Wang's avatar
      ASoC: rsnd: fixup not to call clk_get/set under non-atomic · 4d230d12
      Jiada Wang authored
      Clocking operations clk_get/set_rate, are non-atomic,
      they shouldn't be called in soc_pcm_trigger() which is atomic.
      
      Following issue was found due to execution of clk_get_rate() causes
      sleep in soc_pcm_trigger(), which shouldn't be blocked.
      
      We can reproduce this issue by following
      	> enable CONFIG_DEBUG_ATOMIC_SLEEP=y
      	> compile, and boot
      	> mount -t debugfs none /sys/kernel/debug
      	> while true; do cat /sys/kernel/debug/clk/clk_summary > /dev/null; done &
      	> while true; do aplay xxx; done
      
      This patch adds support to .prepare callback, and moves non-atomic
      clocking operations to it. As .prepare is non-atomic, it is always
      called before trigger_start/trigger_stop.
      
      	BUG: sleeping function called from invalid context at kernel/locking/mutex.c:620
      	in_atomic(): 1, irqs_disabled(): 128, pid: 2242, name: aplay
      	INFO: lockdep is turned off.
      	irq event stamp: 5964
      	hardirqs last enabled at (5963): [<ffff200008e59e40>] mutex_lock_nested+0x6e8/0x6f0
      	hardirqs last disabled at (5964): [<ffff200008e623f0>] _raw_spin_lock_irqsave+0x24/0x68
      	softirqs last enabled at (5502): [<ffff200008081838>] __do_softirq+0x560/0x10c0
      	softirqs last disabled at (5495): [<ffff2000080c2e78>] irq_exit+0x160/0x25c
      	Preemption disabled at:[ 62.904063] [<ffff200008be4d48>] snd_pcm_stream_lock+0xb4/0xc0
      	CPU: 2 PID: 2242 Comm: aplay Tainted: G B C 4.9.54+ #186
      	Hardware name: Renesas Salvator-X board based on r8a7795 (DT)
      	Call trace:
      	[<ffff20000808fe48>] dump_backtrace+0x0/0x37c
      	[<ffff2000080901d8>] show_stack+0x14/0x1c
      	[<ffff2000086f4458>] dump_stack+0xfc/0x154
      	[<ffff2000081134a0>] ___might_sleep+0x57c/0x58c
      	[<ffff2000081136b8>] __might_sleep+0x208/0x21c
      	[<ffff200008e5980c>] mutex_lock_nested+0xb4/0x6f0
      	[<ffff2000087cac74>] clk_prepare_lock+0xb0/0x184
      	[<ffff2000087cb094>] clk_core_get_rate+0x14/0x54
      	[<ffff2000087cb0f4>] clk_get_rate+0x20/0x34
      	[<ffff20000113aa00>] rsnd_adg_ssi_clk_try_start+0x158/0x4f8 [snd_soc_rcar]
      	[<ffff20000113da00>] rsnd_ssi_init+0x668/0x7a0 [snd_soc_rcar]
      	[<ffff200001133ff4>] rsnd_soc_dai_trigger+0x4bc/0xcf8 [snd_soc_rcar]
      	[<ffff200008c1af24>] soc_pcm_trigger+0x2a4/0x2d4
      
      Fixes: e7d850dd ("ASoC: rsnd: use mod base common method on SSI-parent")
      Signed-off-by: default avatarJiada Wang <jiada_wang@mentor.com>
      Signed-off-by: default avatarTimo Wischer <twischer@de.adit-jv.com>
      [Kuninori: tidyup for upstream]
      Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
      Tested-by: default avatarHiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com>
      Signed-off-by: default avatarMark Brown <broonie@kernel.org>
      Cc: stable@vger.kernel.org
      4d230d12
    • Srinivas Kandagatla's avatar
      ASoC: q6routing: initialize data correctly · 7aa09ff2
      Srinivas Kandagatla authored
      Some of the router data fields are left as default zeros which are
      valid dai ids, so initialize these to invalid value of -1.
      
      Without intializing these correctly get_session_from_id() can return
      incorrect session resulting in not closing the opened copp and messing
      up with the copp ref count.
      
      Fixes: e3a33673 ("ASoC: qdsp6: q6routing: Add q6routing driver")
      Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
      Signed-off-by: default avatarMark Brown <broonie@kernel.org>
      7aa09ff2
  6. 31 Aug, 2018 1 commit
    • Andrew F. Davis's avatar
      ASoC: tas6424: Save last fault register even when clear · d40e3e9e
      Andrew F. Davis authored
      When there is no fault bit set in a fault register we skip the fault
      reporting section for that register. This also skips over saving that
      registers value. We save the value so we will not double report an
      error, but if an error clears then returns we will also not report it
      as we did not save the all cleared register value. Fix this by saving
      the fault register value in the all clear path.
      Signed-off-by: default avatarAndrew F. Davis <afd@ti.com>
      Signed-off-by: default avatarMark Brown <broonie@kernel.org>
      Cc: stable@vger.kernel.org
      d40e3e9e
  7. 28 Aug, 2018 4 commits
  8. 16 Aug, 2018 2 commits
  9. 15 Aug, 2018 1 commit
    • Charles Keepax's avatar
      ASoC: dapm: Fix NULL pointer deference on CODEC to CODEC DAIs · 249dc495
      Charles Keepax authored
      Commit a655de80 ("ASoC: core: Allow topology to override
      machine driver FE DAI link config.") caused soc_dai_hw_params to
      be come dependent on the substream private_data being set with
      a pointer to the snd_soc_pcm_runtime. Currently, CODEC to CODEC
      links don't set this, which causes a NULL pointer dereference:
      
      [<4069de54>] (soc_dai_hw_params) from
      [<40694b68>] (snd_soc_dai_link_event+0x1a0/0x380)
      
      Since the ASoC core in general assumes that the substream
      private_data will be set to a pointer to the snd_soc_pcm_runtime,
      update the CODEC to CODEC links to respect this.
      Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
      Signed-off-by: default avatarMark Brown <broonie@kernel.org>
      249dc495
  10. 14 Aug, 2018 4 commits
    • Yong Zhi's avatar
      ASoC: Intel: Skylake: Acquire irq after RIRB allocation · 12eeeb4f
      Yong Zhi authored
      Cold reboot stress test found that the hda irq could access rirb ring
      buffer before its memory gets allocated which resulting in null
      pointer dereference inside snd_hdac_bus_update_rirb().
      
      Fix it by moving the skl_acquire_irq after ring buffer allocation.
      While here, also change err return from -EBUSY to actual error code.
      Signed-off-by: default avatarYong Zhi <yong.zhi@intel.com>
      Acked-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
      Signed-off-by: default avatarMark Brown <broonie@kernel.org>
      12eeeb4f
    • Dmitry V. Levin's avatar
      ASoC: uapi: fix sound/skl-tplg-interface.h userspace compilation errors · fb504caa
      Dmitry V. Levin authored
      Include <linux/types.h> and consistently use types it provides
      to fix the following sound/skl-tplg-interface.h userspace compilation errors:
      
      /usr/include/sound/skl-tplg-interface.h:146:2: error: unknown type name 'u32'
        u32 set_params:2;
      /usr/include/sound/skl-tplg-interface.h:147:2: error: unknown type name 'u32'
        u32 rsvd:30;
      /usr/include/sound/skl-tplg-interface.h:148:2: error: unknown type name 'u32'
        u32 param_id;
      /usr/include/sound/skl-tplg-interface.h:149:2: error: unknown type name 'u32'
        u32 max;
      /usr/include/sound/skl-tplg-interface.h:166:2: error: unknown type name 'u16'
        u16 module_id;
      /usr/include/sound/skl-tplg-interface.h:167:2: error: unknown type name 'u16'
        u16 instance_id;
      /usr/include/sound/skl-tplg-interface.h:171:2: error: unknown type name 'u32'
        u32 channels;
      /usr/include/sound/skl-tplg-interface.h:172:2: error: unknown type name 'u32'
        u32 freq;
      /usr/include/sound/skl-tplg-interface.h:173:2: error: unknown type name 'u32'
        u32 bit_depth;
      /usr/include/sound/skl-tplg-interface.h:174:2: error: unknown type name 'u32'
        u32 valid_bit_depth;
      /usr/include/sound/skl-tplg-interface.h:175:2: error: unknown type name 'u32'
        u32 ch_cfg;
      /usr/include/sound/skl-tplg-interface.h:176:2: error: unknown type name 'u32'
        u32 interleaving_style;
      /usr/include/sound/skl-tplg-interface.h:177:2: error: unknown type name 'u32'
        u32 sample_type;
      /usr/include/sound/skl-tplg-interface.h:178:2: error: unknown type name 'u32'
        u32 ch_map;
      /usr/include/sound/skl-tplg-interface.h:182:2: error: unknown type name 'u32'
        u32 set_params:2;
      /usr/include/sound/skl-tplg-interface.h:183:2: error: unknown type name 'u32'
        u32 rsvd:30;
      /usr/include/sound/skl-tplg-interface.h:184:2: error: unknown type name 'u32'
        u32 param_id;
      /usr/include/sound/skl-tplg-interface.h:185:2: error: unknown type name 'u32'
        u32 caps_size;
      /usr/include/sound/skl-tplg-interface.h:186:2: error: unknown type name 'u32'
        u32 caps[HDA_SST_CFG_MAX];
      /usr/include/sound/skl-tplg-interface.h:190:2: error: unknown type name 'u8'
        u8 pipe_id;
      /usr/include/sound/skl-tplg-interface.h:191:2: error: unknown type name 'u8'
        u8 pipe_priority;
      /usr/include/sound/skl-tplg-interface.h:192:2: error: unknown type name 'u16'
        u16 conn_type:4;
      /usr/include/sound/skl-tplg-interface.h:193:2: error: unknown type name 'u16'
        u16 rsvd:4;
      /usr/include/sound/skl-tplg-interface.h:194:2: error: unknown type name 'u16'
        u16 memory_pages:8;
      /usr/include/sound/skl-tplg-interface.h:200:2: error: unknown type name 'u16'
        u16 module_id;
      /usr/include/sound/skl-tplg-interface.h:201:2: error: unknown type name 'u16'
        u16 instance_id;
      /usr/include/sound/skl-tplg-interface.h:202:2: error: unknown type name 'u32'
        u32 max_mcps;
      /usr/include/sound/skl-tplg-interface.h:203:2: error: unknown type name 'u32'
        u32 mem_pages;
      /usr/include/sound/skl-tplg-interface.h:204:2: error: unknown type name 'u32'
        u32 obs;
      /usr/include/sound/skl-tplg-interface.h:205:2: error: unknown type name 'u32'
        u32 ibs;
      /usr/include/sound/skl-tplg-interface.h:206:2: error: unknown type name 'u32'
        u32 vbus_id;
      /usr/include/sound/skl-tplg-interface.h:208:2: error: unknown type name 'u32'
        u32 max_in_queue:8;
      /usr/include/sound/skl-tplg-interface.h:209:2: error: unknown type name 'u32'
        u32 max_out_queue:8;
      /usr/include/sound/skl-tplg-interface.h:210:2: error: unknown type name 'u32'
        u32 time_slot:8;
      /usr/include/sound/skl-tplg-interface.h:211:2: error: unknown type name 'u32'
        u32 core_id:4;
      /usr/include/sound/skl-tplg-interface.h:212:2: error: unknown type name 'u32'
        u32 rsvd1:4;
      /usr/include/sound/skl-tplg-interface.h:214:2: error: unknown type name 'u32'
        u32 module_type:8;
      /usr/include/sound/skl-tplg-interface.h:215:2: error: unknown type name 'u32'
        u32 conn_type:4;
      /usr/include/sound/skl-tplg-interface.h:216:2: error: unknown type name 'u32'
        u32 dev_type:4;
      /usr/include/sound/skl-tplg-interface.h:217:2: error: unknown type name 'u32'
        u32 hw_conn_type:4;
      /usr/include/sound/skl-tplg-interface.h:218:2: error: unknown type name 'u32'
        u32 rsvd2:12;
      /usr/include/sound/skl-tplg-interface.h:220:2: error: unknown type name 'u32'
        u32 params_fixup:8;
      /usr/include/sound/skl-tplg-interface.h:221:2: error: unknown type name 'u32'
        u32 converter:8;
      /usr/include/sound/skl-tplg-interface.h:222:2: error: unknown type name 'u32'
        u32 input_pin_type:1;
      /usr/include/sound/skl-tplg-interface.h:223:2: error: unknown type name 'u32'
        u32 output_pin_type:1;
      /usr/include/sound/skl-tplg-interface.h:224:2: error: unknown type name 'u32'
        u32 is_dynamic_in_pin:1;
      /usr/include/sound/skl-tplg-interface.h:225:2: error: unknown type name 'u32'
        u32 is_dynamic_out_pin:1;
      /usr/include/sound/skl-tplg-interface.h:226:2: error: unknown type name 'u32'
        u32 is_loadable:1;
      /usr/include/sound/skl-tplg-interface.h:227:2: error: unknown type name 'u32'
        u32 rsvd3:11;
      
      Fixes: 0c24fdc0 ("ASoC: topology: Move skl-tplg-interface.h to uapi")
      Signed-off-by: default avatarDmitry V. Levin <ldv@altlinux.org>
      Reviewed-by: default avatarGuenter Roeck <groeck@chromium.org>
      Signed-off-by: default avatarMark Brown <broonie@kernel.org>
      Cc: <stable@vger.kernel.org> # v4.18
      fb504caa
    • Marcel Ziswiler's avatar
      ASoC: wm9712: fix replace codec to component · 5e4cfada
      Marcel Ziswiler authored
      Since commit 143b4484 ("ASoC: wm9712: replace codec to component")
      "wm9712-codec" got renamed to "wm9712-component", however, this change
      never got propagated down to the actual board/platform drivers. E.g. on
      Colibri T20 this lead to the following spew upon boot with sound/touch
      being broken:
      
      [    2.214121] tegra-snd-wm9712 sound: ASoC: CODEC DAI wm9712-hifi not registered
      [    2.222137] tegra-snd-wm9712 sound: snd_soc_register_card failed (-517)
      ...
      [    2.344384] tegra-snd-wm9712 sound: ASoC: CODEC DAI wm9712-hifi not registered
      [    2.351885] tegra-snd-wm9712 sound: snd_soc_register_card failed (-517)
      ...
      [    2.668339] tegra-snd-wm9712 sound: ASoC: CODEC DAI wm9712-hifi not registered
      [    2.675811] tegra-snd-wm9712 sound: snd_soc_register_card failed (-517)
      ...
      [    3.208408] tegra-snd-wm9712 sound: ASoC: CODEC DAI wm9712-hifi not registered
      [    3.216312] tegra-snd-wm9712 sound: snd_soc_register_card failed (-517)
      ...
      [    3.235397] tegra-snd-wm9712 sound: ASoC: CODEC DAI wm9712-hifi not registered
      [    3.248938] tegra-snd-wm9712 sound: snd_soc_register_card failed (-517)
      ...
      [   14.970443] ALSA device list:
      [   14.996628]   No soundcards found.
      
      This commit finally fixes this again.
      Signed-off-by: default avatarMarcel Ziswiler <marcel.ziswiler@toradex.com>
      Acked-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
      Signed-off-by: default avatarMark Brown <broonie@kernel.org>
      Cc: stable@vger.kernel.org
      5e4cfada
    • Hans de Goede's avatar
      ASoC: Intel: bytcr_rt5640: Add quirks for 2 more devices · 260c48b7
      Hans de Goede authored
      Add quirks to select the right input-map, jack-detect pin, etc. for:
      
      Linx Linx7 tablet
      Onda V975w tablet
      Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
      Acked-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
      Signed-off-by: default avatarMark Brown <broonie@kernel.org>
      260c48b7
  11. 09 Aug, 2018 2 commits
  12. 08 Aug, 2018 6 commits
  13. 07 Aug, 2018 1 commit
    • Srinivas Kandagatla's avatar
      ASoC: compress: make BE and FE order inline with dpcm · 0b0722e1
      Srinivas Kandagatla authored
      For some reason order of startup/hw_params/prepare are reversed
      in dynamic compress usecase when compared to dpcm usecase. This is
      a issue with platforms like QCOM where it expects the BE to be
      initialized before FE.
      
      Interestingly the compress trigger callback order is inline with dpcm.
      
      Am not 100% sure why the compress audio case has been reversed.
      This patch is making the order inline with dpcm.
      
      If the reverse ordering is just co-incendental then this change
      makes sense and will avoid inventing some new mechanism to cope
      with ordering.
      Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
      Signed-off-by: default avatarMark Brown <broonie@kernel.org>
      0b0722e1
  14. 06 Aug, 2018 10 commits