diff mbox series

arm64: dts: qcom: sm8650-hdk: allow more IOMMU SID for the first QUP instance

Message ID 20240605-topic-sm8650-upstream-hdk-iommu-fix-v1-1-9fd7233725fa@linaro.org
State Accepted
Commit 3c61c786d2f058636a92c5b648873fdd45444085
Headers show
Series arm64: dts: qcom: sm8650-hdk: allow more IOMMU SID for the first QUP instance | expand

Commit Message

Neil Armstrong June 5, 2024, 11:43 a.m. UTC
When triggering I2S SE DMA transfers on the 6th Serial Element, we get
some timeouts and finally a fatal SMMU crash because the I2C6 lines
are shared with the secure firmware in order to handle the SMB1396
charger from the secure side.

In order to make thing work flawlessly we need to allow more SIDs
while running our SE DMA transfers, thus add the 0x3 mark to allow
the 0xa0 SID to trigger while we trigger an 0xa3 SID from Linux.

This crash doesn't happen on the QRD platform since the SE6 is
configured differently, with FIFO mode disabled, thus GPI DMA
is used and we cannot exercise SE DMA on this interface.

The crash only happens when large tranfers occurs (>32 bytes) since
the driver is designed to use the SE DMA in this case, and there's
no way to mark the SE DMA as disabled or mark the GPI DMA as
preferred since the FIFO/SE DMA will be used is FIFO is not disabled.

Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
---
 arch/arm64/boot/dts/qcom/sm8650-hdk.dts | 2 ++
 1 file changed, 2 insertions(+)


---
base-commit: 234cb065ad82915ff8d06ce01e01c3e640b674d2
change-id: 20240605-topic-sm8650-upstream-hdk-iommu-fix-542619065c45

Best regards,

Comments

Konrad Dybcio June 5, 2024, 8:47 p.m. UTC | #1
On 5.06.2024 1:43 PM, Neil Armstrong wrote:
> When triggering I2S SE DMA transfers on the 6th Serial Element, we get
> some timeouts and finally a fatal SMMU crash because the I2C6 lines
> are shared with the secure firmware in order to handle the SMB1396
> charger from the secure side.
> 
> In order to make thing work flawlessly we need to allow more SIDs
> while running our SE DMA transfers, thus add the 0x3 mark to allow
> the 0xa0 SID to trigger while we trigger an 0xa3 SID from Linux.
> 
> This crash doesn't happen on the QRD platform since the SE6 is
> configured differently, with FIFO mode disabled, thus GPI DMA
> is used and we cannot exercise SE DMA on this interface.
> 
> The crash only happens when large tranfers occurs (>32 bytes) since
> the driver is designed to use the SE DMA in this case, and there's
> no way to mark the SE DMA as disabled or mark the GPI DMA as
> preferred since the FIFO/SE DMA will be used is FIFO is not disabled.
> 
> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
> ---

there's only 24 I2C masters on this soc, surely the board designer couldn't
have chosen another one for the charger..

Fixes: 01061441029e ("arm64: dts: qcom: sm8650: add support for the SM8650-HDK board")
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad
Bjorn Andersson June 6, 2024, 3:20 a.m. UTC | #2
On Wed, 05 Jun 2024 13:43:30 +0200, Neil Armstrong wrote:
> When triggering I2S SE DMA transfers on the 6th Serial Element, we get
> some timeouts and finally a fatal SMMU crash because the I2C6 lines
> are shared with the secure firmware in order to handle the SMB1396
> charger from the secure side.
> 
> In order to make thing work flawlessly we need to allow more SIDs
> while running our SE DMA transfers, thus add the 0x3 mark to allow
> the 0xa0 SID to trigger while we trigger an 0xa3 SID from Linux.
> 
> [...]

Applied, thanks!

[1/1] arm64: dts: qcom: sm8650-hdk: allow more IOMMU SID for the first QUP instance
      commit: 3c61c786d2f058636a92c5b648873fdd45444085

Best regards,
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/qcom/sm8650-hdk.dts b/arch/arm64/boot/dts/qcom/sm8650-hdk.dts
index 182864a3b6bd..5887d265a077 100644
--- a/arch/arm64/boot/dts/qcom/sm8650-hdk.dts
+++ b/arch/arm64/boot/dts/qcom/sm8650-hdk.dts
@@ -991,6 +991,8 @@  &qup_i2c3_data_clk {
 };
 
 &qupv3_id_0 {
+	iommus = <&apps_smmu 0xa3 0x3>;
+
 	status = "okay";
 };