Commit ec7f9844 authored by Mark Brown's avatar Mark Brown
Browse files

Merge tag 'asoc-fix-v4.11-rc7' into asoc-linus 

ASoC: Fixes for v4.11

A few last minute fixes for v4.11, the STI fix is relatively large but
driver specific and has been cooking in -next for a little while now:

 - A fix from Takashi for some suspend/resume related crashes in the
   Intel drivers.
 - A fix from Mousumi Jana for issues with incorrectly created
   enumeration controls generated from topology files which could cause
   problems for userspace.
 - Fixes from Arnaud Pouliquen for some crashes due to races with the
   interrupt handler in the STI driver.

# gpg: Signature made Wed 26 Apr 2017 00:27:33 KST
# gpg:                using RSA key ADE668AA675718B59FE29FEA24D68B725D5487D0
# gpg:                issuer "broonie@kernel.org"
# gpg: key 0D9EACE2CD7BEEBC: no public key for trusted key - skipped
# gpg: key 0D9EACE2CD7BEEBC marked as ultimately trusted
# gpg: key CCB0A420AF88CD16: no public key for trusted key - skipped
# gpg: key CCB0A420AF88CD16 marked as ultimately trusted
# gpg: key 162614E316005C11: no public key for trusted key - skipped
# gpg: key 162614E316005C11 marked as ultimately trusted
# gpg: key A730C53A5621E907: no public key for trusted key - skipped
# gpg: key A730C53A5621E907 marked as ultimately trusted
# gpg: key 276568D75C6153AD: no public key for trusted key - skipped
# gpg: key 276568D75C6153AD marked as ultimately trusted
# gpg: Good signature from "Mark Brown <broonie@sirena.org.uk>" [ultimate]
# gpg:                 aka "Mark Brown <broonie@debian.org>" [ultimate]
# gpg:                 aka "Mark Brown <broonie@kernel.org>" [ultimate]
# gpg:                 aka "Mark Brown <broonie@tardis.ed.ac.uk>" [ultimate]
# gpg:                 aka "Mark Brown <broonie@linaro.org>" [ultimate]
# gpg:                 aka "Mark Brown <Mark.Brown@linaro.org>" [ultimate]
parents 5a7ad114 dc9617cb

sound/soc/intel/boards/bytcr_rt5640.c

+2 −2
Original line number Diff line number Diff line
@@ -621,7 +621,7 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = { 
		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

		.platform_name = "sst-mfld-platform",

		.ignore_suspend = 1,

		.nonatomic = true,

		.dynamic = 1,

		.dpcm_playback = 1,

		.dpcm_capture = 1,
@@ -634,7 +634,6 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = { 
		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

		.platform_name = "sst-mfld-platform",

		.ignore_suspend = 1,

		.nonatomic = true,

		.dynamic = 1,

		.dpcm_playback = 1,
@@ -661,6 +660,7 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = { 
						| SND_SOC_DAIFMT_CBS_CFS,

		.be_hw_params_fixup = byt_rt5640_codec_fixup,

		.ignore_suspend = 1,

		.nonatomic = true,

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.init = byt_rt5640_init,

sound/soc/intel/boards/bytcr_rt5651.c

+0 −2
Original line number Diff line number Diff line
@@ -235,7 +235,6 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = { 
		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

		.platform_name = "sst-mfld-platform",

		.ignore_suspend = 1,

		.nonatomic = true,

		.dynamic = 1,

		.dpcm_playback = 1,
@@ -249,7 +248,6 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = { 
		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

		.platform_name = "sst-mfld-platform",

		.ignore_suspend = 1,

		.nonatomic = true,

		.dynamic = 1,

		.dpcm_playback = 1,

sound/soc/soc-topology.c

+1 −0
Original line number Diff line number Diff line
@@ -933,6 +933,7 @@ static int soc_tplg_denum_create_texts(struct soc_enum *se, 
		}

	}



	se->texts = (const char * const *)se->dobj.control.dtexts;

	return 0;



err:

sound/soc/sti/uniperif.h

+1 −0
Original line number Diff line number Diff line
@@ -1299,6 +1299,7 @@ struct uniperif { 
	int ver; /* IP version, used by register access macros */

	struct regmap_field *clk_sel;

	struct regmap_field *valid_sel;

	spinlock_t irq_lock; /* use to prevent race condition with IRQ */



	/* capabilities */

	const struct snd_pcm_hardware *hw;

sound/soc/sti/uniperif_player.c

+24 −11
Original line number Diff line number Diff line
@@ -65,10 +65,13 @@ static irqreturn_t uni_player_irq_handler(int irq, void *dev_id) 
	unsigned int status;

	unsigned int tmp;



	if (player->state == UNIPERIF_STATE_STOPPED) {

		/* Unexpected IRQ: do nothing */

		return IRQ_NONE;

	}

	spin_lock(&player->irq_lock);

	if (!player->substream)

		goto irq_spin_unlock;



	snd_pcm_stream_lock(player->substream);

	if (player->state == UNIPERIF_STATE_STOPPED)

		goto stream_unlock;



	/* Get interrupt status & clear them immediately */

	status = GET_UNIPERIF_ITS(player);
@@ -88,9 +91,7 @@ static irqreturn_t uni_player_irq_handler(int irq, void *dev_id) 
			SET_UNIPERIF_ITM_BCLR_FIFO_ERROR(player);



			/* Stop the player */

			snd_pcm_stream_lock(player->substream);

			snd_pcm_stop(player->substream, SNDRV_PCM_STATE_XRUN);

			snd_pcm_stream_unlock(player->substream);

		}



		ret = IRQ_HANDLED;
@@ -104,9 +105,7 @@ static irqreturn_t uni_player_irq_handler(int irq, void *dev_id) 
		SET_UNIPERIF_ITM_BCLR_DMA_ERROR(player);



		/* Stop the player */

		snd_pcm_stream_lock(player->substream);

		snd_pcm_stop(player->substream, SNDRV_PCM_STATE_XRUN);

		snd_pcm_stream_unlock(player->substream);



		ret = IRQ_HANDLED;

	}
@@ -116,7 +115,8 @@ static irqreturn_t uni_player_irq_handler(int irq, void *dev_id) 
		if (!player->underflow_enabled) {

			dev_err(player->dev,

				"unexpected Underflow recovering\n");

			return -EPERM;

			ret = -EPERM;

			goto stream_unlock;

		}

		/* Read the underflow recovery duration */

		tmp = GET_UNIPERIF_STATUS_1_UNDERFLOW_DURATION(player);
@@ -138,13 +138,16 @@ static irqreturn_t uni_player_irq_handler(int irq, void *dev_id) 
		dev_err(player->dev, "Underflow recovery failed\n");



		/* Stop the player */

		snd_pcm_stream_lock(player->substream);

		snd_pcm_stop(player->substream, SNDRV_PCM_STATE_XRUN);

		snd_pcm_stream_unlock(player->substream);



		ret = IRQ_HANDLED;

	}



stream_unlock:

	snd_pcm_stream_unlock(player->substream);

irq_spin_unlock:

	spin_unlock(&player->irq_lock);



	return ret;

}
@@ -588,6 +591,7 @@ static int uni_player_ctl_iec958_put(struct snd_kcontrol *kcontrol, 
	struct sti_uniperiph_data *priv = snd_soc_dai_get_drvdata(dai);

	struct uniperif *player = priv->dai_data.uni;

	struct snd_aes_iec958 *iec958 =  &player->stream_settings.iec958;

	unsigned long flags;



	mutex_lock(&player->ctrl_lock);

	iec958->status[0] = ucontrol->value.iec958.status[0];
@@ -596,12 +600,14 @@ static int uni_player_ctl_iec958_put(struct snd_kcontrol *kcontrol, 
	iec958->status[3] = ucontrol->value.iec958.status[3];

	mutex_unlock(&player->ctrl_lock);



	spin_lock_irqsave(&player->irq_lock, flags);

	if (player->substream && player->substream->runtime)

		uni_player_set_channel_status(player,

					      player->substream->runtime);

	else

		uni_player_set_channel_status(player, NULL);



	spin_unlock_irqrestore(&player->irq_lock, flags);

	return 0;

}
@@ -686,9 +692,12 @@ static int uni_player_startup(struct snd_pcm_substream *substream, 
{

	struct sti_uniperiph_data *priv = snd_soc_dai_get_drvdata(dai);

	struct uniperif *player = priv->dai_data.uni;

	unsigned long flags;

	int ret;



	spin_lock_irqsave(&player->irq_lock, flags);

	player->substream = substream;

	spin_unlock_irqrestore(&player->irq_lock, flags);



	player->clk_adj = 0;
@@ -986,12 +995,15 @@ static void uni_player_shutdown(struct snd_pcm_substream *substream, 
{

	struct sti_uniperiph_data *priv = snd_soc_dai_get_drvdata(dai);

	struct uniperif *player = priv->dai_data.uni;

	unsigned long flags;



	spin_lock_irqsave(&player->irq_lock, flags);

	if (player->state != UNIPERIF_STATE_STOPPED)

		/* Stop the player */

		uni_player_stop(player);



	player->substream = NULL;

	spin_unlock_irqrestore(&player->irq_lock, flags);

}



static int uni_player_parse_dt_audio_glue(struct platform_device *pdev,
@@ -1096,6 +1108,7 @@ int uni_player_init(struct platform_device *pdev, 
	}



	mutex_init(&player->ctrl_lock);

	spin_lock_init(&player->irq_lock);



	/* Ensure that disabled by default */

	SET_UNIPERIF_CONFIG_BACK_STALL_REQ_DISABLE(player);

CRA Git | Maintained and supported by SUSTech CRA and CCSE