[v2] arm64: dts: rockchip: enable HDMI sound nodes for rk3328-rock64
diff mbox series

Message ID 20200802154231.2639186-1-katsuhiro@katsuster.net
State New
Headers show
Series
  • [v2] arm64: dts: rockchip: enable HDMI sound nodes for rk3328-rock64
Related show

Commit Message

Katsuhiro Suzuki Aug. 2, 2020, 3:42 p.m. UTC
This patch enables HDMI sound (I2S0) and Analog sound (I2S1) which
are defined in rk3328.dtsi, and replace SPDIF nodes.

We can use SPDIF pass-through with suitable ALSA settings and on
mpv or other media players.
  - Settings: https://github.com/LibreELEC/LibreELEC.tv/blob/master/projects/Rockchip/filesystem/usr/share/alsa/cards/SPDIF.conf
  - Ex.: mpv foo.ac3 --audio-spdif=ac3 --audio-device='alsa/SPDIF.pcm.iec958.0:SPDIF'

[Why use simple-audio-card for SPDIF?]

For newly adding nodes, ASoC guys recommend to use audio-graph-card.
But all other sound nodes for rk3328 have already been defined by
simple-audio-card. In this time, I chose for consistent sound nodes.

[DMA allocation problem]

After this patch is applied, UART2 will fail to allocate DMA resources
but UART driver can work fine without DMA.

This error is related to the DMAC of rk3328 (pl330 or compatible).
DMAC connected to 16 DMA sources. Each sources have ID number that is
called 'Req number' in rk3328 TRM. After this patch is applied total 7
of DMA sources will be activated as follows:

| Req number | Source | Required  |
|            |        | channels  |
|------------+--------+-----------|
|  8,  9     | SPI0   | 2ch       |
| 11, 12     | I2S0   | 2ch       |
| 14, 15     | I2S1   | 2ch       |
|     10     | SPDIF  | 1ch       |
|------------+--------+-----------|
|            | Total  | 7ch       |
|------------+--------+-----------|
|  6,  7     | UART2  | 2ch       | -> cannot get DMA channels

Due to rk3328 DMAC specification we can use max 8 channels at same
time. If SPI0/I2S0/I2S1/SPDIF will be activated by this patch,
required DMAC channels reach to 7. So the last two channels (for
UART2) cannot get DMA resources.

Virt-dma mechanism for pl0330 DMAC driver is needed to fix this
problem.

Signed-off-by: Katsuhiro Suzuki <katsuhiro@katsuster.net>
---
 .../arm64/boot/dts/rockchip/rk3328-rock64.dts | 56 ++++++++-----------
 1 file changed, 24 insertions(+), 32 deletions(-)

Comments

Heiko Stübner Aug. 30, 2020, 7:16 p.m. UTC | #1
Hi,

Am Sonntag, 2. August 2020, 17:42:31 CEST schrieb Katsuhiro Suzuki:
> This patch enables HDMI sound (I2S0) and Analog sound (I2S1) which
> are defined in rk3328.dtsi, and replace SPDIF nodes.
> 
> We can use SPDIF pass-through with suitable ALSA settings and on
> mpv or other media players.
>   - Settings: https://github.com/LibreELEC/LibreELEC.tv/blob/master/projects/Rockchip/filesystem/usr/share/alsa/cards/SPDIF.conf
>   - Ex.: mpv foo.ac3 --audio-spdif=ac3 --audio-device='alsa/SPDIF.pcm.iec958.0:SPDIF'
> 
> [Why use simple-audio-card for SPDIF?]
> 
> For newly adding nodes, ASoC guys recommend to use audio-graph-card.
> But all other sound nodes for rk3328 have already been defined by
> simple-audio-card. In this time, I chose for consistent sound nodes.
> 
> [DMA allocation problem]
> 
> After this patch is applied, UART2 will fail to allocate DMA resources
> but UART driver can work fine without DMA.
> 
> This error is related to the DMAC of rk3328 (pl330 or compatible).
> DMAC connected to 16 DMA sources. Each sources have ID number that is
> called 'Req number' in rk3328 TRM. After this patch is applied total 7
> of DMA sources will be activated as follows:
> 
> | Req number | Source | Required  |
> |            |        | channels  |
> |------------+--------+-----------|
> |  8,  9     | SPI0   | 2ch       |
> | 11, 12     | I2S0   | 2ch       |
> | 14, 15     | I2S1   | 2ch       |
> |     10     | SPDIF  | 1ch       |
> |------------+--------+-----------|
> |            | Total  | 7ch       |
> |------------+--------+-----------|
> |  6,  7     | UART2  | 2ch       | -> cannot get DMA channels
> 
> Due to rk3328 DMAC specification we can use max 8 channels at same
> time. If SPI0/I2S0/I2S1/SPDIF will be activated by this patch,
> required DMAC channels reach to 7. So the last two channels (for
> UART2) cannot get DMA resources.

Wouldn't the dma allocation depend on the probe ordering?
Or is this predetermined, so that always uart2 looses its dmas?

Heiko
Katsuhiro Suzuki Aug. 31, 2020, 1:26 a.m. UTC | #2
On 2020/08/31 4:16, Heiko Stuebner wrote:
> Hi,
> 
> Am Sonntag, 2. August 2020, 17:42:31 CEST schrieb Katsuhiro Suzuki:
>> This patch enables HDMI sound (I2S0) and Analog sound (I2S1) which
>> are defined in rk3328.dtsi, and replace SPDIF nodes.
>>
>> We can use SPDIF pass-through with suitable ALSA settings and on
>> mpv or other media players.
>>    - Settings: https://github.com/LibreELEC/LibreELEC.tv/blob/master/projects/Rockchip/filesystem/usr/share/alsa/cards/SPDIF.conf
>>    - Ex.: mpv foo.ac3 --audio-spdif=ac3 --audio-device='alsa/SPDIF.pcm.iec958.0:SPDIF'
>>
>> [Why use simple-audio-card for SPDIF?]
>>
>> For newly adding nodes, ASoC guys recommend to use audio-graph-card.
>> But all other sound nodes for rk3328 have already been defined by
>> simple-audio-card. In this time, I chose for consistent sound nodes.
>>
>> [DMA allocation problem]
>>
>> After this patch is applied, UART2 will fail to allocate DMA resources
>> but UART driver can work fine without DMA.
>>
>> This error is related to the DMAC of rk3328 (pl330 or compatible).
>> DMAC connected to 16 DMA sources. Each sources have ID number that is
>> called 'Req number' in rk3328 TRM. After this patch is applied total 7
>> of DMA sources will be activated as follows:
>>
>> | Req number | Source | Required  |
>> |            |        | channels  |
>> |------------+--------+-----------|
>> |  8,  9     | SPI0   | 2ch       |
>> | 11, 12     | I2S0   | 2ch       |
>> | 14, 15     | I2S1   | 2ch       |
>> |     10     | SPDIF  | 1ch       |
>> |------------+--------+-----------|
>> |            | Total  | 7ch       |
>> |------------+--------+-----------|
>> |  6,  7     | UART2  | 2ch       | -> cannot get DMA channels
>>
>> Due to rk3328 DMAC specification we can use max 8 channels at same
>> time. If SPI0/I2S0/I2S1/SPDIF will be activated by this patch,
>> required DMAC channels reach to 7. So the last two channels (for
>> UART2) cannot get DMA resources.
> 
> Wouldn't the dma allocation depend on the probe ordering?
> Or is this predetermined, so that always uart2 looses its dmas?
> 

Ah, it's depends on probe ordering when users use kernel modules...

It's better to disable DMA channels for UART2 for avoiding problem.
I'll fix and resend patch.


> Heiko
> 
> 
> 

Best Regards,
Katsuhiro Suzuki
Robin Murphy Sept. 1, 2020, 12:25 p.m. UTC | #3
On 2020-08-31 02:26, Katsuhiro Suzuki wrote:
> On 2020/08/31 4:16, Heiko Stuebner wrote:
>> Hi,
>>
>> Am Sonntag, 2. August 2020, 17:42:31 CEST schrieb Katsuhiro Suzuki:
>>> This patch enables HDMI sound (I2S0) and Analog sound (I2S1) which
>>> are defined in rk3328.dtsi, and replace SPDIF nodes.
>>>
>>> We can use SPDIF pass-through with suitable ALSA settings and on
>>> mpv or other media players.
>>>    - Settings: 
>>> https://github.com/LibreELEC/LibreELEC.tv/blob/master/projects/Rockchip/filesystem/usr/share/alsa/cards/SPDIF.conf 
>>>
>>>    - Ex.: mpv foo.ac3 --audio-spdif=ac3 
>>> --audio-device='alsa/SPDIF.pcm.iec958.0:SPDIF'
>>>
>>> [Why use simple-audio-card for SPDIF?]
>>>
>>> For newly adding nodes, ASoC guys recommend to use audio-graph-card.
>>> But all other sound nodes for rk3328 have already been defined by
>>> simple-audio-card. In this time, I chose for consistent sound nodes.
>>>
>>> [DMA allocation problem]
>>>
>>> After this patch is applied, UART2 will fail to allocate DMA resources
>>> but UART driver can work fine without DMA.
>>>
>>> This error is related to the DMAC of rk3328 (pl330 or compatible).
>>> DMAC connected to 16 DMA sources. Each sources have ID number that is
>>> called 'Req number' in rk3328 TRM. After this patch is applied total 7
>>> of DMA sources will be activated as follows:
>>>
>>> | Req number | Source | Required  |
>>> |            |        | channels  |
>>> |------------+--------+-----------|
>>> |  8,  9     | SPI0   | 2ch       |
>>> | 11, 12     | I2S0   | 2ch       |
>>> | 14, 15     | I2S1   | 2ch       |
>>> |     10     | SPDIF  | 1ch       |
>>> |------------+--------+-----------|
>>> |            | Total  | 7ch       |
>>> |------------+--------+-----------|
>>> |  6,  7     | UART2  | 2ch       | -> cannot get DMA channels
>>>
>>> Due to rk3328 DMAC specification we can use max 8 channels at same
>>> time. If SPI0/I2S0/I2S1/SPDIF will be activated by this patch,
>>> required DMAC channels reach to 7. So the last two channels (for
>>> UART2) cannot get DMA resources.
>>
>> Wouldn't the dma allocation depend on the probe ordering?
>> Or is this predetermined, so that always uart2 looses its dmas?
>>
> 
> Ah, it's depends on probe ordering when users use kernel modules...
> 
> It's better to disable DMA channels for UART2 for avoiding problem.
> I'll fix and resend patch.

FWIW it seems that since 089b6d365491, DMA is effectively disabled for 
UART2 anyway (unless the user goes out of their way to repurpose it), so 
maybe this is no longer such an immediate concern?

Robin.

Patch
diff mbox series

diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
index 86cfb5c50a94..c984662043da 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
@@ -84,34 +84,32 @@  standby_led: led-1 {
 		};
 	};
 
-	sound {
-		compatible = "audio-graph-card";
-		label = "rockchip,rk3328";
-		dais = <&i2s1_p0
-			&spdif_p0>;
+	spdif_sound: spdif-sound {
+		compatible = "simple-audio-card";
+		simple-audio-card,name = "SPDIF";
+
+		simple-audio-card,cpu {
+			sound-dai = <&spdif>;
+		};
+
+		simple-audio-card,codec {
+			sound-dai = <&spdif_dit>;
+		};
 	};
 
-	spdif-dit {
+	spdif_dit: spdif-dit {
 		compatible = "linux,spdif-dit";
 		#sound-dai-cells = <0>;
-
-		port {
-			dit_p0_0: endpoint {
-				remote-endpoint = <&spdif_p0_0>;
-			};
-		};
 	};
 };
 
+&analog_sound {
+	status = "okay";
+};
+
 &codec {
 	mute-gpios = <&grf_gpio 0 GPIO_ACTIVE_LOW>;
 	status = "okay";
-
-	port@0 {
-		codec_p0_0: endpoint {
-			remote-endpoint = <&i2s1_p0_0>;
-		};
-	};
 };
 
 &cpu0 {
@@ -163,6 +161,10 @@  &hdmi {
 	status = "okay";
 };
 
+&hdmi_sound {
+	status = "okay";
+};
+
 &hdmiphy {
 	status = "okay";
 };
@@ -278,16 +280,12 @@  regulator-state-mem {
 	};
 };
 
-&i2s1 {
+&i2s0 {
 	status = "okay";
+};
 
-	i2s1_p0: port {
-		i2s1_p0_0: endpoint {
-			dai-format = "i2s";
-			mclk-fs = <256>;
-			remote-endpoint = <&codec_p0_0>;
-		};
-	};
+&i2s1 {
+	status = "okay";
 };
 
 &io_domains {
@@ -337,12 +335,6 @@  &sdmmc {
 &spdif {
 	pinctrl-0 = <&spdifm0_tx>;
 	status = "okay";
-
-	spdif_p0: port {
-		spdif_p0_0: endpoint {
-			remote-endpoint = <&dit_p0_0>;
-		};
-	};
 };
 
 &spi0 {