From patchwork Tue Mar 30 01:46:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sujit Kautkar X-Patchwork-Id: 12171393 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=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,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 0C9CEC433E0 for ; Tue, 30 Mar 2021 01:46:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D288E619A7 for ; Tue, 30 Mar 2021 01:46:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229861AbhC3Bq0 (ORCPT ); Mon, 29 Mar 2021 21:46:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50062 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230509AbhC3BqR (ORCPT ); Mon, 29 Mar 2021 21:46:17 -0400 Received: from mail-pg1-x536.google.com (mail-pg1-x536.google.com [IPv6:2607:f8b0:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D26D5C061762 for ; Mon, 29 Mar 2021 18:46:16 -0700 (PDT) Received: by mail-pg1-x536.google.com with SMTP id k8so1429514pgf.4 for ; Mon, 29 Mar 2021 18:46:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=+LuoE4GN3G28a59qj3b0AjCTzyHLDWWgDnhGjPnnBk8=; b=mH2J9hJB2gPQAKBnprK9o1OOgRTXXumcQ6JmuiU7O3g8VwxwnjFuJIw/ygQDMZflyc nIQ9mwnaWltQjsPTwOKAGLBu9qCJfxL0cVM8/qpyrjuWAQfHhrvMiKK0fPgsSsxf5PWP RqgDjkZsBSb7lvc8/pPPCqkwG7XnJYI3QpjVU= 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:mime-version :content-transfer-encoding; bh=+LuoE4GN3G28a59qj3b0AjCTzyHLDWWgDnhGjPnnBk8=; b=CZR0jaJjb/5v5m1GGnlpanjjbb0epJykus2lumvegB9w6AumCrPv5bxhzBMQBkuDn6 CP+l5jAv+4GsMK4hSE74DMSul8NTvOoK+dT6/aLjDWUmdoIxc2qbH5Wxsh03yUHklSgT gsILqpZvL07hYeOqaxXHC2nfC/edLCQAUIslCqsctpdL7OgteNRPXVW87NF+rr+DpZXT /HhRqs5msSqftH1vNRp5SYg5YM0g9+fO8br2RF1uBdh0CD3t6WxiGi0duXvDtURr7XE8 ypS8SaF2ka/25pkWwZGhuiPvXgb89g3oOaMEVDeDmTaZXrQZPDdHTn8/SKc8CNDLwfjH p2uQ== X-Gm-Message-State: AOAM530Uwk/pj4KfxJm9NnZN7rOzzym7WI9Wx/DqdtE96G7GMhWD1bP9 FOI4rHMSsvntZMLlEy2XbL1jfA== X-Google-Smtp-Source: ABdhPJzLvAnFfM2AnTEqQf8nxNp+tk0H8EWFMpvuNRuwJVNf0TOpAd3SUh0kgr34C+kA8W3BYbNziA== X-Received: by 2002:a62:33c6:0:b029:225:5266:28df with SMTP id z189-20020a6233c60000b0290225526628dfmr14377043pfz.7.1617068776385; Mon, 29 Mar 2021 18:46:16 -0700 (PDT) Received: from sujitka-glaptop.hsd1.ca.comcast.net ([2601:647:4c01:5790:305c:8c84:377e:2eeb]) by smtp.gmail.com with ESMTPSA id 138sm19138480pfv.192.2021.03.29.18.46.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Mar 2021 18:46:16 -0700 (PDT) From: Sujit Kautkar To: Andy Gross , Bjorn Andersson , Rob Herring Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sibi Sankar , Rajendra Nayak , Stephen Boyd , Doug Anderson , Sujit Kautkar Subject: [PATCH] arm64: dts: qcom: Move rmtfs memory region Date: Mon, 29 Mar 2021 18:46:10 -0700 Message-Id: <20210330014610.1451198-1-sujitka@chromium.org> X-Mailer: git-send-email 2.31.0.291.g576ba9dcdaf-goog MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Move rmtfs memory region so that it does not overlap with system RAM (kernel data) when KAsan is enabled. This puts rmtfs right after mba_mem which is not supposed to increase beyond 0x94600000 Signed-off-by: Sujit Kautkar Reviewed-by: Stephen Boyd Reviewed-by: Sibi Sankar --- arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 2 +- arch/arm64/boot/dts/qcom/sc7180.dtsi | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi index 07c8b2c926c0..fe052b477b72 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi @@ -45,7 +45,7 @@ trips { /* Increase the size from 2MB to 8MB */ &rmtfs_mem { - reg = <0x0 0x84400000 0x0 0x800000>; + reg = <0x0 0x94600000 0x0 0x800000>; }; / { diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi index 1ea3344ab62c..ac956488908f 100644 --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi @@ -110,9 +110,9 @@ tz_mem: memory@80b00000 { no-map; }; - rmtfs_mem: memory@84400000 { + rmtfs_mem: memory@94600000 { compatible = "qcom,rmtfs-mem"; - reg = <0x0 0x84400000 0x0 0x200000>; + reg = <0x0 0x94600000 0x0 0x200000>; no-map; qcom,client-id = <1>;