From mboxrd@z Thu Jan 1 00:00:00 1970 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=-8.4 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 95BDDC18E5A for ; Wed, 11 Mar 2020 14:39:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C9FDA20637 for ; Wed, 11 Mar 2020 14:39:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="x9hyoRKS" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729869AbgCKOjc (ORCPT ); Wed, 11 Mar 2020 10:39:32 -0400 Received: from mail-il1-f196.google.com ([209.85.166.196]:41957 "EHLO mail-il1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729718AbgCKOjb (ORCPT ); Wed, 11 Mar 2020 10:39:31 -0400 Received: by mail-il1-f196.google.com with SMTP id l14so2201305ilj.8 for ; Wed, 11 Mar 2020 07:39:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=wy+o8H7bDaEo8BGddDsCo4a2Cywi6MmVF56mviUaRRY=; b=x9hyoRKSsjcNql8Vs3VDhHu71U7F4mVlz+l+9FFNuzzath0jvqI2Dy20OaCZrSbi64 8n7VekEx3zlK1oMbjct/nFIPRc9TFXpuqiM7kigXd5fqYqGpv3Slvldg4Qc7R6PV2xih IXwB6jOdD7D/4nMP5juQIBgH4PDziLPcKEz1EJ19eD79TdJR40mzNUIX9vb1rc1gySzX FIgMzmFkRKfEH0xeeyhy6d0IvS97CZP54idilKEoybizu/hSnMFoYgHv71n5Jz+4Gsts 0a/h8tBSKBHSlTWjvfxw6wsQQ/ddTuCD+cqE8/rZd176hzJbW+ZzVJWR67I4Jy83dI2W dCZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=wy+o8H7bDaEo8BGddDsCo4a2Cywi6MmVF56mviUaRRY=; b=r1mgdTA1qsIpZvAj14MhZyc+LY5hq93vQK7KF+rJzkqEutvCkQfonOcVexGryxH7mn wxzEy9hGTGG1Ejlahn5lSzmp935SKVN+/uvSzWoaYRmPiwWqpuH8bWJ/5gsBrkKq/z0c /ZWLDtNxK4paAegroVkwBy0XwuLHLfRyTVD8shrE7LqQQwqKK9UlXlnH/nRuNLM1u2ZL bY6plLR0KFBQxsSONmPCcD1IkNqpk0PofxCy9T6GXRgnvUcEuXKrt9y9hvI3QQ9o5LOF 7HVcoYqbIMM7Q8UXCoDsa0ZSHvWpYQn62qUhLk82yWQEP2ioFn8h2reEYkSabXpMEtdM gapA== X-Gm-Message-State: ANhLgQ3aC7af4H+8fQkX3Dzn9uY359Ybr1Pbwsota5kCuUVpl1Lv0/uV E4ZGt2d59JE4IFvNrxVKG4/dpw== X-Google-Smtp-Source: ADFU+vsoLXbHGd59x7Q6lscbF+LgH2AFuhNx/jrcSAvda5RCT92+oTo8i3ASrpHiJWGnWl/FdM3Wng== X-Received: by 2002:a92:d9d0:: with SMTP id n16mr3509344ilq.200.1583937570436; Wed, 11 Mar 2020 07:39:30 -0700 (PDT) Received: from [172.22.22.26] (c-73-185-129-58.hsd1.mn.comcast.net. [73.185.129.58]) by smtp.googlemail.com with ESMTPSA id h14sm8868430iow.23.2020.03.11.07.39.28 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 11 Mar 2020 07:39:29 -0700 (PDT) Subject: Re: [PATCH v2 17/17] arm64: dts: sdm845: add IPA information To: Jon Hunter , Bjorn Andersson , Andy Gross , David Miller Cc: Arnd Bergmann , Johannes Berg , Dan Williams , Evan Green , Eric Caruso , Susheel Yadav Yadagiri , Chaitanya Pratapa , Subash Abhinov Kasiviswanathan , Rob Herring , Mark Rutland , Ohad Ben-Cohen , Siddharth Gupta , netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, linux-kernel@vger.kernel.org References: <20200306042831.17827-1-elder@linaro.org> <20200306042831.17827-18-elder@linaro.org> From: Alex Elder Message-ID: <4decbc8a-b0a6-8f10-b439-ade9008a4cff@linaro.org> Date: Wed, 11 Mar 2020 09:39:25 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.4.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On 3/11/20 5:49 AM, Jon Hunter wrote: > > On 06/03/2020 04:28, Alex Elder wrote: >> Add IPA-related nodes and definitions to "sdm845.dtsi". >> >> Signed-off-by: Alex Elder >> --- >> arch/arm64/boot/dts/qcom/sdm845.dtsi | 51 ++++++++++++++++++++++++++++ >> 1 file changed, 51 insertions(+) >> >> diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi >> index d42302b8889b..58fd1c611849 100644 >> --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi >> +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi >> @@ -675,6 +675,17 @@ >> 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>; >> + }; >> }; >> >> smp2p-slpi { >> @@ -1435,6 +1446,46 @@ >> }; >> }; >> >> + ipa@1e40000 { >> + compatible = "qcom,sdm845-ipa"; >> + >> + modem-init; >> + modem-remoteproc = <&mss_pil>; >> + >> + reg = <0 0x1e40000 0 0x7000>, >> + <0 0x1e47000 0 0x2000>, >> + <0 0x1e04000 0 0x2c000>; >> + reg-names = "ipa-reg", >> + "ipa-shared", >> + "gsi"; >> + >> + interrupts-extended = >> + <&intc 0 311 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 = >> + <&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>; >> + interconnect-names = "memory", >> + "imem", >> + "config"; >> + >> + qcom,smem-states = <&ipa_smp2p_out 0>, >> + <&ipa_smp2p_out 1>; >> + qcom,smem-state-names = "ipa-clock-enabled-valid", >> + "ipa-clock-enabled"; >> + }; >> + >> tcsr_mutex_regs: syscon@1f40000 { >> compatible = "syscon"; >> reg = <0 0x01f40000 0 0x40000>; >> > > > This change is causing the following build error on today's -next ... > > DTC arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dtb > arch/arm64/boot/dts/qcom/sdm845.dtsi:1710.15-1748.5: ERROR (phandle_references): /soc@0/ipa@1e40000: Reference to non-existent node or label "rsc_hlos" This problem arises because a commit in the Qualcomm SoC tree affects "arch/arm64/boot/dts/qcom/sdm845.dtsi", changing the interconnect provider node(s) used by IPA: b303f9f0050b arm64: dts: sdm845: Redefine interconnect provider DT nodes I will send out a patch today that updates the IPA node in "sdm845.dtsi" to correct that. In the mean time, David, perhaps you should revert this change in net-next: 9cc5ae125f0e arm64: dts: sdm845: add IPA information and let me work out fixing "sdm845.dtsi" with Andy and Bjorn in the Qualcomm tree. Thanks. -Alex > Cheers > Jon >