Skip to content
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

Jump to bottom

Core: Introduce stm32mp remoteproc PTA and driver #6470

Merged
merged 5 commits into from
Dec 15, 2023
Merged

Core: Introduce stm32mp remoteproc PTA and driver #6470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c55906e
libutee: add new remoteproc PTA API
arnopo Jul 6, 2022
6eb03c6
drivers: Add stm32mp1 remoteproc driver
arnopo Sep 7, 2023
25ba4d3
pta: stm32mp: add new remoteproc PTA
arnopo Jul 6, 2022
3eb766e
plat-stm32mp1: Add the remoteproc TA in early TA list
arnopo Nov 17, 2023
a1ff7cd
dts: stm32: update m4_rproc to support the remoteproc OP-TEE framework
arnopo Mar 20, 2023
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
4 changes: 2 additions & 2 deletions core/arch/arm/dts/stm32mp151.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1839,8 +1839,8 @@
reg = <0x10000000 0x40000>,
<0x30000000 0x40000>,
<0x38000000 0x10000>;
resets = <&rcc MCU_R>;
st,syscfg-holdboot = <&rcc 0x10C 0x1>;
resets = <&rcc MCU_R>, <&rcc MCU_HOLD_BOOT_R>;
reset-names = "mcu_rst", "hold_boot";
st,syscfg-tz = <&rcc 0x000 0x1>;
st,syscfg-pdds = <&pwr_mcu 0x0 0x1>;
st,syscfg-rsc-tbl = <&tamp 0x144 0xFFFFFFFF>;
Expand Down
8 changes: 7 additions & 1 deletion core/arch/arm/dts/stm32mp157c-ed1.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,12 @@
no-map;
};

ipc_shmem: ipc-shmem@1004f000 {
compatible = "shared-dma-pool";
reg = <0x10048000 0x8000>;
no-map;
};

mcuram: mcuram@30000000 {
compatible = "shared-dma-pool";
reg = <0x30000000 0x40000>;
Expand Down Expand Up @@ -324,7 +330,7 @@

&m4_rproc {
memory-region = <&retram>, <&mcuram>, <&mcuram2>, <&vdev0vring0>,
<&vdev0vring1>, <&vdev0buffer>;
<&vdev0vring1>, <&vdev0buffer>, <&ipc_shmem>;
mboxes = <&ipcc 0>, <&ipcc 1>, <&ipcc 2>, <&ipcc 3>;
mbox-names = "vq0", "vq1", "shutdown", "detach";
interrupt-parent = <&exti>;
Expand Down
8 changes: 7 additions & 1 deletion core/arch/arm/dts/stm32mp15xx-dkx.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,12 @@
no-map;
};

ipc_shmem: ipc-shmem@1004f000 {
compatible = "shared-dma-pool";
reg = <0x10048000 0x8000>;
no-map;
};

mcuram: mcuram@30000000 {
compatible = "shared-dma-pool";
reg = <0x30000000 0x40000>;
Expand Down Expand Up @@ -476,7 +482,7 @@

&m4_rproc {
memory-region = <&retram>, <&mcuram>, <&mcuram2>, <&vdev0vring0>,
<&vdev0vring1>, <&vdev0buffer>;
<&vdev0vring1>, <&vdev0buffer>, <&ipc_shmem>;
mboxes = <&ipcc 0>, <&ipcc 1>, <&ipcc 2>, <&ipcc 3>;
mbox-names = "vq0", "vq1", "shutdown", "detach";
interrupt-parent = <&exti>;
Expand Down
10 changes: 10 additions & 0 deletions core/arch/arm/plat-stm32mp1/conf.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,16 @@ CFG_MMAP_REGIONS ?= 23
CFG_DTB_MAX_SIZE ?= (256 * 1024)
CFG_CORE_ASLR ?= n

CFG_STM32MP_REMOTEPROC ?= n
CFG_DRIVERS_REMOTEPROC ?= $(CFG_STM32MP_REMOTEPROC)
CFG_REMOTEPROC_PTA ?= $(CFG_STM32MP_REMOTEPROC)
ifeq ($(CFG_REMOTEPROC_PTA),y)
# Remoteproc early TA for coprocessor firmware management in boot stages
CFG_IN_TREE_EARLY_TAS += remoteproc/80a4c275-0a47-4905-8285-1486a9771a08
# Embed public part of this key in OP-TEE OS
RPROC_SIGN_KEY ?= keys/default.pem
endif

ifneq ($(CFG_WITH_LPAE),y)
# Without LPAE, default TEE virtual address range is 1MB, we need at least 2MB.
CFG_TEE_RAM_VA_SIZE ?= 0x00200000
Expand Down
Loading