Received: by 2002:a05:6a10:eb17:0:0:0:0 with SMTP id hx23csp449868pxb; Thu, 9 Sep 2021 04:52:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJznfuqV+5IveFX6RPxeo+T+6yxaK+Vo6+w54PSxainjLriHITaNDCy4oG4Xxw196Y4LhKLR X-Received: by 2002:a05:6e02:134e:: with SMTP id k14mr2031973ilr.39.1631188354815; Thu, 09 Sep 2021 04:52:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631188354; cv=none; d=google.com; s=arc-20160816; b=d//OQyimzcZMq/eDw7iL006aiOLU6WBAUyVgiVk4GUiwfgux7Ui82Bv7YgHyGVBbTI AvGOGp+zLZiLJD7mN5e4j3AudwwrE9HjX+VDYrPxNDzmoX4QFDlRnzkWX6oSvnvv4CFR pRJmE23a9lxVG5iUJ1Sx4fA0BClD+V+EvJ3P69eB3z82R9WpoI0u4T9TGfQXDMCBKTYT XcnQA64+dNstFvrzEPLz5fwXC606r6JeggS+oK+cwLGBobO/nbUuk8ffZ1gGO+Vrip+K StKM3mP7T+Y5hNOtZ04lTOSsPw7ohlboJD63U5NqWOPkaDvC2CbRe5VPb6Te5J9raRbX HtBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=QyKUxVTHg4JEMyd4SA+vaqUWzie6NVBlW0Q330z3leE=; b=t7jtdL66Wo3pQVVdQdSJAc0ONKsGEneh8KqDTfgO7qXe/o/11SLirY2X2hU7rbiKHW hZWIjAZpc+6dvd/JFDYG3p8H9arWaMZhHl4npJ0TbUk6T7BRgqZHYmIX+FQUpV+DYk5P UAa20wKOKVp+lGQ8Kvn3VPFczitqCrNwidXQ2+IImQQdGkmWAnWsly9tBarru0apxC0J FZ3Yh7RiWLBslrCPPKI2akEpp8iakMKJQ6kRAkCobugZg+fpU84K7YKrzyTglKiPnghm 1toU7EJTL7NEU1iqIQdElD1QTOFwjhHtwhbzRv839pDDhvqT8GPdl+nBTa8URV3zywet uZNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=G3mqlBTt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y6si1370947ion.66.2021.09.09.04.52.23; Thu, 09 Sep 2021 04:52:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=G3mqlBTt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239434AbhIILvj (ORCPT + 99 others); Thu, 9 Sep 2021 07:51:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:55048 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237109AbhIILsw (ORCPT ); Thu, 9 Sep 2021 07:48:52 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 159636137E; Thu, 9 Sep 2021 11:43:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631187811; bh=wlrHyYfPWKz23ai1ZnO5b4NKnVRwj7Rn0UBQRRpgyJU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G3mqlBTtUjNawfWR3XUdeSBpdGq0sSvXbEi1Joq3TWy0VBUHCXX6ejPiIwmhGd9YL dn4ZaHXUn2b8SVSJov+QBK6tCGDjK24MyNNTzBjgS4XTZl6fmuoeIZuSfGyvRWPrK7 APWYy8z2i/syJfZ88JhWcFoCYlgK89T9V9w+ZGtvnC2E9hm90qXukJwT1Wigzn31qw 0ZNpxfpGeQDIwDLhs/iFiYbcwCjsv+D6FxqzZHCWeNPhfbXnGfNN8+TUyWMEiESB1B oJ0E8aSNmNMDNeE8Vyd0k+jTSeoJxqmamPfiYoz5vJy4mM/odwmN0XjitCMuG5MPDs ZQgwZsy959fkQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: AngeloGioacchino Del Regno , Konrad Dybcio , Bjorn Andersson , Sasha Levin , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH AUTOSEL 5.14 112/252] arm64: dts: qcom: sdm630: Rewrite memory map Date: Thu, 9 Sep 2021 07:38:46 -0400 Message-Id: <20210909114106.141462-112-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210909114106.141462-1-sashal@kernel.org> References: <20210909114106.141462-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: AngeloGioacchino Del Regno [ Upstream commit 26e02c98a9ad63eb21b9be4ac92002f555130d3b ] The memory map was wrong. Fix it. Signed-off-by: AngeloGioacchino Del Regno Signed-off-by: Konrad Dybcio Link: https://lore.kernel.org/r/20210728222542.54269-2-konrad.dybcio@somainline.org Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/qcom/sdm630.dtsi | 41 ++++++++++++---------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi index f91a928466c3..5ea3884b3ccb 100644 --- a/arch/arm64/boot/dts/qcom/sdm630.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi @@ -343,10 +343,19 @@ wlan_msa_mem: wlan-msa-mem@85700000 { }; qhee_code: qhee-code@85800000 { - reg = <0x0 0x85800000 0x0 0x3700000>; + reg = <0x0 0x85800000 0x0 0x600000>; no-map; }; + rmtfs_mem: memory@85e00000 { + compatible = "qcom,rmtfs-mem"; + reg = <0x0 0x85e00000 0x0 0x200000>; + no-map; + + qcom,client-id = <1>; + qcom,vmid = <15>; + }; + smem_region: smem-mem@86000000 { reg = <0 0x86000000 0 0x200000>; no-map; @@ -357,58 +366,44 @@ tz_mem: memory@86200000 { no-map; }; - modem_fw_mem: modem-fw-region@8ac00000 { + mpss_region: mpss@8ac00000 { reg = <0x0 0x8ac00000 0x0 0x7e00000>; no-map; }; - adsp_fw_mem: adsp-fw-region@92a00000 { + adsp_region: adsp@92a00000 { reg = <0x0 0x92a00000 0x0 0x1e00000>; no-map; }; - pil_mba_mem: pil-mba-region@94800000 { + mba_region: mba@94800000 { reg = <0x0 0x94800000 0x0 0x200000>; no-map; }; - buffer_mem: buffer-region@94a00000 { + buffer_mem: tzbuffer@94a00000 { reg = <0x0 0x94a00000 0x0 0x100000>; no-map; }; - venus_fw_mem: venus-fw-region@9f800000 { + venus_region: venus@9f800000 { reg = <0x0 0x9f800000 0x0 0x800000>; no-map; }; - secure_region2: secure-region2@f7c00000 { - reg = <0x0 0xf7c00000 0x0 0x5c00000>; - no-map; - }; - adsp_mem: adsp-region@f6000000 { reg = <0x0 0xf6000000 0x0 0x800000>; no-map; }; - qseecom_ta_mem: qseecom-ta-region@fec00000 { - reg = <0x0 0xfec00000 0x0 0x1000000>; - no-map; - }; - qseecom_mem: qseecom-region@f6800000 { reg = <0x0 0xf6800000 0x0 0x1400000>; no-map; }; - secure_display_memory: secure-region@f5c00000 { - reg = <0x0 0xf5c00000 0x0 0x5c00000>; - no-map; - }; - - cont_splash_mem: cont-splash-region@9d400000 { - reg = <0x0 0x9d400000 0x0 0x23ff000>; + zap_shader_region: gpu@fed00000 { + compatible = "shared-dma-pool"; + reg = <0x0 0xfed00000 0x0 0xa00000>; no-map; }; }; -- 2.30.2