From bd705e68b048b5c956beecee26517f2ca6f22e76 Mon Sep 17 00:00:00 2001 From: Felipe Date: Sun, 12 Mar 2023 20:42:30 -0300 Subject: [PATCH] soc: xtensa: esp32: increase shared memory region for esp32 and esp32_net because the default 2048 bytes are not sufficient for rpmsg usage. Signed-off-by: Felipe Neves --- dts/xtensa/espressif/esp32.dtsi | 6 +++--- soc/xtensa/esp32/linker.ld | 6 +++--- soc/xtensa/esp32_net/linker.ld | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dts/xtensa/espressif/esp32.dtsi b/dts/xtensa/espressif/esp32.dtsi index f84bcb4ea3b..9a92e7674b6 100644 --- a/dts/xtensa/espressif/esp32.dtsi +++ b/dts/xtensa/espressif/esp32.dtsi @@ -75,7 +75,7 @@ shm0: memory@3ffe5630 { compatible = "mmio-sram"; - reg = <0x3FFE5630 0x400>; + reg = <0x3FFE5630 0x3C00>; }; intc: interrupt-controller@3ff00104 { @@ -118,9 +118,9 @@ }; }; - ipm0: ipm@3ffe5a30 { + ipm0: ipm@3ffed238 { compatible = "espressif,esp32-ipm"; - reg = <0x3FFE5A30 0x8>; + reg = <0x3FFED238 0x8>; status = "disabled"; shared-memory = <&ipmmem0>; shared-memory-size = <0x400>; diff --git a/soc/xtensa/esp32/linker.ld b/soc/xtensa/esp32/linker.ld index 3dbd0819597..9d3a1b84c37 100644 --- a/soc/xtensa/esp32/linker.ld +++ b/soc/xtensa/esp32/linker.ld @@ -75,9 +75,9 @@ MEMORY dram0_0_seg(RW): org = 0x3FFB0000 + CONFIG_ESP32_BT_RESERVE_DRAM, len = 0x2c200 - CONFIG_ESP32_BT_RESERVE_DRAM #ifdef CONFIG_ESP32_NETWORK_CORE - dram0_shm0_seg(RW): org = 0x3FFE5230, len = 2K /* shared RAM reserved for IPM */ - dram0_sem0_seg(RW): org = 0x3FFE5A30, len = 8 /* shared data reserved for IPM data header */ - dram0_1_seg(RW): org = 0x3FFE5A38, len = 0K /* for AMP builds dram0_1 is reserved for network core */ + dram0_shm0_seg(RW): org = 0x3FFE5230, len = 16K /* shared RAM reserved for IPM */ + dram0_sem0_seg(RW): org = 0x3FFED238, len = 8 /* shared data reserved for IPM data header */ + dram0_1_seg(RW): org = 0x3FFE9238, len = 0K /* for AMP builds dram0_1 is reserved for network core */ #else dram0_1_seg(RW): org = 0x3FFE5230, len = 0x1BCB0 - 0xEE0 /* skip data for APP CPU initialization usage */ #endif diff --git a/soc/xtensa/esp32_net/linker.ld b/soc/xtensa/esp32_net/linker.ld index 0b21e141bea..6c1b69872b1 100644 --- a/soc/xtensa/esp32_net/linker.ld +++ b/soc/xtensa/esp32_net/linker.ld @@ -29,9 +29,9 @@ MEMORY { iram0_0_seg(RX): org = 0x40080000 + 0x08000, len = 0x18000 - dram0_shm0_seg(RW): org = 0x3FFE5230, len = 2K /* shared RAM reserved for IPM */ - dram0_sem0_seg(RW): org = 0x3FFE5A30, len = 8 /*shared data reserved for IPM data header */ - dram0_1_seg(RW): org = 0x3FFE5A38 + CONFIG_ESP32_BT_RESERVE_DRAM, len = 0x1BCB0 - 0xEE0 - CONFIG_ESP32_BT_RESERVE_DRAM + dram0_shm0_seg(RW): org = 0x3FFE5230, len = 16K /* shared RAM reserved for IPM */ + dram0_sem0_seg(RW): org = 0x3FFED238, len = 8 /*shared data reserved for IPM data header */ + dram0_1_seg(RW): org = 0x3FFE9238 + CONFIG_ESP32_BT_RESERVE_DRAM, len = 0x17CB0 - 0xEE0 - CONFIG_ESP32_BT_RESERVE_DRAM #ifdef CONFIG_GEN_ISR_TABLES IDT_LIST(RW): org = 0x3ebfe010, len = 0x2000 #endif