| Message ID | 20240623194954.79988-1-marex@denx.de (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | ARM: dts: stm32: Deduplicate rproc mboxes and IRQs | expand |
Hi Marek On 6/23/24 21:49, Marek Vasut wrote: > Pull mboxes, mbox-names, interrupt-parent, interrupts properties of the > m4_rproc into stm32mp151.dtsi to deduplicate multiple copies of the same > in multiple board files. Worse, those copies were starting to get out of > sync, so this should prevent any such issues in the future. > > Signed-off-by: Marek Vasut <marex@denx.de> > --- > Cc: Alexandre Torgue <alexandre.torgue@foss.st.com> > Cc: Conor Dooley <conor+dt@kernel.org> > Cc: Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org> > Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com> > Cc: Richard Cochran <richardcochran@gmail.com> > Cc: Rob Herring <robh+dt@kernel.org> > Cc: devicetree@vger.kernel.org > Cc: kernel@dh-electronics.com > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-stm32@st-md-mailman.stormreply.com > --- > arch/arm/boot/dts/st/stm32mp151.dtsi | 4 ++++ > arch/arm/boot/dts/st/stm32mp157a-icore-stm32mp1.dtsi | 2 -- > arch/arm/boot/dts/st/stm32mp157a-microgea-stm32mp1.dtsi | 2 -- > arch/arm/boot/dts/st/stm32mp157c-ed1.dts | 4 ---- > arch/arm/boot/dts/st/stm32mp157c-emstamp-argon.dtsi | 4 ---- > arch/arm/boot/dts/st/stm32mp157c-odyssey-som.dtsi | 4 ---- > arch/arm/boot/dts/st/stm32mp157c-phycore-stm32mp15-som.dtsi | 4 ---- > arch/arm/boot/dts/st/stm32mp15xx-dhcom-som.dtsi | 4 ---- > arch/arm/boot/dts/st/stm32mp15xx-dhcor-som.dtsi | 4 ---- > arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi | 4 ---- > arch/arm/boot/dts/st/stm32mp15xx-osd32.dtsi | 4 ---- > 11 files changed, 4 insertions(+), 36 deletions(-) > ... It is an old story we already discussed in the past: https://lore.kernel.org/linux-arm-kernel/81f4574d-38c2-21f2-b947-d13e5fc99c60@denx.de/T/#mef3a4050ab4ff181416fe5681f1d5cb9fb744573 My position remains the same. Those interrupts depends on your system/firmware you plan to use. So we give one example in our ST board which relies on firmware we load in OpenSTLinux. But it is just an example. For example depending the firmware used, the detach could be used or not. So I would prefer to not take it. Regards Alex
On 6/27/24 12:48 PM, Alexandre TORGUE wrote: > Hi Marek Hi, > On 6/23/24 21:49, Marek Vasut wrote: >> Pull mboxes, mbox-names, interrupt-parent, interrupts properties of the >> m4_rproc into stm32mp151.dtsi to deduplicate multiple copies of the same >> in multiple board files. Worse, those copies were starting to get out of >> sync, so this should prevent any such issues in the future. >> >> Signed-off-by: Marek Vasut <marex@denx.de> >> --- >> Cc: Alexandre Torgue <alexandre.torgue@foss.st.com> >> Cc: Conor Dooley <conor+dt@kernel.org> >> Cc: Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org> >> Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com> >> Cc: Richard Cochran <richardcochran@gmail.com> >> Cc: Rob Herring <robh+dt@kernel.org> >> Cc: devicetree@vger.kernel.org >> Cc: kernel@dh-electronics.com >> Cc: linux-arm-kernel@lists.infradead.org >> Cc: linux-stm32@st-md-mailman.stormreply.com >> --- >> arch/arm/boot/dts/st/stm32mp151.dtsi | 4 ++++ >> arch/arm/boot/dts/st/stm32mp157a-icore-stm32mp1.dtsi | 2 -- >> arch/arm/boot/dts/st/stm32mp157a-microgea-stm32mp1.dtsi | 2 -- >> arch/arm/boot/dts/st/stm32mp157c-ed1.dts | 4 ---- >> arch/arm/boot/dts/st/stm32mp157c-emstamp-argon.dtsi | 4 ---- >> arch/arm/boot/dts/st/stm32mp157c-odyssey-som.dtsi | 4 ---- >> arch/arm/boot/dts/st/stm32mp157c-phycore-stm32mp15-som.dtsi | 4 ---- >> arch/arm/boot/dts/st/stm32mp15xx-dhcom-som.dtsi | 4 ---- >> arch/arm/boot/dts/st/stm32mp15xx-dhcor-som.dtsi | 4 ---- >> arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi | 4 ---- >> arch/arm/boot/dts/st/stm32mp15xx-osd32.dtsi | 4 ---- >> 11 files changed, 4 insertions(+), 36 deletions(-) >> > ... > > It is an old story we already discussed in the past: > > https://lore.kernel.org/linux-arm-kernel/81f4574d-38c2-21f2-b947-d13e5fc99c60@denx.de/T/#mef3a4050ab4ff181416fe5681f1d5cb9fb744573 > > My position remains the same. Those interrupts depends on your > system/firmware you plan to use. So we give one example in our ST board > which relies on firmware we load in OpenSTLinux. But it is just an > example. For example depending the firmware used, the detach could be > used or not. > > So I would prefer to not take it. Ugh, I had it in my upstreaming tree so I resubmitted it, lemme drop it. Thanks for the reminder and constant vigilance.
diff --git a/arch/arm/boot/dts/st/stm32mp151.dtsi b/arch/arm/boot/dts/st/stm32mp151.dtsi index 4f878ec102c1f..1804e202eb425 100644 --- a/arch/arm/boot/dts/st/stm32mp151.dtsi +++ b/arch/arm/boot/dts/st/stm32mp151.dtsi @@ -1986,6 +1986,10 @@ m4_rproc: m4@10000000 { reg = <0x10000000 0x40000>, <0x30000000 0x40000>, <0x38000000 0x10000>; + interrupt-parent = <&exti>; + interrupts = <68 IRQ_TYPE_EDGE_RISING>; + mbox-names = "vq0", "vq1", "shutdown", "detach"; + mboxes = <&ipcc 0>, <&ipcc 1>, <&ipcc 2>, <&ipcc 3>; resets = <&rcc MCU_R>; reset-names = "mcu_rst"; st,syscfg-holdboot = <&rcc 0x10C 0x1>; diff --git a/arch/arm/boot/dts/st/stm32mp157a-icore-stm32mp1.dtsi b/arch/arm/boot/dts/st/stm32mp157a-icore-stm32mp1.dtsi index 569a7e940ecc8..69c873f30d7df 100644 --- a/arch/arm/boot/dts/st/stm32mp157a-icore-stm32mp1.dtsi +++ b/arch/arm/boot/dts/st/stm32mp157a-icore-stm32mp1.dtsi @@ -175,8 +175,6 @@ &m4_rproc { <&vdev0vring1>, <&vdev0buffer>; mboxes = <&ipcc 0>, <&ipcc 1>, <&ipcc 2>; mbox-names = "vq0", "vq1", "shutdown"; - interrupt-parent = <&exti>; - interrupts = <68 1>; status = "okay"; }; diff --git a/arch/arm/boot/dts/st/stm32mp157a-microgea-stm32mp1.dtsi b/arch/arm/boot/dts/st/stm32mp157a-microgea-stm32mp1.dtsi index a75f50cf71234..9d26368025def 100644 --- a/arch/arm/boot/dts/st/stm32mp157a-microgea-stm32mp1.dtsi +++ b/arch/arm/boot/dts/st/stm32mp157a-microgea-stm32mp1.dtsi @@ -127,8 +127,6 @@ &m4_rproc { <&vdev0vring1>, <&vdev0buffer>; mboxes = <&ipcc 0>, <&ipcc 1>, <&ipcc 2>; mbox-names = "vq0", "vq1", "shutdown"; - interrupt-parent = <&exti>; - interrupts = <68 1>; status = "okay"; }; diff --git a/arch/arm/boot/dts/st/stm32mp157c-ed1.dts b/arch/arm/boot/dts/st/stm32mp157c-ed1.dts index 9cf5ed111b52e..a746e3da2f57d 100644 --- a/arch/arm/boot/dts/st/stm32mp157c-ed1.dts +++ b/arch/arm/boot/dts/st/stm32mp157c-ed1.dts @@ -326,10 +326,6 @@ &iwdg2 { &m4_rproc { memory-region = <&retram>, <&mcuram>, <&mcuram2>, <&vdev0vring0>, <&vdev0vring1>, <&vdev0buffer>; - mboxes = <&ipcc 0>, <&ipcc 1>, <&ipcc 2>, <&ipcc 3>; - mbox-names = "vq0", "vq1", "shutdown", "detach"; - interrupt-parent = <&exti>; - interrupts = <68 1>; status = "okay"; }; diff --git a/arch/arm/boot/dts/st/stm32mp157c-emstamp-argon.dtsi b/arch/arm/boot/dts/st/stm32mp157c-emstamp-argon.dtsi index 4792004cab0cc..1d4380345f157 100644 --- a/arch/arm/boot/dts/st/stm32mp157c-emstamp-argon.dtsi +++ b/arch/arm/boot/dts/st/stm32mp157c-emstamp-argon.dtsi @@ -367,10 +367,6 @@ &iwdg2 { &m4_rproc { memory-region = <&retram>, <&mcuram>, <&mcuram2>, <&vdev0vring0>, <&vdev0vring1>, <&vdev0buffer>; - mboxes = <&ipcc 0>, <&ipcc 1>, <&ipcc 2>, <&ipcc 3>; - mbox-names = "vq0", "vq1", "shutdown", "detach"; - interrupt-parent = <&exti>; - interrupts = <68 1>; interrupt-names = "wdg"; recovery; status = "okay"; diff --git a/arch/arm/boot/dts/st/stm32mp157c-odyssey-som.dtsi b/arch/arm/boot/dts/st/stm32mp157c-odyssey-som.dtsi index cf74852514906..31d7bfe8bf8c9 100644 --- a/arch/arm/boot/dts/st/stm32mp157c-odyssey-som.dtsi +++ b/arch/arm/boot/dts/st/stm32mp157c-odyssey-som.dtsi @@ -230,10 +230,6 @@ &iwdg2 { &m4_rproc { memory-region = <&retram>, <&mcuram>, <&mcuram2>, <&vdev0vring0>, <&vdev0vring1>, <&vdev0buffer>; - mboxes = <&ipcc 0>, <&ipcc 1>, <&ipcc 2>, <&ipcc 3>; - mbox-names = "vq0", "vq1", "shutdown", "detach"; - interrupt-parent = <&exti>; - interrupts = <68 1>; status = "okay"; }; diff --git a/arch/arm/boot/dts/st/stm32mp157c-phycore-stm32mp15-som.dtsi b/arch/arm/boot/dts/st/stm32mp157c-phycore-stm32mp15-som.dtsi index bf0c32027baf7..f823cc453a5c6 100644 --- a/arch/arm/boot/dts/st/stm32mp157c-phycore-stm32mp15-som.dtsi +++ b/arch/arm/boot/dts/st/stm32mp157c-phycore-stm32mp15-som.dtsi @@ -405,10 +405,6 @@ &m_can2 { &m4_rproc { memory-region = <&retram>, <&mcuram>, <&mcuram2>, <&vdev0vring0>, <&vdev0vring1>, <&vdev0buffer>; - mboxes = <&ipcc 0>, <&ipcc 1>, <&ipcc 2>, <&ipcc 3>; - mbox-names = "vq0", "vq1", "shutdown", "detach"; - interrupt-parent = <&exti>; - interrupts = <68 1>; status = "okay"; }; diff --git a/arch/arm/boot/dts/st/stm32mp15xx-dhcom-som.dtsi b/arch/arm/boot/dts/st/stm32mp15xx-dhcom-som.dtsi index 74a11ccc5333f..05795520586d4 100644 --- a/arch/arm/boot/dts/st/stm32mp15xx-dhcom-som.dtsi +++ b/arch/arm/boot/dts/st/stm32mp15xx-dhcom-som.dtsi @@ -416,10 +416,6 @@ &iwdg2 { &m4_rproc { memory-region = <&retram>, <&mcuram>, <&mcuram2>, <&vdev0vring0>, <&vdev0vring1>, <&vdev0buffer>; - mboxes = <&ipcc 0>, <&ipcc 1>, <&ipcc 2>, <&ipcc 3>; - mbox-names = "vq0", "vq1", "shutdown", "detach"; - interrupt-parent = <&exti>; - interrupts = <68 1>; status = "okay"; }; diff --git a/arch/arm/boot/dts/st/stm32mp15xx-dhcor-som.dtsi b/arch/arm/boot/dts/st/stm32mp15xx-dhcor-som.dtsi index 89881a26c6141..309b1aeefffe9 100644 --- a/arch/arm/boot/dts/st/stm32mp15xx-dhcor-som.dtsi +++ b/arch/arm/boot/dts/st/stm32mp15xx-dhcor-som.dtsi @@ -227,10 +227,6 @@ &iwdg2 { &m4_rproc { memory-region = <&retram>, <&mcuram>, <&mcuram2>, <&vdev0vring0>, <&vdev0vring1>, <&vdev0buffer>; - mboxes = <&ipcc 0>, <&ipcc 1>, <&ipcc 2>, <&ipcc 3>; - mbox-names = "vq0", "vq1", "shutdown", "detach"; - interrupt-parent = <&exti>; - interrupts = <68 1>; status = "okay"; }; diff --git a/arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi b/arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi index f7634c51efb26..711a66650955c 100644 --- a/arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi +++ b/arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi @@ -477,10 +477,6 @@ ltdc_ep0_out: endpoint { &m4_rproc { memory-region = <&retram>, <&mcuram>, <&mcuram2>, <&vdev0vring0>, <&vdev0vring1>, <&vdev0buffer>; - mboxes = <&ipcc 0>, <&ipcc 1>, <&ipcc 2>, <&ipcc 3>; - mbox-names = "vq0", "vq1", "shutdown", "detach"; - interrupt-parent = <&exti>; - interrupts = <68 1>; status = "okay"; }; diff --git a/arch/arm/boot/dts/st/stm32mp15xx-osd32.dtsi b/arch/arm/boot/dts/st/stm32mp15xx-osd32.dtsi index 2022a1fa31cab..1db35634e3535 100644 --- a/arch/arm/boot/dts/st/stm32mp15xx-osd32.dtsi +++ b/arch/arm/boot/dts/st/stm32mp15xx-osd32.dtsi @@ -204,10 +204,6 @@ &ipcc { &m4_rproc { memory-region = <&retram>, <&mcuram>, <&mcuram2>, <&vdev0vring0>, <&vdev0vring1>, <&vdev0buffer>; - mboxes = <&ipcc 0>, <&ipcc 1>, <&ipcc 2>, <&ipcc 3>; - mbox-names = "vq0", "vq1", "shutdown", "detach"; - interrupt-parent = <&exti>; - interrupts = <68 1>; status = "okay"; };
Pull mboxes, mbox-names, interrupt-parent, interrupts properties of the m4_rproc into stm32mp151.dtsi to deduplicate multiple copies of the same in multiple board files. Worse, those copies were starting to get out of sync, so this should prevent any such issues in the future. Signed-off-by: Marek Vasut <marex@denx.de> --- Cc: Alexandre Torgue <alexandre.torgue@foss.st.com> Cc: Conor Dooley <conor+dt@kernel.org> Cc: Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org> Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com> Cc: Richard Cochran <richardcochran@gmail.com> Cc: Rob Herring <robh+dt@kernel.org> Cc: devicetree@vger.kernel.org Cc: kernel@dh-electronics.com Cc: linux-arm-kernel@lists.infradead.org Cc: linux-stm32@st-md-mailman.stormreply.com --- arch/arm/boot/dts/st/stm32mp151.dtsi | 4 ++++ arch/arm/boot/dts/st/stm32mp157a-icore-stm32mp1.dtsi | 2 -- arch/arm/boot/dts/st/stm32mp157a-microgea-stm32mp1.dtsi | 2 -- arch/arm/boot/dts/st/stm32mp157c-ed1.dts | 4 ---- arch/arm/boot/dts/st/stm32mp157c-emstamp-argon.dtsi | 4 ---- arch/arm/boot/dts/st/stm32mp157c-odyssey-som.dtsi | 4 ---- arch/arm/boot/dts/st/stm32mp157c-phycore-stm32mp15-som.dtsi | 4 ---- arch/arm/boot/dts/st/stm32mp15xx-dhcom-som.dtsi | 4 ---- arch/arm/boot/dts/st/stm32mp15xx-dhcor-som.dtsi | 4 ---- arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi | 4 ---- arch/arm/boot/dts/st/stm32mp15xx-osd32.dtsi | 4 ---- 11 files changed, 4 insertions(+), 36 deletions(-)