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

(STM32) ETZPC firewall controller updates #7066

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

(STM32) ETZPC firewall controller updates #7066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9c64457
dts: stm32: default disable DMA at SoC level for stm32mp15 platforms
GseoC Oct 2, 2024
8e79111
dts: stm32: disable ADC2 on stm32mp135f-dk
GseoC Oct 2, 2024
d73639c
dts: stm32: disable VREFBUF on stm32mp15-dkx platforms
GseoC Oct 2, 2024
36bd387
dts: stm32: use st,stm32mp15-i2c-non-secure compatible for the I2C4
GseoC Oct 2, 2024
3dddcb6
dt-bindings: add platform specific ETZPC bindings
GseoC May 2, 2024
7aae566
dts: stm32: add the ETZPC configuration table for stm32mp1x boards
GseoC May 2, 2024
617e63f
dts: stm32: define ETZPC as an access controller for stm32mp15 platforms
GseoC May 2, 2024
0a60c07
dts: stm32: define ETZPC as an access controller for stm32mp13 platforms
GseoC May 2, 2024
a6b9cd4
plat-stm32mp1: default enable CFG_DRIVERS_FIREWALL
GseoC May 2, 2024
18ce76c
drivers: stm32_etzpc: update driver to set ETZPC configuration from DT
GseoC May 2, 2024
38ecc55
drivers: stm32_etzpc: move the stm32_etzpc driver to the firewall folder
GseoC Oct 8, 2024
810b07a
plat-stm32mp1: add CFG_STM32_ALLOW_UNSAFE_PROBE to probe unsafe perip…
GseoC Oct 8, 2024
6be9e12
drivers: stm32_etzpc: new driver to use firewall API
GseoC May 2, 2024
feacc01
drivers: stm32_rng: embed ETZPC functions when CFG_STM32_ETZPC is set
GseoC Oct 8, 2024
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
27 changes: 24 additions & 3 deletions core/arch/arm/dts/stm32mp131.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
/*
* Copyright (C) STMicroelectronics 2021-2023 - All Rights Reserved
* Copyright (C) STMicroelectronics 2021-2024 - All Rights Reserved
* Author: Alexandre Torgue <alexandre.torgue@foss.st.com> for STMicroelectronics.
*/

#include <dt-bindings/clock/stm32mp13-clks.h>
#include <dt-bindings/clock/stm32mp13-clksrc.h>
#include <dt-bindings/firewall/stm32mp13-etzpc.h>
GseoC marked this conversation as resolved.
Show resolved Hide resolved
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/regulator/st,stm32mp13-regulator.h>
#include <dt-bindings/reset/stm32mp13-resets.h>
Expand Down Expand Up @@ -395,11 +396,12 @@
};

etzpc: etzpc@5c007000 {
compatible = "st,stm32-etzpc", "firewall-bus";
compatible = "st,stm32-etzpc", "simple-bus";
reg = <0x5C007000 0x400>;
clocks = <&rcc TZPC>;
#address-cells = <1>;
#size-cells = <1>;
#access-controller-cells = <1>;

adc_2: adc@48004000 {
reg = <0x48004000 0x400>;
Expand All @@ -411,6 +413,7 @@
#interrupt-cells = <1>;
#address-cells = <1>;
#size-cells = <0>;
access-controllers = <&etzpc STM32MP1_ETZPC_ADC2_ID>;
status = "disabled";

adc2: adc@0 {
Expand Down Expand Up @@ -451,6 +454,7 @@
interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&rcc USART1_K>;
resets = <&rcc USART1_R>;
access-controllers = <&etzpc STM32MP1_ETZPC_USART1_ID>;
status = "disabled";
};

Expand All @@ -460,6 +464,7 @@
interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&rcc USART2_K>;
resets = <&rcc USART2_R>;
access-controllers = <&etzpc STM32MP1_ETZPC_USART2_ID>;
status = "disabled";
};

Expand All @@ -472,6 +477,7 @@
#size-cells = <0>;
st,syscfg-fmp = <&syscfg 0x4 0x4>;
i2c-analog-filter;
access-controllers = <&etzpc STM32MP1_ETZPC_I2C3_ID>;
status = "disabled";
};

Expand All @@ -484,6 +490,7 @@
#size-cells = <0>;
st,syscfg-fmp = <&syscfg 0x4 0x8>;
i2c-analog-filter;
access-controllers = <&etzpc STM32MP1_ETZPC_I2C4_ID>;
status = "disabled";
};

Expand All @@ -496,6 +503,7 @@
#size-cells = <0>;
st,syscfg-fmp = <&syscfg 0x4 0x10>;
i2c-analog-filter;
access-controllers = <&etzpc STM32MP1_ETZPC_I2C5_ID>;
status = "disabled";
};

Expand All @@ -507,6 +515,8 @@
interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&rcc TIM12_K>;
clock-names = "int";
access-controllers = <&etzpc STM32MP1_ETZPC_TIM12_ID>;
status = "disabled";

counter {
compatible = "st,stm32-timer-counter";
Expand All @@ -521,6 +531,7 @@
reg = <0x4c008000 0x400>;
clocks = <&rcc TIM13_K>;
clock-names = "int";
access-controllers = <&etzpc STM32MP1_ETZPC_TIM13_ID>;
status = "disabled";
};

Expand All @@ -531,6 +542,7 @@
reg = <0x4c009000 0x400>;
clocks = <&rcc TIM14_K>;
clock-names = "int";
access-controllers = <&etzpc STM32MP1_ETZPC_TIM14_ID>;
status = "disabled";
};

Expand All @@ -542,6 +554,7 @@
interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&rcc TIM15_K>;
clock-names = "int";
access-controllers = <&etzpc STM32MP1_ETZPC_TIM15_ID>;
status = "disabled";

counter {
Expand All @@ -557,8 +570,8 @@
reg = <0x4c00b000 0x400>;
clocks = <&rcc TIM16_K>;
clock-names = "int";
access-controllers = <&etzpc STM32MP1_ETZPC_TIM16_ID>;
status = "disabled";

};

timers17: timer@4c00c000 {
Expand All @@ -568,6 +581,7 @@
reg = <0x4c00c000 0x400>;
clocks = <&rcc TIM17_K>;
clock-names = "int";
access-controllers = <&etzpc STM32MP1_ETZPC_TIM17_ID>;
status = "disabled";
};

Expand All @@ -579,6 +593,7 @@
interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&rcc LPTIM2_K>;
clock-names = "mux";
access-controllers = <&etzpc STM32MP1_ETZPC_LPTIM2_ID>;
status = "disabled";
};

Expand All @@ -590,6 +605,7 @@
interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&rcc LPTIM3_K>;
clock-names = "mux";
access-controllers = <&etzpc STM32MP1_ETZPC_LPTIM3_ID>;
status = "disabled";

counter {
Expand All @@ -605,6 +621,7 @@
regulator-min-microvolt = <1650000>;
regulator-max-microvolt = <2500000>;
clocks = <&rcc VREF>;
access-controllers = <&etzpc STM32MP1_ETZPC_VREFBUF_ID>;
status = "disabled";
};

Expand All @@ -614,6 +631,7 @@
interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&rcc HASH1>;
resets = <&rcc HASH1_R>;
access-controllers = <&etzpc STM32MP1_ETZPC_HASH_ID>;
status = "disabled";
};

Expand All @@ -622,6 +640,7 @@
reg = <0x54004000 0x400>;
clocks = <&rcc RNG1_K>;
resets = <&rcc RNG1_R>;
access-controllers = <&etzpc STM32MP1_ETZPC_RNG_ID>;
status = "disabled";
};

Expand All @@ -631,12 +650,14 @@
interrupts = <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&rcc IWDG1>, <&rcc CK_LSI>;
clock-names = "pclk", "lsi";
access-controllers = <&etzpc STM32MP1_ETZPC_IWDG1_ID>;
status = "disabled";
};

stgen: stgen@5c008000 {
compatible = "st,stm32-stgen";
reg = <0x5C008000 0x1000>;
access-controllers = <&etzpc STM32MP1_ETZPC_STGENC_ID>;
};
};
};
Expand Down
3 changes: 2 additions & 1 deletion core/arch/arm/dts/stm32mp135.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
/*
* Copyright (C) STMicroelectronics 2021-2022 - All Rights Reserved
* Copyright (C) STMicroelectronics 2021-2024 - All Rights Reserved
* Author: Alexandre Torgue <alexandre.torgue@foss.st.com> for STMicroelectronics.
*/

Expand All @@ -17,6 +17,7 @@
clocks = <&rcc LTDC_PX>;
clock-names = "lcd";
resets = <&rcc LTDC_R>;
access-controllers = <&etzpc STM32MP1_ETZPC_LTDC_ID>;
status = "disabled";
};
};
Expand Down
62 changes: 46 additions & 16 deletions core/arch/arm/dts/stm32mp135f-dk.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
/*
* Copyright (C) STMicroelectronics 2021-2023 - All Rights Reserved
* Copyright (C) STMicroelectronics 2021-2024 - All Rights Reserved
* Author: Alexandre Torgue <alexandre.torgue@foss.st.com> for STMicroelectronics.
*/

Expand Down Expand Up @@ -61,28 +61,58 @@
};
};

&adc_2 {
vdda-supply = <&vdd_adc>;
vref-supply = <&vdd_adc>;
status = "okay";

adc2: adc@0 {
status = "okay";

channel@15 {
reg = <15>;
label = "vbat";
};
};
};

&bsec {
board_id: board_id@f0 {
reg = <0xf0 0x4>;
st,non-secure-otp;
};
};

&etzpc {
st,decprot =
<DECPROT(STM32MP1_ETZPC_ADC1_ID, DECPROT_NS_RW, DECPROT_UNLOCK)>,
<DECPROT(STM32MP1_ETZPC_ADC2_ID, DECPROT_S_RW, DECPROT_UNLOCK)>,
<DECPROT(STM32MP1_ETZPC_BKPSRAM_ID, DECPROT_S_RW, DECPROT_UNLOCK)>,
<DECPROT(STM32MP1_ETZPC_CRYP_ID, DECPROT_NS_RW, DECPROT_UNLOCK)>,
<DECPROT(STM32MP1_ETZPC_DCMIPP_ID, DECPROT_NS_RW, DECPROT_UNLOCK)>,
<DECPROT(STM32MP1_ETZPC_DDRCTRLPHY_ID, DECPROT_NS_R_S_W, DECPROT_UNLOCK)>,
<DECPROT(STM32MP1_ETZPC_ETH1_ID, DECPROT_NS_RW, DECPROT_UNLOCK)>,
<DECPROT(STM32MP1_ETZPC_ETH2_ID, DECPROT_NS_RW, DECPROT_UNLOCK)>,
<DECPROT(STM32MP1_ETZPC_FMC_ID, DECPROT_NS_RW, DECPROT_UNLOCK)>,
<DECPROT(STM32MP1_ETZPC_HASH_ID, DECPROT_S_RW, DECPROT_UNLOCK)>,
<DECPROT(STM32MP1_ETZPC_I2C3_ID, DECPROT_NS_RW, DECPROT_UNLOCK)>,
<DECPROT(STM32MP1_ETZPC_I2C4_ID, DECPROT_S_RW, DECPROT_UNLOCK)>,
<DECPROT(STM32MP1_ETZPC_I2C5_ID, DECPROT_NS_RW, DECPROT_UNLOCK)>,
<DECPROT(STM32MP1_ETZPC_IWDG1_ID, DECPROT_S_RW, DECPROT_UNLOCK)>,
<DECPROT(STM32MP1_ETZPC_LPTIM2_ID, DECPROT_NS_RW, DECPROT_UNLOCK)>,
<DECPROT(STM32MP1_ETZPC_LPTIM3_ID, DECPROT_S_RW, DECPROT_UNLOCK)>,
<DECPROT(STM32MP1_ETZPC_LTDC_ID, DECPROT_NS_RW, DECPROT_UNLOCK)>,
<DECPROT(STM32MP1_ETZPC_MCE_ID, DECPROT_S_RW, DECPROT_UNLOCK)>,
<DECPROT(STM32MP1_ETZPC_OTG_ID, DECPROT_NS_RW, DECPROT_UNLOCK)>,
<DECPROT(STM32MP1_ETZPC_PKA_ID, DECPROT_S_RW, DECPROT_UNLOCK)>,
<DECPROT(STM32MP1_ETZPC_QSPI_ID, DECPROT_NS_RW, DECPROT_UNLOCK)>,
<DECPROT(STM32MP1_ETZPC_RNG_ID, DECPROT_S_RW, DECPROT_UNLOCK)>,
<DECPROT(STM32MP1_ETZPC_SAES_ID, DECPROT_S_RW, DECPROT_UNLOCK)>,
<DECPROT(STM32MP1_ETZPC_SDMMC1_ID, DECPROT_NS_RW, DECPROT_UNLOCK)>,
<DECPROT(STM32MP1_ETZPC_SDMMC2_ID, DECPROT_NS_RW, DECPROT_UNLOCK)>,
<DECPROT(STM32MP1_ETZPC_SPI4_ID, DECPROT_NS_RW, DECPROT_UNLOCK)>,
<DECPROT(STM32MP1_ETZPC_SPI5_ID, DECPROT_NS_RW, DECPROT_UNLOCK)>,
<DECPROT(STM32MP1_ETZPC_SRAM1_ID, DECPROT_NS_RW, DECPROT_UNLOCK)>,
<DECPROT(STM32MP1_ETZPC_SRAM2_ID, DECPROT_NS_RW, DECPROT_UNLOCK)>,
<DECPROT(STM32MP1_ETZPC_SRAM3_ID, DECPROT_S_RW, DECPROT_UNLOCK)>,
<DECPROT(STM32MP1_ETZPC_STGENC_ID, DECPROT_S_RW, DECPROT_UNLOCK)>,
<DECPROT(STM32MP1_ETZPC_TIM12_ID, DECPROT_S_RW, DECPROT_UNLOCK)>,
<DECPROT(STM32MP1_ETZPC_TIM13_ID, DECPROT_NS_RW, DECPROT_UNLOCK)>,
<DECPROT(STM32MP1_ETZPC_TIM14_ID, DECPROT_NS_RW, DECPROT_UNLOCK)>,
<DECPROT(STM32MP1_ETZPC_TIM15_ID, DECPROT_S_RW, DECPROT_UNLOCK)>,
<DECPROT(STM32MP1_ETZPC_TIM16_ID, DECPROT_NS_RW, DECPROT_UNLOCK)>,
<DECPROT(STM32MP1_ETZPC_TIM17_ID, DECPROT_NS_RW, DECPROT_UNLOCK)>,
<DECPROT(STM32MP1_ETZPC_USART1_ID, DECPROT_NS_RW, DECPROT_UNLOCK)>,
<DECPROT(STM32MP1_ETZPC_USART2_ID, DECPROT_NS_RW, DECPROT_UNLOCK)>,
<DECPROT(STM32MP1_ETZPC_USBPHYCTRL_ID, DECPROT_NS_RW, DECPROT_UNLOCK)>,
<DECPROT(STM32MP1_ETZPC_VREFBUF_ID, DECPROT_NS_RW, DECPROT_UNLOCK)>;
};

&gpiob {
st,protreg = <TZPROT(9)>;
};
Expand Down
5 changes: 4 additions & 1 deletion core/arch/arm/dts/stm32mp13xc.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
/*
* Copyright (C) STMicroelectronics 2021-2022 - All Rights Reserved
* Copyright (C) STMicroelectronics 2021-2024 - All Rights Reserved
* Author: Alexandre Torgue <alexandre.torgue@foss.st.com> for STMicroelectronics.
*/

Expand All @@ -11,6 +11,7 @@
interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&rcc CRYP1>;
resets = <&rcc CRYP1_R>;
access-controllers = <&etzpc STM32MP1_ETZPC_CRYP_ID>;
status = "disabled";
};

Expand All @@ -21,6 +22,7 @@
clocks = <&rcc SAES_K>, <&rcc RNG1_K>;
clock-names = "bus", "rng";
resets = <&rcc SAES_R>;
access-controllers = <&etzpc STM32MP1_ETZPC_SAES_ID>;
status = "disabled";
};

Expand All @@ -30,6 +32,7 @@
interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&rcc PKA>;
resets = <&rcc PKA_R>;
access-controllers = <&etzpc STM32MP1_ETZPC_PKA_ID>;
status = "disabled";
};
};
5 changes: 4 additions & 1 deletion core/arch/arm/dts/stm32mp13xf.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
/*
* Copyright (C) STMicroelectronics 2021-2022 - All Rights Reserved
* Copyright (C) STMicroelectronics 2021-2024 - All Rights Reserved
* Author: Alexandre Torgue <alexandre.torgue@foss.st.com> for STMicroelectronics.
*/

Expand All @@ -11,6 +11,7 @@
interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&rcc CRYP1>;
resets = <&rcc CRYP1_R>;
access-controllers = <&etzpc STM32MP1_ETZPC_CRYP_ID>;
status = "disabled";
};

Expand All @@ -21,6 +22,7 @@
clocks = <&rcc SAES_K>, <&rcc RNG1_K>;
clock-names = "bus", "rng";
resets = <&rcc SAES_R>;
access-controllers = <&etzpc STM32MP1_ETZPC_SAES_ID>;
status = "disabled";
};

Expand All @@ -30,6 +32,7 @@
interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&rcc PKA>;
resets = <&rcc PKA_R>;
access-controllers = <&etzpc STM32MP1_ETZPC_PKA_ID>;
status = "disabled";
};
};
Loading