Merge 5ccc2af5ed on remote branch

Change-Id: I4b82ef32a373c76d35810ea745bd3a9a0539f5ad
This commit is contained in:
Linux Build Service Account
2024-06-20 16:41:31 -07:00
6 changed files with 103 additions and 7 deletions

4
Kbuild
View File

@@ -18,6 +18,10 @@ dtbo-y += sun/sun-dsp.dtbo
endif
endif
ifeq ($(CONFIG_ARCH_MONACO), y)
dtbo-y += monaco/monaco-dsp.dtbo
endif
always-y := $(dtb-y) $(dtbo-y)
subdir-y := $(dts-dirs)
clean-files := *.dtb *.dtbo

View File

@@ -32,6 +32,9 @@ Subnode Required properties:
- dma-coherent : A flag marking a context bank as I/O coherent
- shared-cb : A value indicating how many fastrpc sessions can share a
context bank
- pd-type : A value indicating remote subsystem proess type
- alloc-size-range: A pair values indicating the allocation size range
of context bank
Example:
qcom,msm_fastrpc {

15
monaco/monaco-dsp.dts Normal file
View File

@@ -0,0 +1,15 @@
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
*/
/dts-v1/;
/plugin/;
#include "monaco-dsp.dtsi"
/ {
model = "Qualcomm Technologies, Inc. Monaco SoC";
compatible = "qcom,monaco";
qcom,msm-id = <486 0x10000>, <517 0x10000>;
qcom,board-id = <0 0>;
};

65
monaco/monaco-dsp.dtsi Normal file
View File

@@ -0,0 +1,65 @@
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
*/
&glink_edge {
qcom,fastrpc {
compatible = "qcom,fastrpc";
qcom,glink-channels = "fastrpcglink-apps-dsp";
qcom,intents = <0x64 64>;
label = "adsp";
memory-region = <&adsp_mem>;
qcom,vmids = <22 37>;
compute-cb@1 {
compatible = "qcom,fastrpc-compute-cb";
reg = <3>;
iommus = <&apps_smmu 0x01C3 0x0>;
qcom,iommu-dma-addr-pool = <0x80000000 0x78000000>;
qcom,iommu-faults = "stall-disable";
dma-coherent;
pd-type = <1>; /* ROOT_PD */
};
compute-cb@2 {
compatible = "qcom,fastrpc-compute-cb";
reg = <4>;
iommus = <&apps_smmu 0x01C4 0x0>;
qcom,iommu-dma-addr-pool = <0x80000000 0x78000000>;
qcom,iommu-faults = "stall-disable";
qcom,nsessions = <5>;
dma-coherent;
pd-type = <3>; /* SENSORS_STATICPD */
};
compute-cb@3 {
compatible = "qcom,fastrpc-compute-cb";
reg = <5>;
iommus = <&apps_smmu 0x01C5 0x0>;
qcom,iommu-dma-addr-pool = <0x80000000 0x78000000>;
qcom,iommu-faults = "stall-disable";
dma-coherent;
pd-type = <2>; /* AUDIO_STATICPD */
};
compute-cb@4 {
compatible = "qcom,fastrpc-compute-cb";
reg = <6>;
iommus = <&apps_smmu 0x01C6 0x0>;
qcom,iommu-dma-addr-pool = <0x80000000 0x78000000>;
qcom,iommu-faults = "stall-disable";
dma-coherent;
pd-type = <7>; /* USERPD */
};
compute-cb@5 {
compatible = "qcom,fastrpc-compute-cb";
reg = <7>;
iommus = <&apps_smmu 0x01C7 0x0>;
qcom,iommu-dma-addr-pool = <0x80000000 0x78000000>;
qcom,iommu-faults = "stall-disable";
dma-coherent;
pd-type = <7>; /* USERPD */
};
};
};

View File

@@ -13,6 +13,8 @@
memory-region = <&fastrpc_gen_pool_region>;
qcom,iommu-faults = "stall-disable", "HUPCF";
dma-coherent;
qcom,iova-best-fit;
qcom,iova-max-align-shift = <9>; /* Set MAX alignment to 2 MB*/
qrtr-gen-pool = <&fastrpc_compute_cb1>;
frpc-gen-addr-pool = <0x8000 0x9000>;
pd-type = <4>; /* SECURE_STATICPD */

View File

@@ -154,7 +154,8 @@
dma-coherent;
qcom,iova-best-fit;
qcom,iova-max-align-shift = <9>; /* Set MAX alignment to 2 MB*/
pd-type = <7>; /* USERPD */
pd-type = <9>; /* USER_UNSIGNEDPD_POOL */
alloc-size-range = <0x4000000 0xFFFFFFFF>;
};
compute-cb@6 {
@@ -168,7 +169,8 @@
dma-coherent;
qcom,iova-best-fit;
qcom,iova-max-align-shift = <9>; /* Set MAX alignment to 2 MB*/
pd-type = <7>; /* USERPD */
pd-type = <9>; /* USER_UNSIGNEDPD_POOL */
alloc-size-range = <0x4000000 0xFFFFFFFF>;
};
compute-cb@7 {
@@ -182,7 +184,8 @@
dma-coherent;
qcom,iova-best-fit;
qcom,iova-max-align-shift = <9>; /* Set MAX alignment to 2 MB*/
pd-type = <7>; /* USERPD */
pd-type = <9>; /* USER_UNSIGNEDPD_POOL */
alloc-size-range = <0x1000000 0xFFFFFFFF>;
};
compute-cb@8 {
@@ -196,7 +199,8 @@
dma-coherent;
qcom,iova-best-fit;
qcom,iova-max-align-shift = <9>; /* Set MAX alignment to 2 MB*/
pd-type = <7>; /* USERPD */
pd-type = <9>; /* USER_UNSIGNEDPD_POOL */
alloc-size-range = <0x1000000 0xFFFFFFFF>;
};
compute-cb@9 {
@@ -226,7 +230,8 @@
dma-coherent;
qcom,iova-best-fit;
qcom,iova-max-align-shift = <9>; /* Set MAX alignment to 2 MB*/
pd-type = <7>; /* USERPD */
pd-type = <9>; /* USER_UNSIGNEDPD_POOL */
alloc-size-range = <0x0 0xFFFFFFFF>;
};
compute-cb@11 {
@@ -241,7 +246,8 @@
dma-coherent;
qcom,iova-best-fit;
qcom,iova-max-align-shift = <9>; /* Set MAX alignment to 2 MB*/
pd-type = <7>; /* USERPD */
pd-type = <9>; /* USER_UNSIGNEDPD_POOL */
alloc-size-range = <0x0 0xFFFFFFFF>;
};
compute-cb@12 {
@@ -254,7 +260,8 @@
dma-coherent;
qcom,iova-best-fit;
qcom,iova-max-align-shift = <9>; /* Set MAX alignment to 2 MB*/
pd-type = <7>; /* USERPD */
pd-type = <9>; /* USER_UNSIGNEDPD_POOL */
alloc-size-range = <0x0 0xFFFFFFFF>;
};
};
};