Unverified Commit 0f6fc975 authored by Codrin Ciubotariu's avatar Codrin Ciubotariu Committed by Mark Brown
Browse files

ASoC: mchp-i2s-mcc: Wait for RX/TX RDY only if controller is running 



Since hw_free() can be called multiple times and not just after a stop
trigger command, we should check whether the RX or TX ready interrupt was
truly enabled previously. For this, we assure that the condition of the
wait event is always true, except when RX/TX interrupts are enabled.

Fixes: 7e0cdf545a55 ("ASoC: mchp-i2s-mcc: add driver for I2SC Multi-Channel Controller")
Signed-off-by: default avatarCodrin Ciubotariu <codrin.ciubotariu@microchip.com>
Link: https://lore.kernel.org/r/20190820162411.24836-3-codrin.ciubotariu@microchip.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 988b5946

sound/soc/atmel/mchp-i2s-mcc.c

+16 −12
Original line number Diff line number Diff line
@@ -691,22 +691,24 @@ static int mchp_i2s_mcc_hw_free(struct snd_pcm_substream *substream, 
		err = wait_event_interruptible_timeout(dev->wq_txrdy,

						       dev->tx_rdy,

						       msecs_to_jiffies(500));

		if (err == 0) {

			dev_warn_once(dev->dev,

				      "Timeout waiting for Tx ready\n");

			regmap_write(dev->regmap, MCHP_I2SMCC_IDRA,

				     MCHP_I2SMCC_INT_TXRDY_MASK(dev->channels));

			dev->tx_rdy = 1;

		}

	} else {

		err = wait_event_interruptible_timeout(dev->wq_rxrdy,

						       dev->rx_rdy,

						       msecs_to_jiffies(500));

	}



		if (err == 0) {

		u32 idra;



		dev_warn_once(dev->dev, "Timeout waiting for %s\n",

			      is_playback ? "Tx ready" : "Rx ready");

		if (is_playback)

			idra = MCHP_I2SMCC_INT_TXRDY_MASK(dev->channels);

		else

			idra = MCHP_I2SMCC_INT_RXRDY_MASK(dev->channels);

		regmap_write(dev->regmap, MCHP_I2SMCC_IDRA, idra);

			dev_warn_once(dev->dev,

				      "Timeout waiting for Rx ready\n");

			regmap_write(dev->regmap, MCHP_I2SMCC_IDRA,

				     MCHP_I2SMCC_INT_RXRDY_MASK(dev->channels));

			dev->rx_rdy = 1;

		}

	}



	if (!mchp_i2s_mcc_is_running(dev)) {
@@ -818,6 +820,8 @@ static int mchp_i2s_mcc_dai_probe(struct snd_soc_dai *dai) 


	init_waitqueue_head(&dev->wq_txrdy);

	init_waitqueue_head(&dev->wq_rxrdy);

	dev->tx_rdy = 1;

	dev->rx_rdy = 1;



	snd_soc_dai_init_dma_data(dai, &dev->playback, &dev->capture);

CRA Git | Maintained and supported by SUSTech CRA and CCSE