2024-12-19 21:34:44 +00:00
|
|
|
From 2b4bc8f96391b1f4133f5da28f369da06845664a Mon Sep 17 00:00:00 2001
|
2024-12-15 18:29:23 +00:00
|
|
|
From: donghuawei <donghuawei@eswincomputing.com>
|
|
|
|
|
Date: Wed, 29 May 2024 14:11:20 +0800
|
|
|
|
|
Subject: [PATCH 039/219] fix:dsp dma-ranges buf fix
|
|
|
|
|
|
|
|
|
|
Changelogs:
|
|
|
|
|
linux 6.6 reslove dma-ranges from parent.
|
|
|
|
|
---
|
|
|
|
|
arch/riscv/boot/dts/eswin/eswin-win2030-die0-soc.dtsi | 5 +----
|
|
|
|
|
arch/riscv/boot/dts/eswin/eswin-win2030-die1-soc.dtsi | 5 +----
|
|
|
|
|
2 files changed, 2 insertions(+), 8 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/arch/riscv/boot/dts/eswin/eswin-win2030-die0-soc.dtsi b/arch/riscv/boot/dts/eswin/eswin-win2030-die0-soc.dtsi
|
|
|
|
|
index f4c569697c08..fb5920315be4 100644
|
|
|
|
|
--- a/arch/riscv/boot/dts/eswin/eswin-win2030-die0-soc.dtsi
|
|
|
|
|
+++ b/arch/riscv/boot/dts/eswin/eswin-win2030-die0-soc.dtsi
|
|
|
|
|
@@ -553,6 +553,7 @@ d0_dsp_subsys:dsp_subsys@52280400 {
|
|
|
|
|
reg = <0x0 0x52280400 0x0 0x10000>,
|
|
|
|
|
<0x0 0x51810000 0x0 0x8000>;
|
|
|
|
|
ranges;
|
|
|
|
|
+ dma-ranges = <0x0 0x30000000 0x0 0xc0000000 0x0 0xce000000>;
|
|
|
|
|
compatible = "es-dsp-subsys", "simple-bus";
|
|
|
|
|
clocks = <&d0_clock WIN2030_CLK_DSPT_CFG_CLK>;
|
|
|
|
|
clock-names = "cfg_clk";
|
|
|
|
|
@@ -586,7 +587,6 @@ ESWIN_MAIBOX_U84_IRQ_BIT
|
|
|
|
|
host-irq-mode = <1>;
|
|
|
|
|
firmware-name = "eic7700_dsp_fw";
|
|
|
|
|
process-id = <0>;
|
|
|
|
|
- dma-ranges = <0x30000000 0x0 0xc0000000 0xce000000>;
|
|
|
|
|
iommus = <&smmu0 WIN2030_SID_DSP_0>;
|
|
|
|
|
tbus = <WIN2030_TBUID_DSP0>;
|
|
|
|
|
dma-noncoherent;
|
|
|
|
|
@@ -616,7 +616,6 @@ ESWIN_MAIBOX_U84_IRQ_BIT
|
|
|
|
|
host-irq-mode = <1>;
|
|
|
|
|
firmware-name = "eic7700_dsp_fw";
|
|
|
|
|
process-id = <1>;
|
|
|
|
|
- dma-ranges = <0x30000000 0x0 0xc0000000 0xce000000>;
|
|
|
|
|
iommus = <&smmu0 WIN2030_SID_DSP_1>;
|
|
|
|
|
tbus = <WIN2030_TBUID_DSP1>;
|
|
|
|
|
dma-noncoherent;
|
|
|
|
|
@@ -646,7 +645,6 @@ ESWIN_MAIBOX_U84_IRQ_BIT
|
|
|
|
|
host-irq-mode = <1>;
|
|
|
|
|
firmware-name = "eic7700_dsp_fw";
|
|
|
|
|
process-id = <2>;
|
|
|
|
|
- dma-ranges = <0x30000000 0x0 0xc0000000 0xce000000>;
|
|
|
|
|
iommus = <&smmu0 WIN2030_SID_DSP_2>;
|
|
|
|
|
tbus = <WIN2030_TBUID_DSP2>;
|
|
|
|
|
dma-noncoherent;
|
|
|
|
|
@@ -676,7 +674,6 @@ ESWIN_MAIBOX_U84_IRQ_BIT
|
|
|
|
|
host-irq-mode = <1>;
|
|
|
|
|
firmware-name = "eic7700_dsp_fw";
|
|
|
|
|
process-id = <3>;
|
|
|
|
|
- dma-ranges = <0x30000000 0x0 0xc0000000 0xce000000>;
|
|
|
|
|
iommus = <&smmu0 WIN2030_SID_DSP_3>;
|
|
|
|
|
tbus = <WIN2030_TBUID_DSP3>;
|
|
|
|
|
dma-noncoherent;
|
|
|
|
|
diff --git a/arch/riscv/boot/dts/eswin/eswin-win2030-die1-soc.dtsi b/arch/riscv/boot/dts/eswin/eswin-win2030-die1-soc.dtsi
|
|
|
|
|
index 971b506eaf0b..bbb403cf4776 100644
|
|
|
|
|
--- a/arch/riscv/boot/dts/eswin/eswin-win2030-die1-soc.dtsi
|
|
|
|
|
+++ b/arch/riscv/boot/dts/eswin/eswin-win2030-die1-soc.dtsi
|
|
|
|
|
@@ -1279,6 +1279,7 @@ d1_dsp_subsys:dsp_subsys@72280400 {
|
|
|
|
|
reg = <0x0 0x72280400 0x0 0x10000>,
|
|
|
|
|
<0x0 0x71810000 0x0 0x8000>;
|
|
|
|
|
ranges;
|
|
|
|
|
+ dma-ranges = <0x0 0x30000000 0x0 0xc0000000 0x0 0xce000000>;
|
|
|
|
|
compatible = "es-dsp-subsys", "simple-bus";
|
|
|
|
|
clocks = <&d1_clock WIN2030_CLK_DSPT_CFG_CLK>;
|
|
|
|
|
clock-names = "cfg_clk";
|
|
|
|
|
@@ -1311,7 +1312,6 @@ ESWIN_MAIBOX_U84_IRQ_BIT
|
|
|
|
|
host-irq-mode = <1>;
|
|
|
|
|
firmware-name = "eic7702_dsp_fw";
|
|
|
|
|
process-id = <0>;
|
|
|
|
|
- dma-ranges = <0x30000000 0x0 0xc0000000 0xce000000>;
|
|
|
|
|
iommus = <&smmu1 WIN2030_SID_DSP_0>;
|
|
|
|
|
tbus = <WIN2030_TBUID_DSP0>;
|
|
|
|
|
dma-noncoherent;
|
|
|
|
|
@@ -1341,7 +1341,6 @@ ESWIN_MAIBOX_U84_IRQ_BIT
|
|
|
|
|
host-irq-mode = <1>;
|
|
|
|
|
firmware-name = "eic7702_dsp_fw";
|
|
|
|
|
process-id = <1>;
|
|
|
|
|
- dma-ranges = <0x30000000 0x0 0xc0000000 0xce000000>;
|
|
|
|
|
iommus = <&smmu1 WIN2030_SID_DSP_1>;
|
|
|
|
|
tbus = <WIN2030_TBUID_DSP1>;
|
|
|
|
|
dma-noncoherent;
|
|
|
|
|
@@ -1371,7 +1370,6 @@ ESWIN_MAIBOX_U84_IRQ_BIT
|
|
|
|
|
host-irq-mode = <1>;
|
|
|
|
|
firmware-name = "eic7702_dsp_fw";
|
|
|
|
|
process-id = <2>;
|
|
|
|
|
- dma-ranges = <0x30000000 0x0 0xc0000000 0xce000000>;
|
|
|
|
|
iommus = <&smmu1 WIN2030_SID_DSP_2>;
|
|
|
|
|
tbus = <WIN2030_TBUID_DSP2>;
|
|
|
|
|
dma-noncoherent;
|
|
|
|
|
@@ -1401,7 +1399,6 @@ ESWIN_MAIBOX_U84_IRQ_BIT
|
|
|
|
|
host-irq-mode = <1>;
|
|
|
|
|
firmware-name = "eic7702_dsp_fw";
|
|
|
|
|
process-id = <3>;
|
|
|
|
|
- dma-ranges = <0x30000000 0x0 0xc0000000 0xce000000>;
|
|
|
|
|
iommus = <&smmu1 WIN2030_SID_DSP_3>;
|
|
|
|
|
tbus = <WIN2030_TBUID_DSP3>;
|
|
|
|
|
dma-noncoherent;
|
|
|
|
|
--
|
|
|
|
|
2.47.0
|
|
|
|
|
|
