From patchwork Fri Dec 13 14:53:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 850854 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (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 E52D91E47BD for ; Fri, 13 Dec 2024 14:54:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734101679; cv=none; b=SzuU3/Vw6ihEoNlV7pZqQNRfCwQKg6aOeNSZl7XAERL5cAUdhWy7yUypxV+GDXUpaMlG6tCn7fM2eeoTMLozn44WS7Gu0+AM3EFqtPKtklZRfIofx/4iMXWsv65ZeGKheCifroUA4Rt407jnEek7ZYezlD0+L2rKa2mxlD5x8+U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734101679; c=relaxed/simple; bh=lQSwKydVzuLPgrSnS4czxUhWJ/Yy6d89uPBeKMhJzj8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=okJcx4s8AMgsEk6hbfke5YDFIPYwtUdzSaFUAFAFsKr4UWsi41MSbhket3hzv/l6HcGP9dictWzjtQQUaN/4CX3x7xLtVQpWJ6TvhbTnSfmdGO/qoUmg6bj2bLXTkcl1O2vNCLwSwRGdVnFHZO2eWKXWu5A1elWBW9hDFqeyGWM= 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=Fq5W8Vb4; arc=none smtp.client-ip=209.85.128.41 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="Fq5W8Vb4" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-4361e82e3c3so2344605e9.0 for ; Fri, 13 Dec 2024 06:54:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1734101674; x=1734706474; 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=KWZ5edNQu59uMCBSCPo9Z+e0cBhW7lUlE/lAW7+6yU8=; b=Fq5W8Vb4S5oEzFYjFXZmXRC1KRPLUSE1LiuVg1X4Dc8LL8hYuGQ7tWAsGHqWtBqUvp +v8Ml5hCYtESaChPOG9rgVliK4zifuKGk2flSjsKl7pWlCdWt+IZnIZ10nuPwvMavHk/ NyFUKme8Yzxb+UonUs/tY0XzKgCDEDIJ6wn9XIquy3/cUDquODHQEXrd70mjeXXPctHC shOiKuXx8nAsDeckGjW0LHhKEPjzb7D0mlzJM77blFo/mmbxpQNFcfmSP3fkl2SrrKYj /pO8OtHUIruMLe8qAekQc7A3nO9PK9ulYiMeQ/VrU5GNo6RRqMY/4gXESYkI+4sePdDM mI+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734101674; x=1734706474; 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=KWZ5edNQu59uMCBSCPo9Z+e0cBhW7lUlE/lAW7+6yU8=; b=paYJdZ7vQgdWp0JlWYQQcR4RyqSlrvEfGl0WIn7z3HG1dpL5YjwV6fdzFDXW9Txy9Z lazCGtk2RgVPSah6eOiLbBxXzB+19xa3+qVVF7fzGngJWlQmFpAkpyorK6FohYNGIxdD OkGvtmppzBPriCuRKzOTuwwWmeccfGI2Vjx6hUaCQfTbdpOwndZ69YOYOPglLQqDNPqA aBLSw9RztKkhoNj7azQb2qreCu5KXw4w8TkfNZKkAp5x5TBrAbd2Xs2mqe5OLFzkJHmy UwEd1UsaEzOEpaGl7xC8+Hd8ixH7L/vxUILTOq4XKyzqIpn+f0mb9kIUIJzYZ/hX1aw5 //zA== X-Gm-Message-State: AOJu0YyZYgl5X/FaBck7N8h4A0AWME+rMmVNbSTsc/tzn11WZhSRxcA4 gVPS/cWN8s2hRDzhUyQ/eWOTCvnuDU0s97NHMUNGO9KMsCkXTbBQOg9+rmCHZ44= X-Gm-Gg: ASbGncuNmxipkc4TLU+GGVCJR/Phbsvaf5Gd3VUXQJkovUpJ6V/zLkq1TYLrbSKzN4k DGKckU+svqWbw2+MUkJnZ0xFtZ25COztsdDuQzHZzysj7uvW8agg1KCUR45tSPJCyYMioloYAhR xB/gXe4uEGdHl47JhrC9qQN1LwZsLlHCwsfmqfiAalb+2ERd4mu1kBPGg/2pOquCvNZYebTL2r+ +po3DPJinD/5sltWebEZxZzU2oO6X07ZUNWdRDwVpay6uqCuGg94NX7MaJg7+I00JD/qKQ7 X-Google-Smtp-Source: AGHT+IHu6KOWzC9TWuC0qGIIQBaueo63N794Wxol4EcBIfC60IVY6AgxakwLgjOzRLivwe7KCgaEMA== X-Received: by 2002:a05:600c:3b88:b0:436:1902:23b5 with SMTP id 5b1f17b1804b1-4362aaa6c13mr8917635e9.4.1734101674178; Fri, 13 Dec 2024 06:54:34 -0800 (PST) Received: from [127.0.1.1] ([178.197.223.165]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-436256b42c8sm51547305e9.29.2024.12.13.06.54.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Dec 2024 06:54:33 -0800 (PST) From: Krzysztof Kozlowski Date: Fri, 13 Dec 2024 15:53:56 +0100 Subject: [PATCH v3 07/23] 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: <20241213-dts-qcom-cdsp-mpss-base-address-v3-7-2e0036fccd8d@linaro.org> References: <20241213-dts-qcom-cdsp-mpss-base-address-v3-0-2e0036fccd8d@linaro.org> In-Reply-To: <20241213-dts-qcom-cdsp-mpss-base-address-v3-0-2e0036fccd8d@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, Konrad Dybcio , Krzysztof Kozlowski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=8988; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=lQSwKydVzuLPgrSnS4czxUhWJ/Yy6d89uPBeKMhJzj8=; b=kA0DAAoBwTdm5oaLg9cByyZiAGdcSo2hUIZmF7JUD4CKPWYw247tw3wuKpXTxT4tCk3rohkqS 4kCMwQAAQoAHRYhBN3SYig9ERsjO264qME3ZuaGi4PXBQJnXEqNAAoJEME3ZuaGi4PXAnsP/iuW 71l+Nn9CHmqOTL/LQimop5nbxQ5wPDPA+w39FNXcZvRNQyFbwFDeFYn3NRhnxHEhCMMCsHlxFE9 zVO7w91CzwbntE0DoGVc+6rZSTTdM5hToZSo2MWIVXkXk2gqNRvhC0/Ffq2g0vy/TtnIL/d29eW TXueY/FUXLhTVKm8vURehUvrpL/3A0Yv80JWniyHqTtHhfrBBmc1gwmJ1VLMJLlnWc5kyP3hgaq pmubmNURWEYzFZP713E9RGb3wt31q8UT4LmUJKs2miHNqkF66mtiqSvzRE81eTCA0Aw6ZZG0s4z +3/jNa/7YNeX5vbaFEnBdkKgbbFlfBKaAEexLQg2W8Uu7NL+5ydWb6Eso0vm7Z0L4WQo91tGhDr ncZytBYVuCMv5/KF6kne+sNQdw8FcLEetjRVRD5q4bG1qQGYowYUOfiCjSCG2U+kKQapukauOH4 7DXL4uRMH4da4IVWu9A6tfo9CewI9pTYKqCIXi4bmaI8DbbQ8rwMj660M/bcYOj3pRyVWgR2EGz bYFCaai5kuZ5al/2Gyedd0GLwEuCnzkD6dk3hDj6c/ZotkxWtjOUYLtIXupFTH/bHoZyaBDuP3g neTMSfrnG2Ca8ksAdxci2wnoNKlypFcN0A78mD+gcXUA/bBf2AuyfYcUdVZ/zdvnhIh7Q0HXmgh eWe+3 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 Reviewed-by: Konrad Dybcio 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>;