From patchwork Wed Jan 18 16:25:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 45379 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2434512wrn; Wed, 18 Jan 2023 08:32:09 -0800 (PST) X-Google-Smtp-Source: AMrXdXviozGIs3N3r42aNDRXGz3L6Di9xgf0go+QAQsiP2bHaVWqJOTCELF/JnEmHDrZiojPC6tj X-Received: by 2002:a05:6a20:54a7:b0:b8:3131:75cc with SMTP id i39-20020a056a2054a700b000b8313175ccmr9827315pzk.19.1674059528737; Wed, 18 Jan 2023 08:32:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674059528; cv=none; d=google.com; s=arc-20160816; b=JRe+p4KSOceSSaEh9XMTStRKDyHqDD9rv6rkj0NBcXHDZwbOo/vECqXJ6/pgZjCLH2 hXBspH5h077+bT302k3++Dp9/S+t3BbMCxjcXQV0nzk87u5kJonUtEpFoOYgyRZZyYK7 X97iurEPzwP0pfhskRFlQoAqtWTLMxMllJRXxKccYv/fhnnzhxDqVsI159XC2VDRCJ9Y 4GDWhE973rqoWD/UVHvlDPe/k963V2yT8AyT4znHO81p/VOxEyluY1XRgurM+09VKq6e BG1fpatJgTQ/jQzzSWTg5bpf2k2n9szJtJLL4CJnvFMIBR3nh7q3924lsDtgFB2XFZVZ TB1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=n5Exmqod7rYxyDVLS9FkOBJX2qhHGgIWItdN+1JD6iM=; b=k4IQXccLn/9XzEMmytME1c6Ztf/jZdpz+vWU6hUGEEZM+aQ/TFxC9j03JfboyUNTIp kNTCGNTKSZqMnrskOeSr04Bq1cpY8YjLQcdwURYepPsbYJP5fiXHBXssFoQsmBlFje96 dNZFD+9eJepNqk2CWshtzxdHty0fv728mSMdUygW1zWOzGn4n+i/JTXo5rb3vNpjlyhN 9B4c9VbWQ6Pao+tgNrR2KMvRepUGxWvNvaqDmOml+3SwwCQT+mTXZes33nQ5T0PNC2A1 yqDpUAdWLpptq2KRw8xahOdBvSjgNPmnSaJYSIYaYvnWiwW0BZNidqCyGAC+OpKjCZV5 Eoug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Kp8CojqR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x23-20020a634a17000000b0046fec9f9ed8si35784248pga.704.2023.01.18.08.31.56; Wed, 18 Jan 2023 08:32:08 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Kp8CojqR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230181AbjARQ1r (ORCPT + 99 others); Wed, 18 Jan 2023 11:27:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58522 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230143AbjARQ1V (ORCPT ); Wed, 18 Jan 2023 11:27:21 -0500 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 11DB558961 for ; Wed, 18 Jan 2023 08:25:17 -0800 (PST) Received: by mail-wm1-x32e.google.com with SMTP id k22-20020a05600c1c9600b003d1ee3a6289so1947061wms.2 for ; Wed, 18 Jan 2023 08:25:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=n5Exmqod7rYxyDVLS9FkOBJX2qhHGgIWItdN+1JD6iM=; b=Kp8CojqRPzwg0gnuCcldt7j8PZf5BgsV6fhJwA0cZqV8qIH2kb/BwSJENcOce8fjuX Ov7cQPWFmZSkezEWMQksWgVVrGWG2RpOpqOPrlXuRT69savpHxiyQoN3rZmxYe95x7v/ yBM8SVkjtZ2aE3jN4SjuIJt5s4wp7c47PdJf63tlYWlabGfWIOQmzDWBo9OXBjcDbaEO v9+NBIHoyDR/wyIZlv2jz4Df2zCMkJ1tQK/l2fWXtTdnBZ/O6EbAMfZ7y1pa4zB7P89e enRHzWA1PPEnjKHJiBBHhlEkFU+F1QoMYxjPsHZjU4fa95xaOeHbpwtrZb5+UVmRCpb1 L5Ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=n5Exmqod7rYxyDVLS9FkOBJX2qhHGgIWItdN+1JD6iM=; b=1V1mM4rrKhFyHHKxwjEAWZ9M8Zz+hrazbcWdIQlTJcVeCzZwPK7WdIVvLOxvFSlhIv KEyENdpUkGB/7gHSFEVw3kyU7ecvgHgGsPSJ8xV+84/it0ZZD9FD6Iwkq5eQjIyeOxEo k9QPVDQjwOq5gfKgT1CPUjY6ZrcD8XLAFakWElwJX2eIOtlHAbVLImYEuALpyhoZx7l8 r4+ZlFGDDGOAMA/Isac22Uhafr1IkhlOpnHbDMmuUYeubRDEKncKLEtMbc1LpZyawYIx QDRr7PERoUAp5JNIQgwxtIzUHaXyeD1CIr/dYb/f4phllX759fmOiUAtrX71c9ix2JKd XWiw== X-Gm-Message-State: AFqh2ko5bB3NzxXyISFaG/mURJdm4tiyW4ft5OpZiJ1oskpSlH0P6jif 4pohpA4TODxyz7E6EZcgpItJ7Koz6TZQS0JEkRM= X-Received: by 2002:a05:600c:1ca4:b0:3da:f5b5:1401 with SMTP id k36-20020a05600c1ca400b003daf5b51401mr7529549wms.31.1674059115623; Wed, 18 Jan 2023 08:25:15 -0800 (PST) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id m27-20020a05600c3b1b00b003db012d49b7sm3670695wms.2.2023.01.18.08.25.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 08:25:15 -0800 (PST) From: neil.armstrong@linaro.org Date: Wed, 18 Jan 2023 17:25:11 +0100 Subject: [PATCH v3 1/3] arm64: dts: qcom: sm8550: Add interconnect path to SCM node MIME-Version: 1.0 Message-Id: <20221115-topic-sm8550-upstream-dts-remoteproc-v3-1-815a1753de34@linaro.org> References: <20221115-topic-sm8550-upstream-dts-remoteproc-v3-0-815a1753de34@linaro.org> In-Reply-To: <20221115-topic-sm8550-upstream-dts-remoteproc-v3-0-815a1753de34@linaro.org> To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Abel Vesa , Neil Armstrong , Konrad Dybcio X-Mailer: b4 0.11.1 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755378644677998342?= X-GMAIL-MSGID: =?utf-8?q?1755378644677998342?= From: Abel Vesa Add the interconnect path to SCM dts node. Signed-off-by: Abel Vesa Signed-off-by: Neil Armstrong Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sm8550.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/boot/dts/qcom/sm8550.dtsi b/arch/arm64/boot/dts/qcom/sm8550.dtsi index 3d47281a276b..ee3e5150a976 100644 --- a/arch/arm64/boot/dts/qcom/sm8550.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi @@ -298,6 +298,7 @@ CLUSTER_SLEEP_1: cluster-sleep-1 { firmware { scm: scm { compatible = "qcom,scm-sm8550", "qcom,scm"; + interconnects = <&aggre2_noc MASTER_CRYPTO 0 &mc_virt SLAVE_EBI1 0>; }; }; From patchwork Wed Jan 18 16:25:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 45380 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2434533wrn; Wed, 18 Jan 2023 08:32:11 -0800 (PST) X-Google-Smtp-Source: AMrXdXvlb39zrB11rkUuXAO6nzTl0yoR+JQ1Zu8lGLvUJJX6WH1qKjjNBIuF/+5hwGnQ8rxeVvU+ X-Received: by 2002:a05:6a20:9893:b0:af:1a39:553d with SMTP id jk19-20020a056a20989300b000af1a39553dmr6161561pzb.14.1674059530944; Wed, 18 Jan 2023 08:32:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674059530; cv=none; d=google.com; s=arc-20160816; b=K32Dfq/cWXubMfLDxzluGTW7nAXCl1dXDSl7ftcVKBWcAOmjo9GVEf/x55pVwIHJPY 4jT11qrANecUk1UHkBHhXpWr9nRdTPgVTROt1GYbwNOt4Hxq5mJNvyXzsCeR3ImBQ+oU khYTl81rnUuFb8uMo+WaWSqonAUqRLTacNEq/Qhs+DklDD5Nm86ym7T1eUTGCIVYzSkV KqVKsb54AjkApHkuU38u1705TyktBsluzC4azkytbSKmgQUKRyR6xq/T6hDE1icafjxk R8obtPFKdMQkrMUJraFJDw+bOdK2ntsD3RJm/DHmJDupuPg0e/xLVICFGxcn4iGCiZus FNrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=hOclNqxJMc8W6WVvj69yNcLJ2v6PJKY1XvpbHS40Uoc=; b=NnMp4RwIBY6a/YvBFyB4C8TlboPqlT2jcRdE6bFJUUjz/5Of72z+H9OMO1EUijHyG8 B2smmDa/BajfnDquyyN3EEbN+ZuoqhpH/NnbrkJ3DriPxrZTzpRbb0ztepJ/YQ0SX2qI cCl1OlHF0/9i3lRM/ExU/s8yEUrQVSx3FyhgSMmF0FHqysLJQ5PGQp7Un6ww3M9YZPza Bo9DgRkpVENemASe9lR7bEux/vTG9V6i18bs9MZGVaMLath6peZwRxUp4gjh7r6ZhBOe eT+lrZQarguzWpgBOtcofb1X+qqFKVxUBVaGjtHYp0kYgBuGd4WVEVVRRarL0YLz6QXW kdCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=J+NGYLKn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g1-20020a1709026b4100b001867ea919bdsi33390302plt.25.2023.01.18.08.31.59; Wed, 18 Jan 2023 08:32:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=J+NGYLKn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229644AbjARQ14 (ORCPT + 99 others); Wed, 18 Jan 2023 11:27:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57360 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230166AbjARQ1X (ORCPT ); Wed, 18 Jan 2023 11:27:23 -0500 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E805958979 for ; Wed, 18 Jan 2023 08:25:17 -0800 (PST) Received: by mail-wm1-x331.google.com with SMTP id k22-20020a05600c1c9600b003d1ee3a6289so1947111wms.2 for ; Wed, 18 Jan 2023 08:25:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=hOclNqxJMc8W6WVvj69yNcLJ2v6PJKY1XvpbHS40Uoc=; b=J+NGYLKnSMXV0uu+voTTOnKvSUS2Xu9T7P7XMzpynszBuYRnlUzjkmmlSdfgY0TGZ+ XvhAZzPRbZdy0NelQ4vFO9AfFGQMjJHuVQQdyFk4uYXF6eEfffa7Ux81qWFpaZ0WF89c P9aooZrELFbH+Uum/qZ3fNRFtDYUqqBMFMbUO5VmNYSXRyTv0aWH5VLrAuMaC0gl0ytC 8zdFK1H9PUnpXPtfaWDACkgMh7VGDVzIUR2WzpLJhcsXDmrrjxUwxc1lKKDFm5icSxVY ur5W0fl/GnhWoJukRE4fqs74czalfw6P6AX5Au7nil2LrsK/8JJF4foSN8osKad0PQjk fVOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=hOclNqxJMc8W6WVvj69yNcLJ2v6PJKY1XvpbHS40Uoc=; b=ykNcgclr7FUKoDD3YkiieUgXlsKlDlo+tsSEmX9BJItY/1AbiuprxDM8BQE1eaekrp HM9rimf5qJJ7RbchFQC2UhhLRyxEAoOsy+wwojS0j0qIr4nbTvNn1ZLrj/yMy8rQvnfN HVEMhylJi8DtHqK/tYBGQd50OCf06l6ce2rnfcwGPflMUSq7vC3Jl9BoQbjHx+qC5yca I2G6dssFrpF2Wfuzpy4RF9areg5uzEAZMUn4CHAUcLJDRr788/2+pCHmO4NCrBaIY/jG DLtFd/zS3X7sOtI1dxaCm4pmivScW2wgEdlhVL/lxIyWjza99VdP1MKpK5Ob3eskijgE dbog== X-Gm-Message-State: AFqh2kpJdGinHEgEG2pkYA876T+0Nr5ehjbWSH6VYekmIwxyIuomViLB Iqk4WKiBpZzVpvePBsKjS4/2Dg== X-Received: by 2002:a05:600c:2116:b0:3d6:10e:68a8 with SMTP id u22-20020a05600c211600b003d6010e68a8mr3328857wml.0.1674059116508; Wed, 18 Jan 2023 08:25:16 -0800 (PST) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id m27-20020a05600c3b1b00b003db012d49b7sm3670695wms.2.2023.01.18.08.25.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 08:25:16 -0800 (PST) From: Neil Armstrong Date: Wed, 18 Jan 2023 17:25:12 +0100 Subject: [PATCH v3 2/3] arm64: dts: qcom: sm8550: add adsp, cdsp & mdss nodes MIME-Version: 1.0 Message-Id: <20221115-topic-sm8550-upstream-dts-remoteproc-v3-2-815a1753de34@linaro.org> References: <20221115-topic-sm8550-upstream-dts-remoteproc-v3-0-815a1753de34@linaro.org> In-Reply-To: <20221115-topic-sm8550-upstream-dts-remoteproc-v3-0-815a1753de34@linaro.org> To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Abel Vesa , Neil Armstrong , Konrad Dybcio X-Mailer: b4 0.11.1 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755378646853932103?= X-GMAIL-MSGID: =?utf-8?q?1755378646853932103?= This adds support for the aDSP, cDSP and MPSS Subsystems found in the SM8550 SoC. The aDSP, cDSP and MPSS needs: - smp2p nodes to get event back from the subsystems - remoteproc nodes with glink-edge subnodes providing all needed resources to start and run the subsystems In addition, the MPSS Subsystem needs a rmtfs_mem dedicated memory zone. Signed-off-by: Neil Armstrong Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sm8550.dtsi | 337 +++++++++++++++++++++++++++++++++++ 1 file changed, 337 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm8550.dtsi b/arch/arm64/boot/dts/qcom/sm8550.dtsi index ee3e5150a976..bfdb10e00141 100644 --- a/arch/arm64/boot/dts/qcom/sm8550.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi @@ -541,6 +541,15 @@ adspslpi_mem: adspslpi-region@9ea00000 { /* Linux kernel image is loaded at 0xa8000000 */ + rmtfs_mem: rmtfs-region@d4a80000 { + compatible = "qcom,rmtfs-mem"; + reg = <0x0 0xd4a80000 0x0 0x280000>; + no-map; + + qcom,client-id = <1>; + qcom,vmid = <15>; + }; + mpss_dsm_mem: mpss-dsm-region@d4d00000 { reg = <0 0xd4d00000 0 0x3300000>; no-map; @@ -632,6 +641,89 @@ hyp_ext_reserved_mem: hyp-ext-reserved-region@ff700000 { }; }; + smp2p-adsp { + compatible = "qcom,smp2p"; + qcom,smem = <443>, <429>; + interrupts-extended = <&ipcc IPCC_CLIENT_LPASS + IPCC_MPROC_SIGNAL_SMP2P + IRQ_TYPE_EDGE_RISING>; + mboxes = <&ipcc IPCC_CLIENT_LPASS + IPCC_MPROC_SIGNAL_SMP2P>; + + qcom,local-pid = <0>; + qcom,remote-pid = <2>; + + smp2p_adsp_out: master-kernel { + qcom,entry-name = "master-kernel"; + #qcom,smem-state-cells = <1>; + }; + + smp2p_adsp_in: slave-kernel { + qcom,entry-name = "slave-kernel"; + interrupt-controller; + #interrupt-cells = <2>; + }; + }; + + smp2p-cdsp { + compatible = "qcom,smp2p"; + qcom,smem = <94>, <432>; + interrupts-extended = <&ipcc IPCC_CLIENT_CDSP + IPCC_MPROC_SIGNAL_SMP2P + IRQ_TYPE_EDGE_RISING>; + mboxes = <&ipcc IPCC_CLIENT_CDSP + IPCC_MPROC_SIGNAL_SMP2P>; + + qcom,local-pid = <0>; + qcom,remote-pid = <5>; + + smp2p_cdsp_out: master-kernel { + qcom,entry-name = "master-kernel"; + #qcom,smem-state-cells = <1>; + }; + + smp2p_cdsp_in: slave-kernel { + qcom,entry-name = "slave-kernel"; + interrupt-controller; + #interrupt-cells = <2>; + }; + }; + + smp2p-modem { + compatible = "qcom,smp2p"; + qcom,smem = <435>, <428>; + interrupts-extended = <&ipcc IPCC_CLIENT_MPSS + IPCC_MPROC_SIGNAL_SMP2P + IRQ_TYPE_EDGE_RISING>; + mboxes = <&ipcc IPCC_CLIENT_MPSS + IPCC_MPROC_SIGNAL_SMP2P>; + + qcom,local-pid = <0>; + qcom,remote-pid = <1>; + + smp2p_modem_out: master-kernel { + qcom,entry-name = "master-kernel"; + #qcom,smem-state-cells = <1>; + }; + + smp2p_modem_in: slave-kernel { + qcom,entry-name = "slave-kernel"; + interrupt-controller; + #interrupt-cells = <2>; + }; + + ipa_smp2p_out: ipa-ap-to-modem { + qcom,entry-name = "ipa"; + #qcom,smem-state-cells = <1>; + }; + + ipa_smp2p_in: ipa-modem-to-ap { + qcom,entry-name = "ipa"; + interrupt-controller; + #interrupt-cells = <2>; + }; + }; + soc: soc@0 { compatible = "simple-bus"; ranges = <0 0 0 0 0x10 0>; @@ -1653,6 +1745,48 @@ tcsr: clock-controller@1fc0000 { #reset-cells = <1>; }; + remoteproc_mpss: remoteproc@4080000 { + compatible = "qcom,sm8550-mpss-pas"; + reg = <0x0 0x04080000 0x0 0x4040>; + + interrupts-extended = <&intc GIC_SPI 264 IRQ_TYPE_EDGE_RISING>, + <&smp2p_modem_in 0 IRQ_TYPE_EDGE_RISING>, + <&smp2p_modem_in 1 IRQ_TYPE_EDGE_RISING>, + <&smp2p_modem_in 2 IRQ_TYPE_EDGE_RISING>, + <&smp2p_modem_in 3 IRQ_TYPE_EDGE_RISING>, + <&smp2p_modem_in 7 IRQ_TYPE_EDGE_RISING>; + interrupt-names = "wdog", "fatal", "ready", "handover", + "stop-ack", "shutdown-ack"; + + clocks = <&rpmhcc RPMH_CXO_CLK>; + clock-names = "xo"; + + power-domains = <&rpmhpd SM8550_CX>, + <&rpmhpd SM8550_MSS>; + power-domain-names = "cx", "mss"; + + interconnects = <&mc_virt MASTER_LLCC 0 &mc_virt SLAVE_EBI1 0>; + + memory-region = <&mpss_mem>, <&q6_mpss_dtb_mem>, <&mpss_dsm_mem>; + + qcom,qmp = <&aoss_qmp>; + + qcom,smem-states = <&smp2p_modem_out 0>; + qcom,smem-state-names = "stop"; + + status = "disabled"; + + glink-edge { + interrupts-extended = <&ipcc IPCC_CLIENT_MPSS + IPCC_MPROC_SIGNAL_GLINK_QMP + IRQ_TYPE_EDGE_RISING>; + mboxes = <&ipcc IPCC_CLIENT_MPSS + IPCC_MPROC_SIGNAL_GLINK_QMP>; + label = "mpss"; + qcom,remote-pid = <1>; + }; + }; + lpass_lpiaon_noc: interconnect@7400000 { compatible = "qcom,sm8550-lpass-lpiaon-noc"; reg = <0 0x07400000 0 0x19080>; @@ -2700,12 +2834,215 @@ 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 SM8550_LCX>, + <&rpmhpd SM8550_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"; + #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>; + }; + + compute-cb@4 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <4>; + iommus = <&apps_smmu 0x1004 0x80>, + <&apps_smmu 0x1064 0x0>; + }; + + compute-cb@5 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <5>; + iommus = <&apps_smmu 0x1005 0x80>, + <&apps_smmu 0x1065 0x0>; + }; + + compute-cb@6 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <6>; + iommus = <&apps_smmu 0x1006 0x80>, + <&apps_smmu 0x1066 0x0>; + }; + + compute-cb@7 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <7>; + iommus = <&apps_smmu 0x1007 0x80>, + <&apps_smmu 0x1067 0x0>; + }; + }; + }; + }; + nsp_noc: interconnect@320c0000 { compatible = "qcom,sm8550-nsp-noc"; reg = <0 0x320c0000 0 0xe080>; #interconnect-cells = <2>; qcom,bcm-voters = <&apps_bcm_voter>; }; + + remoteproc_cdsp: remoteproc@32300000 { + compatible = "qcom,sm8550-cdsp-pas"; + reg = <0x0 0x32300000 0x0 0x1400000>; + + interrupts-extended = <&intc GIC_SPI 578 IRQ_TYPE_EDGE_RISING>, + <&smp2p_cdsp_in 0 IRQ_TYPE_EDGE_RISING>, + <&smp2p_cdsp_in 1 IRQ_TYPE_EDGE_RISING>, + <&smp2p_cdsp_in 2 IRQ_TYPE_EDGE_RISING>, + <&smp2p_cdsp_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 SM8550_CX>, + <&rpmhpd SM8550_MXC>, + <&rpmhpd SM8550_NSP>; + power-domain-names = "cx", "mxc", "nsp"; + + interconnects = <&nsp_noc MASTER_CDSP_PROC 0 &mc_virt SLAVE_EBI1 0>; + + memory-region = <&cdsp_mem>, <&q6_cdsp_dtb_mem>; + + qcom,qmp = <&aoss_qmp>; + + qcom,smem-states = <&smp2p_cdsp_out 0>; + qcom,smem-state-names = "stop"; + + status = "disabled"; + + glink-edge { + interrupts-extended = <&ipcc IPCC_CLIENT_CDSP + IPCC_MPROC_SIGNAL_GLINK_QMP + IRQ_TYPE_EDGE_RISING>; + mboxes = <&ipcc IPCC_CLIENT_CDSP + IPCC_MPROC_SIGNAL_GLINK_QMP>; + + label = "cdsp"; + qcom,remote-pid = <5>; + + fastrpc { + compatible = "qcom,fastrpc"; + qcom,glink-channels = "fastrpcglink-apps-dsp"; + label = "cdsp"; + #address-cells = <1>; + #size-cells = <0>; + + + compute-cb@1 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <1>; + iommus = <&apps_smmu 0x1961 0x0>, + <&apps_smmu 0x0c01 0x20>, + <&apps_smmu 0x19c1 0x10>; + }; + + compute-cb@2 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <2>; + iommus = <&apps_smmu 0x1962 0x0>, + <&apps_smmu 0x0c02 0x20>, + <&apps_smmu 0x19c2 0x10>; + }; + + compute-cb@3 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <3>; + iommus = <&apps_smmu 0x1963 0x0>, + <&apps_smmu 0x0c03 0x20>, + <&apps_smmu 0x19c3 0x10>; + }; + + compute-cb@4 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <4>; + iommus = <&apps_smmu 0x1964 0x0>, + <&apps_smmu 0x0c04 0x20>, + <&apps_smmu 0x19c4 0x10>; + }; + + compute-cb@5 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <5>; + iommus = <&apps_smmu 0x1965 0x0>, + <&apps_smmu 0x0c05 0x20>, + <&apps_smmu 0x19c5 0x10>; + }; + + compute-cb@6 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <6>; + iommus = <&apps_smmu 0x1966 0x0>, + <&apps_smmu 0x0c06 0x20>, + <&apps_smmu 0x19c6 0x10>; + }; + + compute-cb@7 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <7>; + iommus = <&apps_smmu 0x1967 0x0>, + <&apps_smmu 0x0c07 0x20>, + <&apps_smmu 0x19c7 0x10>; + }; + + compute-cb@8 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <8>; + iommus = <&apps_smmu 0x1968 0x0>, + <&apps_smmu 0x0c08 0x20>, + <&apps_smmu 0x19c8 0x10>; + }; + + /* note: secure cb9 in downstream */ + }; + }; + }; }; thermal-zones { From patchwork Wed Jan 18 16:25:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 45381 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2434605wrn; Wed, 18 Jan 2023 08:32:17 -0800 (PST) X-Google-Smtp-Source: AMrXdXv6cdpJcUGLOvSSr9rrylIFLrPSllUoqzv5sOGQZFN4/wT0EULVvsyT5R6yowzMrkB0kL/R X-Received: by 2002:a05:6a00:331b:b0:578:333d:d6ab with SMTP id cq27-20020a056a00331b00b00578333dd6abmr9285070pfb.21.1674059537252; Wed, 18 Jan 2023 08:32:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674059537; cv=none; d=google.com; s=arc-20160816; b=Ti/EEVmjqEi2NX2T54zbAzLi4hvuEbXKGmoRD8mnu8F7e7el2ECycSxNipqmw6SfcF 1WbGiJ4CN4d2Xh3qg6bLgAaw7tbdwj2E1J27WevaD3KAlEID2nfqouDCYXb88ir5Tfab 2//Y2mkeoV5ca4JwEuVlX8o4azALQF4v/9IAJ9morherWb0v1Yy6U0PrhFL9jp5EI0lX EBuIFXWOxwO48bXtQnUJlqLKU7GF21vd6n6HlVeTaurA/IC8FuDjr+KWvf9TuU8/WiEC rWEu3nIrfBtlfzCFdLlZz69hshgnIQ0dJjoWFuFHoMnQj+LCIfPWTAKocoDbssUoTIMh MqjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=z2LqQldgrNJPcDI7p5vuw4ycWgmlXdq2eC/RcsIX/VU=; b=gx1V2VNv2lX9SYSMjT2u190mgfqLfhhcKRBd9IQlInb5l/nbFo/c/LqiRGPNUM6sA/ +TOclcrK+HnlGiFEPeBSr36za7zCpfDxs2blspzUzi5txwzHI7SsuCkP4U0ZsU7E85lK Lq9cmTLE1wNn3hd29jxMqOSshte4HAKpTZYb3cst7VvLYoiW9Ld6ocM+PX9xBKT56xzA Ir+kVSkIJFx/LYeaOH8pQRgFGvFRfxk/0YB8LMfLoHc1W19qRRpTbo3kpDhBHlHWBLjx ekpvriazVyR3MWlNqwptnY9gnxZy1NHyHNRyT40Pq5kjc203U3uQaEDRIZfGVKmsfw8S 76uQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SffSry5q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s22-20020a056a00179600b0058dbb06c94dsi8447040pfg.291.2023.01.18.08.32.04; Wed, 18 Jan 2023 08:32:17 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SffSry5q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230035AbjARQ17 (ORCPT + 99 others); Wed, 18 Jan 2023 11:27:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57396 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230196AbjARQ1Z (ORCPT ); Wed, 18 Jan 2023 11:27:25 -0500 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B76B558991 for ; Wed, 18 Jan 2023 08:25:18 -0800 (PST) Received: by mail-wm1-x335.google.com with SMTP id k22-20020a05600c1c9600b003d1ee3a6289so1947153wms.2 for ; Wed, 18 Jan 2023 08:25:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=z2LqQldgrNJPcDI7p5vuw4ycWgmlXdq2eC/RcsIX/VU=; b=SffSry5qO7cTumzlgWrGzzUXzaiocJTBbYvKSI+eeNH3+GpuwOSB2hrq4JdaNXXxqT 3OICczJREC9GO7IqR7z+kLqzAKM3lpF70ow6XKoz+UcEa8GDUv2/ncxF1DXTrLIUJVku NX0lQ7vc0XbSafsVoIyNnh5CzBa+Hjv4g09A+OSSOf86h8d4tsB5ez+C7/TiDDtdOI5S whLRkKEkCJzArHhw9HCVP1MXE09LbomfYL74nrsfhiIihsDPWn+uSEYY+Z+t91Hi//30 ITMRku3LiO9Fmve+Azp3sB+IM84XCCjOPAlJXiNSXpJaWAVjAqjPOL4qAbr0CbmiHxnq zXZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=z2LqQldgrNJPcDI7p5vuw4ycWgmlXdq2eC/RcsIX/VU=; b=6HZj52DAihFx61lyDWA9oHCudm0kPBHvlFNJ7KOCrn1qPSm/9SICH7J0GMMz7rDn1D 4muQsOKVYzhARvahZLGEeQysn2nRWAWueRKSFe53TcU/lSvZznj7meO1YLElAyJUEkEZ HfGE99B3JZwgv9YULE9FrFSfK/LjrXVLDD2Wh22DidD0s6Zr5/n8fkjaMbCwH5jrvkCB KMfXxm0gExznnwFqSlcmjVxqX5lzDtGTZr20DMDVDzld+EbALv04RZzwk+0P+1rFhrV/ /7sfIDDmlQ8ZNSawcnmttHu20OvT8WY1Wsav2uwl/ZsG+biDiUo4mh1T58KC9EDjAZ+W wNyw== X-Gm-Message-State: AFqh2kr6REL3hbPW/G1BslBewLk8fbBYhwAuGReoIkY7rOPMu++Gyfer j6MgOuH4D97+I+yyqCJwk40XLw== X-Received: by 2002:a05:600c:281:b0:3da:1132:4b63 with SMTP id 1-20020a05600c028100b003da11324b63mr7293199wmk.5.1674059117316; Wed, 18 Jan 2023 08:25:17 -0800 (PST) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id m27-20020a05600c3b1b00b003db012d49b7sm3670695wms.2.2023.01.18.08.25.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 08:25:17 -0800 (PST) From: Neil Armstrong Date: Wed, 18 Jan 2023 17:25:13 +0100 Subject: [PATCH v3 3/3] arm64: dts: qcom: sm8550-mtp: enable adsp, cdsp & mdss MIME-Version: 1.0 Message-Id: <20221115-topic-sm8550-upstream-dts-remoteproc-v3-3-815a1753de34@linaro.org> References: <20221115-topic-sm8550-upstream-dts-remoteproc-v3-0-815a1753de34@linaro.org> In-Reply-To: <20221115-topic-sm8550-upstream-dts-remoteproc-v3-0-815a1753de34@linaro.org> To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Abel Vesa , Neil Armstrong , Konrad Dybcio X-Mailer: b4 0.11.1 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755378652978995159?= X-GMAIL-MSGID: =?utf-8?q?1755378652978995159?= Add the aDSP, cDSP and MPSS firmware and "Devicetree" firmware paths for the SM8550 MTP platform. Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/qcom/sm8550-mtp.dts | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm8550-mtp.dts b/arch/arm64/boot/dts/qcom/sm8550-mtp.dts index 81fcbdc6bdc4..5ab5ac05f989 100644 --- a/arch/arm64/boot/dts/qcom/sm8550-mtp.dts +++ b/arch/arm64/boot/dts/qcom/sm8550-mtp.dts @@ -374,6 +374,24 @@ &qupv3_id_0 { status = "okay"; }; +&remoteproc_adsp { + firmware-name = "qcom/sm8550/adsp.mbn", + "qcom/sm8550/adsp_dtb.mbn"; + status = "okay"; +}; + +&remoteproc_cdsp { + firmware-name = "qcom/sm8550/cdsp.mbn", + "qcom/sm8550/cdsp_dtb.mbn"; + status = "okay"; +}; + +&remoteproc_mpss { + firmware-name = "qcom/sm8550/modem.mbn", + "qcom/sm8550/modem_dtb.mbn"; + status = "okay"; +}; + &sdhc_2 { cd-gpios = <&pm8550_gpios 12 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "sleep";