From patchwork Fri Dec 6 15:32:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 848134 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DC00020CCD7 for ; Fri, 6 Dec 2024 15:33:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733499197; cv=none; b=aR1zPKqVu057HgsagqxqzU4uFY6Uk/z4Bl5N5SmlZTHfa7mAGwJELqKEIKkRt4ovDiv6WToSsmCnLegqlTS1uKegfMg3+fsKtn8tjaMyfZAlvQLBL0p2Hnd6gQHJXN96cfmK99IZOgXi6RbIxTDhGkN4uwhJwORdCQLR0lRsEsg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733499197; c=relaxed/simple; bh=lG/TGchmN2huTnU3U21E2+YKqCiyb7DXNUl0Mk5XRjA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=q4gVaT0wVvWTFYmXeBZScAVXXqIWH3UpnvqO5bpCLVxVRryQVMc8vbVfhIFzfTEfYT3YXJTsw+ctBCMzgerx77dHrrtWaG1JnK9lGDVjFQ579Gvr/w4yynkn0omCBmcpkkuB5948e0N8nFEaYc86mATLcZr/i/jTtovZA3VSg3w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=C4UVGuzQ; arc=none smtp.client-ip=209.85.128.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="C4UVGuzQ" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-434941aac88so1625165e9.3 for ; Fri, 06 Dec 2024 07:33:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1733499193; x=1734103993; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=ZvCDoCp60h6mjXrU/MuQxaUloOR/sEa9UZgoRej7gWI=; b=C4UVGuzQIpf7S0KLiLXHYx7XOyYt5Hv576OZCRYt64s0IPOcBNmuOshGsfIxEE5FGH F9Fx2a6j42rZ+Cx0CcdQzmFNQfaJJLTUMT8rIzPJaLkBMBJ3u5Uu2HtZ9RcNwRryty1H auoeQCA46JXWxjwfiA3t2HKRswxRRu8onLBD1RLOxmMYd2fASoHzntHl/WfaopywBfoh JAk8OmfEfX2D+tUGUTrqgcPmFSj7MjLgyy9UITMhP96krPR3ZpxTZtqy63mmM6JqJxw5 nEe1yH+PU0I59TJF/ApYgSY7Gzz6VWrMyEtFtGp+b+ZTiVM6SMIc3pUsFzCeEsaktgvO 2dyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733499193; x=1734103993; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZvCDoCp60h6mjXrU/MuQxaUloOR/sEa9UZgoRej7gWI=; b=pkRSPTbS7qbGR8IvtjnLV5diTnAqjDhO21kchG8sN96qSNyaUn9OWPpZ0qgSqFggY+ K5r0cSPhc28s68nCdqFSZ0GAHGzYrd8crovsSlxr+4pwggobkUjUlWR6SeB5kkT9iE45 GzTxXaSYAf20FqG5bZHYa0R3peBMw87SH3ePYHsTqLOykezV4rCKr3aqia69RUADdkPU oIqvlna/W1WoFBkuP+xiyGh991HqZDvLUY0t82TB5bSRqgRcpMCr3bS+kJdNcJcnJezE CWFT/vT1b++IdOP4nzaeuwbXjMQJLYtRbgozxPX3fc3DhYvsvjjurO25pOfPhLPmm5AM qsGw== X-Gm-Message-State: AOJu0YzU1BkdjTe2qDDtdcyQgM5D5yIpi8UAR/orhztY/ijiSipexP3X cgbSRR8bD7WBsbaYNq3+e68fHFPFPjLagW7gxPg2pRU2hNQ5e4e8GRqRk7FOPmc= X-Gm-Gg: ASbGncusdsdC7LbDbdgwVnMSDLl0o7azgdxkwKFIXO2/wwkuh/UvwEPcdcJnuY4FgXU DITDGQnyiUA1ydzARKg32sbZUQ9OFxqmiDZPZYl8soKxfS58aZbsl4kYc2wA35kiyWpFQEaVAhi OaecMPJJ7hyAikyuQ9L/fjAdjDfsrM8bC6zM6StdSmRm/IH5oKHCt7yzwgSPo9Ta3S8flYZI/lc yMjg2ksdic3ByJ5kuRxf2EUUqnkqF0MVYaSFjCGlrBX+mOiMTZnIlPGQnnCnLVQtQ== X-Google-Smtp-Source: AGHT+IFK7kgObGAlxtebU9DOM4xbqjiQxfTwBzeLLbZt9IlUtQApHBlS/nqhoF9mNRxYIE3mJMlZCA== X-Received: by 2002:a05:600c:35d2:b0:42c:bb35:b6d0 with SMTP id 5b1f17b1804b1-434ddea7de9mr12447335e9.1.1733499193134; Fri, 06 Dec 2024 07:33:13 -0800 (PST) Received: from [127.0.1.1] ([178.197.223.165]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-434da113580sm61158035e9.29.2024.12.06.07.33.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Dec 2024 07:33:12 -0800 (PST) From: Krzysztof Kozlowski Date: Fri, 06 Dec 2024 16:32:37 +0100 Subject: [PATCH 13/19] arm64: dts: qcom: x1e80100: Fix ADSP memory base and length Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241206-dts-qcom-cdsp-mpss-base-address-v1-13-2f349e4d5a63@linaro.org> References: <20241206-dts-qcom-cdsp-mpss-base-address-v1-0-2f349e4d5a63@linaro.org> In-Reply-To: <20241206-dts-qcom-cdsp-mpss-base-address-v1-0-2f349e4d5a63@linaro.org> To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Vinod Koul , Dmitry Baryshkov , Neil Armstrong , Abel Vesa , Sibi Sankar , Luca Weiss Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=9093; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=lG/TGchmN2huTnU3U21E2+YKqCiyb7DXNUl0Mk5XRjA=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBnUxkYYLB9pLih6EzZSt4N+MCvp+s4DadX3SCQD laWgvgpp5yJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCZ1MZGAAKCRDBN2bmhouD 16P6D/wM3xSh3y6/x2UbDlyw6UZin9wSXU9Xi/bkkwC8KMAO6je6MUbjFMVeD/rlDiIXu390RF3 9uJ72VEsgsiesX25t2ZKOyc86rXbgc9OywGJf7bJPdqDmzECD5W9KTKhJBuzzgcZ+exrf2CAgrf x8jrYGICtbYS/ZO484sG4P2kFLzQ+Z5/5dNENRS6eR6ZjffJH1cMTRnANuOj4Q1X68PJf8OpVGF SQzD2cu4vq70vsGen1IsoNpWHCeMW/HiUGzkQWe7Cu9282KVc5iURTpGngdlOd55dGYRHmlWFRL SY8milr+sByf7gDDUKMgaBYvarpvm2yGq9bGS2zI3Lv4Xznk5j1akBnHViNKT4aUY0PSPf5/Vgu VFZkCw1YwTkernEVI5nLY0rZfirAC3NeYMBGgEeMTl+kTHGb0Uv4EnsK/d85unZ3xU44FZy4UIU 58zNv7NsvNU3BrFpcx4kA5gFfHbbsP+HtMjAw+QDvD08FPYBu0LtJEvVc8PwNhU8b3r4cDs9lk3 hQoRaq34B9azx1/a4asYwOINPzcRr5f6UmJCQW4IXrZkhD7p6+ITaK5c8aOT9MXZGsAApv1207h yax+Vzywl/xzsuWS7/ploNdzSlgFA29STz5hKxwUMtSH+vsdZMUWdf9rkwGOb8fhBBGbT0eEwcU 3EKTNlwI+rVOPHw== X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B The address space in ADSP PAS (Peripheral Authentication Service) remoteproc node should point to the QDSP PUB address space (QDSP6...SS_PUB): 0x0680_0000 with length of 0x10000. 0x3000_0000, value used so far, is the main region of CDSP. Downstream DTS uses 0x0300_0000, which is oddly similar to 0x3000_0000, yet quite different and points to unused area. Correct the base address and length, which also moves the node to different place to keep things sorted by unit address. The diff looks big, but only the unit address and "reg" property were changed. This should have no functional impact on Linux users, because PAS loader does not use this address space at all. Fixes: 5f2a9cd4b104 ("arm64: dts: qcom: x1e80100: Add ADSP/CDSP remoteproc nodes") Cc: Signed-off-by: Krzysztof Kozlowski --- arch/arm64/boot/dts/qcom/x1e80100.dtsi | 274 ++++++++++++++++----------------- 1 file changed, 137 insertions(+), 137 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/x1e80100.dtsi b/arch/arm64/boot/dts/qcom/x1e80100.dtsi index c18b99765c25c901b3d0a3fbaddc320c0a8c1716..9df6903b5d59aadda26d9e0d4d9f951c5c3add7b 100644 --- a/arch/arm64/boot/dts/qcom/x1e80100.dtsi +++ b/arch/arm64/boot/dts/qcom/x1e80100.dtsi @@ -3720,6 +3720,143 @@ nsp_noc: interconnect@320c0000 { #interconnect-cells = <2>; }; + remoteproc_adsp: remoteproc@6800000 { + compatible = "qcom,x1e80100-adsp-pas"; + reg = <0x0 0x06800000 0x0 0x10000>; + + interrupts-extended = <&pdc 6 IRQ_TYPE_EDGE_RISING>, + <&smp2p_adsp_in 0 IRQ_TYPE_EDGE_RISING>, + <&smp2p_adsp_in 1 IRQ_TYPE_EDGE_RISING>, + <&smp2p_adsp_in 2 IRQ_TYPE_EDGE_RISING>, + <&smp2p_adsp_in 3 IRQ_TYPE_EDGE_RISING>; + interrupt-names = "wdog", + "fatal", + "ready", + "handover", + "stop-ack"; + + clocks = <&rpmhcc RPMH_CXO_CLK>; + clock-names = "xo"; + + power-domains = <&rpmhpd RPMHPD_LCX>, + <&rpmhpd RPMHPD_LMX>; + power-domain-names = "lcx", + "lmx"; + + interconnects = <&lpass_lpicx_noc MASTER_LPASS_PROC QCOM_ICC_TAG_ALWAYS + &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>; + + memory-region = <&adspslpi_mem>, + <&q6_adsp_dtb_mem>; + + qcom,qmp = <&aoss_qmp>; + + qcom,smem-states = <&smp2p_adsp_out 0>; + qcom,smem-state-names = "stop"; + + status = "disabled"; + + glink-edge { + interrupts-extended = <&ipcc IPCC_CLIENT_LPASS + IPCC_MPROC_SIGNAL_GLINK_QMP + IRQ_TYPE_EDGE_RISING>; + mboxes = <&ipcc IPCC_CLIENT_LPASS + IPCC_MPROC_SIGNAL_GLINK_QMP>; + + label = "lpass"; + qcom,remote-pid = <2>; + + fastrpc { + compatible = "qcom,fastrpc"; + qcom,glink-channels = "fastrpcglink-apps-dsp"; + label = "adsp"; + qcom,non-secure-domain; + #address-cells = <1>; + #size-cells = <0>; + + compute-cb@3 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <3>; + iommus = <&apps_smmu 0x1003 0x80>, + <&apps_smmu 0x1063 0x0>; + dma-coherent; + }; + + compute-cb@4 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <4>; + iommus = <&apps_smmu 0x1004 0x80>, + <&apps_smmu 0x1064 0x0>; + dma-coherent; + }; + + compute-cb@5 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <5>; + iommus = <&apps_smmu 0x1005 0x80>, + <&apps_smmu 0x1065 0x0>; + dma-coherent; + }; + + compute-cb@6 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <6>; + iommus = <&apps_smmu 0x1006 0x80>, + <&apps_smmu 0x1066 0x0>; + dma-coherent; + }; + + compute-cb@7 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <7>; + iommus = <&apps_smmu 0x1007 0x80>, + <&apps_smmu 0x1067 0x0>; + dma-coherent; + }; + }; + + gpr { + compatible = "qcom,gpr"; + qcom,glink-channels = "adsp_apps"; + qcom,domain = ; + qcom,intents = <512 20>; + #address-cells = <1>; + #size-cells = <0>; + + q6apm: service@1 { + compatible = "qcom,q6apm"; + reg = ; + #sound-dai-cells = <0>; + qcom,protection-domain = "avs/audio", + "msm/adsp/audio_pd"; + + q6apmbedai: bedais { + compatible = "qcom,q6apm-lpass-dais"; + #sound-dai-cells = <1>; + }; + + q6apmdai: dais { + compatible = "qcom,q6apm-dais"; + iommus = <&apps_smmu 0x1001 0x80>, + <&apps_smmu 0x1061 0x0>; + }; + }; + + q6prm: service@2 { + compatible = "qcom,q6prm"; + reg = ; + qcom,protection-domain = "avs/audio", + "msm/adsp/audio_pd"; + + q6prmcc: clock-controller { + compatible = "qcom,q6prm-lpass-clocks"; + #clock-cells = <2>; + }; + }; + }; + }; + }; + lpass_wsa2macro: codec@6aa0000 { compatible = "qcom,x1e80100-lpass-wsa-macro", "qcom,sm8550-lpass-wsa-macro"; reg = <0 0x06aa0000 0 0x1000>; @@ -6319,143 +6456,6 @@ system-cache-controller@25000000 { interrupts = ; }; - remoteproc_adsp: remoteproc@30000000 { - compatible = "qcom,x1e80100-adsp-pas"; - reg = <0 0x30000000 0 0x100>; - - interrupts-extended = <&pdc 6 IRQ_TYPE_EDGE_RISING>, - <&smp2p_adsp_in 0 IRQ_TYPE_EDGE_RISING>, - <&smp2p_adsp_in 1 IRQ_TYPE_EDGE_RISING>, - <&smp2p_adsp_in 2 IRQ_TYPE_EDGE_RISING>, - <&smp2p_adsp_in 3 IRQ_TYPE_EDGE_RISING>; - interrupt-names = "wdog", - "fatal", - "ready", - "handover", - "stop-ack"; - - clocks = <&rpmhcc RPMH_CXO_CLK>; - clock-names = "xo"; - - power-domains = <&rpmhpd RPMHPD_LCX>, - <&rpmhpd RPMHPD_LMX>; - power-domain-names = "lcx", - "lmx"; - - interconnects = <&lpass_lpicx_noc MASTER_LPASS_PROC QCOM_ICC_TAG_ALWAYS - &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>; - - memory-region = <&adspslpi_mem>, - <&q6_adsp_dtb_mem>; - - qcom,qmp = <&aoss_qmp>; - - qcom,smem-states = <&smp2p_adsp_out 0>; - qcom,smem-state-names = "stop"; - - status = "disabled"; - - glink-edge { - interrupts-extended = <&ipcc IPCC_CLIENT_LPASS - IPCC_MPROC_SIGNAL_GLINK_QMP - IRQ_TYPE_EDGE_RISING>; - mboxes = <&ipcc IPCC_CLIENT_LPASS - IPCC_MPROC_SIGNAL_GLINK_QMP>; - - label = "lpass"; - qcom,remote-pid = <2>; - - fastrpc { - compatible = "qcom,fastrpc"; - qcom,glink-channels = "fastrpcglink-apps-dsp"; - label = "adsp"; - qcom,non-secure-domain; - #address-cells = <1>; - #size-cells = <0>; - - compute-cb@3 { - compatible = "qcom,fastrpc-compute-cb"; - reg = <3>; - iommus = <&apps_smmu 0x1003 0x80>, - <&apps_smmu 0x1063 0x0>; - dma-coherent; - }; - - compute-cb@4 { - compatible = "qcom,fastrpc-compute-cb"; - reg = <4>; - iommus = <&apps_smmu 0x1004 0x80>, - <&apps_smmu 0x1064 0x0>; - dma-coherent; - }; - - compute-cb@5 { - compatible = "qcom,fastrpc-compute-cb"; - reg = <5>; - iommus = <&apps_smmu 0x1005 0x80>, - <&apps_smmu 0x1065 0x0>; - dma-coherent; - }; - - compute-cb@6 { - compatible = "qcom,fastrpc-compute-cb"; - reg = <6>; - iommus = <&apps_smmu 0x1006 0x80>, - <&apps_smmu 0x1066 0x0>; - dma-coherent; - }; - - compute-cb@7 { - compatible = "qcom,fastrpc-compute-cb"; - reg = <7>; - iommus = <&apps_smmu 0x1007 0x80>, - <&apps_smmu 0x1067 0x0>; - dma-coherent; - }; - }; - - gpr { - compatible = "qcom,gpr"; - qcom,glink-channels = "adsp_apps"; - qcom,domain = ; - qcom,intents = <512 20>; - #address-cells = <1>; - #size-cells = <0>; - - q6apm: service@1 { - compatible = "qcom,q6apm"; - reg = ; - #sound-dai-cells = <0>; - qcom,protection-domain = "avs/audio", - "msm/adsp/audio_pd"; - - q6apmbedai: bedais { - compatible = "qcom,q6apm-lpass-dais"; - #sound-dai-cells = <1>; - }; - - q6apmdai: dais { - compatible = "qcom,q6apm-dais"; - iommus = <&apps_smmu 0x1001 0x80>, - <&apps_smmu 0x1061 0x0>; - }; - }; - - q6prm: service@2 { - compatible = "qcom,q6prm"; - reg = ; - qcom,protection-domain = "avs/audio", - "msm/adsp/audio_pd"; - - q6prmcc: clock-controller { - compatible = "qcom,q6prm-lpass-clocks"; - #clock-cells = <2>; - }; - }; - }; - }; - }; - remoteproc_cdsp: remoteproc@32300000 { compatible = "qcom,x1e80100-cdsp-pas"; reg = <0 0x32300000 0 0x1400000>;