From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (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 B8C2F20E038 for ; Fri, 6 Dec 2024 15:43:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733499794; cv=none; b=cxo97tqr9Fk480QVi2e5D+u2VTEaUKEsdKfPpCMl4ZaEoFdcwlSNuRdqRAafhgI1YkyrNur7U9h8ZWt0yA/8T3yOSokzuJAIm5M06gKIuB37c7yhWgqkpDpim0PqQQIqiJ8ZZA7syfKGMA+TfCkUVe/GO/tSdjr4W+qSdcNixF0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733499794; c=relaxed/simple; bh=3P9Re4i5OetH50KMbpHgNl1Mz2sO8eUJ84qtwUpCAMQ=; h=Message-ID:Date:MIME-Version:From:Subject:To:Cc:References: In-Reply-To:Content-Type; b=WMn4n36aqCuU7kUcAy9qLxkAG+ahzSEFuK+11Hsd0pou+yIXn6jKCf/3WYdHHTWzvLJ5p0YBHS9Pj9Gv2xTyvXMjcGXKW6ZyfKYQDZnULGEVnnY68r7EV9E4vBfdgwpzk1Qa4gJJhlg2n89KTpKDmDN/f8Khy3+ldkH3r652iBQ= 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=e6yPEfYb; arc=none smtp.client-ip=209.85.128.44 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="e6yPEfYb" Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-434a10588f3so14857855e9.1 for ; Fri, 06 Dec 2024 07:43:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1733499790; x=1734104590; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:references:cc:to:subject:reply-to:from:user-agent :mime-version:date:message-id:from:to:cc:subject:date:message-id :reply-to; bh=9l+8hgcOTP5OFgWjraHM7FKjybQxrDym2khU0s5Y4U8=; b=e6yPEfYbfoPHCrzOhCybnjvnxvQhmTt/bOFZdvgge5EDS5o+iB8s5istbbSY7/Nk49 Nu17fB525TwxCU0bIRhGsP+961Hao01+9f5xRSD9TAjqmh0336OhZ5JF0zgwS3DEYNdQ THAtuFBzCMprA6F+Rppn7W8J9LFgnpJn4I+vkyiTJWnEktToomKqMnyDkIPK5XCJiNkG fgt7/2S9KAcW54CRG7Qgz9EYwWCs12OsmF1cj0KphoLsaQJQwXySPAfGz6XxUGCPnvbE RvfzH1pOf5irKP1wIx/UzIAC3s2BZC4pIx/KarDhGXgoku4WmwfVwQPA5rbHRSgQjZyO mDUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733499790; x=1734104590; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:references:cc:to:subject:reply-to:from:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=9l+8hgcOTP5OFgWjraHM7FKjybQxrDym2khU0s5Y4U8=; b=k4YsfqAK6uIziJJvTx77dmkbtUpWYEMB1cDRm3i71cccuydac6vhwr/B6nOQ3GJkHK aXQmK8C2/bleq25PaJt7QoJ4A/WnpNrwozMGErwlwAW6IwY1s5q6FDhnmUejzjmeEhE7 3vtkO6d+JSFMdmcGDlj/ATkT8tdm+DtfmCzCkRJJ4sCM0TZmpteyQ+fLY/+GU5ND2O2U Zx1ah6+Le6n9GVz0hvvDo4JwJ2msXLB10pFK+gBuk67MasKToFpaNRxJVyco14VYkYuH xtrrVURjdjR/+imZZd+LIF+zjk39ZI/oZ87EX99PdI5B11bXO73KWwoo6/3NViv3UlEd mrhg== X-Forwarded-Encrypted: i=1; AJvYcCVjpkmMoAL0yvbOEKXL6nso4kN8P2j9urO5rf0fQTC7/p5sht52XDriLx48LxAcJQVzxmT9G2VCwnM/5iI=@vger.kernel.org X-Gm-Message-State: AOJu0YwIAJP+y3SAi4ZKN4fzXPfc2HBCD8qDxpFrikngRY9k4uLAORC6 0lIKRCpTi8b+7oXbrCs/t6SeJtLTtnYkuuvSa0ueYsH0VMjxuDt/qAEuFCkIEMw= X-Gm-Gg: ASbGncvguikSufo1pyVF5VFuzmMErg1GapRHM+7OJKbB89Go9GdeYUxLi/OgBYD4EiK kE4qCFAlqZAcl5Akb3KdnazABYYf78PBQAmMt8+XlaISNmohIKIzvIYAvb+9q0ej2xvP2vbp2fz 8NU7nhAvBBZBmvLn2f/D/YU8nvpVuyD4uGQ9jaHUej2GSCofMLWKVLInc41qpAWb05Se/M5tKeC Q9UnCaLu570ePx/wNBniChWfSl0IObosWg3uCtApFY00xSQOchq4pXedp02I+G3uAC7HRGTnlGN OqpQbfTDX/3cJDjTZ+ULFmCY0uE= X-Google-Smtp-Source: AGHT+IE5koNuNvxPmbBViCOCRoO80TeAOdiVnlHy3nwK1dS8c910DR8sA2rJ08WXFiinB416K1zXyw== X-Received: by 2002:a05:600c:1f8c:b0:434:a1e7:27b0 with SMTP id 5b1f17b1804b1-434ddeb5379mr29307995e9.11.1733499790060; Fri, 06 Dec 2024 07:43:10 -0800 (PST) Received: from ?IPV6:2a01:e0a:982:cbb0:bf3a:f04c:5b99:c889? ([2a01:e0a:982:cbb0:bf3a:f04c:5b99:c889]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38631f73237sm448908f8f.62.2024.12.06.07.43.09 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 06 Dec 2024 07:43:09 -0800 (PST) Message-ID: Date: Fri, 6 Dec 2024 16:43:08 +0100 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Neil Armstrong Reply-To: neil.armstrong@linaro.org Subject: Re: [PATCH 07/19] arm64: dts: qcom: sm8550: Fix ADSP memory base and length To: Krzysztof Kozlowski , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Vinod Koul , Dmitry Baryshkov , 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 References: <20241206-dts-qcom-cdsp-mpss-base-address-v1-0-2f349e4d5a63@linaro.org> <20241206-dts-qcom-cdsp-mpss-base-address-v1-7-2f349e4d5a63@linaro.org> Content-Language: en-US, fr Autocrypt: addr=neil.armstrong@linaro.org; keydata= xsBNBE1ZBs8BCAD78xVLsXPwV/2qQx2FaO/7mhWL0Qodw8UcQJnkrWmgTFRobtTWxuRx8WWP GTjuhvbleoQ5Cxjr+v+1ARGCH46MxFP5DwauzPekwJUD5QKZlaw/bURTLmS2id5wWi3lqVH4 BVF2WzvGyyeV1o4RTCYDnZ9VLLylJ9bneEaIs/7cjCEbipGGFlfIML3sfqnIvMAxIMZrvcl9 qPV2k+KQ7q+aXavU5W+yLNn7QtXUB530Zlk/d2ETgzQ5FLYYnUDAaRl+8JUTjc0CNOTpCeik 80TZcE6f8M76Xa6yU8VcNko94Ck7iB4vj70q76P/J7kt98hklrr85/3NU3oti3nrIHmHABEB AAHNKk5laWwgQXJtc3Ryb25nIDxuZWlsLmFybXN0cm9uZ0BsaW5hcm8ub3JnPsLAkQQTAQoA OwIbIwULCQgHAwUVCgkICwUWAgMBAAIeAQIXgBYhBInsPQWERiF0UPIoSBaat7Gkz/iuBQJk Q5wSAhkBAAoJEBaat7Gkz/iuyhMIANiD94qDtUTJRfEW6GwXmtKWwl/mvqQtaTtZID2dos04 YqBbshiJbejgVJjy+HODcNUIKBB3PSLaln4ltdsV73SBcwUNdzebfKspAQunCM22Mn6FBIxQ GizsMLcP/0FX4en9NaKGfK6ZdKK6kN1GR9YffMJd2P08EO8mHowmSRe/ExAODhAs9W7XXExw UNCY4pVJyRPpEhv373vvff60bHxc1k/FF9WaPscMt7hlkbFLUs85kHtQAmr8pV5Hy9ezsSRa GzJmiVclkPc2BY592IGBXRDQ38urXeM4nfhhvqA50b/nAEXc6FzqgXqDkEIwR66/Gbp0t3+r yQzpKRyQif3OwE0ETVkGzwEIALyKDN/OGURaHBVzwjgYq+ZtifvekdrSNl8TIDH8g1xicBYp QTbPn6bbSZbdvfeQPNCcD4/EhXZuhQXMcoJsQQQnO4vwVULmPGgtGf8PVc7dxKOeta+qUh6+ SRh3vIcAUFHDT3f/Zdspz+e2E0hPV2hiSvICLk11qO6cyJE13zeNFoeY3ggrKY+IzbFomIZY 4yG6xI99NIPEVE9lNBXBKIlewIyVlkOaYvJWSV+p5gdJXOvScNN1epm5YHmf9aE2ZjnqZGoM Mtsyw18YoX9BqMFInxqYQQ3j/HpVgTSvmo5ea5qQDDUaCsaTf8UeDcwYOtgI8iL4oHcsGtUX oUk33HEAEQEAAcLAXwQYAQIACQUCTVkGzwIbDAAKCRAWmrexpM/4rrXiB/sGbkQ6itMrAIfn M7IbRuiSZS1unlySUVYu3SD6YBYnNi3G5EpbwfBNuT3H8//rVvtOFK4OD8cRYkxXRQmTvqa3 3eDIHu/zr1HMKErm+2SD6PO9umRef8V82o2oaCLvf4WeIssFjwB0b6a12opuRP7yo3E3gTCS KmbUuLv1CtxKQF+fUV1cVaTPMyT25Od+RC1K+iOR0F54oUJvJeq7fUzbn/KdlhA8XPGzwGRy 4zcsPWvwnXgfe5tk680fEKZVwOZKIEuJC3v+/yZpQzDvGYJvbyix0lHnrCzq43WefRHI5XTT QbM0WUIBIcGmq38+OgUsMYu4NzLu7uZFAcmp6h8g Organization: Linaro In-Reply-To: <20241206-dts-qcom-cdsp-mpss-base-address-v1-7-2f349e4d5a63@linaro.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 06/12/2024 16:32, Krzysztof Kozlowski wrote: > 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: > 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>; > Reviewed-by: Neil Armstrong