* [PATCH 0/2] ASoC: rockchip: i2s: fix TDL and RDL to 16 bits
@ 2014-12-23 9:08 Jianqun Xu
2014-12-23 9:08 ` [PATCH 1/2] ASoC: rockchip: i2s: fix error defination of transmit data level Jianqun Xu
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Jianqun Xu @ 2014-12-23 9:08 UTC (permalink / raw)
To: lgirdwood, heiko, broonie, perex, tiwai, sonnyrao
Cc: linux-arm-kernel, alsa-devel, linux-kernel, devicetree,
Jianqun Xu
To make Bus DMA works more efficiency, DMA may work in burst mode,
we set the watermark of transmit and receive reach to 16 bits.
Jianqun Xu (2):
ASoC: rockchip: i2s: fix error defination of transmit data level
ASoC: rockchip: i2s: set TDL and RDL to 16 bits
sound/soc/rockchip/rockchip_i2s.c | 4 ++++
sound/soc/rockchip/rockchip_i2s.h | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
--
1.9.1
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 1/2] ASoC: rockchip: i2s: fix error defination of transmit data level 2014-12-23 9:08 [PATCH 0/2] ASoC: rockchip: i2s: fix TDL and RDL to 16 bits Jianqun Xu @ 2014-12-23 9:08 ` Jianqun Xu 2014-12-23 9:08 ` [PATCH 2/2] ASoC: rockchip: i2s: set TDL and RDL to 16 bits Jianqun Xu 2014-12-24 9:36 ` [PATCH v2 0/3] ASoC: rockchip: i2s: fix watermark to 16 and maxburst to 4 Jianqun Xu 2 siblings, 0 replies; 10+ messages in thread From: Jianqun Xu @ 2014-12-23 9:08 UTC (permalink / raw) To: lgirdwood, heiko, broonie, perex, tiwai, sonnyrao Cc: linux-arm-kernel, alsa-devel, linux-kernel, devicetree, Jianqun Xu According to description about "Transmit Data Level", This bit field controls the level at which a DMA request is made by the transmit logic. It is equal to the watermark level. That is, the dma_tx_req signal is generated when the number of valid data entries in the TXFIFO (TXFIFO0 if CSR=00 TXFIFO1 if CSR=01 TXFIFO2 if CSR=10 TXFIFO3 if CSR=11) is equal to or below this field value. Different to receive data level, transmit data level does not need to "-1". Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com> --- sound/soc/rockchip/rockchip_i2s.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/rockchip/rockchip_i2s.h b/sound/soc/rockchip/rockchip_i2s.h index 89a5d8b..93f456f 100644 --- a/sound/soc/rockchip/rockchip_i2s.h +++ b/sound/soc/rockchip/rockchip_i2s.h @@ -127,7 +127,7 @@ #define I2S_DMACR_TDE_DISABLE (0 << I2S_DMACR_TDE_SHIFT) #define I2S_DMACR_TDE_ENABLE (1 << I2S_DMACR_TDE_SHIFT) #define I2S_DMACR_TDL_SHIFT 0 -#define I2S_DMACR_TDL(x) ((x - 1) << I2S_DMACR_TDL_SHIFT) +#define I2S_DMACR_TDL(x) ((x) << I2S_DMACR_TDL_SHIFT) #define I2S_DMACR_TDL_MASK (0x1f << I2S_DMACR_TDL_SHIFT) /* -- 1.9.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/2] ASoC: rockchip: i2s: set TDL and RDL to 16 bits 2014-12-23 9:08 [PATCH 0/2] ASoC: rockchip: i2s: fix TDL and RDL to 16 bits Jianqun Xu 2014-12-23 9:08 ` [PATCH 1/2] ASoC: rockchip: i2s: fix error defination of transmit data level Jianqun Xu @ 2014-12-23 9:08 ` Jianqun Xu 2014-12-23 23:06 ` [alsa-devel] " Dylan Reid 2014-12-24 9:36 ` [PATCH v2 0/3] ASoC: rockchip: i2s: fix watermark to 16 and maxburst to 4 Jianqun Xu 2 siblings, 1 reply; 10+ messages in thread From: Jianqun Xu @ 2014-12-23 9:08 UTC (permalink / raw) To: lgirdwood, heiko, broonie, perex, tiwai, sonnyrao Cc: linux-arm-kernel, alsa-devel, linux-kernel, devicetree, Jianqun Xu Set Transmit Data Level(TDL) and Receive Data Level(RDL) to 16 bits. Without this setting, the TDL is default to be 0x00 (means 1 bit), and the RDL is default to be 0x1f (means 16 bits). This patch is helpful to fix pop sound, tested on rk3288 board. Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com> --- sound/soc/rockchip/rockchip_i2s.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index c74ba37..1cd7efc 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -247,6 +247,10 @@ static int rockchip_i2s_hw_params(struct snd_pcm_substream *substream, regmap_update_bits(i2s->regmap, I2S_TXCR, I2S_TXCR_VDW_MASK, val); regmap_update_bits(i2s->regmap, I2S_RXCR, I2S_RXCR_VDW_MASK, val); + regmap_update_bits(i2s->regmap, I2S_DMACR, I2S_DMACR_TDL_MASK, + I2S_DMACR_TDL(16)); + regmap_update_bits(i2s->regmap, I2S_DMACR, I2S_DMACR_RDL_MASK, + I2S_DMACR_RDL(16)); return 0; } -- 1.9.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [alsa-devel] [PATCH 2/2] ASoC: rockchip: i2s: set TDL and RDL to 16 bits 2014-12-23 9:08 ` [PATCH 2/2] ASoC: rockchip: i2s: set TDL and RDL to 16 bits Jianqun Xu @ 2014-12-23 23:06 ` Dylan Reid 2014-12-24 0:36 ` Jianqun 0 siblings, 1 reply; 10+ messages in thread From: Dylan Reid @ 2014-12-23 23:06 UTC (permalink / raw) To: Jianqun Xu Cc: Liam Girdwood, Heiko Stübner, Mark Brown, perex, Takashi Iwai, Sonny Rao, devicetree@vger.kernel.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org On Tue, Dec 23, 2014 at 1:08 AM, Jianqun Xu <jay.xu@rock-chips.com> wrote: > Set Transmit Data Level(TDL) and Receive Data Level(RDL) to 16 bits. > Without this setting, the TDL is default to be 0x00 (means 1 bit), > and the RDL is default to be 0x1f (means 16 bits). My impression from the TRM was that TDL and RDL were measured in samples. Are you sure it's 'bits'? > > This patch is helpful to fix pop sound, tested on rk3288 board. > > Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com> > --- > sound/soc/rockchip/rockchip_i2s.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c > index c74ba37..1cd7efc 100644 > --- a/sound/soc/rockchip/rockchip_i2s.c > +++ b/sound/soc/rockchip/rockchip_i2s.c > @@ -247,6 +247,10 @@ static int rockchip_i2s_hw_params(struct snd_pcm_substream *substream, > > regmap_update_bits(i2s->regmap, I2S_TXCR, I2S_TXCR_VDW_MASK, val); > regmap_update_bits(i2s->regmap, I2S_RXCR, I2S_RXCR_VDW_MASK, val); > + regmap_update_bits(i2s->regmap, I2S_DMACR, I2S_DMACR_TDL_MASK, > + I2S_DMACR_TDL(16)); > + regmap_update_bits(i2s->regmap, I2S_DMACR, I2S_DMACR_RDL_MASK, > + I2S_DMACR_RDL(16)); > > return 0; > } > -- > 1.9.1 > > > _______________________________________________ > Alsa-devel mailing list > Alsa-devel@alsa-project.org > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [alsa-devel] [PATCH 2/2] ASoC: rockchip: i2s: set TDL and RDL to 16 bits 2014-12-23 23:06 ` [alsa-devel] " Dylan Reid @ 2014-12-24 0:36 ` Jianqun 0 siblings, 0 replies; 10+ messages in thread From: Jianqun @ 2014-12-24 0:36 UTC (permalink / raw) To: Dylan Reid, Jianqun Xu Cc: xjq, Liam Girdwood, Heiko Stübner, Mark Brown, perex, Takashi Iwai, Sonny Rao, devicetree@vger.kernel.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org 在 12/24/2014 07:06 AM, Dylan Reid 写道: > On Tue, Dec 23, 2014 at 1:08 AM, Jianqun Xu <jay.xu@rock-chips.com> wrote: >> Set Transmit Data Level(TDL) and Receive Data Level(RDL) to 16 bits. >> Without this setting, the TDL is default to be 0x00 (means 1 bit), >> and the RDL is default to be 0x1f (means 16 bits). > > My impression from the TRM was that TDL and RDL were measured in > samples. Are you sure it's 'bits'? You are right, I'll modify the commit message next version, thank you > >> >> This patch is helpful to fix pop sound, tested on rk3288 board. >> >> Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com> >> --- >> sound/soc/rockchip/rockchip_i2s.c | 4 ++++ >> 1 file changed, 4 insertions(+) >> >> diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c >> index c74ba37..1cd7efc 100644 >> --- a/sound/soc/rockchip/rockchip_i2s.c >> +++ b/sound/soc/rockchip/rockchip_i2s.c >> @@ -247,6 +247,10 @@ static int rockchip_i2s_hw_params(struct snd_pcm_substream *substream, >> >> regmap_update_bits(i2s->regmap, I2S_TXCR, I2S_TXCR_VDW_MASK, val); >> regmap_update_bits(i2s->regmap, I2S_RXCR, I2S_RXCR_VDW_MASK, val); >> + regmap_update_bits(i2s->regmap, I2S_DMACR, I2S_DMACR_TDL_MASK, >> + I2S_DMACR_TDL(16)); >> + regmap_update_bits(i2s->regmap, I2S_DMACR, I2S_DMACR_RDL_MASK, >> + I2S_DMACR_RDL(16)); >> >> return 0; >> } >> -- >> 1.9.1 >> >> >> _______________________________________________ >> Alsa-devel mailing list >> Alsa-devel@alsa-project.org >> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel > > > -- Jianqun Xu **************************************************************************** *IMPORTANT NOTICE:*This email is from Fuzhou Rockchip Electronics Co., Ltd .The contents of this email and any attachments may contain information that is privileged, confidential and/or exempt from disclosure under applicable law and relevant NDA. If you are not the intended recipient, you are hereby notified that any disclosure, copying, distribution, or use of the information is STRICTLY PROHIBITED. Please immediately contact the sender as soon as possible and destroy the material in its entirety in any format. Thank you. **************************************************************************** ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2 0/3] ASoC: rockchip: i2s: fix watermark to 16 and maxburst to 4 2014-12-23 9:08 [PATCH 0/2] ASoC: rockchip: i2s: fix TDL and RDL to 16 bits Jianqun Xu 2014-12-23 9:08 ` [PATCH 1/2] ASoC: rockchip: i2s: fix error defination of transmit data level Jianqun Xu 2014-12-23 9:08 ` [PATCH 2/2] ASoC: rockchip: i2s: set TDL and RDL to 16 bits Jianqun Xu @ 2014-12-24 9:36 ` Jianqun Xu 2014-12-24 9:37 ` [PATCH v2 1/3] ASoC: rockchip: i2s: fix error defination of transmit data level Jianqun Xu ` (3 more replies) 2 siblings, 4 replies; 10+ messages in thread From: Jianqun Xu @ 2014-12-24 9:36 UTC (permalink / raw) To: lgirdwood, heiko, broonie, perex, tiwai, sonnyrao Cc: linux-arm-kernel, alsa-devel, linux-kernel, devicetree, linux-rockchip, Jianqun Xu To make Bus DMA works more efficiency, DMA may work in burst mode, we set the watermark of transmit and receive reach to 16 bits. Jianqun Xu (3): ASoC: rockchip: i2s: fix error defination of transmit data level ASoC: rockchip: i2s: set TDL and RDL to 16 samples ASoC: rockchip: i2s: fix maxburst of dma data to 4 sound/soc/rockchip/rockchip_i2s.c | 8 ++++++-- sound/soc/rockchip/rockchip_i2s.h | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) -- changes since v1: - modify commit message suggested by dgreid - add patch to fix maxburst 1.9.1 ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2 1/3] ASoC: rockchip: i2s: fix error defination of transmit data level 2014-12-24 9:36 ` [PATCH v2 0/3] ASoC: rockchip: i2s: fix watermark to 16 and maxburst to 4 Jianqun Xu @ 2014-12-24 9:37 ` Jianqun Xu 2014-12-24 9:37 ` [PATCH v2 2/3] ASoC: rockchip: i2s: set TDL and RDL to 16 samples Jianqun Xu ` (2 subsequent siblings) 3 siblings, 0 replies; 10+ messages in thread From: Jianqun Xu @ 2014-12-24 9:37 UTC (permalink / raw) To: lgirdwood, heiko, broonie, perex, tiwai, sonnyrao Cc: linux-arm-kernel, alsa-devel, linux-kernel, devicetree, linux-rockchip, Jianqun Xu According to description about "Transmit Data Level", This bit field controls the level at which a DMA request is made by the transmit logic. It is equal to the watermark level. That is, the dma_tx_req signal is generated when the number of valid data entries in the TXFIFO (TXFIFO0 if CSR=00 TXFIFO1 if CSR=01 TXFIFO2 if CSR=10 TXFIFO3 if CSR=11) is equal to or below this field value. Different to receive data level, transmit data level does not need to "-1". Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com> --- changes since v1: - none sound/soc/rockchip/rockchip_i2s.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/rockchip/rockchip_i2s.h b/sound/soc/rockchip/rockchip_i2s.h index 89a5d8b..93f456f 100644 --- a/sound/soc/rockchip/rockchip_i2s.h +++ b/sound/soc/rockchip/rockchip_i2s.h @@ -127,7 +127,7 @@ #define I2S_DMACR_TDE_DISABLE (0 << I2S_DMACR_TDE_SHIFT) #define I2S_DMACR_TDE_ENABLE (1 << I2S_DMACR_TDE_SHIFT) #define I2S_DMACR_TDL_SHIFT 0 -#define I2S_DMACR_TDL(x) ((x - 1) << I2S_DMACR_TDL_SHIFT) +#define I2S_DMACR_TDL(x) ((x) << I2S_DMACR_TDL_SHIFT) #define I2S_DMACR_TDL_MASK (0x1f << I2S_DMACR_TDL_SHIFT) /* -- 1.9.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v2 2/3] ASoC: rockchip: i2s: set TDL and RDL to 16 samples 2014-12-24 9:36 ` [PATCH v2 0/3] ASoC: rockchip: i2s: fix watermark to 16 and maxburst to 4 Jianqun Xu 2014-12-24 9:37 ` [PATCH v2 1/3] ASoC: rockchip: i2s: fix error defination of transmit data level Jianqun Xu @ 2014-12-24 9:37 ` Jianqun Xu 2014-12-24 9:37 ` [PATCH v2 3/3] ASoC: rockchip: i2s: fix maxburst of dma data to 4 Jianqun Xu 2014-12-24 12:43 ` [PATCH v2 0/3] ASoC: rockchip: i2s: fix watermark to 16 and maxburst " Mark Brown 3 siblings, 0 replies; 10+ messages in thread From: Jianqun Xu @ 2014-12-24 9:37 UTC (permalink / raw) To: lgirdwood, heiko, broonie, perex, tiwai, sonnyrao Cc: linux-arm-kernel, alsa-devel, linux-kernel, devicetree, linux-rockchip, Jianqun Xu Set Transmit Data Level(TDL) and Receive Data Level(RDL) to 16 samples. Without this setting, the TDL is default to be 0x00 (means 0 sample), and the RDL is default to be 0x1f (means 32 samples). Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com> --- changes since v1: - modify commit message "bit" to "sample", suggested by dgreid sound/soc/rockchip/rockchip_i2s.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index c74ba37..1cd7efc 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -247,6 +247,10 @@ static int rockchip_i2s_hw_params(struct snd_pcm_substream *substream, regmap_update_bits(i2s->regmap, I2S_TXCR, I2S_TXCR_VDW_MASK, val); regmap_update_bits(i2s->regmap, I2S_RXCR, I2S_RXCR_VDW_MASK, val); + regmap_update_bits(i2s->regmap, I2S_DMACR, I2S_DMACR_TDL_MASK, + I2S_DMACR_TDL(16)); + regmap_update_bits(i2s->regmap, I2S_DMACR, I2S_DMACR_RDL_MASK, + I2S_DMACR_RDL(16)); return 0; } -- 1.9.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v2 3/3] ASoC: rockchip: i2s: fix maxburst of dma data to 4 2014-12-24 9:36 ` [PATCH v2 0/3] ASoC: rockchip: i2s: fix watermark to 16 and maxburst to 4 Jianqun Xu 2014-12-24 9:37 ` [PATCH v2 1/3] ASoC: rockchip: i2s: fix error defination of transmit data level Jianqun Xu 2014-12-24 9:37 ` [PATCH v2 2/3] ASoC: rockchip: i2s: set TDL and RDL to 16 samples Jianqun Xu @ 2014-12-24 9:37 ` Jianqun Xu 2014-12-24 12:43 ` [PATCH v2 0/3] ASoC: rockchip: i2s: fix watermark to 16 and maxburst " Mark Brown 3 siblings, 0 replies; 10+ messages in thread From: Jianqun Xu @ 2014-12-24 9:37 UTC (permalink / raw) To: lgirdwood, heiko, broonie, perex, tiwai, sonnyrao Cc: linux-arm-kernel, alsa-devel, linux-kernel, devicetree, linux-rockchip, Jianqun Xu Since RK3288 DMAC's burst length only support max to 4, here set maxburst of playback and capture dma data to 4. Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com> --- changes since v1: - new patch since v1 sound/soc/rockchip/rockchip_i2s.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index 1cd7efc..59aeec4 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -458,11 +458,11 @@ static int rockchip_i2s_probe(struct platform_device *pdev) i2s->playback_dma_data.addr = res->start + I2S_TXDR; i2s->playback_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; - i2s->playback_dma_data.maxburst = 16; + i2s->playback_dma_data.maxburst = 4; i2s->capture_dma_data.addr = res->start + I2S_RXDR; i2s->capture_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; - i2s->capture_dma_data.maxburst = 16; + i2s->capture_dma_data.maxburst = 4; i2s->dev = &pdev->dev; dev_set_drvdata(&pdev->dev, i2s); -- 1.9.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v2 0/3] ASoC: rockchip: i2s: fix watermark to 16 and maxburst to 4 2014-12-24 9:36 ` [PATCH v2 0/3] ASoC: rockchip: i2s: fix watermark to 16 and maxburst to 4 Jianqun Xu ` (2 preceding siblings ...) 2014-12-24 9:37 ` [PATCH v2 3/3] ASoC: rockchip: i2s: fix maxburst of dma data to 4 Jianqun Xu @ 2014-12-24 12:43 ` Mark Brown 3 siblings, 0 replies; 10+ messages in thread From: Mark Brown @ 2014-12-24 12:43 UTC (permalink / raw) To: Jianqun Xu Cc: lgirdwood, heiko, perex, tiwai, sonnyrao, linux-arm-kernel, alsa-devel, linux-kernel, devicetree, linux-rockchip [-- Attachment #1: Type: text/plain, Size: 219 bytes --] On Wed, Dec 24, 2014 at 05:36:59PM +0800, Jianqun Xu wrote: > To make Bus DMA works more efficiency, DMA may work in burst mode, > we set the watermark of transmit and receive reach to 16 bits. Applied all, thanks. [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 473 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2014-12-24 12:44 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-12-23 9:08 [PATCH 0/2] ASoC: rockchip: i2s: fix TDL and RDL to 16 bits Jianqun Xu 2014-12-23 9:08 ` [PATCH 1/2] ASoC: rockchip: i2s: fix error defination of transmit data level Jianqun Xu 2014-12-23 9:08 ` [PATCH 2/2] ASoC: rockchip: i2s: set TDL and RDL to 16 bits Jianqun Xu 2014-12-23 23:06 ` [alsa-devel] " Dylan Reid 2014-12-24 0:36 ` Jianqun 2014-12-24 9:36 ` [PATCH v2 0/3] ASoC: rockchip: i2s: fix watermark to 16 and maxburst to 4 Jianqun Xu 2014-12-24 9:37 ` [PATCH v2 1/3] ASoC: rockchip: i2s: fix error defination of transmit data level Jianqun Xu 2014-12-24 9:37 ` [PATCH v2 2/3] ASoC: rockchip: i2s: set TDL and RDL to 16 samples Jianqun Xu 2014-12-24 9:37 ` [PATCH v2 3/3] ASoC: rockchip: i2s: fix maxburst of dma data to 4 Jianqun Xu 2014-12-24 12:43 ` [PATCH v2 0/3] ASoC: rockchip: i2s: fix watermark to 16 and maxburst " Mark Brown
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox