Skip to content

arm64: dts: qcom: shikra: Add OP-TEE node and disable unused CTI #1260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Bibek Kumar Patro (bibekpatro) wants to merge 4 commits into
base: qcom-6.18.y
Choose a base branch
from
Open

arm64: dts: qcom: shikra: Add OP-TEE node and disable unused CTI #1260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
55ae639
arm64: dts: qcom: shikra: Add OP-TEE firmware node
bibekpatro Oct 8, 2026
b8847ef
arm64: dts: qcom: shikra: Disable cti_riscv node
bibekpatro Oct 8, 2026
c4dad8b
FROMLIST: remoteproc: qcom: pas: pass no resource table when the firm…
bibekpatro Oct 8, 2026
5b5c29b
remoteproc: qcom: shikra: Disable auto-boot for all PIL subsystems
bibekpatro Oct 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions arch/arm64/boot/dts/qcom/shikra.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,11 @@
};

firmware {
optee {
compatible = "linaro,optee-tz";
method = "smc";
};

scm {
compatible = "qcom,scm-shikra", "qcom,scm";
clocks = <&rpmcc RPM_SMD_CE1_CLK>;
Expand Down Expand Up @@ -4808,6 +4813,7 @@
clocks = <&rpmcc RPM_SMD_QDSS_CLK>;
clock-names = "apb_pclk";
label = "cti_riscv";
status = "disabled";
};

tpdm@9860000 {
Expand Down
15 changes: 8 additions & 7 deletions drivers/remoteproc/qcom_q6v5_pas.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@ static int qcom_pas_parse_firmware(struct rproc *rproc, const struct firmware *f
struct resource_table *table = NULL;
size_t output_rt_size;
void *output_rt;
size_t table_sz;
size_t table_sz = 0;
int ret;

ret = qcom_register_dump_segments(rproc, fw);
Expand All @@ -493,11 +493,12 @@ static int qcom_pas_parse_firmware(struct rproc *rproc, const struct firmware *f
return 0;

ret = rproc_elf_load_rsc_table(rproc, fw);
if (ret)
if (ret) {
dev_dbg(&rproc->dev, "Failed to load resource table from firmware\n");

table = rproc->table_ptr;
table_sz = rproc->table_sz;
} else {
table = rproc->table_ptr;
table_sz = rproc->table_sz;
}

/*
* The resources consumed by Qualcomm remote processors fall into two categories:
Expand Down Expand Up @@ -1516,7 +1517,7 @@ static const struct qcom_pas_data shikra_cdsp_resource = {
.firmware_name = "cdsp.mbn",
.pas_id = 18,
.minidump_id = 7,
.auto_boot = true,
.auto_boot = false,
.proxy_pd_names = (char *[]){
"cx",
NULL
Expand All @@ -1535,7 +1536,7 @@ static const struct qcom_pas_data shikra_lpaicp_resource = {
.pas_id = 0x56,
.dtb_pas_id = 0x57,
.minidump_id = 0,
.auto_boot = true,
.auto_boot = false,
.ssr_name = "lpaicp",
.sysmon_name = "lpaicp",
};
Expand Down
Loading