Commit 02d5e016 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-5.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "This became a slightly large collection of changes, partly because
  I've been off in the last weeks. Most of changes are small and
  scattered while a bit big change is found in HD-audio Realtek codec
  driver; it's a very device-specific fix that has been long wanted, so
  I decided to pick up although it's in the middle RC.

  Some highlights:

   - A new guard ioctl for ALSA rawmidi API to avoid the misuse of the
     new timestamp framing mode; it's for a regression fix

   - HD-audio: a revert of the 5.15 change that might work badly, new
     quirks for Lenovo Legion & co, a follow-up fix for CS8409

   - ASoC: lots of SOF-related fixes, fsl component fixes, corrections
     of mediatek drivers

   - USB-audio: fix for the PM resume

   - FireWire: oxfw and motu fixes"

* tag 'sound-5.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (25 commits)
  ALSA: pcsp: Make hrtimer forwarding more robust
  ALSA: rawmidi: introduce SNDRV_RAWMIDI_IOCTL_USER_PVERSION
  ALSA: firewire-motu: fix truncated bytes in message tracepoints
  ASoC: SOF: trace: Omit error print when waking up trace sleepers
  ASoC: mediatek: mt8195: remove wrong fixup assignment on HDMITX
  ASoC: SOF: loader: Re-phrase the missing firmware error to avoid duplication
  ASoC: SOF: loader: release_firmware() on load failure to avoid batching
  ALSA: hda/cs8409: Setup Dolphin Headset Mic as Phantom Jack
  ALSA: pcxhr: "fix" PCXHR_REG_TO_PORT definition
  ASoC: SOF: imx: imx8m: Bar index is only valid for IRAM and SRAM types
  ASoC: SOF: imx: imx8: Bar index is only valid for IRAM and SRAM types
  ASoC: SOF: Fix DSP oops stack dump output contents
  ALSA: hda/realtek: Quirks to enable speaker output for Lenovo Legion 7i 15IMHG05, Yoga 7i 14ITL5/15ITL5, and 13s Gen2 laptops.
  ALSA: usb-audio: Unify mixer resume and reset_resume procedure
  Revert "ALSA: hda: Drop workaround for a hang at shutdown again"
  ALSA: oxfw: fix transmission method for Loud models based on OXFW971
  ASoC: mediatek: common: handle NULL case in suspend/resume function
  ASoC: fsl_xcvr: register platform component before registering cpu dai
  ASoC: fsl_spdif: register platform component before registering cpu dai
  ASoC: fsl_micfil: register platform component before registering cpu dai
  ...
parents 6e439bbd f2ff7147

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -17883,7 +17883,8 @@ M: Olivier Moysan <olivier.moysan@foss.st.com> 
M:	Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

S:	Maintained

F:	Documentation/devicetree/bindings/iio/adc/st,stm32-*.yaml

F:	Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml

F:	Documentation/devicetree/bindings/sound/st,stm32-*.yaml

F:	sound/soc/stm/









STM32 TIMER/LPTIMER DRIVERS

























include/sound/rawmidi.h



+1
−0






























Original line number
Diff line number
Diff line







@@ -98,6 +98,7 @@ struct snd_rawmidi_file {







	struct snd_rawmidi *rmidi;









	struct snd_rawmidi_substream *input;









	struct snd_rawmidi_substream *output;









	unsigned int user_pversion;	/* supported protocol version */









};



















struct snd_rawmidi_str {
































include/uapi/sound/asound.h



+1
−0






























Original line number
Diff line number
Diff line







@@ -784,6 +784,7 @@ struct snd_rawmidi_status {

















#define SNDRV_RAWMIDI_IOCTL_PVERSION	_IOR('W', 0x00, int)









#define SNDRV_RAWMIDI_IOCTL_INFO	_IOR('W', 0x01, struct snd_rawmidi_info)









#define SNDRV_RAWMIDI_IOCTL_USER_PVERSION _IOW('W', 0x02, int)









#define SNDRV_RAWMIDI_IOCTL_PARAMS	_IOWR('W', 0x10, struct snd_rawmidi_params)









#define SNDRV_RAWMIDI_IOCTL_STATUS	_IOWR('W', 0x20, struct snd_rawmidi_status)









#define SNDRV_RAWMIDI_IOCTL_DROP	_IOW('W', 0x30, int)
































sound/core/rawmidi.c



+9
−0






























Original line number
Diff line number
Diff line







@@ -873,12 +873,21 @@ static long snd_rawmidi_ioctl(struct file *file, unsigned int cmd, unsigned long







			return -EINVAL;









		}









	}









	case SNDRV_RAWMIDI_IOCTL_USER_PVERSION:









		if (get_user(rfile->user_pversion, (unsigned int __user *)arg))









			return -EFAULT;









		return 0;



















	case SNDRV_RAWMIDI_IOCTL_PARAMS:









	{









		struct snd_rawmidi_params params;



















		if (copy_from_user(&params, argp, sizeof(struct snd_rawmidi_params)))









			return -EFAULT;









		if (rfile->user_pversion < SNDRV_PROTOCOL_VERSION(2, 0, 2)) {









			params.mode = 0;









			memset(params.reserved, 0, sizeof(params.reserved));









		}









		switch (params.stream) {









		case SNDRV_RAWMIDI_STREAM_OUTPUT:









			if (rfile->output == NULL)
































sound/drivers/pcsp/pcsp_lib.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -143,7 +143,7 @@ enum hrtimer_restart pcsp_do_timer(struct hrtimer *handle)







	if (pointer_update)









		pcsp_pointer_update(chip);



















	hrtimer_forward(handle, hrtimer_get_expires(handle), ns_to_ktime(ns));









	hrtimer_forward_now(handle, ns_to_ktime(ns));



















	return HRTIMER_RESTART;









}