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=-15.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 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 09C32C433EF for ; Mon, 20 Sep 2021 00:22:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D2ECF61052 for ; Mon, 20 Sep 2021 00:22:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231189AbhITAYP (ORCPT ); Sun, 19 Sep 2021 20:24:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60180 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229565AbhITAYP (ORCPT ); Sun, 19 Sep 2021 20:24:15 -0400 Received: from mail-oi1-x232.google.com (mail-oi1-x232.google.com [IPv6:2607:f8b0:4864:20::232]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 827ECC061760 for ; Sun, 19 Sep 2021 17:22:49 -0700 (PDT) Received: by mail-oi1-x232.google.com with SMTP id p2so22516503oif.1 for ; Sun, 19 Sep 2021 17:22:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=JA2O0tqf7sL9eIuWtE+kSmSgHrEDnom7oC3gmz/7Xyk=; b=CJWxhZzIgbfuNcH22lzV1pX6+nRj7JkMlNggF+YKgTkCueUdH79pDLMurmh0xCpEst RwQzyuRRMlh7iQ4GLy5ODiSGH75G5MzWIBzGZMjEBMXIhapkBHccy3HEl7Fyqw/PeCou 4AXTb7TFZRCQrlBcL9sMIx8+9WXjcMNmypZrLm/Tc1oVLv3qZEoI5k7hcA9pi1k7Aw6d I6Bj3axtU9d4+CDWGsoHIsrq8un32WHhRdcKNoSXAgAYGVoMZSaHPZKdq9Vy52t4v+r2 jrHTCC5VVFlTPcrHbHmF+4APkOfb0K/a8vlIV2X/3MeqtIAxICFfjpoKCiBz7GIk1ENI C+Qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=JA2O0tqf7sL9eIuWtE+kSmSgHrEDnom7oC3gmz/7Xyk=; b=ztOI/Fub5U/g74THpvQbEsygjaNnKRmnwegbh1Thdh+c+jopXquCUusdDe3bnrVrqF 0VOKof4GERVL9TqQcGpB0dAkuHhaGNwyHb5VFFst6ggLxxazF/V8B/idTwxFgUYOR67k dJoJTm7jhalas6Wc6WqlBtOtSAaKZx5Krspr3hboWNvLsY4qJmlDZXyiyiVTv7k5uqbF +VKL1QpHDQ64Fn/XEJZ1g6ZFydaYe/c2EyksoNXgfKhAwjHpDNGT+PuFv2bW52pylAKa B/eVDRtz9qdPOrDMu7/ZeHlsTRl7CsqOqzyMO5VJAvIHP1tbxCBhEGJdDc+IYYMD/cV9 KQhQ== X-Gm-Message-State: AOAM532drOHTl7LWiY6UFPhk2lMSzWSb6KDrjm5ZZUhqOU/7C/Mt3FDd xnBTMKBWxPDz+7gnBXoV0y/t6A== X-Google-Smtp-Source: ABdhPJzQedi3f92lIYBEL8kfICVGlImMKFL2gHXZze+USeuXgcJtLMo3OkGfKdV4KGSYx0BVN4j3Ug== X-Received: by 2002:aca:7c5:: with SMTP id 188mr11630121oih.60.1632097368754; Sun, 19 Sep 2021 17:22:48 -0700 (PDT) Received: from ripper (104-57-184-186.lightspeed.austtx.sbcglobal.net. [104.57.184.186]) by smtp.gmail.com with ESMTPSA id y18sm3227048ooy.7.2021.09.19.17.22.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Sep 2021 17:22:48 -0700 (PDT) Date: Sun, 19 Sep 2021 17:23:33 -0700 From: Bjorn Andersson To: Amit Pundir Cc: Andy Gross , Alex Elder , Rob Herring , linux-arm-msm , dt , lkml Subject: Re: [PATCH] arm64: dts: qcom: sdm850-yoga: Reshuffle IPA memory mappings Message-ID: References: <20210916200554.2434439-1-amit.pundir@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210916200554.2434439-1-amit.pundir@linaro.org> Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On Thu 16 Sep 13:05 PDT 2021, Amit Pundir wrote: > Upstream commit 2e01e0c21459 ("arm64: dts: qcom: sdm850-yoga: > Enable IPA") shuffled reserved memory regions in sdm845.dtsi > to make firmware loading succeed and enable the ipa device on > sdm845-yoga but it broke the other common users of those > memory regions like Xiaomi Pocophone F1. > > So this patch effectively revert those upstream commit changes > and move all the relevant changes to sdm850-lenovo-yoga-c630.dts > instead. > > Fixes: 2e01e0c21459 ("arm64: dts: qcom: sdm850-yoga: Enable IPA") > Signed-off-by: Amit Pundir Thanks for the report and fix Amit, I verified that this works fine on my Yoga as well. Tested-by: Bjorn Andersson Regards, Bjorn > --- > Smoke tested on PocoF1 and not on Yoga-C630. > > arch/arm64/boot/dts/qcom/sdm845.dtsi | 21 +++++++----- > .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 34 +++++++++++++++++++ > 2 files changed, 47 insertions(+), 8 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi > index 6d7172e6f4c3..b3b911926184 100644 > --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi > +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi > @@ -128,23 +128,28 @@ camera_mem: memory@8bf00000 { > no-map; > }; > > - wlan_msa_mem: memory@8c400000 { > - reg = <0 0x8c400000 0 0x100000>; > + ipa_fw_mem: memory@8c400000 { > + reg = <0 0x8c400000 0 0x10000>; > no-map; > }; > > - gpu_mem: memory@8c515000 { > - reg = <0 0x8c515000 0 0x2000>; > + ipa_gsi_mem: memory@8c410000 { > + reg = <0 0x8c410000 0 0x5000>; > no-map; > }; > > - ipa_fw_mem: memory@8c517000 { > - reg = <0 0x8c517000 0 0x5a000>; > + gpu_mem: memory@8c415000 { > + reg = <0 0x8c415000 0 0x2000>; > no-map; > }; > > - adsp_mem: memory@8c600000 { > - reg = <0 0x8c600000 0 0x1a00000>; > + adsp_mem: memory@8c500000 { > + reg = <0 0x8c500000 0 0x1a00000>; > + no-map; > + }; > + > + wlan_msa_mem: memory@8df00000 { > + reg = <0 0x8df00000 0 0x100000>; > no-map; > }; > > diff --git a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts > index 385e5029437d..2ba23aa582a1 100644 > --- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts > +++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts > @@ -16,6 +16,17 @@ > #include "sdm850.dtsi" > #include "pm8998.dtsi" > > +/* > + * Update following upstream (sdm845.dtsi) reserved > + * memory mappings for firmware loading to succeed > + * and enable the IPA device. > + */ > +/delete-node/ &ipa_fw_mem; > +/delete-node/ &ipa_gsi_mem; > +/delete-node/ &gpu_mem; > +/delete-node/ &adsp_mem; > +/delete-node/ &wlan_msa_mem; > + > / { > model = "Lenovo Yoga C630"; > compatible = "lenovo,yoga-c630", "qcom,sdm845"; > @@ -58,6 +69,29 @@ panel_in_edp: endpoint { > }; > }; > > + /* Reserved memory changes for IPA */ > + reserved-memory { > + wlan_msa_mem: memory@8c400000 { > + reg = <0 0x8c400000 0 0x100000>; > + no-map; > + }; > + > + gpu_mem: memory@8c515000 { > + reg = <0 0x8c515000 0 0x2000>; > + no-map; > + }; > + > + ipa_fw_mem: memory@8c517000 { > + reg = <0 0x8c517000 0 0x5a000>; > + no-map; > + }; > + > + adsp_mem: memory@8c600000 { > + reg = <0 0x8c600000 0 0x1a00000>; > + no-map; > + }; > + }; > + > sn65dsi86_refclk: sn65dsi86-refclk { > compatible = "fixed-clock"; > #clock-cells = <0>; > -- > 2.25.1 >