* [GIT PULL] sound fixes for 4.19-rc3
@ 2018-09-07 9:40 Takashi Iwai
0 siblings, 0 replies; 3+ messages in thread
From: Takashi Iwai @ 2018-09-07 9:40 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Linux Kernel Mailing List
Linus,
please pull sound fixes for v4.19-rc3 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-4.19-rc3
The topmost commit is f7c50fa636f72490baceb1664ba64973137266f2
----------------------------------------------------------------
sound fixes for 4.19-rc3
Just a few small fixes:
- a fix for the recursive work cancellation in a specific HD-audio
operation mode
- a fix for potentially uninitialized memory access via rawmidi
- the register bit access fixes for ASoC HD-audio
----------------------------------------------------------------
Keyon Jie (1):
ALSA: hda: Fix several mismatch for register mask and value
Takashi Iwai (2):
ALSA: hda - Fix cancel_work_sync() stall from jackpoll work
ALSA: rawmidi: Initialize allocated buffers
---
sound/core/rawmidi.c | 4 ++--
sound/hda/ext/hdac_ext_stream.c | 22 +++++++---------------
sound/pci/hda/hda_codec.c | 3 ++-
3 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c
index 69517e18ef07..08d5662039e3 100644
--- a/sound/core/rawmidi.c
+++ b/sound/core/rawmidi.c
@@ -129,7 +129,7 @@ static int snd_rawmidi_runtime_create(struct snd_rawmidi_substream *substream)
runtime->avail = 0;
else
runtime->avail = runtime->buffer_size;
- runtime->buffer = kvmalloc(runtime->buffer_size, GFP_KERNEL);
+ runtime->buffer = kvzalloc(runtime->buffer_size, GFP_KERNEL);
if (!runtime->buffer) {
kfree(runtime);
return -ENOMEM;
@@ -655,7 +655,7 @@ static int resize_runtime_buffer(struct snd_rawmidi_runtime *runtime,
if (params->avail_min < 1 || params->avail_min > params->buffer_size)
return -EINVAL;
if (params->buffer_size != runtime->buffer_size) {
- newbuf = kvmalloc(params->buffer_size, GFP_KERNEL);
+ newbuf = kvzalloc(params->buffer_size, GFP_KERNEL);
if (!newbuf)
return -ENOMEM;
spin_lock_irq(&runtime->lock);
diff --git a/sound/hda/ext/hdac_ext_stream.c b/sound/hda/ext/hdac_ext_stream.c
index 1bd27576db98..a835558ddbc9 100644
--- a/sound/hda/ext/hdac_ext_stream.c
+++ b/sound/hda/ext/hdac_ext_stream.c
@@ -146,7 +146,8 @@ EXPORT_SYMBOL_GPL(snd_hdac_ext_stream_decouple);
*/
void snd_hdac_ext_link_stream_start(struct hdac_ext_stream *stream)
{
- snd_hdac_updatel(stream->pplc_addr, AZX_REG_PPLCCTL, 0, AZX_PPLCCTL_RUN);
+ snd_hdac_updatel(stream->pplc_addr, AZX_REG_PPLCCTL,
+ AZX_PPLCCTL_RUN, AZX_PPLCCTL_RUN);
}
EXPORT_SYMBOL_GPL(snd_hdac_ext_link_stream_start);
@@ -171,7 +172,8 @@ void snd_hdac_ext_link_stream_reset(struct hdac_ext_stream *stream)
snd_hdac_ext_link_stream_clear(stream);
- snd_hdac_updatel(stream->pplc_addr, AZX_REG_PPLCCTL, 0, AZX_PPLCCTL_STRST);
+ snd_hdac_updatel(stream->pplc_addr, AZX_REG_PPLCCTL,
+ AZX_PPLCCTL_STRST, AZX_PPLCCTL_STRST);
udelay(3);
timeout = 50;
do {
@@ -242,7 +244,7 @@ EXPORT_SYMBOL_GPL(snd_hdac_ext_link_set_stream_id);
void snd_hdac_ext_link_clear_stream_id(struct hdac_ext_link *link,
int stream)
{
- snd_hdac_updatew(link->ml_addr, AZX_REG_ML_LOSIDV, 0, (1 << stream));
+ snd_hdac_updatew(link->ml_addr, AZX_REG_ML_LOSIDV, (1 << stream), 0);
}
EXPORT_SYMBOL_GPL(snd_hdac_ext_link_clear_stream_id);
@@ -415,7 +417,6 @@ void snd_hdac_ext_stream_spbcap_enable(struct hdac_bus *bus,
bool enable, int index)
{
u32 mask = 0;
- u32 register_mask = 0;
if (!bus->spbcap) {
dev_err(bus->dev, "Address of SPB capability is NULL\n");
@@ -424,12 +425,8 @@ void snd_hdac_ext_stream_spbcap_enable(struct hdac_bus *bus,
mask |= (1 << index);
- register_mask = readl(bus->spbcap + AZX_REG_SPB_SPBFCCTL);
-
- mask |= register_mask;
-
if (enable)
- snd_hdac_updatel(bus->spbcap, AZX_REG_SPB_SPBFCCTL, 0, mask);
+ snd_hdac_updatel(bus->spbcap, AZX_REG_SPB_SPBFCCTL, mask, mask);
else
snd_hdac_updatel(bus->spbcap, AZX_REG_SPB_SPBFCCTL, mask, 0);
}
@@ -503,7 +500,6 @@ void snd_hdac_ext_stream_drsm_enable(struct hdac_bus *bus,
bool enable, int index)
{
u32 mask = 0;
- u32 register_mask = 0;
if (!bus->drsmcap) {
dev_err(bus->dev, "Address of DRSM capability is NULL\n");
@@ -512,12 +508,8 @@ void snd_hdac_ext_stream_drsm_enable(struct hdac_bus *bus,
mask |= (1 << index);
- register_mask = readl(bus->drsmcap + AZX_REG_SPB_SPBFCCTL);
-
- mask |= register_mask;
-
if (enable)
- snd_hdac_updatel(bus->drsmcap, AZX_REG_DRSM_CTL, 0, mask);
+ snd_hdac_updatel(bus->drsmcap, AZX_REG_DRSM_CTL, mask, mask);
else
snd_hdac_updatel(bus->drsmcap, AZX_REG_DRSM_CTL, mask, 0);
}
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 0a5085537034..26d348b47867 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -3935,7 +3935,8 @@ void snd_hda_bus_reset_codecs(struct hda_bus *bus)
list_for_each_codec(codec, bus) {
/* FIXME: maybe a better way needed for forced reset */
- cancel_delayed_work_sync(&codec->jackpoll_work);
+ if (current_work() != &codec->jackpoll_work.work)
+ cancel_delayed_work_sync(&codec->jackpoll_work);
#ifdef CONFIG_PM
if (hda_codec_is_power_on(codec)) {
hda_call_codec_suspend(codec);
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [GIT PULL] sound fixes for 4.19-rc3
@ 2018-09-20 7:26 Takashi Iwai
2018-09-20 8:47 ` Greg Kroah-Hartman
0 siblings, 1 reply; 3+ messages in thread
From: Takashi Iwai @ 2018-09-20 7:26 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: Linus Torvalds, Linux Kernel Mailing List
Greg,
please pull sound fixes for v4.19-rc5 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-4.19-rc5
The topmost commit is 196f4eeeb78f53e0a598db8f9408b6f8b270c355
----------------------------------------------------------------
sound fixes for 4.19-rc5
here comes a collection of various fixes, mostly for stable-tree
or regression fixes.
Two relatively high LOCs are about the (rather simple) conversion of
uapi integer types in topology API, and a regression fix about HDMI
hotplug notification on AMD HD-audio. The rest are all small
individual fixes like ASoC Intel Skylake race condition, minor
uninitialized page leak in emu10k1 ioctl, Firewire audio error paths,
and so on.
----------------------------------------------------------------
Akshu Agrawal (1):
ASoC: AMD: Ensure reset bit is cleared before configuring
Andrew F. Davis (1):
ASoC: tas6424: Save last fault register even when clear
Charles Keepax (1):
ASoC: dapm: Fix NULL pointer deference on CODEC to CODEC DAIs
Danny Smith (1):
ASoC: sigmadsp: safeload should not have lower byte limit
Dmitry V. Levin (1):
ASoC: uapi: fix sound/skl-tplg-interface.h userspace compilation errors
Hans de Goede (1):
ASoC: Intel: bytcr_rt5640: Add quirks for 2 more devices
Jiada Wang (1):
ASoC: rsnd: fixup not to call clk_get/set under non-atomic
Katsuhiro Suzuki (1):
ASoC: uniphier: change status to orphan
Kuninori Morimoto (2):
ASoC: rsnd: adg: care clock-frequency size
ASoC: rsnd: don't fallback to PIO mode when -EPROBE_DEFER
Marcel Ziswiler (1):
ASoC: wm9712: fix replace codec to component
Oder Chiou (1):
ASoC: rt5514: Fix the issue of the delay volume applied again
Pierre-Louis Bossart (1):
ASoC: wm8804: Add ACPI support
Ryan Lee (2):
ASoC: max98373: Added speaker FS gain cotnrol register to volatile.
ASoC: max98373: Added 10ms sleep after amp software reset
Shuming Fan (1):
ASoC: rt5682: Change DAC/ADC volume scale
Srinivas Kandagatla (1):
ASoC: q6routing: initialize data correctly
Sébastien Szymanski (1):
ASoC: cs4265: fix MMTLR Data switch control
Takashi Iwai (1):
ALSA: hda - Enable runtime PM only for discrete GPU
Takashi Sakamoto (9):
ALSA: bebob: use address returned by kmalloc() instead of kernel stack for streaming DMA mapping
ALSA: fireface: fix memory leak in ff400_switch_fetching_mode()
ALSA: firewire-digi00x: fix memory leak of private data
ALSA: firewire-tascam: fix memory leak of private data
ALSA: oxfw: fix memory leak of private data
ALSA: bebob: fix memory leak for M-Audio FW1814 and ProjectMix I/O at error path
ALSA: oxfw: fix memory leak for model-dependent data at error path
ALSA: oxfw: fix memory leak of discovered stream formats at error path
ALSA: fireworks: fix memory leak of response buffer at error path
Willy Tarreau (1):
ALSA: emu10k1: fix possible info leak to userspace on SNDRV_EMU10K1_IOCTL_INFO
Yong Zhi (1):
ASoC: Intel: Skylake: Acquire irq after RIRB allocation
Yu Zhao (3):
Revert "ASoC: Intel: Skylake: Acquire irq after RIRB allocation"
sound: enable interrupt after dma buffer initialization
sound: don't call skl_init_chip() to reset intel skl soc
---
MAINTAINERS | 3 +-
drivers/gpu/vga/vga_switcheroo.c | 2 +
include/linux/vga_switcheroo.h | 3 +
include/sound/hdaudio.h | 1 +
include/sound/soc-dapm.h | 1 +
include/uapi/sound/skl-tplg-interface.h | 106 ++++++++++++++--------------
sound/firewire/bebob/bebob.c | 2 +
sound/firewire/bebob/bebob_maudio.c | 28 ++++----
sound/firewire/digi00x/digi00x.c | 1 +
sound/firewire/fireface/ff-protocol-ff400.c | 9 ++-
sound/firewire/fireworks/fireworks.c | 2 +
sound/firewire/oxfw/oxfw.c | 10 +++
sound/firewire/tascam/tascam.c | 1 +
sound/hda/hdac_controller.c | 15 ++--
sound/pci/emu10k1/emufx.c | 2 +-
sound/pci/hda/hda_intel.c | 86 ++++++++++++++++------
sound/pci/hda/hda_intel.h | 1 +
sound/soc/amd/acp-pcm-dma.c | 21 ++++++
sound/soc/codecs/cs4265.c | 4 +-
sound/soc/codecs/max98373.c | 3 +
sound/soc/codecs/rt5514.c | 8 +--
sound/soc/codecs/rt5682.c | 8 +--
sound/soc/codecs/sigmadsp.c | 3 +-
sound/soc/codecs/tas6424.c | 12 +++-
sound/soc/codecs/wm8804-i2c.c | 15 +++-
sound/soc/codecs/wm9712.c | 2 +-
sound/soc/intel/boards/bytcr_rt5640.c | 26 +++++++
sound/soc/intel/skylake/skl.c | 2 +-
sound/soc/qcom/qdsp6/q6routing.c | 4 +-
sound/soc/sh/rcar/adg.c | 5 ++
sound/soc/sh/rcar/core.c | 21 +++++-
sound/soc/sh/rcar/dma.c | 4 ++
sound/soc/sh/rcar/rsnd.h | 7 ++
sound/soc/sh/rcar/ssi.c | 16 +++--
sound/soc/soc-core.c | 4 +-
sound/soc/soc-dapm.c | 4 ++
36 files changed, 314 insertions(+), 128 deletions(-)
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [GIT PULL] sound fixes for 4.19-rc3
2018-09-20 7:26 [GIT PULL] sound fixes for 4.19-rc3 Takashi Iwai
@ 2018-09-20 8:47 ` Greg Kroah-Hartman
0 siblings, 0 replies; 3+ messages in thread
From: Greg Kroah-Hartman @ 2018-09-20 8:47 UTC (permalink / raw)
To: Takashi Iwai; +Cc: Linus Torvalds, Linux Kernel Mailing List
On Thu, Sep 20, 2018 at 09:26:43AM +0200, Takashi Iwai wrote:
> Greg,
>
> please pull sound fixes for v4.19-rc5 from:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-4.19-rc5
>
> The topmost commit is 196f4eeeb78f53e0a598db8f9408b6f8b270c355
Now pulled, thanks.
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-09-20 8:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-20 7:26 [GIT PULL] sound fixes for 4.19-rc3 Takashi Iwai
2018-09-20 8:47 ` Greg Kroah-Hartman
-- strict thread matches above, loose matches on Subject: below --
2018-09-07 9:40 Takashi Iwai
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.