Hi John,
2015-12-09 11:32 GMT+01:00 John Keeping john@metanate.com:
If we only clear the tx/rx state when both are disabled it is not possible to start/stop one multiple times while the other is running. Since the two are independently controlled, treat them as such and remove the false dependency between capture and playback.
Signed-off-by: John Keeping john@metanate.com
sound/soc/rockchip/rockchip_i2s.c | 72 +++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 40 deletions(-)
diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index 83b1b9c..acc6225 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -82,8 +82,8 @@ static void rockchip_snd_txctrl(struct rk_i2s_dev *i2s, int on) I2S_DMACR_TDE_ENABLE, I2S_DMACR_TDE_ENABLE);
regmap_update_bits(i2s->regmap, I2S_XFER,
I2S_XFER_TXS_START | I2S_XFER_RXS_START,I2S_XFER_TXS_START |I2S_XFER_RXS_START);
I2S_XFER_TXS_START,I2S_XFER_TXS_START); i2s->tx_start = true; } else {@@ -92,27 +92,23 @@ static void rockchip_snd_txctrl(struct rk_i2s_dev *i2s, int on) regmap_update_bits(i2s->regmap, I2S_DMACR, I2S_DMACR_TDE_ENABLE, I2S_DMACR_TDE_DISABLE);
if (!i2s->rx_start) {regmap_update_bits(i2s->regmap, I2S_XFER,I2S_XFER_TXS_START |I2S_XFER_RXS_START,I2S_XFER_TXS_STOP |I2S_XFER_RXS_STOP);
regmap_update_bits(i2s->regmap, I2S_XFER,I2S_XFER_TXS_START,I2S_XFER_TXS_STOP);
regmap_update_bits(i2s->regmap, I2S_CLR,I2S_CLR_TXC | I2S_CLR_RXC,I2S_CLR_TXC | I2S_CLR_RXC);
regmap_update_bits(i2s->regmap, I2S_CLR,I2S_CLR_TXC,I2S_CLR_TXC);
regmap_read(i2s->regmap, I2S_CLR, &val);
regmap_read(i2s->regmap, I2S_CLR, &val);
/* Should wait for clear operation to finish */while (val) {regmap_read(i2s->regmap, I2S_CLR, &val);retry--;if (!retry) {dev_warn(i2s->dev, "fail toclear\n");
break;}
/* Should wait for clear operation to finish */while (val & I2S_CLR_TXC) {regmap_read(i2s->regmap, I2S_CLR, &val);retry--;if (!retry) {dev_warn(i2s->dev, "fail to clear\n");break; } } }@@ -128,8 +124,8 @@ static void rockchip_snd_rxctrl(struct rk_i2s_dev *i2s, int on) I2S_DMACR_RDE_ENABLE, I2S_DMACR_RDE_ENABLE);
regmap_update_bits(i2s->regmap, I2S_XFER,
I2S_XFER_TXS_START | I2S_XFER_RXS_START,I2S_XFER_TXS_START |I2S_XFER_RXS_START);
I2S_XFER_RXS_START,I2S_XFER_RXS_START); i2s->rx_start = true; } else {@@ -138,27 +134,23 @@ static void rockchip_snd_rxctrl(struct rk_i2s_dev *i2s, int on) regmap_update_bits(i2s->regmap, I2S_DMACR, I2S_DMACR_RDE_ENABLE, I2S_DMACR_RDE_DISABLE);
if (!i2s->tx_start) {regmap_update_bits(i2s->regmap, I2S_XFER,I2S_XFER_TXS_START |I2S_XFER_RXS_START,I2S_XFER_TXS_STOP |I2S_XFER_RXS_STOP);
regmap_update_bits(i2s->regmap, I2S_XFER,I2S_XFER_RXS_START,I2S_XFER_RXS_STOP);
regmap_update_bits(i2s->regmap, I2S_CLR,I2S_CLR_TXC | I2S_CLR_RXC,I2S_CLR_TXC | I2S_CLR_RXC);
regmap_update_bits(i2s->regmap, I2S_CLR,I2S_CLR_RXC,I2S_CLR_RXC);
regmap_read(i2s->regmap, I2S_CLR, &val);
regmap_read(i2s->regmap, I2S_CLR, &val);
/* Should wait for clear operation to finish */while (val) {regmap_read(i2s->regmap, I2S_CLR, &val);retry--;if (!retry) {dev_warn(i2s->dev, "fail toclear\n");
break;}
/* Should wait for clear operation to finish */while (val & I2S_CLR_RXC) {regmap_read(i2s->regmap, I2S_CLR, &val);retry--;if (!retry) {dev_warn(i2s->dev, "fail to clear\n");break; } } }--
Using my Veyron Jerry Chromebook wiht latest kernel I found that the speakers doesn't work. Bisect points to this patch as the offending commit. However your changes looks reasonable the fact is that reverting the patch makes the audio work again on my device. I need to dig a bit more into the issue, but meanwhile, any idea on what is happening ? Can I ask which device did you test?
Best regards, Enric