From patchwork Mon Dec 9 11:02:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 13899295 Received: from mail-ed1-f42.google.com (mail-ed1-f42.google.com [209.85.208.42]) (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 C3B8C21B1BD for ; Mon, 9 Dec 2024 11:02:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733742165; cv=none; b=rj70LDii0gQO7D3i0mGOCoRJ5QcPjN2PW+rdcgSA1V7IXbjtUgxLZtAk3L0B+deOE+DoK/KZjnT56eongwjSNY+4aYUOPwyveiJBLhkzev4SuX9/2o4WSMWSUWclmTr5r2gUeaR9zQhxv1qI/QqXXjQ5b4UAKjgrxYF/tHPPxSc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733742165; c=relaxed/simple; bh=vrwP+h6zpIhOuCkjeo3qhBybMESM51e5HW0nDc1kJiY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ZKFcKnrj1x0W5bWwlg0rHijcCutT9dIt4pAiTotJK9Ep0LYBO4fsL45+ZFanaOWrHnMTAj6oqaDfqY6/1Lz/XZbKGggrQw+KMCyWzoFeIi89MI3IcjJK4mDyDTTazNHWKq8qNJjoFgvnwwEQJkP0kOejN50beaZu+2KS67n4YiE= 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=clkyOoO1; arc=none smtp.client-ip=209.85.208.42 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="clkyOoO1" Received: by mail-ed1-f42.google.com with SMTP id 4fb4d7f45d1cf-5d3c1f68ef1so492922a12.1 for ; Mon, 09 Dec 2024 03:02:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1733742161; x=1734346961; 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=ylbfkDketc8h5XC3dggtd3WAotQ14SQ+WCMxgV3LPvw=; b=clkyOoO17qW2OHblEkMyzfzcbo3p6mReDvAKeeRWfa6ErPTOq91j8oo46pxNFKnryb oGBEVQ0bywrYWkF2yWTLje8Ag7rryMqXkLrtGE1EM0+pf8zWzlbuYq2WxkfFFkDwd491 ZR+1SPE71jkabhKwyPvjJjKJ0UWtaA9VQ+jZ/gLTAj/pJraKRbfJf3pXTYusCwv1U+HA U6oYhV9c+m5onu+WxE1ijVBv3U3APnq1u3OqLAC44LxSgfGKxbuEavJx+6Q/pFzvdwN3 DlaGlSraigTSt0h89J/8KqVgm5fhcTSaWTX84RwxrI4jvO8OTtMr9MhMDGo4oKPXz9QT 7UNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733742161; x=1734346961; 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=ylbfkDketc8h5XC3dggtd3WAotQ14SQ+WCMxgV3LPvw=; b=h5IoD45pD/bYLCmf83E0bOwesHELpMnGxgrZb9UNEueixNSOUk9E/LrG/mWPdQb0nA J++C5lrBnN3dsvMWPsDun2mC3iJKAzK5nn/kttCkct1QBaM3NyecPK3h45dQsNGtM8Nb MNLMWxYhdY7IFnnkRcQ84tOuI8dnWB02lBRClPiLfDu4zuRq+qK4AdmyiSiLc0qA1J0x GBDsWjVROE7rRi0qx4dGKRRt9JFDDXYwEFARgNIPPjLehw5iXKenuHKHxjbKuM3UBDHL wxEbIhlveNudeu/LoFZWHN6t+ukV3uDjgpT2o2elY5dhPfIXLsdCmbSbaNXdwp+w7A92 XrNw== X-Gm-Message-State: AOJu0YzPq/P/QdHbNvT6sqqcpg4d6JPKYDljChx/2YfZm0+m0Bb2OUvg PbxFaRjnoRhDCEiw3mZ0EuIf5rjAycHrrbGBc1xo7VN0j0NV4T+8rq5CJRno7G8= X-Gm-Gg: ASbGncs9XNbiSTm4xYgqWLQNYm3bkNtFXr//q13FtJuvpCIQTbyjrEyhwhahs7iVGo1 H7qTpkuazT+VHnQblB2sJ8b1BXGiN4XuxzLBpxXKpYSzBlVbfpu7jY/DH4AqiZvwtrvvEUuUzQm PgFKYlc9REjt33YDQp4lLnnz5M76vcZQePcCPR4gsFx0QN2U/2N1FkXTcGQ+CJmqbPOChO08bDy UmNyda9VFE2AyVUctkyB++zFQ8/LAW2Npr1xMMu1T3uL7oNwU+v5sfrAB+WuRJVOw== X-Google-Smtp-Source: AGHT+IF2mcNXKaw/FZzi7gg0/uWlXrIwcL0K9xSH7PrjhEKX0XxZycwI13k/NkXr2kaKHJNglr+2gg== X-Received: by 2002:a05:6402:3224:b0:5d3:e79b:3b4f with SMTP id 4fb4d7f45d1cf-5d3e79b3fe6mr2481141a12.8.1733742161118; Mon, 09 Dec 2024 03:02:41 -0800 (PST) Received: from [127.0.1.1] ([178.197.223.165]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5d3dd4f641bsm3348818a12.51.2024.12.09.03.02.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2024 03:02:40 -0800 (PST) From: Krzysztof Kozlowski Date: Mon, 09 Dec 2024 12:02:12 +0100 Subject: [PATCH v2 07/19] arm64: dts: qcom: sm8550: 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: <20241209-dts-qcom-cdsp-mpss-base-address-v2-7-d85a3bd5cced@linaro.org> References: <20241209-dts-qcom-cdsp-mpss-base-address-v2-0-d85a3bd5cced@linaro.org> In-Reply-To: <20241209-dts-qcom-cdsp-mpss-base-address-v2-0-d85a3bd5cced@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=8927; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=vrwP+h6zpIhOuCkjeo3qhBybMESM51e5HW0nDc1kJiY=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBnVs423CFVOKApA3wu78lFPDWKAuT8mwgni+MHA jSNnFRT11+JAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCZ1bONgAKCRDBN2bmhouD 121wD/91jTaAE3KeZhGDkg3p7Z/FV2Tcz5LUVzb6okEaB2aD3CHNNSQC8rCXwLcl/992hVNFNfh CogA2Ck77F4Cp+zi7wJSmAR5dJgWNCG2Ln2q3R3A20lkWFH9VbCp9SDe9ppeFemUcrfnU1YzDZ3 OauxMSA5daMpLVn1IiVGGfg2FzL3yX58c3oSMAOZjbEkt6E+e2DsDt2WXWG1FHJ/5Mo9fh254Od fzGqIvrv5oQ1lEvbCg4DmJ35O0ePCcUchxYuezqY1Ra/EdTwN0P0ZlMOLXVYiZuJ3OIsyHJ/aD5 6DVlykcOZzS0SxdyWuTDWOH6dF8M/joYODmiHNaj8MbNlixlqgnaHan+7ZxXsl8G73cLPbekW2y b+X5rUaycE0FDnfDTkv/dUPrHVPgD2o4PuIUeDo12UqktqdbPMBdnquyqKWwoR87aU9H0znTAPS 3BHcUxG5vd2xOs4VbtsO+CzWLqmNjYlYVJt+Rl3INc1sOks0XxQGHSNfyaW0HtBBxI2t8k3t/Kc EwyISSOf6n7rU+KybpzcLQL1tg/oz3hoDE9Ir5IwJ0aNF5tiWjMwspSz48a/fT0RH3DZv3uK8PX L3WZs+02HGkqIkHyKmtMkIxNwPlfRxIO0b/Iz2qOF2VzWkE4+54gAjnRbi6IacCDJ5X383VRCbi d/J8OU5jg9nswlw== 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: d0c061e366ed ("arm64: dts: qcom: sm8550: add adsp, cdsp & mdss nodes") Cc: stable@vger.kernel.org Reviewed-by: Neil Armstrong Signed-off-by: Krzysztof Kozlowski --- arch/arm64/boot/dts/qcom/sm8550.dtsi | 262 +++++++++++++++++------------------ 1 file changed, 131 insertions(+), 131 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8550.dtsi b/arch/arm64/boot/dts/qcom/sm8550.dtsi index e7774d32fb6d2288748ecec00bf525b2b3c40fbb..f454015c5b90c7d792c01bf85256812857d79c64 100644 --- a/arch/arm64/boot/dts/qcom/sm8550.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi @@ -2354,6 +2354,137 @@ IPCC_MPROC_SIGNAL_GLINK_QMP }; }; + remoteproc_adsp: remoteproc@6800000 { + compatible = "qcom,sm8550-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 0 &mc_virt SLAVE_EBI1 0>; + + 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"; + + remoteproc_adsp_glink: 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"; + + q6apmdai: dais { + compatible = "qcom,q6apm-dais"; + iommus = <&apps_smmu 0x1001 0x80>, + <&apps_smmu 0x1061 0x0>; + }; + + q6apmbedai: bedais { + compatible = "qcom,q6apm-lpass-dais"; + #sound-dai-cells = <1>; + }; + }; + + 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,sm8550-lpass-wsa-macro"; reg = <0 0x06aa0000 0 0x1000>; @@ -4576,137 +4707,6 @@ system-cache-controller@25000000 { interrupts = ; }; - remoteproc_adsp: remoteproc@30000000 { - compatible = "qcom,sm8550-adsp-pas"; - reg = <0x0 0x30000000 0x0 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 0 &mc_virt SLAVE_EBI1 0>; - - 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"; - - remoteproc_adsp_glink: 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"; - - q6apmdai: dais { - compatible = "qcom,q6apm-dais"; - iommus = <&apps_smmu 0x1001 0x80>, - <&apps_smmu 0x1061 0x0>; - }; - - q6apmbedai: bedais { - compatible = "qcom,q6apm-lpass-dais"; - #sound-dai-cells = <1>; - }; - }; - - 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>; - }; - }; - }; - }; - }; - nsp_noc: interconnect@320c0000 { compatible = "qcom,sm8550-nsp-noc"; reg = <0 0x320c0000 0 0xe080>;