From patchwork Mon Jul 19 21:24:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 480282 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT 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 17B38C6377B for ; Mon, 19 Jul 2021 23:37:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 37B0861165 for ; Mon, 19 Jul 2021 23:37:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1443042AbhGSW5B (ORCPT ); Mon, 19 Jul 2021 18:57:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1388276AbhGSUsk (ORCPT ); Mon, 19 Jul 2021 16:48:40 -0400 Received: from mail-io1-xd34.google.com (mail-io1-xd34.google.com [IPv6:2607:f8b0:4864:20::d34]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B2400C0613DD for ; Mon, 19 Jul 2021 14:25:00 -0700 (PDT) Received: by mail-io1-xd34.google.com with SMTP id u7so21627450ion.3 for ; Mon, 19 Jul 2021 14:25:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=r7IIwcEFnbBJbVXSjVGGdfTr8FW2F9zozHrzizCnu6k=; b=jvBTIiql8PFue/rA4X4a5i0OBg/MWU98DiyH2cQFL3yXPuMamFrPc9D3/BAf7qd0o2 AzECrBNxvgTZ1TxSKR9ja2rgBEWWsa2bi2jafFIvjyi90ko7WIFbpE9aOql4s811XfRW PWNxYthe6qX+XNvyPU/DEkUS2P3ktojibjOTP0BD2NvE1HBzYilFue8gSS3UNIPubikx +73cwSy+X39VK7FY9vqb3GMvgb2gM1f1LfciCQAnAy4m7oykkTsymP4pzE5IpmIoRdw7 HIAx/5VaTpcTy1MiIjpUaEfeGgLOlOZQHpn7hAct6K8kqshZ9N0Vv0wtP5m086G5ZOdI 9OHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=r7IIwcEFnbBJbVXSjVGGdfTr8FW2F9zozHrzizCnu6k=; b=aOYsKexOYSXb9L4cFAKrm8ZjsLi6muFIX0i0VVeu/8fBFk0cozmDrSIBlK4OFgpkbP dJCpn0+Rs7SIOASQbEKPFCVIbFglkP20417VwNtaskyfX55TnefO7ZVpyx0+PDAf81Pg L3Fg8lH+vR+71S6s6uHqjh1oXYPj9ZULvIPt9YONHY7lbvJxt8DNkivlaC7o1Py2tXAf oEaBPm1/YUgQhTRoQA/ho4GN0S3r5v9ufpuwhKjNjYzORrCI0V1ODnjuQvsCr++CDIDJ sGRlskl4hM6jKTe9ygGBxwE0UVqQRb4/ehWXjdhnUGCD40g7NIPR+7e+EXFBIledEYbs zBCQ== X-Gm-Message-State: AOAM533/W4GhlJcAMOePRJ14If37wTVlcwP0eWU1Dm271z/ef6G058xC EATXt37W+NtYBltsBxNJHIiAPw== X-Google-Smtp-Source: ABdhPJxjooy5oyUmH2Eg0hJixGIRqk+cFsPWqI+M6jfWjabbRTuqLzKKPdfWMoUBRr9SktiAQv5DIw== X-Received: by 2002:a02:9626:: with SMTP id c35mr8345598jai.84.1626729900198; Mon, 19 Jul 2021 14:25:00 -0700 (PDT) Received: from presto.localdomain (c-73-185-129-58.hsd1.mn.comcast.net. [73.185.129.58]) by smtp.gmail.com with ESMTPSA id f16sm10365634ilc.53.2021.07.19.14.24.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jul 2021 14:24:59 -0700 (PDT) From: Alex Elder To: robh+dt@kernel.org, bjorn.andersson@linaro.org, agross@kernel.org Cc: davem@davemloft.net, kuba@kernel.org, evgreen@chromium.org, cpratapa@codeaurora.org, subashab@codeaurora.org, elder@kernel.org, linux-arm-msm@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 1/3] dt-bindings: net: qcom, ipa: make imem interconnect optional Date: Mon, 19 Jul 2021 16:24:54 -0500 Message-Id: <20210719212456.3176086-2-elder@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210719212456.3176086-1-elder@linaro.org> References: <20210719212456.3176086-1-elder@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On some newer SoCs, the interconnect between IPA and SoC internal memory (imem) is not used. Reflect this in the binding by moving the definition of the "imem" interconnect to the end and defining minItems to be 2 for both the interconnects and interconnect-names properties. Signed-off-by: Alex Elder --- .../devicetree/bindings/net/qcom,ipa.yaml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Documentation/devicetree/bindings/net/qcom,ipa.yaml b/Documentation/devicetree/bindings/net/qcom,ipa.yaml index ed88ba4b94df5..4853ab7017bd9 100644 --- a/Documentation/devicetree/bindings/net/qcom,ipa.yaml +++ b/Documentation/devicetree/bindings/net/qcom,ipa.yaml @@ -87,16 +87,18 @@ properties: - const: ipa-setup-ready interconnects: + minItems: 2 items: - - description: Interconnect path between IPA and main memory - - description: Interconnect path between IPA and internal memory - - description: Interconnect path between IPA and the AP subsystem + - description: Path leading to system memory + - description: Path between the AP and IPA config space + - description: Path leading to internal memory interconnect-names: + minItems: 2 items: - const: memory - - const: imem - const: config + - const: imem qcom,smem-states: $ref: /schemas/types.yaml#/definitions/phandle-array @@ -207,11 +209,11 @@ examples: interconnects = <&rsc_hlos MASTER_IPA &rsc_hlos SLAVE_EBI1>, - <&rsc_hlos MASTER_IPA &rsc_hlos SLAVE_IMEM>, - <&rsc_hlos MASTER_APPSS_PROC &rsc_hlos SLAVE_IPA_CFG>; + <&rsc_hlos MASTER_APPSS_PROC &rsc_hlos SLAVE_IPA_CFG>, + <&rsc_hlos MASTER_IPA &rsc_hlos SLAVE_IMEM>; interconnect-names = "memory", - "imem", - "config"; + "config", + "imem"; qcom,smem-states = <&ipa_smp2p_out 0>, <&ipa_smp2p_out 1>; From patchwork Mon Jul 19 21:24:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 480281 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT 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 573ECC07E95 for ; Mon, 19 Jul 2021 23:37:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 330576113E for ; Mon, 19 Jul 2021 23:37:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245753AbhGSW5N (ORCPT ); Mon, 19 Jul 2021 18:57:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39674 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1388283AbhGSUsr (ORCPT ); Mon, 19 Jul 2021 16:48:47 -0400 Received: from mail-il1-x12a.google.com (mail-il1-x12a.google.com [IPv6:2607:f8b0:4864:20::12a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 96241C0613E2 for ; Mon, 19 Jul 2021 14:25:01 -0700 (PDT) Received: by mail-il1-x12a.google.com with SMTP id w1so17302472ilg.10 for ; Mon, 19 Jul 2021 14:25:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=46RsDietiFjiFAmxHIYkL76FeOwDdqdmSCbTGG461UY=; b=u0YJcFOFHDFPhKL9n6v8T/fbiThMvb5VJ6ffhsL620e5jzPAZUV/Eov+IK3LPGgsKb sxS8HETu5mv093AOYUgGHq66GXQrufK5aAjGBwjIgnYZfqlRJxQReyMWrEV8R9rbpEJD KnPA6GaZN2ATQ0SN7Fq2LdHZpFaCD9elKkwlfFzn1EdvlrccIVxTNWj23qVAEs5dtbGW ouo8n/+Uyq74CogfkvXXRHZVwGkWksNxWJ5p77IfOp24wQgXvdZM2W9QS0v9LRJlq3tR Kr64yw2ZlE4nCLdK7wuTLyof7bDxQOLsU+9+STUGvCOSbaMtdiHCgHndpQrow6eWW/c9 PqBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=46RsDietiFjiFAmxHIYkL76FeOwDdqdmSCbTGG461UY=; b=aeIil1BYqkqE5exeFSOMiO+Q401EcgA22/DgjFYlvSqeXe0vAluKDn87nAZEa5uNdN 0NXUIvtRtDG4NX2YIs4hF46JSYnMvy9bx2F6X2fAtnDATiSs8CDXp8sOBMQ1YcphaBs7 gLnRZ0F8gTRBzmHWPoSN8yA5+X761w8z2ilrnOusHa80sa+0QlRb2SHZTJV3pPXhDK3w 5v5Ds6GpbrV0R33EZZl+zGN484VrLaxKqnko/05KSHMcMCZ//rnhIE6JE2cO3CjCPQWq KuL2/p1Rayo7Vaoa/Y6pcUIdsz2YhD6ooOzXq6+IahQuUCfpfWNyA5kunufQeMmXGmgb vn1g== X-Gm-Message-State: AOAM532AIaojLVVZ/79wtp3YFVnvtVTm+6uYNVeI2YZzh/tvE+Mc91zu Z51DTGzh6BL+SqkvFsEmY4adbsG0n4xrIw== X-Google-Smtp-Source: ABdhPJwe45lcNNsXefD+ynyXkZd7c/eXVEUWvmyXLjRAhMEYNKZVfQ0ly/KZysHqRz5+mqBezGqJEg== X-Received: by 2002:a92:c10c:: with SMTP id p12mr17775712ile.92.1626729901039; Mon, 19 Jul 2021 14:25:01 -0700 (PDT) Received: from presto.localdomain (c-73-185-129-58.hsd1.mn.comcast.net. [73.185.129.58]) by smtp.gmail.com with ESMTPSA id f16sm10365634ilc.53.2021.07.19.14.25.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jul 2021 14:25:00 -0700 (PDT) From: Alex Elder To: bjorn.andersson@linaro.org, agross@kernel.org Cc: robh+dt@kernel.org, davem@davemloft.net, kuba@kernel.org, evgreen@chromium.org, cpratapa@codeaurora.org, subashab@codeaurora.org, elder@kernel.org, linux-arm-msm@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 2/3] arm64: dts: qcom: sc7280: add IPA information Date: Mon, 19 Jul 2021 16:24:55 -0500 Message-Id: <20210719212456.3176086-3-elder@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210719212456.3176086-1-elder@linaro.org> References: <20210719212456.3176086-1-elder@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add IPA-related nodes and definitions to "sc7280.dtsi", including the reserved memory area used for AP-based IPA firmware loading. Signed-off-by: Alex Elder --- arch/arm64/boot/dts/qcom/sc7280.dtsi | 43 ++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi index a8c274ad74c47..5eb2b58ea23be 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -7,6 +7,7 @@ #include #include +#include #include #include #include @@ -63,6 +64,11 @@ cpucp_mem: memory@80b00000 { no-map; reg = <0x0 0x80b00000 0x0 0x100000>; }; + + ipa_fw_mem: memory@8b700000 { + reg = <0 0x8b700000 0 0x10000>; + no-map; + }; }; cpus { @@ -508,6 +514,43 @@ mmss_noc: interconnect@1740000 { qcom,bcm-voters = <&apps_bcm_voter>; }; + ipa: ipa@1e40000 { + compatible = "qcom,sc7280-ipa"; + + iommus = <&apps_smmu 0x480 0x0>, + <&apps_smmu 0x482 0x0>; + reg = <0 0x1e40000 0 0x8000>, + <0 0x1e50000 0 0x4ad0>, + <0 0x1e04000 0 0x23000>; + reg-names = "ipa-reg", + "ipa-shared", + "gsi"; + + interrupts-extended = <&intc 0 654 IRQ_TYPE_EDGE_RISING>, + <&intc 0 432 IRQ_TYPE_LEVEL_HIGH>, + <&ipa_smp2p_in 0 IRQ_TYPE_EDGE_RISING>, + <&ipa_smp2p_in 1 IRQ_TYPE_EDGE_RISING>; + interrupt-names = "ipa", + "gsi", + "ipa-clock-query", + "ipa-setup-ready"; + + clocks = <&rpmhcc RPMH_IPA_CLK>; + clock-names = "core"; + + interconnects = <&aggre2_noc MASTER_IPA 0 &mc_virt SLAVE_EBI1 0>, + <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_IPA_CFG 0>; + interconnect-names = "memory", + "config"; + + qcom,smem-states = <&ipa_smp2p_out 0>, + <&ipa_smp2p_out 1>; + qcom,smem-state-names = "ipa-clock-enabled-valid", + "ipa-clock-enabled"; + + status = "disabled"; + }; + tcsr_mutex: hwlock@1f40000 { compatible = "qcom,tcsr-mutex", "syscon"; reg = <0 0x01f40000 0 0x40000>;