From patchwork Fri Dec 13 14:53:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 13907294 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (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 2CC111EB9E2 for ; Fri, 13 Dec 2024 14:54:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734101683; cv=none; b=q/NGuYsAKxHGCefxW80La6hoU7ccOCrj4ezonL1IUOoa4s6AQ32f+whnIgDqMA3xSTvpbNWHJmF2jL9biE6I9Dohzcd+Dh/rTeLLmuDv0dvxTyjKuTOo/HR2RGjo55VbzVb1v6UKvjo8ivIuGR793Z2R9mh+tRtEBb8Y8/Yfzn0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734101683; c=relaxed/simple; bh=69rRyzD7UVwsDJrvawwBIb2zszx7qa/tJWcDrcRmByM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=A4GrYL4Uc5OiHsKDqSY6UPOZHYCPPVeObGf7hS+ParOk7hGwEVMmYvKN8YBv6Xo0fK3vXIklPkT4oFea7Aypcc17/t2kH5Wt7FJD7D807CnzjihzWub1T/v83n4XRkAq0rciYZxF0PjTrtDxR4esCeVJHbnYQkDNVI/RC6wpLz0= 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=UMKivv1K; arc=none smtp.client-ip=209.85.128.51 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="UMKivv1K" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-4363298fff2so470035e9.3 for ; Fri, 13 Dec 2024 06:54:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1734101679; x=1734706479; 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=GBsKHrKNRUATgmtRwROOAjv7TEkAzQZ7Y8QwFCRkRf0=; b=UMKivv1KRkLwm1iL0XmhQOe55e+kKo1qC8E7/8GlE3VyX6CE4bZLGeCFD6X9d+zv+z KQ0h9/yHw/PxBAvv7ca9PYae+ZPnuaZtg0UmLCEwtnvUTmAi48+WdzW8xBIXVP9JBB9l BJBvOZme61cRTPIzOnJuAhN/ipUfrfJdte2yBe1vFoEW1v2yN/ReEQeSsRwhDcMuJwb3 jlEnXIUX9xXjcbrJqHqr98xe5a+ncP8PA1VKFHRzpukaIY0BjElNIlwUNr7ebnJjTvTK 6gNheIo3iC/lc62MX3tt3R2CDQ89npYOIHXjcgV9oCXhulBkey6DWGECDzKTH6hO497W Q84w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734101679; x=1734706479; 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=GBsKHrKNRUATgmtRwROOAjv7TEkAzQZ7Y8QwFCRkRf0=; b=uflH7/ChV//gzUefkjLFW0hLctaaq+R1QPvBngK2OHdrFyKQv/TsPU5t/0DxeB6ouF 6ii8r+wnUhiXGpo4dZb1TOI62YzyxGfCvEhCjwTb0Zu/c7uwCq4O5UisJWTE1fJa0VET oDyGh2ep+AQCq/21LlZONPgrU09M1Pq7zV6Tc+Fly5Eu0+Ipre2lIu8bG7TBsOTk4iSZ L+qMo92z8iRoBQDKawQQJmd4ZosRdwJUjZEnKEUq0Mk3M2aAk82AUX/ugh4853pXzPUS aB3NwXITgp+T7a6ydQjlgg8BSQw5YbaOYz/279uPHwO+FaSzlVglXyCPuZAFUct+4yEe o94Q== X-Gm-Message-State: AOJu0YwUdlNBgQEPjAXyCatFXRqsHev2mHMFDBoTL8KKOdWWrh4vCkTf 9bpgHclpnzIiooley0DUMiRSool9KAJstCOTla0znQLqQrwkx7gwkHyFOEwgPaI= X-Gm-Gg: ASbGnctyPjp6qWH2hteUOx48XY4GlJkXx6a9G6Biuj6/mtd4mVCASM2bijSKYf8oMOw usGMkI6LvvqNPv22ICuboUkI4ZelVbRi/nVWdXqmXvvpJ7agNs8ANaPkWqxGBJUbbwUbALlzNb3 TDKMH31v+3Q8p2y5dhIXV/SLLej6lX+1Iq+Tk7nvZMWaXJDeZ04JkFMVySnqOri3QHQTifac5Ws yhsn9C2PouL6832N7JrnE7bOuAIJ2qps/wbf4PhhcxQKJMwWW87zIiED+l77tdlcdv0oa+B X-Google-Smtp-Source: AGHT+IHWtY+8L60nN1CkdSfPFX/jy31Yzj9z+k8xUzZqCrBDCpokA7rcZhw7VpbMxM/KME5eq9cafg== X-Received: by 2002:a05:600c:5128:b0:42c:aeee:80a with SMTP id 5b1f17b1804b1-4362aaaa5c1mr9744455e9.7.1734101679543; Fri, 13 Dec 2024 06:54:39 -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.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Dec 2024 06:54:39 -0800 (PST) From: Krzysztof Kozlowski Date: Fri, 13 Dec 2024 15:53:59 +0100 Subject: [PATCH v3 10/23] arm64: dts: qcom: sm8650: 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-10-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=9337; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=69rRyzD7UVwsDJrvawwBIb2zszx7qa/tJWcDrcRmByM=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBnXEqQLEYPAUb9fY32+ZAj2+SFDuCeoALmMg12e sv5F/zBkcGJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCZ1xKkAAKCRDBN2bmhouD 160eEACAUY81sM027jQAu/6dA64eyGU9giIWUOOxqB8VmdmxtUGWbQjXeLqBf+R4NcdsDaC/vEV beIvoA5fZA5tqc8KYkbBOp22H1fEPY7gcyX9nBzQQy10MwuPb5JmNkQdsiOCHaocQgyLTQ8zLB1 5YM3sAbTCKo0/D56NVQFTfWC0EDyLS6s9bFH5/Xe3Qy6EpZfRfaMHGSTVlfyDDwho+32vBzG5Py L6Tv4PKBf8g2kqDursTXFK7J7POKrxWpa6vyNeDl5gH3t0DqAE6KH4yR7A3zWvXox0yQm65oqTH g1patEfNQ+1p9RyJ+AaOXbA1MqE83hdp93TJHz60UHupS5U6DUEhg8BVqmVbLfvdgyNMI8YddZh JQzldA4fI82aRw67I3PoMJWzyKHg16yjS5xnNfqPkyGFe+BWtfA55FVanTeK+iFS7rMCVFEc0IJ 7RdT0VVrDh4XRO0OxtaPnsW/XFV+M4c/9pifCzX0m8Pvv/GLuFCWxDcH7ev2JrSBY05Td//FtBk NtfEEkrxkZNGs0eeL5vaJ8v6oj7uPaS2g+O2VytPH6Ew3ysmO1l00Mc3XGeXpfXM9Cdh82ysQ3K Kv8N97zscVBeMMWdUBqrkPTWjXdOCDnHWGiAOVRF5J8ALqgtNNlmjoKT3V66n5Fxhc2+ebsgE7u D2qSEbLE20I0S/w== 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: 10e024671295 ("arm64: dts: qcom: sm8650: add interconnect dependent device nodes") Cc: stable@vger.kernel.org Reviewed-by: Neil Armstrong Reviewed-by: Konrad Dybcio Signed-off-by: Krzysztof Kozlowski --- arch/arm64/boot/dts/qcom/sm8650.dtsi | 296 +++++++++++++++++------------------ 1 file changed, 148 insertions(+), 148 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8650.dtsi b/arch/arm64/boot/dts/qcom/sm8650.dtsi index 25e47505adcb790d09f1d2726386438487255824..95ec82bce3162bce4a3da6122a41fee37118740e 100644 --- a/arch/arm64/boot/dts/qcom/sm8650.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8650.dtsi @@ -2904,6 +2904,154 @@ IPCC_MPROC_SIGNAL_GLINK_QMP }; }; + remoteproc_adsp: remoteproc@6800000 { + compatible = "qcom,sm8650-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"; + + interconnects = <&lpass_lpicx_noc MASTER_LPASS_PROC QCOM_ICC_TAG_ALWAYS + &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>; + + power-domains = <&rpmhpd RPMHPD_LCX>, + <&rpmhpd RPMHPD_LMX>; + power-domain-names = "lcx", + "lmx"; + + 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>; + + qcom,remote-pid = <2>; + + label = "lpass"; + + 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 0x1043 0x20>; + dma-coherent; + }; + + compute-cb@4 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <4>; + + iommus = <&apps_smmu 0x1004 0x80>, + <&apps_smmu 0x1044 0x20>; + dma-coherent; + }; + + compute-cb@5 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <5>; + + iommus = <&apps_smmu 0x1005 0x80>, + <&apps_smmu 0x1045 0x20>; + dma-coherent; + }; + + compute-cb@6 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <6>; + + iommus = <&apps_smmu 0x1006 0x80>, + <&apps_smmu 0x1046 0x20>; + dma-coherent; + }; + + compute-cb@7 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <7>; + + iommus = <&apps_smmu 0x1007 0x40>, + <&apps_smmu 0x1067 0x0>, + <&apps_smmu 0x1087 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,sm8650-lpass-wsa-macro", "qcom,sm8550-lpass-wsa-macro"; reg = <0 0x06aa0000 0 0x1000>; @@ -5322,154 +5470,6 @@ system-cache-controller@25000000 { interrupts = ; }; - remoteproc_adsp: remoteproc@30000000 { - compatible = "qcom,sm8650-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"; - - interconnects = <&lpass_lpicx_noc MASTER_LPASS_PROC QCOM_ICC_TAG_ALWAYS - &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>; - - power-domains = <&rpmhpd RPMHPD_LCX>, - <&rpmhpd RPMHPD_LMX>; - power-domain-names = "lcx", - "lmx"; - - 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>; - - qcom,remote-pid = <2>; - - label = "lpass"; - - 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 0x1043 0x20>; - dma-coherent; - }; - - compute-cb@4 { - compatible = "qcom,fastrpc-compute-cb"; - reg = <4>; - - iommus = <&apps_smmu 0x1004 0x80>, - <&apps_smmu 0x1044 0x20>; - dma-coherent; - }; - - compute-cb@5 { - compatible = "qcom,fastrpc-compute-cb"; - reg = <5>; - - iommus = <&apps_smmu 0x1005 0x80>, - <&apps_smmu 0x1045 0x20>; - dma-coherent; - }; - - compute-cb@6 { - compatible = "qcom,fastrpc-compute-cb"; - reg = <6>; - - iommus = <&apps_smmu 0x1006 0x80>, - <&apps_smmu 0x1046 0x20>; - dma-coherent; - }; - - compute-cb@7 { - compatible = "qcom,fastrpc-compute-cb"; - reg = <7>; - - iommus = <&apps_smmu 0x1007 0x40>, - <&apps_smmu 0x1067 0x0>, - <&apps_smmu 0x1087 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>; - }; - }; - }; - }; - }; - nsp_noc: interconnect@320c0000 { compatible = "qcom,sm8650-nsp-noc"; reg = <0 0x320c0000 0 0xf080>;