Message ID | 20241118130343.3675277-1-quic_lxu5@quicinc.com (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
Series | [v2] arm64: qcom: qcs8300: Add ADSP and CDSP0 fastrpc nodes | expand |
On Mon, Nov 18, 2024 at 06:33:43PM +0530, Ling Xu wrote: > Add ADSP and CDSP0 fastrpc nodes for QCS8300 platform. > > Signed-off-by: Ling Xu <quic_lxu5@quicinc.com> > --- > This patch depends on patch https://lore.kernel.org/all/20240904-qcs8300_initial_dtsi-v1-0-d0ea9afdc007@quicinc.com/#t > Changes since v1: > - Remove duplicate cdsp fastrpc nodes > - Add adsp memory-region and vmids > --- > arch/arm64/boot/dts/qcom/qcs8300.dtsi | 81 +++++++++++++++++++++++++++ > 1 file changed, 81 insertions(+) > > diff --git a/arch/arm64/boot/dts/qcom/qcs8300.dtsi b/arch/arm64/boot/dts/qcom/qcs8300.dtsi > index 2c35f96c3f28..fdfec15f606e 100644 > --- a/arch/arm64/boot/dts/qcom/qcs8300.dtsi > +++ b/arch/arm64/boot/dts/qcom/qcs8300.dtsi > @@ -5,6 +5,7 @@ > > #include <dt-bindings/clock/qcom,qcs8300-gcc.h> > #include <dt-bindings/clock/qcom,rpmh.h> > +#include <dt-bindings/firmware/qcom,scm.h> > #include <dt-bindings/interconnect/qcom,icc.h> > #include <dt-bindings/interconnect/qcom,qcs8300-rpmh.h> > #include <dt-bindings/interrupt-controller/arm-gic.h> > @@ -762,6 +763,38 @@ IPCC_MPROC_SIGNAL_GLINK_QMP > > label = "lpass"; > qcom,remote-pid = <2>; > + > + fastrpc { > + compatible = "qcom,fastrpc"; > + qcom,glink-channels = "fastrpcglink-apps-dsp"; > + label = "adsp"; > + memory-region = <&adsp_rpc_remote_heap_mem>; > + qcom,vmids = <QCOM_SCM_VMID_LPASS > + QCOM_SCM_VMID_ADSP_HEAP>; > + #address-cells = <1>; > + #size-cells = <0>; > + > + compute-cb@3 { > + compatible = "qcom,fastrpc-compute-cb"; > + reg = <3>; > + iommus = <&apps_smmu 0x2003 0x0>; > + dma-coherent; > + }; > + > + compute-cb@4 { > + compatible = "qcom,fastrpc-compute-cb"; > + reg = <4>; > + iommus = <&apps_smmu 0x2004 0x0>; > + dma-coherent; > + }; > + > + compute-cb@5 { > + compatible = "qcom,fastrpc-compute-cb"; > + reg = <5>; > + iommus = <&apps_smmu 0x2005 0x0>; > + dma-coherent; > + }; > + }; > }; > }; > > @@ -1361,6 +1394,54 @@ IPCC_MPROC_SIGNAL_GLINK_QMP > > label = "cdsp"; > qcom,remote-pid = <5>; > + > + fastrpc { > + compatible = "qcom,fastrpc"; > + qcom,glink-channels = "fastrpcglink-apps-dsp"; > + label = "cdsp"; > + #address-cells = <1>; > + #size-cells = <0>; > + > + compute-cb@1 { > + compatible = "qcom,fastrpc-compute-cb"; > + reg = <1>; > + iommus = <&apps_smmu 0x19c1 0x0440>, > + <&apps_smmu 0x1dc1 0x0440>, > + <&apps_smmu 0x1961 0x0400>, > + <&apps_smmu 0x1d61 0x0400>; This still doesn't look correct: (gdb) print/x 0x19c1 & ~0x440 $1 = 0x1981 (gdb) print/x 0x1dc1 & ~0x440 $2 = 0x1981 (gdb) print/x 0x1961 & ~0x400 $3 = 0x1961 (gdb) print/x 0x1d61 & ~0x400 $4 = 0x1961 > + dma-coherent; > + }; > + > + compute-cb@2 { > + compatible = "qcom,fastrpc-compute-cb"; > + reg = <2>; > + iommus = <&apps_smmu 0x19c2 0x0440>, > + <&apps_smmu 0x1dc2 0x0440>, > + <&apps_smmu 0x1962 0x0400>, > + <&apps_smmu 0x1d62 0x0400>; > + dma-coherent; > + }; > + > + compute-cb@3 { > + compatible = "qcom,fastrpc-compute-cb"; > + reg = <3>; > + iommus = <&apps_smmu 0x19c3 0x0440>, > + <&apps_smmu 0x1dc3 0x0440>, > + <&apps_smmu 0x1963 0x0400>, > + <&apps_smmu 0x1d63 0x0400>; > + dma-coherent; > + }; > + > + compute-cb@4 { > + compatible = "qcom,fastrpc-compute-cb"; > + reg = <4>; > + iommus = <&apps_smmu 0x19c4 0x0440>, > + <&apps_smmu 0x1dc4 0x0440>, > + <&apps_smmu 0x1964 0x0400>, > + <&apps_smmu 0x1d64 0x0400>; > + dma-coherent; > + }; > + }; > }; > }; > }; > -- > 2.34.1 >
diff --git a/arch/arm64/boot/dts/qcom/qcs8300.dtsi b/arch/arm64/boot/dts/qcom/qcs8300.dtsi index 2c35f96c3f28..fdfec15f606e 100644 --- a/arch/arm64/boot/dts/qcom/qcs8300.dtsi +++ b/arch/arm64/boot/dts/qcom/qcs8300.dtsi @@ -5,6 +5,7 @@ #include <dt-bindings/clock/qcom,qcs8300-gcc.h> #include <dt-bindings/clock/qcom,rpmh.h> +#include <dt-bindings/firmware/qcom,scm.h> #include <dt-bindings/interconnect/qcom,icc.h> #include <dt-bindings/interconnect/qcom,qcs8300-rpmh.h> #include <dt-bindings/interrupt-controller/arm-gic.h> @@ -762,6 +763,38 @@ IPCC_MPROC_SIGNAL_GLINK_QMP label = "lpass"; qcom,remote-pid = <2>; + + fastrpc { + compatible = "qcom,fastrpc"; + qcom,glink-channels = "fastrpcglink-apps-dsp"; + label = "adsp"; + memory-region = <&adsp_rpc_remote_heap_mem>; + qcom,vmids = <QCOM_SCM_VMID_LPASS + QCOM_SCM_VMID_ADSP_HEAP>; + #address-cells = <1>; + #size-cells = <0>; + + compute-cb@3 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <3>; + iommus = <&apps_smmu 0x2003 0x0>; + dma-coherent; + }; + + compute-cb@4 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <4>; + iommus = <&apps_smmu 0x2004 0x0>; + dma-coherent; + }; + + compute-cb@5 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <5>; + iommus = <&apps_smmu 0x2005 0x0>; + dma-coherent; + }; + }; }; }; @@ -1361,6 +1394,54 @@ IPCC_MPROC_SIGNAL_GLINK_QMP label = "cdsp"; qcom,remote-pid = <5>; + + fastrpc { + compatible = "qcom,fastrpc"; + qcom,glink-channels = "fastrpcglink-apps-dsp"; + label = "cdsp"; + #address-cells = <1>; + #size-cells = <0>; + + compute-cb@1 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <1>; + iommus = <&apps_smmu 0x19c1 0x0440>, + <&apps_smmu 0x1dc1 0x0440>, + <&apps_smmu 0x1961 0x0400>, + <&apps_smmu 0x1d61 0x0400>; + dma-coherent; + }; + + compute-cb@2 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <2>; + iommus = <&apps_smmu 0x19c2 0x0440>, + <&apps_smmu 0x1dc2 0x0440>, + <&apps_smmu 0x1962 0x0400>, + <&apps_smmu 0x1d62 0x0400>; + dma-coherent; + }; + + compute-cb@3 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <3>; + iommus = <&apps_smmu 0x19c3 0x0440>, + <&apps_smmu 0x1dc3 0x0440>, + <&apps_smmu 0x1963 0x0400>, + <&apps_smmu 0x1d63 0x0400>; + dma-coherent; + }; + + compute-cb@4 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <4>; + iommus = <&apps_smmu 0x19c4 0x0440>, + <&apps_smmu 0x1dc4 0x0440>, + <&apps_smmu 0x1964 0x0400>, + <&apps_smmu 0x1d64 0x0400>; + dma-coherent; + }; + }; }; }; };
Add ADSP and CDSP0 fastrpc nodes for QCS8300 platform. Signed-off-by: Ling Xu <quic_lxu5@quicinc.com> --- This patch depends on patch https://lore.kernel.org/all/20240904-qcs8300_initial_dtsi-v1-0-d0ea9afdc007@quicinc.com/#t Changes since v1: - Remove duplicate cdsp fastrpc nodes - Add adsp memory-region and vmids --- arch/arm64/boot/dts/qcom/qcs8300.dtsi | 81 +++++++++++++++++++++++++++ 1 file changed, 81 insertions(+)