From: Shengjiu Wang <hidden> Date: 2015-11-24 07:03:46
ASRC need to enable the spba clock, when sdma is using share peripheral
script. In this case, there is two spba master port is used, if don't
enable the clock, the spba bus will have arbitration issue, which may
cause read/write wrong data from/to ASRC registers
Signed-off-by: Shengjiu Wang <redacted>
---
Documentation/devicetree/bindings/sound/fsl,asrc.txt | 5 +++++
sound/soc/fsl/fsl_asrc.c | 10 ++++++++++
sound/soc/fsl/fsl_asrc.h | 2 ++
3 files changed, 17 insertions(+)
@@ -25,6 +25,11 @@ Required properties: "mem" Peripheral access clock to access registers. "ipg" Peripheral clock to driver module. "asrck_<0-f>" Clock sources for input and output clock.+ "spba" The spba clock is required when ASRC is placed as a+ bus slave of the Shared Peripheral Bus and when two+ or more bus masters (CPU, DMA or DSP) try to access+ it. This property is optional depending on the SoC+ design. - big-endian : If this property is absent, the little endian mode will be in use as default. Otherwise, the big endian
@@ -859,6 +859,10 @@ static int fsl_asrc_probe(struct platform_device *pdev)returnPTR_ERR(asrc_priv->ipg_clk);}+asrc_priv->spba_clk=devm_clk_get(&pdev->dev,"spba");+if(IS_ERR(asrc_priv->spba_clk))+dev_warn(&pdev->dev,"failed to get spba clock\n");+for(i=0;i<ASRC_CLK_MAX_NUM;i++){sprintf(tmp,"asrck_%x",i);asrc_priv->asrck_clk[i]=devm_clk_get(&pdev->dev,tmp);
@@ -939,6 +943,9 @@ static int fsl_asrc_runtime_resume(struct device *dev)ret=clk_prepare_enable(asrc_priv->ipg_clk);if(ret)gotodisable_mem_clk;+ret=clk_prepare_enable(asrc_priv->spba_clk);+if(ret)+gotodisable_ipg_clk;for(i=0;i<ASRC_CLK_MAX_NUM;i++){ret=clk_prepare_enable(asrc_priv->asrck_clk[i]);if(ret)
@@ -950,6 +957,8 @@ static int fsl_asrc_runtime_resume(struct device *dev)disable_asrck_clk:for(i--;i>=0;i--)clk_disable_unprepare(asrc_priv->asrck_clk[i]);+clk_disable_unprepare(asrc_priv->spba_clk);+disable_ipg_clk:clk_disable_unprepare(asrc_priv->ipg_clk);disable_mem_clk:clk_disable_unprepare(asrc_priv->mem_clk);
@@ -963,6 +972,7 @@ static int fsl_asrc_runtime_suspend(struct device *dev)for(i=0;i<ASRC_CLK_MAX_NUM;i++)clk_disable_unprepare(asrc_priv->asrck_clk[i]);+clk_disable_unprepare(asrc_priv->spba_clk);clk_disable_unprepare(asrc_priv->ipg_clk);clk_disable_unprepare(asrc_priv->mem_clk);
From: Shengjiu Wang <hidden> Date: 2015-11-24 07:03:48
SPDIF need to enable the spba clock, when sdma is using share peripheral
script. In this case, there is two spba master port is used, if don't
enable the clock, the spba bus will have arbitration issue, which may
cause read/write wrong data from/to SPDIF registers.
Signed-off-by: Shengjiu Wang <redacted>
---
Documentation/devicetree/bindings/sound/fsl,spdif.txt | 5 +++++
sound/soc/fsl/fsl_spdif.c | 15 +++++++++++++++
2 files changed, 20 insertions(+)
@@ -27,6 +27,11 @@ Required properties: Transceiver Clock Diagram" of SoC reference manual. It can also be referred to TxClk_Source bit of register SPDIF_STC.+ "spba" The spba clock is required when SPDIF is placed as a+ bus slave of the Shared Peripheral Bus and when two+ or more bus masters (CPU, DMA or DSP) try to access+ it. This property is optional depending on the SoC+ design. - big-endian : If this property is absent, the native endian mode will be in use as default, or the big endian mode
From: Shengjiu Wang <hidden> Date: 2015-11-24 07:17:59
ESAI need to enable the spba clock, when sdma is using share peripheral
script. In this case, there is two spba master port is used, if don't
enable the clock, the spba bus will have arbitration issue, which may
cause read/write wrong data from/to ESAI registers.
Signed-off-by: Shengjiu Wang <redacted>
---
Documentation/devicetree/bindings/sound/fsl,esai.txt | 5 +++++
sound/soc/fsl/fsl_esai.c | 13 +++++++++++++
2 files changed, 18 insertions(+)
@@ -27,6 +27,11 @@ Required properties: derive HCK, SCK and FS. "fsys" The system clock derived from ahb clock used to derive HCK, SCK and FS.+ "spba" The spba clock is required when ESAI is placed as a+ bus slave of the Shared Peripheral Bus and when two+ or more bus masters (CPU, DMA or DSP) try to access+ it. This property is optional depending on the SoC+ design. - fsl,fifo-depth : The number of elements in the transmit and receive FIFOs. This number is the maximum allowed value for
@@ -819,6 +827,11 @@ static int fsl_esai_probe(struct platform_device *pdev)dev_warn(&pdev->dev,"failed to get fsys clock: %ld\n",PTR_ERR(esai_priv->fsysclk));+esai_priv->spbaclk=devm_clk_get(&pdev->dev,"spba");+if(IS_ERR(esai_priv->spbaclk))+dev_warn(&pdev->dev,"failed to get spba clock: %ld\n",+PTR_ERR(esai_priv->spbaclk));+irq=platform_get_irq(pdev,0);if(irq<0){dev_err(&pdev->dev,"no irq for node %s\n",pdev->name);
On Tue, Nov 24, 2015 at 03:03:28PM +0800, Shengjiu Wang wrote:
quoted hunk
@@ -469,6 +471,9 @@ static int fsl_esai_startup(struct snd_pcm_substream *substream, ret = clk_prepare_enable(esai_priv->coreclk); if (ret) return ret;+ ret = clk_prepare_enable(esai_priv->spbaclk);+ if (ret)+ goto err_spbaclk; if (!IS_ERR(esai_priv->extalclk)) { ret = clk_prepare_enable(esai_priv->extalclk); if (ret)
Just like for extalclk there is a IS_ERR check out there, there
should be one for spbaclk as well. Otherwise....
root@imx6qdlsolo:~# aplay /unit_tests/audio8k16S.wav
[ 29.956250] Unable to handle kernel paging request at virtual address fffffffe
[ 29.963491] pgd = edd98000
[ 29.966278] [fffffffe] *pgd=afffd861, *pte=00000000, *ppte=00000000
[ 29.972615] Internal error: Oops: 37 [#1] SMP ARM
[ 29.977327] Modules linked in:
[ 29.980410] CPU: 0 PID: 755 Comm: aplay Not tainted 4.4.0-rc1-12414-gcc8db17 #250
[ 29.987899] Hardware name: Freescale i.MX6 SoloX (Device Tree)
[ 29.993738] task: edece780 ti: ed26a000 task.ti: ed26a000
[ 29.999156] PC is at clk_prepare+0x18/0x38
[ 30.003268] LR is at mark_held_locks+0x70/0x98
[ 30.007720] pc : [<c0568714>] lr : [<c006f42c>] psr: 600f0013
[ 30.007720] sp : ed26bc60 ip : 00000003 fp : ed26bc74
[ 30.019204] r10: eebe4d9c r9 : eeb2e00c r8 : eeb2e00c
[ 30.024435] r7 : fffffffe r6 : eeb2c500 r5 : eeb2d0c0 r4 : fffffffe
[ 30.030966] r3 : edece780 r2 : 00000001 r1 : 00000001 r0 : 00000001
[ 30.037502] Flags: nZCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment none
[ 30.044643] Control: 10c5387d Table: add9804a DAC: 00000051
[ 30.050395] Process aplay (pid: 755, stack limit = 0xed26a210)
From: Shengjiu Wang <hidden> Date: 2015-11-24 09:06:25
On Tue, Nov 24, 2015 at 12:33:45AM -0800, Nicolin Chen wrote:
On Tue, Nov 24, 2015 at 03:03:28PM +0800, Shengjiu Wang wrote:
quoted
@@ -469,6 +471,9 @@ static int fsl_esai_startup(struct snd_pcm_substream *substream, ret = clk_prepare_enable(esai_priv->coreclk); if (ret) return ret;+ ret = clk_prepare_enable(esai_priv->spbaclk);+ if (ret)+ goto err_spbaclk; if (!IS_ERR(esai_priv->extalclk)) { ret = clk_prepare_enable(esai_priv->extalclk); if (ret)
Just like for extalclk there is a IS_ERR check out there, there
should be one for spbaclk as well. Otherwise....
root@imx6qdlsolo:~# aplay /unit_tests/audio8k16S.wav
[ 29.956250] Unable to handle kernel paging request at virtual address fffffffe
[ 29.963491] pgd = edd98000
[ 29.966278] [fffffffe] *pgd=afffd861, *pte=00000000, *ppte=00000000
[ 29.972615] Internal error: Oops: 37 [#1] SMP ARM
[ 29.977327] Modules linked in:
[ 29.980410] CPU: 0 PID: 755 Comm: aplay Not tainted 4.4.0-rc1-12414-gcc8db17 #250
[ 29.987899] Hardware name: Freescale i.MX6 SoloX (Device Tree)
[ 29.993738] task: edece780 ti: ed26a000 task.ti: ed26a000
[ 29.999156] PC is at clk_prepare+0x18/0x38
[ 30.003268] LR is at mark_held_locks+0x70/0x98
[ 30.007720] pc : [<c0568714>] lr : [<c006f42c>] psr: 600f0013
[ 30.007720] sp : ed26bc60 ip : 00000003 fp : ed26bc74
[ 30.019204] r10: eebe4d9c r9 : eeb2e00c r8 : eeb2e00c
[ 30.024435] r7 : fffffffe r6 : eeb2c500 r5 : eeb2d0c0 r4 : fffffffe
[ 30.030966] r3 : edece780 r2 : 00000001 r1 : 00000001 r0 : 00000001
[ 30.037502] Flags: nZCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment none
[ 30.044643] Control: 10c5387d Table: add9804a DAC: 00000051
[ 30.050395] Process aplay (pid: 755, stack limit = 0xed26a210)
Will fix it in next version, and send it out later.
best regards
wang shengjiu
From: Rob Herring <robh@kernel.org> Date: 2015-11-24 23:21:40
On Tue, Nov 24, 2015 at 03:03:28PM +0800, Shengjiu Wang wrote:
ESAI need to enable the spba clock, when sdma is using share peripheral
script. In this case, there is two spba master port is used, if don't
enable the clock, the spba bus will have arbitration issue, which may
cause read/write wrong data from/to ESAI registers.
Signed-off-by: Shengjiu Wang <redacted>
---
Documentation/devicetree/bindings/sound/fsl,esai.txt | 5 +++++
@@ -27,6 +27,11 @@ Required properties: derive HCK, SCK and FS. "fsys" The system clock derived from ahb clock used to derive HCK, SCK and FS.+ "spba" The spba clock is required when ESAI is placed as a+ bus slave of the Shared Peripheral Bus and when two+ or more bus masters (CPU, DMA or DSP) try to access+ it. This property is optional depending on the SoC+ design. - fsl,fifo-depth : The number of elements in the transmit and receive FIFOs. This number is the maximum allowed value for
@@ -819,6 +827,11 @@ static int fsl_esai_probe(struct platform_device *pdev)dev_warn(&pdev->dev,"failed to get fsys clock: %ld\n",PTR_ERR(esai_priv->fsysclk));+esai_priv->spbaclk=devm_clk_get(&pdev->dev,"spba");+if(IS_ERR(esai_priv->spbaclk))+dev_warn(&pdev->dev,"failed to get spba clock: %ld\n",+PTR_ERR(esai_priv->spbaclk));+irq=platform_get_irq(pdev,0);if(irq<0){dev_err(&pdev->dev,"no irq for node %s\n",pdev->name);
From: Rob Herring <robh@kernel.org> Date: 2015-11-24 23:23:47
On Tue, Nov 24, 2015 at 03:03:29PM +0800, Shengjiu Wang wrote:
SPDIF need to enable the spba clock, when sdma is using share peripheral
script. In this case, there is two spba master port is used, if don't
enable the clock, the spba bus will have arbitration issue, which may
cause read/write wrong data from/to SPDIF registers.
Signed-off-by: Shengjiu Wang <redacted>
---
Documentation/devicetree/bindings/sound/fsl,spdif.txt | 5 +++++
For the binding:
Acked-by: Rob Herring <robh@kernel.org>
@@ -27,6 +27,11 @@ Required properties: Transceiver Clock Diagram" of SoC reference manual. It can also be referred to TxClk_Source bit of register SPDIF_STC.+ "spba" The spba clock is required when SPDIF is placed as a+ bus slave of the Shared Peripheral Bus and when two+ or more bus masters (CPU, DMA or DSP) try to access+ it. This property is optional depending on the SoC+ design. - big-endian : If this property is absent, the native endian mode will be in use as default, or the big endian mode
From: Rob Herring <robh@kernel.org> Date: 2015-11-24 23:24:54
On Tue, Nov 24, 2015 at 03:03:30PM +0800, Shengjiu Wang wrote:
ASRC need to enable the spba clock, when sdma is using share peripheral
script. In this case, there is two spba master port is used, if don't
enable the clock, the spba bus will have arbitration issue, which may
cause read/write wrong data from/to ASRC registers
Signed-off-by: Shengjiu Wang <redacted>
---
Documentation/devicetree/bindings/sound/fsl,asrc.txt | 5 +++++
For the binding:
Acked-by: Rob Herring <robh@kernel.org>
@@ -25,6 +25,11 @@ Required properties: "mem" Peripheral access clock to access registers. "ipg" Peripheral clock to driver module. "asrck_<0-f>" Clock sources for input and output clock.+ "spba" The spba clock is required when ASRC is placed as a+ bus slave of the Shared Peripheral Bus and when two+ or more bus masters (CPU, DMA or DSP) try to access+ it. This property is optional depending on the SoC+ design. - big-endian : If this property is absent, the little endian mode will be in use as default. Otherwise, the big endian
@@ -859,6 +859,10 @@ static int fsl_asrc_probe(struct platform_device *pdev)returnPTR_ERR(asrc_priv->ipg_clk);}+asrc_priv->spba_clk=devm_clk_get(&pdev->dev,"spba");+if(IS_ERR(asrc_priv->spba_clk))+dev_warn(&pdev->dev,"failed to get spba clock\n");+for(i=0;i<ASRC_CLK_MAX_NUM;i++){sprintf(tmp,"asrck_%x",i);asrc_priv->asrck_clk[i]=devm_clk_get(&pdev->dev,tmp);
@@ -939,6 +943,9 @@ static int fsl_asrc_runtime_resume(struct device *dev)ret=clk_prepare_enable(asrc_priv->ipg_clk);if(ret)gotodisable_mem_clk;+ret=clk_prepare_enable(asrc_priv->spba_clk);+if(ret)+gotodisable_ipg_clk;for(i=0;i<ASRC_CLK_MAX_NUM;i++){ret=clk_prepare_enable(asrc_priv->asrck_clk[i]);if(ret)
@@ -950,6 +957,8 @@ static int fsl_asrc_runtime_resume(struct device *dev)disable_asrck_clk:for(i--;i>=0;i--)clk_disable_unprepare(asrc_priv->asrck_clk[i]);+clk_disable_unprepare(asrc_priv->spba_clk);+disable_ipg_clk:clk_disable_unprepare(asrc_priv->ipg_clk);disable_mem_clk:clk_disable_unprepare(asrc_priv->mem_clk);
@@ -963,6 +972,7 @@ static int fsl_asrc_runtime_suspend(struct device *dev)for(i=0;i<ASRC_CLK_MAX_NUM;i++)clk_disable_unprepare(asrc_priv->asrck_clk[i]);+clk_disable_unprepare(asrc_priv->spba_clk);clk_disable_unprepare(asrc_priv->ipg_clk);clk_disable_unprepare(asrc_priv->mem_clk);
From: Shengjiu Wang <hidden> Date: 2015-11-25 02:20:07
On Tue, Nov 24, 2015 at 05:21:30PM -0600, Rob Herring wrote:
On Tue, Nov 24, 2015 at 03:03:28PM +0800, Shengjiu Wang wrote:
quoted
ESAI need to enable the spba clock, when sdma is using share peripheral
script. In this case, there is two spba master port is used, if don't
enable the clock, the spba bus will have arbitration issue, which may
cause read/write wrong data from/to ESAI registers.
Signed-off-by: Shengjiu Wang <redacted>
---
Documentation/devicetree/bindings/sound/fsl,esai.txt | 5 +++++
Acked-by: Rob Herring <robh@kernel.org>
Hi Mark, Rob
Just a reminder. There is V4 for this patch set. I think the "Acked-by:" is
for the V4. Thanks.
best regards
wang shengjiu
@@ -27,6 +27,11 @@ Required properties: derive HCK, SCK and FS. "fsys" The system clock derived from ahb clock used to derive HCK, SCK and FS.+ "spba" The spba clock is required when ESAI is placed as a+ bus slave of the Shared Peripheral Bus and when two+ or more bus masters (CPU, DMA or DSP) try to access+ it. This property is optional depending on the SoC+ design. - fsl,fifo-depth : The number of elements in the transmit and receive FIFOs. This number is the maximum allowed value for
@@ -819,6 +827,11 @@ static int fsl_esai_probe(struct platform_device *pdev)dev_warn(&pdev->dev,"failed to get fsys clock: %ld\n",PTR_ERR(esai_priv->fsysclk));+esai_priv->spbaclk=devm_clk_get(&pdev->dev,"spba");+if(IS_ERR(esai_priv->spbaclk))+dev_warn(&pdev->dev,"failed to get spba clock: %ld\n",+PTR_ERR(esai_priv->spbaclk));+irq=platform_get_irq(pdev,0);if(irq<0){dev_err(&pdev->dev,"no irq for node %s\n",pdev->name);