From patchwork Thu May 6 21:18:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yassine Oudjana X-Patchwork-Id: 431690 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A03EEC433B4 for ; Thu, 6 May 2021 21:18:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5DF18613B5 for ; Thu, 6 May 2021 21:18:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230056AbhEFVTT (ORCPT ); Thu, 6 May 2021 17:19:19 -0400 Received: from mail-41103.protonmail.ch ([185.70.41.103]:33534 "EHLO mail-41103.protonmail.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229942AbhEFVTS (ORCPT ); Thu, 6 May 2021 17:19:18 -0400 Received: from mail-03.mail-europe.com (mail-0301.mail-europe.com [188.165.51.139]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by mail-41103.protonmail.ch (Postfix) with ESMTPS id 4Fbmdl2P2vz4wy4y for ; Thu, 6 May 2021 21:18:19 +0000 (UTC) Authentication-Results: mail-41103.protonmail.ch; dkim=pass (1024-bit key) header.d=protonmail.com header.i=@protonmail.com header.b="kkmMzCGc" Date: Thu, 06 May 2021 21:18:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1620335894; bh=swGFRkl78skPVTJSCaHHFeLlw3u7VBz6phnnlAM9X2o=; h=Date:To:From:Cc:Reply-To:Subject:From; b=kkmMzCGcSx362pQMTjFLWzrTECflGXKXY9g1u3eE74OU/jqrTVgrhp96YOaYjtkDE LWII7MxKWN4P2m+5r6xTvNCQH8d3MSvVs36x/KsZ6o1PZgBq9rVZdmG1GyJfDo/TpI 3Oy2US7fTjrd7hFhAM83YsA8jlAg9AXWtJ0sEbT4= To: Andy Gross , Bjorn Andersson , Rob Herring , Ohad Ben-Cohen , Mathieu Poirier , linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org From: Yassine Oudjana Cc: Yassine Oudjana , Manivannan Sadhasivam , Konrad Dybcio , linux-kernel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht Reply-To: Yassine Oudjana Subject: [PATCH 1/3] remoteproc: qcom: pas: Use the same init resources for MSM8996 and MSM8998 Message-ID: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The init resources for MSM8996 are missing power domains, and adding them makes the resources identical to the MSM8998 ones. Remove slpi_resource_init and use MSM8998 resources for both chips. Signed-off-by: Yassine Oudjana --- drivers/remoteproc/qcom_q6v5_pas.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c index b921fc26cd04..b1e613187c68 100644 --- a/drivers/remoteproc/qcom_q6v5_pas.c +++ b/drivers/remoteproc/qcom_q6v5_pas.c @@ -689,17 +689,6 @@ static const struct adsp_data mpss_resource_init = { .ssctl_id = 0x12, }; -static const struct adsp_data slpi_resource_init = { - .crash_reason_smem = 424, - .firmware_name = "slpi.mdt", - .pas_id = 12, - .has_aggre2_clk = true, - .auto_boot = true, - .ssr_name = "dsps", - .sysmon_name = "slpi", - .ssctl_id = 0x16, -}; - static const struct adsp_data sm8150_slpi_resource = { .crash_reason_smem = 424, .firmware_name = "slpi.mdt", @@ -803,8 +792,8 @@ static const struct adsp_data sdx55_mpss_resource = { static const struct of_device_id adsp_of_match[] = { { .compatible = "qcom,msm8974-adsp-pil", .data = &adsp_resource_init}, - { .compatible = "qcom,msm8996-adsp-pil", .data = &adsp_resource_init}, - { .compatible = "qcom,msm8996-slpi-pil", .data = &slpi_resource_init}, + { .compatible = "qcom,msm8996-adsp-pil", .data = &msm8998_adsp_resource}, + { .compatible = "qcom,msm8996-slpi-pil", .data = &msm8998_slpi_resource}, { .compatible = "qcom,msm8998-adsp-pas", .data = &msm8998_adsp_resource}, { .compatible = "qcom,msm8998-slpi-pas", .data = &msm8998_slpi_resource}, { .compatible = "qcom,qcs404-adsp-pas", .data = &adsp_resource_init }, From patchwork Thu May 6 21:18:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yassine Oudjana X-Patchwork-Id: 432177 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A7793C433B4 for ; Thu, 6 May 2021 21:18:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 70EF460698 for ; Thu, 6 May 2021 21:18:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230129AbhEFVTh (ORCPT ); Thu, 6 May 2021 17:19:37 -0400 Received: from mail-40140.protonmail.ch ([185.70.40.140]:47986 "EHLO mail-40140.protonmail.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230096AbhEFVTg (ORCPT ); Thu, 6 May 2021 17:19:36 -0400 Date: Thu, 06 May 2021 21:18:31 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1620335916; bh=JmIfeZqgnVk4S62XKaHhoZ6ZAhL2NhbjmNUWTGH2gr0=; h=Date:To:From:Cc:Reply-To:Subject:From; b=gKuLcjEJZNSXY3ZN8OcOxUeUr9qMoBLyOH5Xs4Jyq0puK7vL9ZzHweysBWxt2CZMA dVmkQ2scZJ/tA78rzgcQSQuUW4wDMLP3eTxVe5Ir4b5GVMPSGFOpUGFOHkLz3w70zU mj3/IndMR6r/K1xQmm8S5OAE/jxo9VSs23otgf48= To: Andy Gross , Bjorn Andersson , Rob Herring , Ohad Ben-Cohen , Mathieu Poirier , linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org From: Yassine Oudjana Cc: Yassine Oudjana , Manivannan Sadhasivam , Konrad Dybcio , linux-kernel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht Reply-To: Yassine Oudjana Subject: [PATCH 2/3] dt-bindings: remoteproc: qcom: pas: Add power domains for MSM8996 Message-ID: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add MSM8996 compatible strings to CX and SSC-CX power domains. This depends on: "dt-bindings: remoteproc: qcom: pas: Convert binding to YAML" https://lore.kernel.org/linux-arm-msm/20210505082200.32635-1-manivannan.sadhasivam@linaro.org/T/#u Signed-off-by: Yassine Oudjana --- Documentation/devicetree/bindings/remoteproc/qcom,adsp.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,adsp.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,adsp.yaml index 9c07cfce0383..6c11812385ca 100644 --- a/Documentation/devicetree/bindings/remoteproc/qcom,adsp.yaml +++ b/Documentation/devicetree/bindings/remoteproc/qcom,adsp.yaml @@ -320,6 +320,7 @@ allOf: compatible: contains: enum: + - qcom,msm8996-adsp-pil - qcom,msm8998-adsp-pas then: properties: @@ -335,6 +336,7 @@ allOf: compatible: contains: enum: + - qcom,msm8996-slpi-pil - qcom,msm8998-slpi-pas then: properties: From patchwork Thu May 6 21:18:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yassine Oudjana X-Patchwork-Id: 431689 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A2C02C433B4 for ; Thu, 6 May 2021 21:19:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7077D6121F for ; Thu, 6 May 2021 21:19:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230366AbhEFVUF (ORCPT ); Thu, 6 May 2021 17:20:05 -0400 Received: from mail-41104.protonmail.ch ([185.70.41.104]:46488 "EHLO mail-41104.protonmail.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230348AbhEFVUE (ORCPT ); Thu, 6 May 2021 17:20:04 -0400 Received: from mail-02.mail-europe.com (mail-0201.mail-europe.com [51.77.79.158]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by mail-41104.protonmail.ch (Postfix) with ESMTPS id 4Fbmfd1T2gz4x8RH for ; Thu, 6 May 2021 21:19:05 +0000 (UTC) Authentication-Results: mail-41104.protonmail.ch; dkim=pass (1024-bit key) header.d=protonmail.com header.i=@protonmail.com header.b="vEUlZx9B" Date: Thu, 06 May 2021 21:18:52 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1620335940; bh=hOrbqVj5R3JVLRiDgquRCxHlYsob+D3PH8ZLMkNz0DQ=; h=Date:To:From:Cc:Reply-To:Subject:From; b=vEUlZx9BpIVLYi+i8KmAnglGAhY0Lm+PIWgY+jzs7hfCLrg2nNt+6cGhKjfk+jh+t MW/USfsin/HVSWU0gRSSR3DqrLvTlTXA8hNDtHUcNzmek7ypLAcoBu346h8ed+gu0G +qOE5bKEtiOU5gdivGNSoTUgxnzYSx0iCMl+hGNA= To: Andy Gross , Bjorn Andersson , Rob Herring , Ohad Ben-Cohen , Mathieu Poirier , linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org From: Yassine Oudjana Cc: Yassine Oudjana , Manivannan Sadhasivam , Konrad Dybcio , linux-kernel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht Reply-To: Yassine Oudjana Subject: [PATCH 3/3] arm64: dts: qcom: msm8996: Disable ADSP and add power domains Message-ID: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Disable ADSP by default and enable it in devices that use it. Also add CX power domain. Signed-off-by: Yassine Oudjana --- arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 4 ++++ arch/arm64/boot/dts/qcom/msm8996.dtsi | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi index defcbd15edf9..409a5dec2615 100644 --- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi @@ -162,6 +162,10 @@ bluetooth { }; }; +&adsp_pil { + status = "okay"; +}; + &blsp2_i2c0 { /* On High speed expansion */ label = "HS-I2C2"; diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index ce430ba9c118..7e647843f7c7 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -6,6 +6,7 @@ #include #include #include +#include #include / { @@ -2067,6 +2068,11 @@ adsp_pil: remoteproc@9300000 { qcom,smem-states = <&smp2p_adsp_out 0>; qcom,smem-state-names = "stop"; + power-domains = <&rpmpd MSM8996_VDDCX>; + power-domain-names = "cx"; + + status = "disabled"; + smd-edge { interrupts = ;