From patchwork Mon Dec 9 11:02:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 13899292 Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.49]) (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 9B9AF21A935 for ; Mon, 9 Dec 2024 11:02:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733742160; cv=none; b=WdVVE2u/HBj9tc+i6KzGyr7zGMjpnUaQAiEmPpXHmCefYEsPkk1VFXhZh3VFhDnkQtG09XRa8JPuu7/1m0KGLugN6Vu5EobcVlJaBGF635AAZG5S2tAmfTk0g4nAcduXQPV781vdmnNbk9q8hPc6M8+0v+GjI0rNOCVFVQu9+SE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733742160; c=relaxed/simple; bh=ojNBKn2Cn0kL/c1PWCkFJmK3q2qRhAktzyUnFGcbPSU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HLYUxG7HNMguq84DKFrou/NBvLOSGt6hRr45n/AyV1pHsMBQSjtZWaKWw01ZZPuPD7R/O5fehsdXaq3fThCR+JxEeTvQZu3hWI+ZIPeakVrL6ukMQ2otnDtNt31jDkDFb7HgKTgDGM4lchefrt2ITbzoRNsIAe2jOgB5z5xIf/s= 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=G+o9abM0; arc=none smtp.client-ip=209.85.208.49 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="G+o9abM0" Received: by mail-ed1-f49.google.com with SMTP id 4fb4d7f45d1cf-5d3c0bd1cc4so236829a12.0 for ; Mon, 09 Dec 2024 03:02:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1733742156; x=1734346956; 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=AiJezWnFLPyP/UDR+sDZkKbQNqEaekKVv8EfgzgM7q4=; b=G+o9abM0/4OXgRK2aLVOaJeHnuRHlHsIa7FGYmQ5mAQkJaC51Rt0hwavUstezbtS1C a0g7blklzP3PH9wj/66zUbn6i/4wpcYGl36PU7OvD1wr84Oj8mehb1AYgTuww+bK4KPL /4YQTFVALWfeewH8A+60O3jcLg7MFb/MwMyISXmGFkpkFjNVsgkrjJj4k+XP1LlgLor2 lrPqicGIRfMgpee9vywLp7vwTwuXEZnq3W7XMCDn3LIycRuzEv8wtjX7i/OUGiJjl7Oc SiZsI1bKwAlMw4RF7Wr7vK88mwRKJRrJVAqXdHSl00gPBXQCYPNSDwng4NqZftG8UHlE F7dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733742156; x=1734346956; 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=AiJezWnFLPyP/UDR+sDZkKbQNqEaekKVv8EfgzgM7q4=; b=n5iyRDw+oWF/HfMIxOf88Zw6vNJr50KMGTdiq6m+TbSzk9U/OQR+bdYJy69aT9UkH0 3hQw67Vmn/psV+cIxR+0s34m0rRTyro88wdbNER2lVWiL6JVb98Qx5z6PC893XWvpu0X IU+OTLMkRG+z+2YH2O6Mhe1ld7OvYdpXsyD+OB31+DH62PLY54+0/7airdnNut1aNB35 3niP3kADM9qYjRa40LPqJNV25OunKR+k5P+ZzDtgMbexrmExU1CO3omMkwEMTj2qnYlK Mv12ryqV1XyFmtiaCE0V1imWWt2AZNVbwOlB5v48FhXLYvZtwUdfCiWPwKbaEKvtC0tR 2uKg== X-Gm-Message-State: AOJu0YzMe60R4AopbyueMdhshH/xdUJT20pus7wfFQateclA3dCmgO11 wctZ3/ubzYu20SplruWq1KWuFjJhe+bm0r+QBQKoJ5e/m4sbffSO+s9W778aQaI= X-Gm-Gg: ASbGnctmJ6QYDr/4udLdh7RsNgv58WMg1HctA4Ja/x9iYQS4MWJ7ffqpNdE101dUJHg i1AV+PFwNdqggWionQmKi21zjLo7MKNL8VzM5JVXbPmmxG3gym2DcRVy5JDsobyKGJFj0WZt2wf QDZCrg3RhZGfGHiko/nnzOOTGjvpA7HbgAQ418UIOKPOj6NxKKv5v9089HU2uQXwphEskMVwa4B Voa/FE9BwG/39ZG2dcI9fRXoM3YMTO1ymCWUVpeLVs1TEqQDLrTCKi7p58bGy4Xyjqf5g== X-Google-Smtp-Source: AGHT+IGKXwbCUPH3IuMuyf0snHk+QvGd4G+6BUZERDpK+riKYxJ+eGLFzrJ3iPmZVjP0/DWHQxG9Aw== X-Received: by 2002:a05:6402:40c7:b0:5d0:eb6b:1a31 with SMTP id 4fb4d7f45d1cf-5d3be6ae309mr3445049a12.5.1733742155894; Mon, 09 Dec 2024 03:02:35 -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.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2024 03:02:34 -0800 (PST) From: Krzysztof Kozlowski Date: Mon, 09 Dec 2024 12:02:09 +0100 Subject: [PATCH v2 04/19] arm64: dts: qcom: sm8450: 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-4-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=7362; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=ojNBKn2Cn0kL/c1PWCkFJmK3q2qRhAktzyUnFGcbPSU=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBnVs4zau1QfwAGKYpqrqIHNBY2ZKXAp+oLLbGFn xV2Bn6XLYiJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCZ1bOMwAKCRDBN2bmhouD 1zx9D/0Xl0QeWsWUx7GCSma6eq9wWiq2xDTI5GOKaNSI5ktZDOejXE6hSLrY8MG6CuoiRB7d29N ZK7c8R2GQwyQOB6wX4HcJXLJh95UEg1VJiNHNqRZt0mCH5PiL62ve777ua5EsjpVtVomMPrNyl/ E3I342Cf7a4t5N4LOTmJzpT5Qau90aaV55JYb9jt/FPcIuifCxHViqJoWkB9R8VE0iHD14Z6jpv j+G0IXz3y73KIIRIjjr26FnYnxAQBo3JQ6mTl9tl1qdbHhN2ZOF59NvyxN3CRUov2wWzhcaVXbQ 2PgvwenfDNJ4UBMkONp09jE2b8Agpl5SJhvCVd1MEEEWtXLxr/4wIm4WicRWSMjCXWxpoWvgsL1 mvyU+hoGdr+vGJa72Tm3qZBDFXgGaBeSzhsxvxga5loinLDT/QN7Z3i/esXseua6gb+o9joxFO2 R76Aoi+JFlods+RuNmQlte1oFcm5g/g6/X0BZgKMDV1Kk25t6KzDIu3ZaAZ4BAGhiFqr+BxiZRA TSjgNvplyw9AO3OIHXYi9Ss7MQzAc3Nji7/mwfHqXbsdSNlF5bMiv3JKJVpNOB/uriX43aXFkQT jkIx+cglERVfgagsyCm1/CFQ1gEO5LZk+LYMawIjWcLVWvd6hco/Eemg2wvp0eWh+099S23CYL5 hxg51fXudYt0AJw== 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): 0x0300_0000 with length of 0x10000, which also matches downstream DTS. 0x3000_0000, value used so far, was in datasheet is the region of CDSP. 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: 1172729576fb ("arm64: dts: qcom: sm8450: Add remoteproc enablers and instances") Cc: stable@vger.kernel.org Reviewed-by: Neil Armstrong Signed-off-by: Krzysztof Kozlowski --- arch/arm64/boot/dts/qcom/sm8450.dtsi | 212 +++++++++++++++++------------------ 1 file changed, 106 insertions(+), 106 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8450.dtsi b/arch/arm64/boot/dts/qcom/sm8450.dtsi index 53147aa6f7e4acb102dd5dee51f0aec164b971c7..d028079c11bdc2dd2b254f7f7d85e315a86f79bc 100644 --- a/arch/arm64/boot/dts/qcom/sm8450.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi @@ -2496,6 +2496,112 @@ compute-cb@3 { }; }; + remoteproc_adsp: remoteproc@3000000 { + compatible = "qcom,sm8450-adsp-pas"; + reg = <0x0 0x03000000 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"; + + memory-region = <&adsp_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>; + + 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 0x1801 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>; + }; + }; + }; + + 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 0x1803 0x0>; + }; + + compute-cb@4 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <4>; + iommus = <&apps_smmu 0x1804 0x0>; + }; + + compute-cb@5 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <5>; + iommus = <&apps_smmu 0x1805 0x0>; + }; + }; + }; + }; + wsa2macro: codec@31e0000 { compatible = "qcom,sm8450-lpass-wsa-macro"; reg = <0 0x031e0000 0 0x1000>; @@ -2692,112 +2798,6 @@ vamacro: codec@33f0000 { status = "disabled"; }; - remoteproc_adsp: remoteproc@30000000 { - compatible = "qcom,sm8450-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"; - - memory-region = <&adsp_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>; - - 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 0x1801 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>; - }; - }; - }; - - 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 0x1803 0x0>; - }; - - compute-cb@4 { - compatible = "qcom,fastrpc-compute-cb"; - reg = <4>; - iommus = <&apps_smmu 0x1804 0x0>; - }; - - compute-cb@5 { - compatible = "qcom,fastrpc-compute-cb"; - reg = <5>; - iommus = <&apps_smmu 0x1805 0x0>; - }; - }; - }; - }; - remoteproc_cdsp: remoteproc@32300000 { compatible = "qcom,sm8450-cdsp-pas"; reg = <0 0x32300000 0 0x1400000>;